Merge branch 'release-api-plugin-stable' into feature/gen1-migration

.prettierignore

@@ -15,5 +15,4 @@ packages/amplify-e2e-tests/amplify-e2e-reports
 packages/amplify-graphql-model-transformer/publish-notification-lambda/lib/
 packages/amplify-graphql-model-transformer/rds-lambda/
 packages/amplify-graphql-model-transformer/rds-patching-lambda/lib/
-packages/amplify-graphql-schema-generator/vpc-db-lambda/lib/
 scripts/components/private_packages.ts

.yarnrc

@@ -3,4 +3,3 @@
 
 
 yarn-path ".yarn/releases/yarn-1.18.0.cjs"
-registry "https://registry.yarnpkg.com"

codebuild_specs/scripts/post_publish.sh

@@ -0,0 +1,49 @@
+#!/bin/bash -e
+
+REGISTRY="https://registry.npmjs.org"
+PACKAGE_NAME="amplify-category-api"
+NEW_TAG="latest"
+RETRIES=30
+DELAY=60 # 1 minute delay between retries
+
+# Read package name and version from package.json
+PACKAGE_MANIFEST_PATH="packages/$PACKAGE_NAME/package.json"
+PACKAGE_NAME=$(jq -r '.name' "$PACKAGE_MANIFEST_PATH")
+PACKAGE_VERSION=$(jq -r '.version' "$PACKAGE_MANIFEST_PATH")
+
+# Validate package name and version
+if [ -z "$PACKAGE_NAME" ] || [ -z "$PACKAGE_VERSION" ]; then
+  echo "Unable to read package name or version from package.json."
+  exit 1
+fi
+echo "Using package: $PACKAGE_NAME, version: $PACKAGE_VERSION"
+
+# Sets the "NEW_TAG" tag to the specified version
+update_dist_tag() {
+  # Check if the version is available on npm
+  if npm view $PACKAGE_NAME@$PACKAGE_VERSION > /dev/null 2>&1; then
+    echo "Version $PACKAGE_VERSION of package $PACKAGE_NAME is available."
+    # Add the dist-tag
+    npm dist-tag add $PACKAGE_NAME@$PACKAGE_VERSION $NEW_TAG --registry $REGISTRY
+    return $?
+  else
+    echo "Version $PACKAGE_VERSION of package $PACKAGE_NAME is not available yet."
+    return 1
+  fi
+}
+
+# Retry loop
+for (( i=1; i<=$RETRIES; i++ ))
+do
+  echo "Attempt $i to update dist-tag..."
+  if update_dist_tag; then
+    echo "Successfully updated the $NEW_TAG tag to version $PACKAGE_VERSION."
+    exit 0
+  else
+    echo "Failed to update dist-tag. Retrying in $DELAY seconds..."
+    sleep $DELAY
+  fi
+done
+
+echo "Failed to update the dist-tag after $RETRIES attempts."
+exit 1

codebuild_specs/scripts/publish.sh

@@ -9,8 +9,6 @@ if [ -z "$BRANCH_NAME" ]; then
   exit 1
 else
   # These are more of an extra caution to make sure we have latest commits
-  git checkout main
-  git pull origin main
   git checkout $BRANCH_NAME
   git pull origin $BRANCH_NAME
   git fetch --all
@@ -33,7 +31,13 @@ else
   git config --global user.name $GITHUB_USER
 fi
 
-RESERVED_TAGS=(alpha beta dev latest main)
+if [ "$RUN_POST_PUBLISH_ONLY" = "true" ]; then
+  echo "Post publish script is invoked on branch $BRANCH_NAME"
+  yarn postpublish:$BRANCH_NAME
+  exit 0
+fi
+
+RESERVED_TAGS=(alpha beta dev latest main api-plugin-stable)
 
 if [[ "$BRANCH_NAME" =~ ^tagged-release ]]; then
   if [[ "$BRANCH_NAME" =~ ^tagged-release-without-e2e-tests\/.* ]]; then

jest.config.js

@@ -19,8 +19,6 @@ module.exports = {
   coverageDirectory: 'coverage',
   projects: [
     // '<rootDir>/packages/amplify-category-api',
-    // '<rootDir>/packages/amplify-data-construct',
-    '<rootDir>/packages/amplify-graphql-api-construct',
     '<rootDir>/packages/amplify-graphql-auth-transformer',
     '<rootDir>/packages/amplify-graphql-default-value-transformer',
     '<rootDir>/packages/amplify-graphql-function-transformer',
@@ -31,9 +29,7 @@ module.exports = {
     '<rootDir>/packages/amplify-graphql-name-mapping-transformer',
     '<rootDir>/packages/amplify-graphql-predictions-transformer',
     '<rootDir>/packages/amplify-graphql-relational-transformer',
-    // '<rootDir>/packages/amplify-graphql-schema-generator',
     '<rootDir>/packages/amplify-graphql-searchable-transformer',
-    '<rootDir>/packages/amplify-graphql-sql-transformer',
     // '<rootDir>/packages/amplify-graphql-transformer',
     '<rootDir>/packages/amplify-graphql-transformer-core',
     // '<rootDir>/packages/amplify-graphql-transformer-migrator',

package.json

@@ -29,17 +29,16 @@
     "link-win": "node ./scripts/link-bin.js node_modules/amplify-cli-internal/bin/amplify amplify-dev",
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
     "package": "lerna run package",
-    "postpublish:release": "git fetch . release:main && git push origin main",
-    "postpublish:api-plugin-stable": "git push origin api-plugin-stable",
+    "postpublish:release-api-plugin-stable": "./codebuild_specs/scripts/post_publish.sh",
     "prettier-check": "yarn prettier --check .",
     "prettier-write": "yarn prettier --write .",
     "production-install": "yarn --frozen-lockfile --cache-folder ~/.cache/yarn",
     "production-build": "yarn production-install && lerna run build --concurrency 3 --stream",
-    "publish-to-verdaccio": "lerna publish --yes --no-commit-hooks --no-push --exact --dist-tag=latest --conventional-commits --no-git-tag-version --no-verify-access",
+    "publish-to-verdaccio": "lerna publish --dist-tag=api-plugin-stable --yes --no-commit-hooks --no-push --exact --conventional-commits --no-git-tag-version --no-verify-access",
     "publish:beta": "lerna publish --exact --dist-tag=beta --preid=beta --conventional-commits --conventional-prerelease --message 'chore(release): Publish [ci skip]' --no-verify-access --yes",
     "publish:main": "lerna publish --canary --force-publish --preid=alpha --exact --include-merged-tags --conventional-prerelease --no-verify-access --yes",
     "publish:release": "lerna publish --conventional-commits --conventional-graduate --exact --yes --message 'chore(release): Publish [ci skip]' --no-verify-access",
-    "publish:api-plugin-stable": "lerna publish --dist-tag=api-plugin-stable --conventional-commits --conventional-graduate --exact --yes --message 'chore(release): Publish [ci skip]' --no-verify-access",
+    "publish:release-api-plugin-stable": "lerna publish --dist-tag=api-plugin-stable --conventional-commits --conventional-graduate --exact --yes --message 'chore(release): Publish [ci skip]' --no-verify-access",
     "publish:tag": "lerna publish --exact --dist-tag=$NPM_TAG --preid=$NPM_TAG --conventional-commits --conventional-prerelease --message \"chore(release): Publish tagged release $NPM_TAG [ci skip]\" --no-verify-access --yes",
     "refresh-lockfile": "rimraf yarn.lock && yarn",
     "rm-dev-link": "rimraf -f \"$(yarn global bin)/amplify-dev\"",
@@ -52,6 +51,7 @@
     "test-v2-transformers": "lerna run --scope '@aws-amplify/graphql-*-transformer' test",
     "test": "lerna run test",
     "trigger-release": "source ./scripts/cloud-release.sh && triggerRelease",
+    "trigger-postpublish": "source ./scripts/cloud-release.sh && triggerPostPublish",
     "trigger-tag-release": "source ./scripts/cloud-release.sh && triggerTagRelease",
     "trigger-deprecate-release": "source ./scripts/cloud-release.sh && deprecateRelease",
     "update-cli-packages": "./scripts/update-cli-dependencies.sh && yarn",

packages/amplify-category-api/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.12.7](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-09-09)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-api
+
 ## [5.12.6](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-08-12)
 
 **Note:** Version bump only for package @aws-amplify/amplify-category-api

packages/amplify-category-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-api",
-  "version": "5.12.6",
+  "version": "5.12.7",
   "description": "Amplify CLI API Category Plugin",
   "repository": {
     "type": "git",
@@ -29,9 +29,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/graphql-auth-transformer": "3.6.5",
-    "@aws-amplify/graphql-schema-generator": "0.9.4",
-    "@aws-amplify/graphql-transformer": "1.6.5",
+    "@aws-amplify/graphql-auth-transformer": "3.6.6",
+    "@aws-amplify/graphql-schema-generator": "^0.9.4",
+    "@aws-amplify/graphql-transformer": "1.6.6",
     "@aws-amplify/graphql-transformer-core": "2.9.3",
     "@aws-amplify/graphql-transformer-interfaces": "3.10.1",
     "@aws-amplify/graphql-transformer-migrator": "2.2.27",
@@ -79,7 +79,7 @@
     "constructs": "^10.3.0"
   },
   "devDependencies": {
-    "@aws-amplify/graphql-transformer-test-utils": "0.5.6",
+    "@aws-amplify/graphql-transformer-test-utils": "0.6.2",
     "@types/js-yaml": "^4.0.0",
     "@types/node": "^12.12.6",
     "amplify-util-headless-input": "^1.9.18",

packages/amplify-e2e-core/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.9.2](https://github.com/aws-amplify/amplify-category-api/compare/amplify-category-api-e2e-core@[email protected]) (2024-09-09)
+
+**Note:** Version bump only for package amplify-category-api-e2e-core
+
 ## [4.8.6](https://github.com/aws-amplify/amplify-category-api/compare/amplify-category-api-e2e-core@[email protected]) (2024-08-12)
 
 **Note:** Version bump only for package amplify-category-api-e2e-core

packages/amplify-e2e-core/package.json

@@ -1,7 +1,7 @@
 {
   "name": "amplify-category-api-e2e-core",
-  "version": "4.8.6",
-  "description": "Core testing library",
+  "version": "4.9.2",
+  "description": "Core testing library ",
   "repository": {
     "type": "git",
     "url": "https://github.com/aws-amplify/amplify-category-api.git",

packages/amplify-e2e-tests/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.22.12](https://github.com/aws-amplify/amplify-category-api/compare/amplify-category-api-e2e-tests@[email protected]) (2024-09-09)
+
+**Note:** Version bump only for package amplify-category-api-e2e-tests
+
 ## [3.22.9](https://github.com/aws-amplify/amplify-category-api/compare/amplify-category-api-e2e-tests@[email protected]) (2024-08-12)
 
 **Note:** Version bump only for package amplify-category-api-e2e-tests

packages/amplify-e2e-tests/package.json

@@ -1,7 +1,7 @@
 {
   "name": "amplify-category-api-e2e-tests",
-  "version": "3.22.9",
-  "description": "E2e test suite",
+  "version": "3.22.12",
+  "description": "E2e test suite ",
   "repository": {
     "type": "git",
     "url": "https://github.com/aws-amplify/amplify-category-api.git",
@@ -25,9 +25,9 @@
   },
   "dependencies": {
     "@aws-amplify/amplify-app": "^5.0.35",
-    "@aws-amplify/graphql-schema-generator": "0.9.4",
+    "@aws-amplify/graphql-schema-generator": "^0.9.4",
     "@aws-amplify/graphql-transformer-core": "2.9.3",
-    "amplify-category-api-e2e-core": "4.8.6",
+    "amplify-category-api-e2e-core": "4.9.2",
     "aws-amplify": "^4.2.8",
     "aws-appsync": "^4.1.1",
     "aws-sdk": "^2.1113.0",

packages/amplify-graphql-auth-transformer/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.6.6](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-09-09)
+
+**Note:** Version bump only for package @aws-amplify/graphql-auth-transformer
+
 ## [3.6.5](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-08-12)
 
 **Note:** Version bump only for package @aws-amplify/graphql-auth-transformer

packages/amplify-graphql-auth-transformer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/graphql-auth-transformer",
-  "version": "3.6.5",
+  "version": "3.6.6",
   "description": "Amplify GraphQL @auth transformer",
   "repository": {
     "type": "git",
@@ -30,8 +30,8 @@
   },
   "dependencies": {
     "@aws-amplify/graphql-directives": "1.1.0",
-    "@aws-amplify/graphql-model-transformer": "2.11.4",
-    "@aws-amplify/graphql-relational-transformer": "2.5.11",
+    "@aws-amplify/graphql-model-transformer": "2.11.5",
+    "@aws-amplify/graphql-relational-transformer": "2.5.12",
     "@aws-amplify/graphql-transformer-core": "2.9.3",
     "@aws-amplify/graphql-transformer-interfaces": "3.10.1",
     "graphql": "^15.5.0",
@@ -41,11 +41,11 @@
     "md5": "^2.3.0"
   },
   "devDependencies": {
-    "@aws-amplify/graphql-function-transformer": "2.1.26",
-    "@aws-amplify/graphql-index-transformer": "2.4.9",
-    "@aws-amplify/graphql-searchable-transformer": "2.7.9",
-    "@aws-amplify/graphql-sql-transformer": "0.3.9",
-    "@aws-amplify/graphql-transformer-test-utils": "0.5.6",
+    "@aws-amplify/graphql-function-transformer": "2.1.27",
+    "@aws-amplify/graphql-index-transformer": "2.4.10",
+    "@aws-amplify/graphql-searchable-transformer": "2.7.10",
+    "@aws-amplify/graphql-sql-transformer": "^0.3.9",
+    "@aws-amplify/graphql-transformer-test-utils": "0.6.2",
     "@types/node": "^12.12.6"
   },
   "peerDependencies": {

packages/amplify-graphql-default-value-transformer/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.3.14](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-09-09)
+
+**Note:** Version bump only for package @aws-amplify/graphql-default-value-transformer
+
 ## [2.3.13](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-08-12)
 
 **Note:** Version bump only for package @aws-amplify/graphql-default-value-transformer

packages/amplify-graphql-default-value-transformer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/graphql-default-value-transformer",
-  "version": "2.3.13",
+  "version": "2.3.14",
   "description": "Amplify GraphQL default value transformer",
   "repository": {
     "type": "git",
@@ -38,8 +38,8 @@
     "libphonenumber-js": "1.9.47"
   },
   "devDependencies": {
-    "@aws-amplify/graphql-model-transformer": "2.11.4",
-    "@aws-amplify/graphql-transformer-test-utils": "0.5.6"
+    "@aws-amplify/graphql-model-transformer": "2.11.5",
+    "@aws-amplify/graphql-transformer-test-utils": "0.6.2"
   },
   "jest": {
     "transform": {

packages/amplify-graphql-function-transformer/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.1.27](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-09-09)
+
+**Note:** Version bump only for package @aws-amplify/graphql-function-transformer
+
 ## [2.1.26](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-07-15)
 
 **Note:** Version bump only for package @aws-amplify/graphql-function-transformer

packages/amplify-graphql-function-transformer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/graphql-function-transformer",
-  "version": "2.1.26",
+  "version": "2.1.27",
   "description": "Amplify GraphQL @function transformer",
   "repository": {
     "type": "git",
@@ -36,7 +36,7 @@
     "graphql-transformer-common": "4.31.1"
   },
   "devDependencies": {
-    "@aws-amplify/graphql-transformer-test-utils": "0.5.6"
+    "@aws-amplify/graphql-transformer-test-utils": "0.6.2"
   },
   "peerDependencies": {
     "aws-cdk-lib": "^2.129.0",

packages/amplify-graphql-http-transformer/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.1.27](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-09-09)
+
+**Note:** Version bump only for package @aws-amplify/graphql-http-transformer
+
 ## [2.1.26](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-07-15)
 
 **Note:** Version bump only for package @aws-amplify/graphql-http-transformer

packages/amplify-graphql-http-transformer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/graphql-http-transformer",
-  "version": "2.1.26",
+  "version": "2.1.27",
   "description": "Amplify GraphQL @http transformer",
   "repository": {
     "type": "git",
@@ -36,7 +36,7 @@
     "graphql-transformer-common": "4.31.1"
   },
   "devDependencies": {
-    "@aws-amplify/graphql-transformer-test-utils": "0.5.6"
+    "@aws-amplify/graphql-transformer-test-utils": "0.6.2"
   },
   "peerDependencies": {
     "aws-cdk-lib": "^2.129.0",

packages/amplify-graphql-index-transformer/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.4.10](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-09-09)
+
+**Note:** Version bump only for package @aws-amplify/graphql-index-transformer
+
 ## [2.4.9](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-08-12)
 
 **Note:** Version bump only for package @aws-amplify/graphql-index-transformer

packages/amplify-graphql-index-transformer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/graphql-index-transformer",
-  "version": "2.4.9",
+  "version": "2.4.10",
   "description": "Amplify GraphQL index and key transformers",
   "repository": {
     "type": "git",
@@ -29,15 +29,15 @@
   },
   "dependencies": {
     "@aws-amplify/graphql-directives": "1.1.0",
-    "@aws-amplify/graphql-model-transformer": "2.11.4",
+    "@aws-amplify/graphql-model-transformer": "2.11.5",
     "@aws-amplify/graphql-transformer-core": "2.9.3",
     "@aws-amplify/graphql-transformer-interfaces": "3.10.1",
     "graphql": "^15.5.0",
     "graphql-mapping-template": "4.20.16",
     "graphql-transformer-common": "4.31.1"
   },
   "devDependencies": {
-    "@aws-amplify/graphql-transformer-test-utils": "0.5.6"
+    "@aws-amplify/graphql-transformer-test-utils": "0.6.2"
   },
   "peerDependencies": {
     "aws-cdk-lib": "^2.129.0",