Merge pull request #13397 from aws-amplify/dev-main-merge-7979d82a39d…

…cdb7 chore(release): Merge main into dev
aws-amplify · Nov 8, 2023 · 7250f38 · 7250f38
2 parents 2398b84 + 0e3bbf8
commit 7250f38
Show file tree

Hide file tree

Showing 111 changed files with 1,724 additions and 414 deletions.
diff --git a/.circleci/cb-publish-step-2-verdaccio.sh b/.circleci/cb-publish-step-2-verdaccio.sh
@@ -8,7 +8,7 @@ function lernaPublishExitOnFailure {
   set -e
   # run lerna publish with the args that were passed to this function
   # duplicate stdout to a temp file
-  npx lerna publish "$@" | tee /tmp/publish-results
+  npx lerna publish "$@" 2>&1 | tee /tmp/publish-results
   # grep the temp file for the lerna err token and return exit 1
   number_of_lerna_errors=$(grep "lerna ERR" /tmp/publish-results | wc -l)
   if [[ number_of_lerna_errors -gt 0 ]]; then

diff --git a/.circleci/cb-publish-step-3-npm.sh b/.circleci/cb-publish-step-3-npm.sh
@@ -8,7 +8,7 @@ function lernaPublishExitOnFailure {
   set -e
   # run lerna publish with the args that were passed to this function
   # duplicate stdout to a temp file
-  npx lerna publish "$@" | tee /tmp/publish-results
+  npx lerna publish "$@" 2>&1 | tee /tmp/publish-results
   # grep the temp file for the lerna err token and return exit 1
   number_of_lerna_errors=$(grep "lerna ERR" /tmp/publish-results | wc -l)
   if [[ number_of_lerna_errors -gt 0 ]]; then

diff --git a/.circleci/cb-publish-step-4-push-to-git.sh b/.circleci/cb-publish-step-4-push-to-git.sh
@@ -13,15 +13,15 @@ if [[ "$PROJECT_NAME" == "TaggedReleaseWithoutE2E" ]] || [[ "$PROJECT_NAME" == "
   git push origin "$BRANCH_NAME" --no-verify
 
   # push release tags
-  git tag --points-at HEAD | xargs git push origin
+  git tag --points-at HEAD | xargs git push origin --no-verify
 
 # @latest release
 elif [[ "$PROJECT_NAME" == "Release" ]]; then
   # push release commit
   git push origin "$BRANCH_NAME" --no-verify
 
   # push release tags
-  git tag --points-at HEAD | xargs git push origin
+  git tag --points-at HEAD | xargs git push origin --no-verify
 
   # fast forward main to release
   git fetch origin main

diff --git a/.circleci/codebuild-checkout.sh b/.circleci/codebuild-checkout.sh
@@ -41,4 +41,5 @@ if [[ "$INITIAL_HEAD_HASH" != "$HEAD_HASH" ]]; then
   echo "Fail! Detected a drift of commit we attempt to build!"
   echo "INITIAL_HEAD_HASH=$INITIAL_HEAD_HASH"
   echo "HEAD_HASH=$HEAD_HASH"
+  exit 1
 fi
diff --git a/.github/workflows/build-test-mac.yml b/.github/workflows/build-test-mac.yml
@@ -17,6 +17,11 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Install Python
+        uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1
+        with:
+          python-version: '3.11'
+
       - name: Install Dependencies
         run: yarn install
 

diff --git a/package.json b/package.json
@@ -62,7 +62,7 @@
     "test": "lerna run test --concurrency 1",
     "update-data-packages": "./scripts/update-data-dependencies.sh && yarn && yarn dedupe",
     "update-test-timing-data": "ts-node ./scripts/cci-get-job-metrics.ts && ts-node ./scripts/cci-extract-test-timings-from-job-metrics.ts",
-    "update-versions": "lerna version --yes --no-commit-hooks --no-push --exact --conventional-commits --no-git-tag-version",
+    "update-versions": "lerna version --yes --no-commit-hooks --no-push --exact --conventional-commits --no-git-tag-version --force-publish",
     "verdaccio-clean": "rimraf ../verdaccio-cache",
     "verdaccio-connect": "bash -c 'source .circleci/local_publish_helpers_codebuild.sh && setNpmRegistryUrlToLocal'",
     "verdaccio-disconnect": "bash -c 'source .circleci/local_publish_helpers_codebuild.sh && unsetNpmRegistryUrl'",

diff --git a/packages/amplify-app/CHANGELOG.md b/packages/amplify-app/CHANGELOG.md
@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.0.25](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-11-08)
+
+
+### Bug Fixes
+
+* bump versions after unsuccessful release ([#13395](https://github.com/aws-amplify/amplify-cli/issues/13395)) ([7f43363](https://github.com/aws-amplify/amplify-cli/commit/7f433637b052d6dd33fcbf87f390a6b85e9de5b7))
+
+
+
+
+
+## [5.0.24](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-11-08)
+
+**Note:** Version bump only for package @aws-amplify/amplify-app
+
+
+
+
+
+## [5.0.23](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-11-08)
+
+**Note:** Version bump only for package @aws-amplify/amplify-app
+
+
+
+
+
 ## [5.0.22](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-10-21)
 
 **Note:** Version bump only for package @aws-amplify/amplify-app

diff --git a/packages/amplify-app/package.json b/packages/amplify-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-app",
-  "version": "5.0.22",
+  "version": "5.0.25",
   "description": "Amplify CLI",
   "repository": {
     "type": "git",
@@ -26,10 +26,10 @@
     "@aws-amplify/cli": ">=5.0.0"
   },
   "dependencies": {
-    "@aws-amplify/amplify-frontend-android": "3.5.6",
-    "@aws-amplify/amplify-frontend-flutter": "1.4.5",
-    "@aws-amplify/amplify-frontend-ios": "3.6.23",
-    "@aws-amplify/amplify-frontend-javascript": "3.10.4",
+    "@aws-amplify/amplify-frontend-android": "3.5.8",
+    "@aws-amplify/amplify-frontend-flutter": "1.4.7",
+    "@aws-amplify/amplify-frontend-ios": "3.6.26",
+    "@aws-amplify/amplify-frontend-javascript": "3.10.7",
     "chalk": "^4.1.1",
     "execa": "^5.1.1",
     "fs-extra": "^8.1.0",

diff --git a/packages/amplify-appsync-simulator/CHANGELOG.md b/packages/amplify-appsync-simulator/CHANGELOG.md
@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.15.5](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-11-08)
+
+
+### Bug Fixes
+
+* bump versions after unsuccessful release ([#13395](https://github.com/aws-amplify/amplify-cli/issues/13395)) ([7f43363](https://github.com/aws-amplify/amplify-cli/commit/7f433637b052d6dd33fcbf87f390a6b85e9de5b7))
+
+
+
+
+
+## [2.15.4](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-11-08)
+
+**Note:** Version bump only for package @aws-amplify/amplify-appsync-simulator
+
+
+
+
+
+## [2.15.3](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-11-08)
+
+**Note:** Version bump only for package @aws-amplify/amplify-appsync-simulator
+
+
+
+
+
 ## [2.15.2](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-10-21)
 
 **Note:** Version bump only for package @aws-amplify/amplify-appsync-simulator

diff --git a/packages/amplify-appsync-simulator/package.json b/packages/amplify-appsync-simulator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-appsync-simulator",
-  "version": "2.15.2",
+  "version": "2.15.5",
   "description": "An AppSync Simulator to test AppSync API.",
   "repository": {
     "type": "git",
@@ -30,11 +30,11 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.2.10",
-    "@aws-amplify/amplify-prompts": "2.8.4",
+    "@aws-amplify/amplify-cli-core": "4.2.13",
+    "@aws-amplify/amplify-prompts": "2.8.6",
     "@graphql-tools/schema": "^8.3.1",
     "@graphql-tools/utils": "^8.5.1",
-    "amplify-velocity-template": "1.4.12",
+    "amplify-velocity-template": "1.4.14",
     "aws-sdk": "^2.1464.0",
     "chalk": "^4.1.1",
     "cors": "^2.8.5",
@@ -59,7 +59,7 @@
     "ws": "^8.5.0"
   },
   "devDependencies": {
-    "@aws-amplify/amplify-graphiql-explorer": "2.5.10",
+    "@aws-amplify/amplify-graphiql-explorer": "2.5.12",
     "@types/cors": "^2.8.6",
     "@types/express": "^4.17.3",
     "@types/node": "^12.12.6",

diff --git a/packages/amplify-category-analytics/CHANGELOG.md b/packages/amplify-category-analytics/CHANGELOG.md
@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.0.25](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-11-08)
+
+
+### Bug Fixes
+
+* bump versions after unsuccessful release ([#13395](https://github.com/aws-amplify/amplify-cli/issues/13395)) ([7f43363](https://github.com/aws-amplify/amplify-cli/commit/7f433637b052d6dd33fcbf87f390a6b85e9de5b7))
+
+
+
+
+
+## [5.0.24](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-11-08)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-analytics
+
+
+
+
+
+## [5.0.23](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-11-08)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-analytics
+
+
+
+
+
 ## [5.0.22](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-10-12)
 
 **Note:** Version bump only for package @aws-amplify/amplify-category-analytics

diff --git a/packages/amplify-category-analytics/package.json b/packages/amplify-category-analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-analytics",
-  "version": "5.0.22",
+  "version": "5.0.25",
   "description": "amplify-cli analytics plugin",
   "repository": {
     "type": "git",
@@ -25,9 +25,9 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.2.10",
-    "@aws-amplify/amplify-environment-parameters": "1.9.1",
-    "@aws-amplify/amplify-prompts": "2.8.4",
+    "@aws-amplify/amplify-cli-core": "4.2.13",
+    "@aws-amplify/amplify-environment-parameters": "1.9.4",
+    "@aws-amplify/amplify-prompts": "2.8.6",
     "fs-extra": "^8.1.0",
     "uuid": "^8.3.2"
   },

diff --git a/packages/amplify-category-auth/CHANGELOG.md b/packages/amplify-category-auth/CHANGELOG.md
@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.7.4](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-11-08)
+
+
+### Bug Fixes
+
+* bump versions after unsuccessful release ([#13395](https://github.com/aws-amplify/amplify-cli/issues/13395)) ([7f43363](https://github.com/aws-amplify/amplify-cli/commit/7f433637b052d6dd33fcbf87f390a6b85e9de5b7))
+
+
+
+
+
+## [3.7.3](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-11-08)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-auth
+
+
+
+
+
+## [3.7.2](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-11-08)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-auth
+
+
+
+
+
 ## [3.7.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-10-12)
 
 **Note:** Version bump only for package @aws-amplify/amplify-category-auth

diff --git a/packages/amplify-category-auth/package.json b/packages/amplify-category-auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-auth",
-  "version": "3.7.1",
+  "version": "3.7.4",
   "description": "amplify-cli authentication plugin",
   "repository": {
     "type": "git",
@@ -28,14 +28,14 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.2.10",
-    "@aws-amplify/amplify-environment-parameters": "1.9.1",
-    "@aws-amplify/amplify-function-plugin-interface": "1.11.0",
-    "@aws-amplify/amplify-prompts": "2.8.4",
-    "@aws-amplify/amplify-util-import": "2.8.1",
-    "@aws-amplify/cli-extensibility-helper": "3.0.20",
-    "amplify-headless-interface": "1.17.4",
-    "amplify-util-headless-input": "1.9.15",
+    "@aws-amplify/amplify-cli-core": "4.2.13",
+    "@aws-amplify/amplify-environment-parameters": "1.9.4",
+    "@aws-amplify/amplify-function-plugin-interface": "1.12.1",
+    "@aws-amplify/amplify-prompts": "2.8.6",
+    "@aws-amplify/amplify-util-import": "2.8.3",
+    "@aws-amplify/cli-extensibility-helper": "3.0.23",
+    "amplify-headless-interface": "1.17.6",
+    "amplify-util-headless-input": "1.9.17",
     "aws-cdk-lib": "~2.80.0",
     "aws-sdk": "^2.1464.0",
     "axios": "^0.26.0",

diff --git a/packages/amplify-category-custom/CHANGELOG.md b/packages/amplify-category-custom/CHANGELOG.md
@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.1.13](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-11-08)
+
+
+### Bug Fixes
+
+* bump versions after unsuccessful release ([#13395](https://github.com/aws-amplify/amplify-cli/issues/13395)) ([7f43363](https://github.com/aws-amplify/amplify-cli/commit/7f433637b052d6dd33fcbf87f390a6b85e9de5b7))
+
+
+
+
+
+## [3.1.12](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-11-08)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-custom
+
+
+
+
+
+## [3.1.11](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-11-08)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-custom
+
+
+
+
+
 ## [3.1.10](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-10-12)
 
 **Note:** Version bump only for package @aws-amplify/amplify-category-custom

diff --git a/packages/amplify-category-custom/package.json b/packages/amplify-category-custom/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-custom",
-  "version": "3.1.10",
+  "version": "3.1.13",
   "description": "amplify-cli custom resources plugin",
   "repository": {
     "type": "git",
@@ -26,8 +26,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.2.10",
-    "@aws-amplify/amplify-prompts": "2.8.4",
+    "@aws-amplify/amplify-cli-core": "4.2.13",
+    "@aws-amplify/amplify-prompts": "2.8.6",
     "aws-cdk-lib": "~2.80.0",
     "execa": "^5.1.1",
     "fs-extra": "^8.1.0",

diff --git a/packages/amplify-category-function/CHANGELOG.md b/packages/amplify-category-function/CHANGELOG.md
@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.6.4](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-11-08)
+
+
+### Bug Fixes
+
+* bump versions after unsuccessful release ([#13395](https://github.com/aws-amplify/amplify-cli/issues/13395)) ([7f43363](https://github.com/aws-amplify/amplify-cli/commit/7f433637b052d6dd33fcbf87f390a6b85e9de5b7))
+
+
+
+
+
+## [5.6.3](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-11-08)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-function
+
+
+
+
+
+## [5.6.2](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-11-08)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-function
+
+
+
+
+
 ## [5.6.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-10-12)