Merge branch 'dev' into fix-yarn-modern

aws-amplify · Oct 31, 2023 · 3c4b9af · 3c4b9af
2 parents 37be610 + ee05f50
commit 3c4b9af
Show file tree

Hide file tree

Showing 35 changed files with 601 additions and 526 deletions.
diff --git a/package.json b/package.json
@@ -99,7 +99,7 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.10.5",
-    "@babel/core": "^7.10.5",
+    "@babel/core": "^7.23.2",
     "@babel/plugin-proposal-numeric-separator": "^7.10.4",
     "@babel/plugin-transform-modules-commonjs": "7.10.4",
     "@babel/plugin-transform-typescript": "7.10.5",

diff --git a/packages/amplify-app/CHANGELOG.md b/packages/amplify-app/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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
+
+
+
+
+
 ## [5.0.21](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-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.21",
+  "version": "5.0.22",
   "description": "Amplify CLI",
   "repository": {
     "type": "git",
@@ -29,7 +29,7 @@
     "@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.3",
+    "@aws-amplify/amplify-frontend-javascript": "3.10.4",
     "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,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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
+
+
+
+
+
 ## [2.15.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-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.1",
+  "version": "2.15.2",
   "description": "An AppSync Simulator to test AppSync API.",
   "repository": {
     "type": "git",
@@ -59,7 +59,7 @@
     "ws": "^8.5.0"
   },
   "devDependencies": {
-    "@aws-amplify/amplify-graphiql-explorer": "2.5.9",
+    "@aws-amplify/amplify-graphiql-explorer": "2.5.10",
     "@types/cors": "^2.8.6",
     "@types/express": "^4.17.3",
     "@types/node": "^12.12.6",

diff --git a/packages/amplify-category-function/package.json b/packages/amplify-category-function/package.json
@@ -38,7 +38,7 @@
     "folder-hash": "^4.0.2",
     "fs-extra": "^8.1.0",
     "globby": "^11.0.3",
-    "graphql-transformer-core": "^8.1.12",
+    "graphql-transformer-core": "^8.1.13",
     "inquirer": "^7.3.3",
     "inquirer-datepicker": "^2.0.0",
     "jstreemap": "^1.28.2",

diff --git a/packages/amplify-cli-core/package.json b/packages/amplify-cli-core/package.json
@@ -31,7 +31,7 @@
     "@aws-amplify/amplify-cli-logger": "1.3.6",
     "@aws-amplify/amplify-function-plugin-interface": "1.11.0",
     "@aws-amplify/amplify-prompts": "2.8.4",
-    "@aws-amplify/graphql-transformer-interfaces": "^3.2.0",
+    "@aws-amplify/graphql-transformer-interfaces": "^3.2.1",
     "@aws-sdk/util-arn-parser": "^3.310.0",
     "@yarnpkg/lockfile": "^1.1.0",
     "ajv": "^6.12.6",

diff --git a/packages/amplify-cli-npm/CHANGELOG.md b/packages/amplify-cli-npm/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [12.7.1](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/cli
+
+
+
+
+
 # [12.7.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-10-12)
 
 

diff --git a/packages/amplify-cli-npm/index.ts b/packages/amplify-cli-npm/index.ts
@@ -16,4 +16,4 @@ export const install = async (): Promise<void> => {
   return binary.install();
 };
 
-// force version bump to 12.7.0 fixing hash
+// force version bump to 12.8.0
diff --git a/packages/amplify-cli-npm/package.json b/packages/amplify-cli-npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/cli",
-  "version": "12.7.0",
+  "version": "12.7.1",
   "description": "Amplify CLI",
   "repository": {
     "type": "git",
@@ -36,7 +36,7 @@
     "tar-stream": "^2.2.0"
   },
   "devDependencies": {
-    "@aws-amplify/cli-internal": "12.7.0",
+    "@aws-amplify/cli-internal": "12.7.1",
     "@types/tar": "^6.1.1",
     "rimraf": "^3.0.2"
   },

diff --git a/packages/amplify-cli/CHANGELOG.md b/packages/amplify-cli/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [12.7.1](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/cli-internal
+
+
+
+
+
 # [12.7.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-10-12)
 
 

diff --git a/packages/amplify-cli/package.json b/packages/amplify-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/cli-internal",
-  "version": "12.7.0",
+  "version": "12.7.1",
   "description": "Amplify CLI",
   "repository": {
     "type": "git",
@@ -34,9 +34,9 @@
     "node": ">=12.0.0"
   },
   "dependencies": {
-    "@aws-amplify/amplify-app": "5.0.21",
+    "@aws-amplify/amplify-app": "5.0.22",
     "@aws-amplify/amplify-category-analytics": "5.0.22",
-    "@aws-amplify/amplify-category-api": "^5.7.2",
+    "@aws-amplify/amplify-category-api": "^5.7.7",
     "@aws-amplify/amplify-category-auth": "3.7.1",
     "@aws-amplify/amplify-category-custom": "3.1.10",
     "@aws-amplify/amplify-category-function": "5.6.1",
@@ -56,17 +56,17 @@
     "@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.3",
+    "@aws-amplify/amplify-frontend-javascript": "3.10.4",
     "@aws-amplify/amplify-go-function-template-provider": "1.4.5",
     "@aws-amplify/amplify-nodejs-function-template-provider": "2.9.4",
     "@aws-amplify/amplify-prompts": "2.8.4",
     "@aws-amplify/amplify-provider-awscloudformation": "8.8.0",
     "@aws-amplify/amplify-python-function-template-provider": "1.4.5",
     "@aws-amplify/amplify-util-import": "2.8.1",
-    "@aws-amplify/amplify-util-mock": "5.8.0",
+    "@aws-amplify/amplify-util-mock": "5.8.1",
     "@aws-amplify/amplify-util-uibuilder": "1.13.0",
     "@aws-cdk/cloudformation-diff": "~2.68.0",
-    "amplify-codegen": "^4.7.0",
+    "amplify-codegen": "^4.7.2",
     "amplify-dotnet-function-runtime-provider": "2.0.15",
     "amplify-go-function-runtime-provider": "2.3.33",
     "amplify-java-function-runtime-provider": "2.3.33",
@@ -87,7 +87,7 @@
     "fs-extra": "^8.1.0",
     "glob": "^7.2.0",
     "graphql": "^15.5.0",
-    "graphql-transformer-core": "^8.1.12",
+    "graphql-transformer-core": "^8.1.13",
     "gunzip-maybe": "^1.4.2",
     "hidefile": "^3.0.0",
     "ini": "^1.3.5",

diff --git a/packages/amplify-container-hosting/package.json b/packages/amplify-container-hosting/package.json
@@ -26,7 +26,7 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-category-api": "^5.7.2",
+    "@aws-amplify/amplify-category-api": "^5.7.7",
     "@aws-amplify/amplify-cli-core": "4.2.10",
     "@aws-amplify/amplify-environment-parameters": "1.9.1",
     "fs-extra": "^8.1.0",

diff --git a/packages/amplify-dotnet-function-template-provider/package.json b/packages/amplify-dotnet-function-template-provider/package.json
@@ -27,7 +27,7 @@
   "dependencies": {
     "@aws-amplify/amplify-cli-core": "4.2.10",
     "@aws-amplify/amplify-function-plugin-interface": "1.11.0",
-    "graphql-transformer-core": "^8.1.12"
+    "graphql-transformer-core": "^8.1.13"
   },
   "devDependencies": {
     "@types/inquirer": "^6.5.0",

diff --git a/packages/amplify-e2e-core/package.json b/packages/amplify-e2e-core/package.json
@@ -33,7 +33,7 @@
     "dotenv": "^8.2.0",
     "execa": "^5.1.1",
     "fs-extra": "^8.1.0",
-    "graphql-transformer-core": "^8.1.12",
+    "graphql-transformer-core": "^8.1.13",
     "ini": "^1.3.5",
     "jest-circus": "^27.0.0",
     "jest-environment-node": "^26.6.2",

diff --git a/packages/amplify-e2e-core/src/init/amplifyPull.ts b/packages/amplify-e2e-core/src/init/amplifyPull.ts
@@ -166,8 +166,7 @@ export const amplifyStudioHeadlessPull = (
     awscloudformation: {
       configLevel: 'project',
       useProfile: true,
-      // eslint-disable-next-line spellcheck/spell-checker
-      profileName: profileName ?? 'amplify-integ-test-user',
+      profileName: profileName ?? TEST_PROFILE_NAME,
     },
   };
   const args = ['pull', '--amplify', JSON.stringify({ appId, envName }), '--providers', JSON.stringify(providersConfig), '--yes'];

diff --git a/packages/amplify-e2e-tests/CHANGELOG.md b/packages/amplify-e2e-tests/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.8.2](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@4.8.2) (2023-10-21)
+
+**Note:** Version bump only for package amplify-e2e-tests
+
+
+
+
+
 ## [4.8.1](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@4.8.1) (2023-10-12)
 
 

diff --git a/packages/amplify-e2e-tests/package.json b/packages/amplify-e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-e2e-tests",
-  "version": "4.8.1",
+  "version": "4.8.2",
   "description": "",
   "repository": {
     "type": "git",
@@ -29,12 +29,12 @@
     "@aws-amplify/amplify-cli-core": "4.2.10",
     "@aws-amplify/amplify-e2e-core": "5.4.1",
     "@aws-amplify/amplify-opensearch-simulator": "1.7.1",
-    "@aws-amplify/graphql-transformer-core": "^2.2.1",
+    "@aws-amplify/graphql-transformer-core": "^2.2.3",
     "@aws-sdk/client-appsync": "^3.303.0",
     "@aws-sdk/client-dynamodb": "^3.303.0",
     "@aws-sdk/client-s3": "^3.303.0",
     "@aws-sdk/client-ssm": "^3.303.0",
-    "@babel/core": "^7.10.5",
+    "@babel/core": "^7.23.2",
     "@babel/plugin-transform-modules-commonjs": "7.10.4",
     "amplify-dynamodb-simulator": "2.9.5",
     "amplify-headless-interface": "1.17.4",
@@ -53,7 +53,7 @@
     "get-port": "^5.1.1",
     "glob": "^8.0.3",
     "graphql-tag": "^2.10.1",
-    "graphql-transformer-core": "8.1.12",
+    "graphql-transformer-core": "8.1.13",
     "isomorphic-fetch": "^3.0.0",
     "lodash": "^4.17.21",
     "moment": "^2.24.0",

diff --git a/packages/amplify-e2e-tests/src/__tests__/__snapshots__/api_10.test.ts.snap b/packages/amplify-e2e-tests/src/__tests__/__snapshots__/api_10.test.ts.snap
@@ -62,8 +62,7 @@ $util.qr($ctx.stash.put("hasAuth", true))
 #set( $isAuthorized = false )
 #set( $allowedFields = [] )
 #if( $util.authType() == "IAM Authorization" )
-  #set( $adminRoles = ["myAdminRoleName"] )
-  #foreach( $adminRole in $adminRoles )
+  #foreach( $adminRole in $ctx.stash.adminRoles )
     #if( $ctx.identity.userArn.contains($adminRole) && $ctx.identity.userArn != $ctx.stash.authRole && $ctx.identity.userArn != $ctx.stash.unauthRole )
       #return($util.toJson({}))
     #end
@@ -175,8 +174,7 @@ $util.qr($ctx.stash.put("hasAuth", true))
 #set( $isAuthorized = false )
 #set( $allowedFields = [] )
 #if( $util.authType() == "IAM Authorization" )
-  #set( $adminRoles = ["myAdminRoleName"] )
-  #foreach( $adminRole in $adminRoles )
+  #foreach( $adminRole in $ctx.stash.adminRoles )
     #if( $ctx.identity.userArn.contains($adminRole) && $ctx.identity.userArn != $ctx.stash.authRole && $ctx.identity.userArn != $ctx.stash.unauthRole )
       #return($util.toJson({}))
     #end

diff --git a/...ages/amplify-e2e-tests/src/__tests__/transformer-migrations/predictions-migration.test.ts b/...ages/amplify-e2e-tests/src/__tests__/transformer-migrations/predictions-migration.test.ts
@@ -55,7 +55,7 @@ describe('transformer predictions migration test', () => {
     expect(translateResult.errors).toBeUndefined();
     expect(translateResult.data).toBeDefined();
     expect((translateResult.data as any).translateThis).toMatch(
-      /((\bDies\b)|(\bdas\b)|(\bder\b)) ist ein ((\bStimmtest\b)|(\Sprachtest\b))/i,
+      /((\bDies\b)|(\bdas\b)|(\bder\b)) ist ein ((\bStimmtest\b)|(\Sprachtest\b)|(\bStimmentest\b))/i,
     );
 
     const speakQuery = /* GraphQL */ `
@@ -93,7 +93,7 @@ describe('transformer predictions migration test', () => {
     expect(translateResult.errors).toBeUndefined();
     expect(translateResult.data).toBeDefined();
     expect((translateResult.data as any).translateThis).toMatch(
-      /((\bDies\b)|(\bdas\b)|(\bder\b)) ist ein ((\bStimmtest\b)|(\Sprachtest\b))/i,
+      /((\bDies\b)|(\bdas\b)|(\bder\b)) ist ein ((\bStimmtest\b)|(\Sprachtest\b)|(\bStimmentest\b))/i,
     );
 
     speakResult = await appSyncClient.query({

diff --git a/packages/amplify-frontend-javascript/CHANGELOG.md b/packages/amplify-frontend-javascript/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.10.4](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-frontend-javascript
+
+
+
+
+
 ## [3.10.3](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-frontend-javascript

diff --git a/packages/amplify-frontend-javascript/package.json b/packages/amplify-frontend-javascript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-frontend-javascript",
-  "version": "3.10.3",
+  "version": "3.10.4",
   "description": "amplify-cli front-end plugin for JavaScript projects",
   "scripts": {
     "test": "jest --logHeapUsage",
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@aws-amplify/amplify-cli-core": "4.2.10",
-    "@babel/core": "^7.10.5",
+    "@babel/core": "^7.23.2",
     "@babel/plugin-transform-modules-commonjs": "7.10.4",
     "chalk": "^4.1.1",
     "execa": "^5.1.1",

diff --git a/packages/amplify-graphiql-explorer/CHANGELOG.md b/packages/amplify-graphiql-explorer/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.5.10](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-graphiql-explorer
+
+
+
+
+
 ## [2.5.9](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-08-09)
 
 

diff --git a/packages/amplify-graphiql-explorer/package.json b/packages/amplify-graphiql-explorer/package.json
@@ -1,9 +1,9 @@
 {
   "name": "@aws-amplify/amplify-graphiql-explorer",
-  "version": "2.5.9",
+  "version": "2.5.10",
   "private": true,
   "dependencies": {
-    "@babel/core": "^7.16.0",
+    "@babel/core": "^7.23.2",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.3",
     "@svgr/webpack": "^5.5.0",
     "@testing-library/jest-dom": "^5.11.4",

diff --git a/packages/amplify-migration-tests/package.json b/packages/amplify-migration-tests/package.json
@@ -35,7 +35,7 @@
     "aws-cdk-lib": "~2.80.0",
     "constructs": "^10.0.5",
     "fs-extra": "^8.1.0",
-    "graphql-transformer-core": "^8.1.12",
+    "graphql-transformer-core": "^8.1.13",
     "lodash": "^4.17.21",
     "semver": "^7.5.4",
     "strip-ansi": "^6.0.0",

diff --git a/packages/amplify-nodejs-function-template-provider/package.json b/packages/amplify-nodejs-function-template-provider/package.json
@@ -28,7 +28,7 @@
     "@aws-amplify/amplify-cli-core": "4.2.10",
     "@aws-amplify/amplify-function-plugin-interface": "1.11.0",
     "@aws-amplify/amplify-prompts": "2.8.4",
-    "graphql-transformer-core": "^8.1.12",
+    "graphql-transformer-core": "^8.1.13",
     "lodash": "^4.17.21"
   },
   "devDependencies": {