chore: fixing main to dev merge conflicts (#11696)

aws-amplify · Jan 3, 2023 · dfc9706 · dfc9706
1 parent 06300cc
commit dfc9706
Show file tree

Hide file tree

Showing 102 changed files with 765 additions and 193 deletions.
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.
 
+## [4.3.6](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@4.3.6) (2023-01-03)
+
+**Note:** Version bump only for package amplify-app
+
+
+
+
+
 ## [4.3.5](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@4.3.5) (2022-11-17)
 
 **Note:** Version bump only for package amplify-app

diff --git a/packages/amplify-app/package.json b/packages/amplify-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-app",
-  "version": "4.3.5",
+  "version": "4.3.6",
   "description": "Amplify CLI",
   "repository": {
     "type": "git",
@@ -30,8 +30,8 @@
   "dependencies": {
     "amplify-frontend-android": "3.4.0",
     "amplify-frontend-flutter": "1.3.5",
-    "amplify-frontend-ios": "3.5.5",
-    "amplify-frontend-javascript": "3.7.1",
+    "amplify-frontend-ios": "3.5.6",
+    "amplify-frontend-javascript": "3.7.2",
     "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,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.9.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-01-03)
+
+
+### Features
+
+* add resource parameter map to `backend-config.json` ([#11417](https://github.com/aws-amplify/amplify-cli/issues/11417)) ([6500436](https://github.com/aws-amplify/amplify-cli/commit/6500436c3c91c7cedfd26b79681acabdc8dfdb7f))
+
+
+
+
+
 # [2.8.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2022-11-17)
 
 

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.8.0",
+  "version": "2.9.0",
   "description": "An AppSync Simulator to test AppSync API.",
   "repository": {
     "type": "git",
@@ -32,8 +32,8 @@
   "dependencies": {
     "@graphql-tools/schema": "^8.3.1",
     "@graphql-tools/utils": "^8.5.1",
-    "amplify-cli-core": "3.4.0",
-    "amplify-prompts": "2.6.1",
+    "amplify-cli-core": "3.5.0",
+    "amplify-prompts": "2.6.2",
     "amplify-velocity-template": "1.4.8",
     "aws-sdk": "^2.1233.0",
     "chalk": "^4.1.1",
@@ -58,7 +58,7 @@
     "ws": "^8.5.0"
   },
   "devDependencies": {
-    "@aws-amplify/amplify-graphiql-explorer": "2.5.1",
+    "@aws-amplify/amplify-graphiql-explorer": "2.5.2",
     "@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,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.3.0](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@4.3.0) (2023-01-03)
+
+
+### Features
+
+* add resource parameter map to `backend-config.json` ([#11417](https://github.com/aws-amplify/amplify-cli/issues/11417)) ([6500436](https://github.com/aws-amplify/amplify-cli/commit/6500436c3c91c7cedfd26b79681acabdc8dfdb7f))
+
+
+
+
+
 ## [4.2.1](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@4.2.1) (2022-11-17)
 
 

diff --git a/packages/amplify-category-analytics/package.json b/packages/amplify-category-analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-category-analytics",
-  "version": "4.2.1",
+  "version": "4.3.0",
   "description": "amplify-cli analytics plugin",
   "repository": {
     "type": "git",
@@ -22,9 +22,9 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-environment-parameters": "1.2.1",
-    "amplify-cli-core": "3.4.0",
-    "amplify-prompts": "2.6.1",
+    "@aws-amplify/amplify-environment-parameters": "1.3.0",
+    "amplify-cli-core": "3.5.0",
+    "amplify-prompts": "2.6.2",
     "fs-extra": "^8.1.0",
     "inquirer": "^7.3.3",
     "uuid": "^8.3.2"

diff --git a/packages/amplify-category-auth/CHANGELOG.md b/packages/amplify-category-auth/CHANGELOG.md
@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.14.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-01-03)
+
+
+### Bug Fixes
+
+* add a dependsOn to custom resource for auth trigger ([#11504](https://github.com/aws-amplify/amplify-cli/issues/11504)) ([1ee69a4](https://github.com/aws-amplify/amplify-cli/commit/1ee69a4dba4adb1264ddec513ba9888c1296d7b4))
+* added getPermissionPolicies and exported ([61b77b9](https://github.com/aws-amplify/amplify-cli/commit/61b77b9e2702ffe7845e1adb045e627ac1dc2583))
+* additional type information, removed unnecessary try/catch block ([218a345](https://github.com/aws-amplify/amplify-cli/commit/218a3458e5d61cf00bc5521f37768f25394a98c2))
+* additional variable renamings, more specific return values ([18a5ffd](https://github.com/aws-amplify/amplify-cli/commit/18a5ffdaeca0df0c57dee9a3ea74bb74dcf265cb))
+* **category-auth:** prevent overwriting local changes to admin queries function ([#11520](https://github.com/aws-amplify/amplify-cli/issues/11520)) ([74d98a0](https://github.com/aws-amplify/amplify-cli/commit/74d98a09550de1e0c343c6684d37bc1f02a17c9d))
+* coerce provider type ([1da880f](https://github.com/aws-amplify/amplify-cli/commit/1da880f136a45bb424f8f8f38fd5fcc5baf8ece6))
+* cognito trigger template permissions ([#11482](https://github.com/aws-amplify/amplify-cli/issues/11482)) ([5d606e0](https://github.com/aws-amplify/amplify-cli/commit/5d606e09d986878ef4dacfb929697c654e424154))
+* more descriptive function parameter name ([3088664](https://github.com/aws-amplify/amplify-cli/commit/308866470e4f6dfdbe39b57c5ae123cd4966c631))
+* more specific return types in auth-questions.ts ([19153b9](https://github.com/aws-amplify/amplify-cli/commit/19153b914883ae1176015d453379698bd4eb03d2))
+* pr comment resolution ([c8cd19f](https://github.com/aws-amplify/amplify-cli/commit/c8cd19f2639d572f8c0fbb18c76747ae7249c19e))
+* pr comment resolution ([30552c0](https://github.com/aws-amplify/amplify-cli/commit/30552c0f043f2563308b155bfa29dd0b8f8de784))
+* provider name transform in map ([54b5a74](https://github.com/aws-amplify/amplify-cli/commit/54b5a74ec3dc8a0c73c6f71565a217389bdbf635))
+* return null ([7ccf9a1](https://github.com/aws-amplify/amplify-cli/commit/7ccf9a199b88d1ba0caedf10aff17dab37699d69))
+* use more specific return type ([9a2c8d2](https://github.com/aws-amplify/amplify-cli/commit/9a2c8d285a296196deb214415642d32841582fb6))
+* use require to keep synchronous behavior ([fe25cfe](https://github.com/aws-amplify/amplify-cli/commit/fe25cfe842b13fce04b2b68584c192caa719c4ba))
+
+
+### Features
+
+* add resource parameter map to `backend-config.json` ([#11417](https://github.com/aws-amplify/amplify-cli/issues/11417)) ([6500436](https://github.com/aws-amplify/amplify-cli/commit/6500436c3c91c7cedfd26b79681acabdc8dfdb7f))
+
+
+
+
+
 ## [2.13.2](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2022-12-09)
 
 

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": "2.13.2",
+  "version": "2.14.0",
   "description": "amplify-cli authentication plugin",
   "repository": {
     "type": "git",
@@ -28,17 +28,17 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-environment-parameters": "1.2.1",
-    "@aws-amplify/cli-extensibility-helper": "2.4.5",
+    "@aws-amplify/amplify-environment-parameters": "1.3.0",
+    "@aws-amplify/cli-extensibility-helper": "2.4.6",
     "@aws-cdk/aws-cognito": "~1.172.0",
     "@aws-cdk/aws-iam": "~1.172.0",
     "@aws-cdk/aws-lambda": "~1.172.0",
     "@aws-cdk/core": "~1.172.0",
-    "amplify-cli-core": "3.4.0",
-    "amplify-headless-interface": "1.16.0",
-    "amplify-prompts": "2.6.1",
-    "amplify-util-headless-input": "1.9.7",
-    "amplify-util-import": "2.3.0",
+    "amplify-cli-core": "3.5.0",
+    "amplify-headless-interface": "1.16.1",
+    "amplify-prompts": "2.6.2",
+    "amplify-util-headless-input": "1.9.8",
+    "amplify-util-import": "2.3.1",
     "aws-sdk": "^2.1233.0",
     "chalk": "^4.1.1",
     "change-case": "^4.1.1",

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.
 
+# [2.6.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-01-03)
+
+
+### Bug Fixes
+
+* Typescript -> TypeScript in customer-facing errors ([#11404](https://github.com/aws-amplify/amplify-cli/issues/11404)) ([a1e63d8](https://github.com/aws-amplify/amplify-cli/commit/a1e63d83c9366f957f7087273e34e36ceacb1293))
+
+
+### Features
+
+* add resource parameter map to `backend-config.json` ([#11417](https://github.com/aws-amplify/amplify-cli/issues/11417)) ([6500436](https://github.com/aws-amplify/amplify-cli/commit/6500436c3c91c7cedfd26b79681acabdc8dfdb7f))
+
+
+
+
+
 ## [2.5.5](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2022-11-17)
 
 **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": "2.5.5",
+  "version": "2.6.0",
   "description": "amplify-cli custom resources plugin",
   "repository": {
     "type": "git",
@@ -26,8 +26,8 @@
     "access": "public"
   },
   "dependencies": {
-    "amplify-cli-core": "3.4.0",
-    "amplify-prompts": "2.6.1",
+    "amplify-cli-core": "3.5.0",
+    "amplify-prompts": "2.6.2",
     "execa": "^5.1.1",
     "fs-extra": "^8.1.0",
     "glob": "^7.2.0",

diff --git a/packages/amplify-category-function/CHANGELOG.md b/packages/amplify-category-function/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.2.2](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@4.2.2) (2023-01-03)
+
+
+### Bug Fixes
+
+* cognito trigger template permissions ([#11482](https://github.com/aws-amplify/amplify-cli/issues/11482)) ([5d606e0](https://github.com/aws-amplify/amplify-cli/commit/5d606e09d986878ef4dacfb929697c654e424154))
+* handle lambda permissions for notifications category ([#11357](https://github.com/aws-amplify/amplify-cli/issues/11357)) ([163ab8f](https://github.com/aws-amplify/amplify-cli/commit/163ab8f74e846f9ea43081c5c045e7d65f28f05c))
+
+
+
+
+
 ## [4.2.1](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@4.2.1) (2022-11-17)
 
 **Note:** Version bump only for package amplify-category-function

diff --git a/packages/amplify-category-function/package.json b/packages/amplify-category-function/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-category-function",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "description": "amplify-cli function plugin",
   "repository": {
     "type": "git",
@@ -23,10 +23,10 @@
     "aws"
   ],
   "dependencies": {
-    "@aws-amplify/amplify-environment-parameters": "1.2.1",
-    "amplify-cli-core": "3.4.0",
-    "amplify-function-plugin-interface": "1.9.5",
-    "amplify-prompts": "2.6.1",
+    "@aws-amplify/amplify-environment-parameters": "1.3.0",
+    "amplify-cli-core": "3.5.0",
+    "amplify-function-plugin-interface": "1.9.6",
+    "amplify-prompts": "2.6.2",
     "archiver": "^5.3.0",
     "aws-sdk": "^2.1233.0",
     "chalk": "^4.1.1",

diff --git a/packages/amplify-category-geo/CHANGELOG.md b/packages/amplify-category-geo/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.10.1](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@2.10.1) (2023-01-03)
+
+**Note:** Version bump only for package amplify-category-geo
+
+
+
+
+
 # [2.10.0](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@2.10.0) (2022-11-17)
 
 

diff --git a/packages/amplify-category-geo/package.json b/packages/amplify-category-geo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-category-geo",
-  "version": "2.10.0",
+  "version": "2.10.1",
   "description": "Amplify CLI plugin to manage the Geo resources for the project",
   "repository": {
     "type": "git",
@@ -27,10 +27,10 @@
     "@aws-cdk/aws-lambda": "~1.172.0",
     "@aws-cdk/core": "~1.172.0",
     "ajv": "^6.12.6",
-    "amplify-cli-core": "3.4.0",
-    "amplify-headless-interface": "1.16.0",
-    "amplify-prompts": "2.6.1",
-    "amplify-util-headless-input": "1.9.7",
+    "amplify-cli-core": "3.5.0",
+    "amplify-headless-interface": "1.16.1",
+    "amplify-prompts": "2.6.2",
+    "amplify-util-headless-input": "1.9.8",
     "aws-sdk": "^2.1233.0",
     "fs-extra": "^8.1.0",
     "lodash": "^4.17.21",

diff --git a/packages/amplify-category-hosting/CHANGELOG.md b/packages/amplify-category-hosting/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.4.6](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@3.4.6) (2023-01-03)
+
+**Note:** Version bump only for package amplify-category-hosting
+
+
+
+
+
 ## [3.4.5](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@3.4.5) (2022-11-17)
 
 **Note:** Version bump only for package amplify-category-hosting

diff --git a/packages/amplify-category-hosting/package.json b/packages/amplify-category-hosting/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-category-hosting",
-  "version": "3.4.5",
+  "version": "3.4.6",
   "description": "amplify-cli hosting plugin",
   "repository": {
     "type": "git",
@@ -18,7 +18,7 @@
     "test": "jest --logHeapUsage --coverage"
   },
   "dependencies": {
-    "amplify-cli-core": "3.4.0",
+    "amplify-cli-core": "3.5.0",
     "chalk": "^4.1.1",
     "fs-extra": "^8.1.0",
     "inquirer": "^7.3.3",

diff --git a/packages/amplify-category-interactions/CHANGELOG.md b/packages/amplify-category-interactions/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.2.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-interactions@[email protected]) (2023-01-03)
+
+
+### Features
+
+* add resource parameter map to `backend-config.json` ([#11417](https://github.com/aws-amplify/amplify-cli/issues/11417)) ([6500436](https://github.com/aws-amplify/amplify-cli/commit/6500436c3c91c7cedfd26b79681acabdc8dfdb7f))
+
+
+
+
+
 ## [4.1.5](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-interactions@[email protected]) (2022-11-17)
 
 **Note:** Version bump only for package amplify-category-interactions

diff --git a/packages/amplify-category-interactions/package.json b/packages/amplify-category-interactions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-category-interactions",
-  "version": "4.1.5",
+  "version": "4.2.0",
   "description": "amplify-cli interactions plugin",
   "repository": {
     "type": "git",
@@ -22,7 +22,7 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "amplify-cli-core": "3.4.0",
+    "amplify-cli-core": "3.5.0",
     "fs-extra": "^8.1.0",
     "fuzzy": "^0.1.3",
     "inquirer": "^7.3.3",