Merge branch 'aws-amplify:main' into amplify-js/update-issue-template

aws-amplify · Nov 23, 2022 · 8faa645 · 8faa645
2 parents 2af8e9f + d1b6791
commit 8faa645
Show file tree

Hide file tree

Showing 44 changed files with 593 additions and 106 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -387,7 +387,6 @@ jobs:
             echo $SSH_HOST_PUBLIC_KEY >> ~/.ssh/known_hosts
             git clone $AMPLIFY_JS_SAMPLES_STAGING_URL
             cd amplify-js-samples-staging
-            git checkout next-major-version/5
             yarn
       - save_cache:
           key: amplify-js-{{ .Branch }}-{{ checksum "amplify-js-samples-staging/yarn.lock" }}
@@ -1329,7 +1328,6 @@ releasable_branches: &releasable_branches
       - 1.0-stable
       - geo/main
       - in-app-messaging/main
-      - next-major-version/5
 
 test_browsers: &test_browsers
   browser: [chrome, firefox]

diff --git a/README.md b/README.md
@@ -134,7 +134,7 @@ To get started pick your platform from our [**Getting Started** home page](https
   + Analytics.record({ name: 'my example event' });
   ```
 
-- The `JS` export has been removed from `@aws-amplify/core` in favor the exporting the functions it contained.
+- The `JS` export has been removed from `@aws-amplify/core` in favor of exporting the functions it contained.
 - Any calls to `Amplify.Auth`, `Amplify.Cache`, and `Amplify.ServiceWorker` are no longer supported. Instead, your code should use the named exports. For example:
 
   ```diff

diff --git a/package.json b/package.json
@@ -101,19 +101,6 @@
 		"winston": "^3.2.1",
 		"wml": "0.0.83"
 	},
-	"resolutions": {
-		"@babel/generator": "7.19.6",
-		"@babel/helpers": "7.19.4",
-		"@babel/helper-skip-transparent-expression-wrappers": "7.18.9",
-		"@babel/types": "7.12.10",
-		"@types/babel__traverse": "7.0.8",
-		"@babel/traverse": "7.17.9",
-		"@types/react": "16.9.10",
-		"terser": "4.6.7",
-		"npm-packlist": "1.1.12",
-		"error-stack-parser": "2.0.6",
-		"@types/minimatch": "3.0.5"
-	},
 	"bundlewatch": {
 		"files": [
 			{

diff --git a/packages/analytics/CHANGELOG.md b/packages/analytics/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.0.4](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/analytics@6.0.3...@aws-amplify/analytics@6.0.4) (2022-11-23)
+
+**Note:** Version bump only for package @aws-amplify/analytics
+
+
+
+
+
+## [6.0.3](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/analytics@6.0.2...@aws-amplify/analytics@6.0.3) (2022-11-19)
+
+**Note:** Version bump only for package @aws-amplify/analytics
+
+
+
+
+
 ## [6.0.2](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/analytics@6.0.1...@aws-amplify/analytics@6.0.2) (2022-11-16)
 
 **Note:** Version bump only for package @aws-amplify/analytics

diff --git a/packages/analytics/package.json b/packages/analytics/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/analytics",
-	"version": "6.0.2",
+	"version": "6.0.4",
 	"description": "Analytics category of aws-amplify",
 	"main": "./lib/index.js",
 	"module": "./lib-esm/index.js",
@@ -46,8 +46,8 @@
 		"src"
 	],
 	"dependencies": {
-		"@aws-amplify/cache": "5.0.2",
-		"@aws-amplify/core": "5.0.2",
+		"@aws-amplify/cache": "5.0.4",
+		"@aws-amplify/core": "5.0.4",
 		"@aws-sdk/client-firehose": "3.6.1",
 		"@aws-sdk/client-kinesis": "3.6.1",
 		"@aws-sdk/client-personalize-events": "3.6.1",

diff --git a/packages/api-graphql/CHANGELOG.md b/packages/api-graphql/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.0.4](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/api-graphql@3.0.3...@aws-amplify/api-graphql@3.0.4) (2022-11-23)
+
+**Note:** Version bump only for package @aws-amplify/api-graphql
+
+
+
+
+
+## [3.0.3](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/api-graphql@3.0.2...@aws-amplify/api-graphql@3.0.3) (2022-11-19)
+
+**Note:** Version bump only for package @aws-amplify/api-graphql
+
+
+
+
+
 ## [3.0.2](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/api-graphql@3.0.1...@aws-amplify/api-graphql@3.0.2) (2022-11-16)
 
 **Note:** Version bump only for package @aws-amplify/api-graphql

diff --git a/packages/api-graphql/package.json b/packages/api-graphql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/api-graphql",
-  "version": "3.0.2",
+  "version": "3.0.4",
   "description": "Api-graphql category of aws-amplify",
   "main": "./lib/index.js",
   "module": "./lib-esm/index.js",
@@ -47,11 +47,11 @@
     "src"
   ],
   "dependencies": {
-    "@aws-amplify/api-rest": "3.0.2",
-    "@aws-amplify/auth": "5.0.2",
-    "@aws-amplify/cache": "5.0.2",
-    "@aws-amplify/core": "5.0.2",
-    "@aws-amplify/pubsub": "5.0.2",
+    "@aws-amplify/api-rest": "3.0.4",
+    "@aws-amplify/auth": "5.0.4",
+    "@aws-amplify/cache": "5.0.4",
+    "@aws-amplify/core": "5.0.4",
+    "@aws-amplify/pubsub": "5.0.4",
     "graphql": "15.8.0",
     "tslib": "^1.8.0",
     "uuid": "^3.2.1",

diff --git a/packages/api-rest/CHANGELOG.md b/packages/api-rest/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.0.4](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/api-rest@3.0.3...@aws-amplify/api-rest@3.0.4) (2022-11-23)
+
+**Note:** Version bump only for package @aws-amplify/api-rest
+
+
+
+
+
+## [3.0.3](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/api-rest@3.0.2...@aws-amplify/api-rest@3.0.3) (2022-11-19)
+
+**Note:** Version bump only for package @aws-amplify/api-rest
+
+
+
+
+
 ## [3.0.2](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/api-rest@3.0.1...@aws-amplify/api-rest@3.0.2) (2022-11-16)
 
 **Note:** Version bump only for package @aws-amplify/api-rest

diff --git a/packages/api-rest/package.json b/packages/api-rest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/api-rest",
-  "version": "3.0.2",
+  "version": "3.0.4",
   "description": "Api-rest category of aws-amplify",
   "main": "./lib/index.js",
   "module": "./lib-esm/index.js",
@@ -44,7 +44,7 @@
     "src"
   ],
   "dependencies": {
-    "@aws-amplify/core": "5.0.2",
+    "@aws-amplify/core": "5.0.4",
     "axios": "0.26.0",
     "tslib": "^1.8.0"
   },

diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.0.4](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/api@5.0.3...@aws-amplify/api@5.0.4) (2022-11-23)
+
+**Note:** Version bump only for package @aws-amplify/api
+
+
+
+
+
+## [5.0.3](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/api@5.0.2...@aws-amplify/api@5.0.3) (2022-11-19)
+
+**Note:** Version bump only for package @aws-amplify/api
+
+
+
+
+
 ## [5.0.2](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/api@5.0.1...@aws-amplify/api@5.0.2) (2022-11-16)
 
 **Note:** Version bump only for package @aws-amplify/api

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/api",
-	"version": "5.0.2",
+	"version": "5.0.4",
 	"description": "Api category of aws-amplify",
 	"main": "./lib/index.js",
 	"module": "./lib-esm/index.js",
@@ -55,8 +55,8 @@
 		"index.*.d.ts"
 	],
 	"dependencies": {
-		"@aws-amplify/api-graphql": "3.0.2",
-		"@aws-amplify/api-rest": "3.0.2",
+		"@aws-amplify/api-graphql": "3.0.4",
+		"@aws-amplify/api-rest": "3.0.4",
 		"tslib": "^1.8.0"
 	},
 	"jest": {

diff --git a/packages/auth/CHANGELOG.md b/packages/auth/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.0.4](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/auth@5.0.3...@aws-amplify/auth@5.0.4) (2022-11-23)
+
+**Note:** Version bump only for package @aws-amplify/auth
+
+
+
+
+
+## [5.0.3](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/auth@5.0.2...@aws-amplify/auth@5.0.3) (2022-11-19)
+
+**Note:** Version bump only for package @aws-amplify/auth
+
+
+
+
+
 ## [5.0.2](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/auth@5.0.1...@aws-amplify/auth@5.0.2) (2022-11-16)
 
 

diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/auth",
-  "version": "5.0.2",
+  "version": "5.0.4",
   "description": "Auth category of aws-amplify",
   "main": "./lib/index.js",
   "module": "./lib-esm/index.js",
@@ -44,7 +44,7 @@
     "src"
   ],
   "dependencies": {
-    "@aws-amplify/core": "5.0.2",
+    "@aws-amplify/core": "5.0.4",
     "amazon-cognito-identity-js": "6.0.1",
     "tslib": "^1.8.0"
   },

diff --git a/packages/aws-amplify/CHANGELOG.md b/packages/aws-amplify/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.0.4](https://github.com/aws-amplify/amplify-js/compare/aws-amplify@5.0.3...aws-amplify@5.0.4) (2022-11-23)
+
+**Note:** Version bump only for package aws-amplify
+
+
+
+
+
+## [5.0.3](https://github.com/aws-amplify/amplify-js/compare/aws-amplify@5.0.2...aws-amplify@5.0.3) (2022-11-19)
+
+**Note:** Version bump only for package aws-amplify
+
+
+
+
+
 ## [5.0.2](https://github.com/aws-amplify/amplify-js/compare/aws-amplify@5.0.1...aws-amplify@5.0.2) (2022-11-16)
 
 **Note:** Version bump only for package aws-amplify

diff --git a/packages/aws-amplify/package.json b/packages/aws-amplify/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aws-amplify",
-  "version": "5.0.2",
+  "version": "5.0.4",
   "description": "AWS Amplify is a JavaScript library for Frontend and mobile developers building cloud-enabled applications.",
   "main": "./lib/index.js",
   "module": "./lib-esm/index.js",
@@ -40,19 +40,19 @@
     "src"
   ],
   "dependencies": {
-    "@aws-amplify/analytics": "6.0.2",
-    "@aws-amplify/api": "5.0.2",
-    "@aws-amplify/auth": "5.0.2",
-    "@aws-amplify/cache": "5.0.2",
-    "@aws-amplify/core": "5.0.2",
-    "@aws-amplify/datastore": "4.0.2",
-    "@aws-amplify/geo": "2.0.2",
-    "@aws-amplify/interactions": "5.0.2",
-    "@aws-amplify/notifications": "1.0.2",
-    "@aws-amplify/predictions": "5.0.2",
-    "@aws-amplify/pubsub": "5.0.2",
-    "@aws-amplify/storage": "5.0.2",
-    "@aws-amplify/xr": "4.0.2",
+    "@aws-amplify/analytics": "6.0.4",
+    "@aws-amplify/api": "5.0.4",
+    "@aws-amplify/auth": "5.0.4",
+    "@aws-amplify/cache": "5.0.4",
+    "@aws-amplify/core": "5.0.4",
+    "@aws-amplify/datastore": "4.0.4",
+    "@aws-amplify/geo": "2.0.4",
+    "@aws-amplify/interactions": "5.0.4",
+    "@aws-amplify/notifications": "1.0.4",
+    "@aws-amplify/predictions": "5.0.4",
+    "@aws-amplify/pubsub": "5.0.4",
+    "@aws-amplify/storage": "5.0.4",
+    "@aws-amplify/xr": "4.0.4",
     "tslib": "^2.0.0"
   },
   "jest": {

diff --git a/packages/cache/CHANGELOG.md b/packages/cache/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.0.4](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/cache@5.0.3...@aws-amplify/cache@5.0.4) (2022-11-23)
+
+**Note:** Version bump only for package @aws-amplify/cache
+
+
+
+
+
+## [5.0.3](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/cache@5.0.2...@aws-amplify/cache@5.0.3) (2022-11-19)
+
+**Note:** Version bump only for package @aws-amplify/cache
+
+
+
+
+
 ## [5.0.2](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/cache@5.0.1...@aws-amplify/cache@5.0.2) (2022-11-16)
 
 **Note:** Version bump only for package @aws-amplify/cache

diff --git a/packages/cache/package.json b/packages/cache/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/cache",
-  "version": "5.0.2",
+  "version": "5.0.4",
   "description": "Cache category of aws-amplify",
   "main": "./lib/index.js",
   "module": "./lib-esm/index.js",
@@ -46,7 +46,7 @@
     "src"
   ],
   "dependencies": {
-    "@aws-amplify/core": "5.0.2",
+    "@aws-amplify/core": "5.0.4",
     "tslib": "^1.8.0"
   },
   "jest": {

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.0.4](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/core@5.0.3...@aws-amplify/core@5.0.4) (2022-11-23)
+
+**Note:** Version bump only for package @aws-amplify/core
+
+
+
+
+
+## [5.0.3](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/core@5.0.2...@aws-amplify/core@5.0.3) (2022-11-19)
+
+**Note:** Version bump only for package @aws-amplify/core
+
+
+
+
+
 ## [5.0.2](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/core@5.0.1...@aws-amplify/core@5.0.2) (2022-11-16)
 
 **Note:** Version bump only for package @aws-amplify/core

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/core",
-	"version": "5.0.2",
+	"version": "5.0.4",
 	"description": "Core category of aws-amplify",
 	"main": "./lib/index.js",
 	"module": "./lib-esm/index.js",

diff --git a/packages/core/src/Platform/version.ts b/packages/core/src/Platform/version.ts
@@ -1,2 +1,2 @@
 // generated by genversion
-export const version = '5.0.2';
+export const version = '5.0.4';