Merge branch 'dev' into bump-codegen

aws-amplify · Apr 18, 2024 · 9bd9e35 · 9bd9e35
2 parents f98fc53 + 8782456
commit 9bd9e35
Show file tree

Hide file tree

Showing 88 changed files with 1,460 additions and 668 deletions.
diff --git a/package.json b/package.json
@@ -173,6 +173,8 @@
     "pkg-fetch": "https://github.com/aws-amplify/pkg-fetch#ad4a21feb533d338bf951e7ba28cea7256aedeff",
     "tough-cookie": "^4.1.3",
     "semver": "^7.5.4",
-    "word-wrap": "^1.2.4"
+    "word-wrap": "^1.2.4",
+    "follow-redirects": "^1.15.6",
+    "tar": "^6.2.1"
   }
 }
diff --git a/packages/amplify-app/CHANGELOG.md b/packages/amplify-app/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.30](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-04-18)
+
+**Note:** Version bump only for package @aws-amplify/amplify-app
+
+
+
+
+
+## [5.0.29](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-04-15)
+
+**Note:** Version bump only for package @aws-amplify/amplify-app
+
+
+
+
+
 ## [5.0.28](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-03-29)
 
 **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.28",
+  "version": "5.0.30",
   "description": "Amplify CLI",
   "repository": {
     "type": "git",
@@ -28,8 +28,8 @@
   "dependencies": {
     "@aws-amplify/amplify-frontend-android": "3.5.8",
     "@aws-amplify/amplify-frontend-flutter": "1.4.7",
-    "@aws-amplify/amplify-frontend-ios": "3.6.29",
-    "@aws-amplify/amplify-frontend-javascript": "3.10.10",
+    "@aws-amplify/amplify-frontend-ios": "3.7.1",
+    "@aws-amplify/amplify-frontend-javascript": "3.10.12",
     "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,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.15.10](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-04-18)
+
+**Note:** Version bump only for package @aws-amplify/amplify-appsync-simulator
+
+
+
+
+
+## [2.15.9](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-04-15)
+
+
+### Bug Fixes
+
+* resolve issues with graphiql explorer ([#13691](https://github.com/aws-amplify/amplify-cli/issues/13691)) ([4d0677d](https://github.com/aws-amplify/amplify-cli/commit/4d0677def73fb0d1c2fb77e30ed8b7c0e34cfebd))
+
+
+
+
+
 ## [2.15.8](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-03-29)
 
 **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.8",
+  "version": "2.15.10",
   "description": "An AppSync Simulator to test AppSync API.",
   "repository": {
     "type": "git",
@@ -30,7 +30,7 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.2",
+    "@aws-amplify/amplify-cli-core": "4.3.4",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "@graphql-tools/schema": "^8.3.1",
     "@graphql-tools/utils": "^8.5.1",
@@ -59,7 +59,7 @@
     "ws": "^8.5.0"
   },
   "devDependencies": {
-    "@aws-amplify/amplify-graphiql-explorer": "2.5.13",
+    "@aws-amplify/amplify-graphiql-explorer": "2.5.14",
     "@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,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.0.30](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-04-18)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-analytics
+
+
+
+
+
+## [5.0.29](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-04-15)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-analytics
+
+
+
+
+
 ## [5.0.28](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-03-29)
 
 **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.28",
+  "version": "5.0.30",
   "description": "amplify-cli analytics plugin",
   "repository": {
     "type": "git",
@@ -25,8 +25,8 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.2",
-    "@aws-amplify/amplify-environment-parameters": "1.9.7",
+    "@aws-amplify/amplify-cli-core": "4.3.4",
+    "@aws-amplify/amplify-environment-parameters": "1.9.9",
     "@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,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.7.9](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-04-18)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-auth
+
+
+
+
+
+## [3.7.8](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-04-15)
+
+
+### Bug Fixes
+
+* upgrade Go runtime and fix e2e ([#13671](https://github.com/aws-amplify/amplify-cli/issues/13671)) ([395f717](https://github.com/aws-amplify/amplify-cli/commit/395f717cf52e7beef76f00ee08d37877138b0c30))
+
+
+
+
+
 ## [3.7.7](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-03-29)
 
 **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.7",
+  "version": "3.7.9",
   "description": "amplify-cli authentication plugin",
   "repository": {
     "type": "git",
@@ -28,12 +28,12 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.2",
-    "@aws-amplify/amplify-environment-parameters": "1.9.7",
+    "@aws-amplify/amplify-cli-core": "4.3.4",
+    "@aws-amplify/amplify-environment-parameters": "1.9.9",
     "@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.26",
+    "@aws-amplify/cli-extensibility-helper": "3.0.28",
     "amplify-headless-interface": "1.17.6",
     "amplify-util-headless-input": "1.9.17",
     "aws-cdk-lib": "~2.80.0",

diff --git a/packages/amplify-category-auth/resources/adminAuth/admin-auth-cognitoActions.js b/packages/amplify-category-auth/resources/adminAuth/admin-auth-cognitoActions.js
@@ -167,22 +167,18 @@ async function listUsers(Limit, PaginationToken) {
   }
 }
 
-async function listGroups(Limit, PaginationToken) {
+async function listGroups(Limit, NextToken) {
   const params = {
     UserPoolId: userPoolId,
     ...(Limit && { Limit }),
-    ...(PaginationToken && { PaginationToken }),
+    ...(NextToken && { NextToken }),
   };
 
   console.log('Attempting to list groups');
 
   try {
     const result = await cognitoIdentityProviderClient.send(new ListGroupsCommand(params));
 
-    // Rename to NextToken for consistency with other Cognito APIs
-    result.NextToken = result.PaginationToken;
-    delete result.PaginationToken;
-
     return result;
   } catch (err) {
     console.log(err);

diff --git a/packages/amplify-category-custom/CHANGELOG.md b/packages/amplify-category-custom/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.1.18](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-04-18)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-custom
+
+
+
+
+
+## [3.1.17](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-04-15)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-custom
+
+
+
+
+
 ## [3.1.16](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-03-29)
 
 **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.16",
+  "version": "3.1.18",
   "description": "amplify-cli custom resources plugin",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.2",
+    "@aws-amplify/amplify-cli-core": "4.3.4",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "aws-cdk-lib": "~2.80.0",
     "execa": "^5.1.1",

diff --git a/packages/amplify-category-function/CHANGELOG.md b/packages/amplify-category-function/CHANGELOG.md
@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.7.4](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-04-18)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-function
+
+
+
+
+
+## [5.7.3](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-04-15)
+
+
+### Bug Fixes
+
+* upgrade Go runtime and fix e2e ([#13671](https://github.com/aws-amplify/amplify-cli/issues/13671)) ([395f717](https://github.com/aws-amplify/amplify-cli/commit/395f717cf52e7beef76f00ee08d37877138b0c30))
+
+
+
+
+
 ## [5.7.2](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-03-29)
 
 **Note:** Version bump only for package @aws-amplify/amplify-category-function

diff --git a/packages/amplify-category-function/package.json b/packages/amplify-category-function/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-function",
-  "version": "5.7.2",
+  "version": "5.7.4",
   "description": "amplify-cli function plugin",
   "repository": {
     "type": "git",
@@ -26,8 +26,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.2",
-    "@aws-amplify/amplify-environment-parameters": "1.9.7",
+    "@aws-amplify/amplify-cli-core": "4.3.4",
+    "@aws-amplify/amplify-environment-parameters": "1.9.9",
     "@aws-amplify/amplify-function-plugin-interface": "1.12.1",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "archiver": "^5.3.0",
@@ -38,7 +38,7 @@
     "folder-hash": "^4.0.2",
     "fs-extra": "^8.1.0",
     "globby": "^11.0.3",
-    "graphql-transformer-core": "^8.2.8",
+    "graphql-transformer-core": "^8.2.9",
     "inquirer": "^7.3.3",
     "inquirer-datepicker": "^2.0.0",
     "jstreemap": "^1.28.2",

diff --git a/packages/amplify-category-geo/CHANGELOG.md b/packages/amplify-category-geo/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.5.9](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-04-18)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-geo
+
+
+
+
+
+## [3.5.8](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-04-15)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-geo
+
+
+
+
+
 ## [3.5.7](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-03-29)
 
 **Note:** Version bump only for package @aws-amplify/amplify-category-geo

diff --git a/packages/amplify-category-geo/package.json b/packages/amplify-category-geo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-geo",
-  "version": "3.5.7",
+  "version": "3.5.9",
   "description": "Amplify CLI plugin to manage the Geo resources for the project",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.2",
+    "@aws-amplify/amplify-cli-core": "4.3.4",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "ajv": "^6.12.6",
     "amplify-headless-interface": "1.17.6",

diff --git a/packages/amplify-category-hosting/CHANGELOG.md b/packages/amplify-category-hosting/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.5.31](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-04-18)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-hosting
+
+
+
+
+
+## [3.5.30](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-04-15)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-hosting
+
+
+
+
+
 ## [3.5.29](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-03-29)
 
 **Note:** Version bump only for package @aws-amplify/amplify-category-hosting

diff --git a/packages/amplify-category-hosting/package.json b/packages/amplify-category-hosting/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-hosting",
-  "version": "3.5.29",
+  "version": "3.5.31",
   "description": "amplify-cli hosting plugin",
   "repository": {
     "type": "git",
@@ -21,7 +21,7 @@
     "test": "jest --logHeapUsage --coverage"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.3.2",
+    "@aws-amplify/amplify-cli-core": "4.3.4",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "chalk": "^4.1.1",
     "fs-extra": "^8.1.0",