Merge pull request #14073 from aws-amplify/dev-main-merge-65e7887895d…

…1eee

chore(release): Merge main into dev

packages/amplify-category-notifications/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.26.26](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2025-01-16)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-notifications
+
+
+
+
+
 ## [2.26.25](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-11-18)
 
 **Note:** Version bump only for package @aws-amplify/amplify-category-notifications

packages/amplify-category-notifications/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-notifications",
-  "version": "2.26.25",
+  "version": "2.26.26",
   "description": "amplify-cli notifications plugin",
   "repository": {
     "type": "git",
@@ -29,7 +29,7 @@
     "@aws-amplify/amplify-cli-core": "4.3.10",
     "@aws-amplify/amplify-environment-parameters": "1.9.15",
     "@aws-amplify/amplify-prompts": "2.8.6",
-    "@aws-amplify/amplify-provider-awscloudformation": "8.11.1",
+    "@aws-amplify/amplify-provider-awscloudformation": "8.11.2",
     "aws-sdk": "^2.1464.0",
     "chalk": "^4.1.1",
     "fs-extra": "^8.1.0",

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.14.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2025-01-16)
+
+**Note:** Version bump only for package @aws-amplify/cli
+
+
+
+
+
 # [12.14.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2025-01-02)
 
 

packages/amplify-cli-npm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/cli",
-  "version": "12.14.0",
+  "version": "12.14.1",
   "description": "Amplify CLI",
   "repository": {
     "type": "git",
@@ -36,7 +36,7 @@
     "tar-stream": "^2.2.0"
   },
   "devDependencies": {
-    "@aws-amplify/cli-internal": "12.14.0",
+    "@aws-amplify/cli-internal": "12.14.1",
     "@types/tar": "^6.1.1",
     "rimraf": "^3.0.2"
   },

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.14.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2025-01-16)
+
+**Note:** Version bump only for package @aws-amplify/cli-internal
+
+
+
+
+
 # [12.14.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2025-01-02)
 
 

packages/amplify-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/cli-internal",
-  "version": "12.14.0",
+  "version": "12.14.1",
   "description": "Amplify CLI",
   "repository": {
     "type": "git",
@@ -43,14 +43,14 @@
     "@aws-amplify/amplify-category-geo": "3.5.16",
     "@aws-amplify/amplify-category-hosting": "3.5.37",
     "@aws-amplify/amplify-category-interactions": "5.1.29",
-    "@aws-amplify/amplify-category-notifications": "2.26.25",
+    "@aws-amplify/amplify-category-notifications": "2.26.26",
     "@aws-amplify/amplify-category-predictions": "5.5.16",
     "@aws-amplify/amplify-category-storage": "5.5.15",
     "@aws-amplify/amplify-cli-core": "4.3.10",
     "@aws-amplify/amplify-cli-logger": "1.3.8",
     "@aws-amplify/amplify-cli-shared-interfaces": "1.2.5",
     "@aws-amplify/amplify-console-hosting": "2.5.34",
-    "@aws-amplify/amplify-container-hosting": "2.8.13",
+    "@aws-amplify/amplify-container-hosting": "2.8.14",
     "@aws-amplify/amplify-dotnet-function-template-provider": "2.7.0",
     "@aws-amplify/amplify-environment-parameters": "1.9.15",
     "@aws-amplify/amplify-frontend-android": "3.5.8",
@@ -60,11 +60,11 @@
     "@aws-amplify/amplify-go-function-template-provider": "1.4.8",
     "@aws-amplify/amplify-nodejs-function-template-provider": "2.10.10",
     "@aws-amplify/amplify-prompts": "2.8.6",
-    "@aws-amplify/amplify-provider-awscloudformation": "8.11.1",
+    "@aws-amplify/amplify-provider-awscloudformation": "8.11.2",
     "@aws-amplify/amplify-python-function-template-provider": "1.4.7",
     "@aws-amplify/amplify-util-import": "2.8.3",
-    "@aws-amplify/amplify-util-mock": "5.10.9",
-    "@aws-amplify/amplify-util-uibuilder": "1.14.14",
+    "@aws-amplify/amplify-util-mock": "5.10.10",
+    "@aws-amplify/amplify-util-uibuilder": "1.14.15",
     "@aws-cdk/cloudformation-diff": "~2.68.0",
     "amplify-codegen": "^4.10.2",
     "amplify-dotnet-function-runtime-provider": "2.1.0",

packages/amplify-container-hosting/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.8.14](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2025-01-16)
+
+
+### Reverts
+
+* Revert "chore: cateogry-api + codegen version bump (#14048)" (#14049) ([5a0cdbf](https://github.com/aws-amplify/amplify-cli/commit/5a0cdbfa46856da320323923a4336d6ba60d82b9)), closes [#14048](https://github.com/aws-amplify/amplify-cli/issues/14048) [#14049](https://github.com/aws-amplify/amplify-cli/issues/14049)
+
+
+
+
+
 ## [2.8.13](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-11-18)
 
 **Note:** Version bump only for package @aws-amplify/amplify-container-hosting

packages/amplify-container-hosting/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-container-hosting",
-  "version": "2.8.13",
+  "version": "2.8.14",
   "description": "amplify-cli hosting plugin for containers",
   "repository": {
     "type": "git",

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.11.1](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@4.11.1) (2025-01-16)
+
+**Note:** Version bump only for package amplify-e2e-tests
+
+
+
+
+
 # [4.11.0](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@4.11.0) (2025-01-02)
 
 

packages/amplify-e2e-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amplify-e2e-tests",
-  "version": "4.11.0",
+  "version": "4.11.1",
   "description": "",
   "repository": {
     "type": "git",

packages/amplify-migration-tests/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.
 
+## [6.5.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2025-01-16)
+
+
+### Bug Fixes
+
+* removed migration tests between versions of Gen 1 ([#14062](https://github.com/aws-amplify/amplify-cli/issues/14062)) ([58856c8](https://github.com/aws-amplify/amplify-cli/commit/58856c8fb908ed21f3aea850d4dcc0d4a03f4114))
+
+
+
+
+
 # [6.5.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2025-01-02)
 
 

packages/amplify-migration-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-migration-tests",
-  "version": "6.5.0",
+  "version": "6.5.1",
   "description": "",
   "repository": {
     "type": "git",

packages/amplify-provider-awscloudformation/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.
 
+## [8.11.2](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2025-01-16)
+
+
+### Reverts
+
+* Revert "chore: cateogry-api + codegen version bump (#14048)" (#14049) ([5a0cdbf](https://github.com/aws-amplify/amplify-cli/commit/5a0cdbfa46856da320323923a4336d6ba60d82b9)), closes [#14048](https://github.com/aws-amplify/amplify-cli/issues/14048) [#14049](https://github.com/aws-amplify/amplify-cli/issues/14049)
+
+
+
+
+
 ## [8.11.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-11-18)
 
 **Note:** Version bump only for package @aws-amplify/amplify-provider-awscloudformation

packages/amplify-provider-awscloudformation/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-provider-awscloudformation",
-  "version": "8.11.1",
+  "version": "8.11.2",
   "description": "AWS CloudFormation Provider",
   "repository": {
     "type": "git",

packages/amplify-util-mock/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.10.10](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2025-01-16)
+
+**Note:** Version bump only for package @aws-amplify/amplify-util-mock
+
+
+
+
+
 ## [5.10.9](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2025-01-02)
 
 

packages/amplify-util-mock/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-util-mock",
-  "version": "5.10.9",
+  "version": "5.10.10",
   "description": "amplify cli plugin providing local testing",
   "repository": {
     "type": "git",
@@ -37,7 +37,7 @@
     "@aws-amplify/amplify-environment-parameters": "1.9.15",
     "@aws-amplify/amplify-opensearch-simulator": "1.7.15",
     "@aws-amplify/amplify-prompts": "2.8.6",
-    "@aws-amplify/amplify-provider-awscloudformation": "8.11.1",
+    "@aws-amplify/amplify-provider-awscloudformation": "8.11.2",
     "@hapi/topo": "^5.0.0",
     "amplify-codegen": "^4.10.2",
     "amplify-dynamodb-simulator": "2.9.19",

packages/amplify-util-uibuilder/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.
 
+## [1.14.15](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2025-01-16)
+
+
+### Reverts
+
+* Revert "chore: cateogry-api + codegen version bump (#14048)" (#14049) ([5a0cdbf](https://github.com/aws-amplify/amplify-cli/commit/5a0cdbfa46856da320323923a4336d6ba60d82b9)), closes [#14048](https://github.com/aws-amplify/amplify-cli/issues/14048) [#14049](https://github.com/aws-amplify/amplify-cli/issues/14049)
+
+
+
+
+
 ## [1.14.14](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2024-11-18)
 
 **Note:** Version bump only for package @aws-amplify/amplify-util-uibuilder

packages/amplify-util-uibuilder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-util-uibuilder",
-  "version": "1.14.14",
+  "version": "1.14.15",
   "description": "",
   "main": "lib/index.js",
   "scripts": {

yarn.lock

@@ -334,14 +334,14 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/[email protected].25, @aws-amplify/amplify-category-notifications@workspace:packages/amplify-category-notifications":
+"@aws-amplify/[email protected].26, @aws-amplify/amplify-category-notifications@workspace:packages/amplify-category-notifications":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-category-notifications@workspace:packages/amplify-category-notifications"
   dependencies:
     "@aws-amplify/amplify-cli-core": 4.3.10
     "@aws-amplify/amplify-environment-parameters": 1.9.15
     "@aws-amplify/amplify-prompts": 2.8.6
-    "@aws-amplify/amplify-provider-awscloudformation": 8.11.1
+    "@aws-amplify/amplify-provider-awscloudformation": 8.11.2
     aws-sdk: ^2.1464.0
     chalk: ^4.1.1
     fs-extra: ^8.1.0
@@ -500,7 +500,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/[email protected].13, @aws-amplify/amplify-container-hosting@workspace:packages/amplify-container-hosting":
+"@aws-amplify/[email protected].14, @aws-amplify/amplify-container-hosting@workspace:packages/amplify-container-hosting":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-container-hosting@workspace:packages/amplify-container-hosting"
   dependencies:
@@ -795,7 +795,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/[email protected].1, @aws-amplify/amplify-provider-awscloudformation@workspace:packages/amplify-provider-awscloudformation":
+"@aws-amplify/[email protected].2, @aws-amplify/amplify-provider-awscloudformation@workspace:packages/amplify-provider-awscloudformation":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-provider-awscloudformation@workspace:packages/amplify-provider-awscloudformation"
   dependencies:
@@ -868,7 +868,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/[email protected].9, @aws-amplify/amplify-util-mock@workspace:packages/amplify-util-mock":
+"@aws-amplify/[email protected].10, @aws-amplify/amplify-util-mock@workspace:packages/amplify-util-mock":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-util-mock@workspace:packages/amplify-util-mock"
   dependencies:
@@ -879,7 +879,7 @@ __metadata:
     "@aws-amplify/amplify-function-plugin-interface": 1.12.1
     "@aws-amplify/amplify-opensearch-simulator": 1.7.15
     "@aws-amplify/amplify-prompts": 2.8.6
-    "@aws-amplify/amplify-provider-awscloudformation": 8.11.1
+    "@aws-amplify/amplify-provider-awscloudformation": 8.11.2
     "@aws-amplify/graphql-auth-transformer": ^3.6.7
     "@aws-amplify/graphql-default-value-transformer": ^2.3.15
     "@aws-amplify/graphql-function-transformer": ^2.1.27
@@ -938,7 +938,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/[email protected].14, @aws-amplify/amplify-util-uibuilder@workspace:packages/amplify-util-uibuilder":
+"@aws-amplify/[email protected].15, @aws-amplify/amplify-util-uibuilder@workspace:packages/amplify-util-uibuilder":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/amplify-util-uibuilder@workspace:packages/amplify-util-uibuilder"
   dependencies:
@@ -1072,7 +1072,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aws-amplify/[email protected].0, @aws-amplify/cli-internal@workspace:packages/amplify-cli":
+"@aws-amplify/[email protected].1, @aws-amplify/cli-internal@workspace:packages/amplify-cli":
   version: 0.0.0-use.local
   resolution: "@aws-amplify/cli-internal@workspace:packages/amplify-cli"
   dependencies:
@@ -1085,14 +1085,14 @@ __metadata:
     "@aws-amplify/amplify-category-geo": 3.5.16
     "@aws-amplify/amplify-category-hosting": 3.5.37
     "@aws-amplify/amplify-category-interactions": 5.1.29
-    "@aws-amplify/amplify-category-notifications": 2.26.25
+    "@aws-amplify/amplify-category-notifications": 2.26.26
     "@aws-amplify/amplify-category-predictions": 5.5.16
     "@aws-amplify/amplify-category-storage": 5.5.15
     "@aws-amplify/amplify-cli-core": 4.3.10
     "@aws-amplify/amplify-cli-logger": 1.3.8
     "@aws-amplify/amplify-cli-shared-interfaces": 1.2.5
     "@aws-amplify/amplify-console-hosting": 2.5.34
-    "@aws-amplify/amplify-container-hosting": 2.8.13
+    "@aws-amplify/amplify-container-hosting": 2.8.14
     "@aws-amplify/amplify-dotnet-function-template-provider": 2.7.0
     "@aws-amplify/amplify-environment-parameters": 1.9.15
     "@aws-amplify/amplify-frontend-android": 3.5.8
@@ -1103,11 +1103,11 @@ __metadata:
     "@aws-amplify/amplify-go-function-template-provider": 1.4.8
     "@aws-amplify/amplify-nodejs-function-template-provider": 2.10.10
     "@aws-amplify/amplify-prompts": 2.8.6
-    "@aws-amplify/amplify-provider-awscloudformation": 8.11.1
+    "@aws-amplify/amplify-provider-awscloudformation": 8.11.2
     "@aws-amplify/amplify-python-function-template-provider": 1.4.7
     "@aws-amplify/amplify-util-import": 2.8.3
-    "@aws-amplify/amplify-util-mock": 5.10.9
-    "@aws-amplify/amplify-util-uibuilder": 1.14.14
+    "@aws-amplify/amplify-util-mock": 5.10.10
+    "@aws-amplify/amplify-util-uibuilder": 1.14.15
     "@aws-cdk/cloudformation-diff": ~2.68.0
     "@types/archiver": ^5.3.1
     "@types/columnify": ^1.5.1
@@ -1172,7 +1172,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@aws-amplify/cli@workspace:packages/amplify-cli-npm"
   dependencies:
-    "@aws-amplify/cli-internal": 12.14.0
+    "@aws-amplify/cli-internal": 12.14.1
     "@types/tar": ^6.1.1
     axios: ^1.6.7
     rimraf: ^3.0.2