Gen2 migrations merge from dev and renames around prepare command and resourceMappings

.gitignore

@@ -103,3 +103,6 @@ packages/amplify-category-notifications/lib
 packages/amplify-category-interactions/lib/
 packages/amplify-environment-parameters/lib/
 !packages/amplify-graphql-model-transformer/src/__tests__/overrides/build/override.js
+
+.nx/cache
+.nx/workspace-data

.prettierignore

@@ -23,3 +23,6 @@ packages/amplify-frontend-ios/tests/sample**
 # Exceptions:
 !packages/amplify-category-hosting/lib
 !packages/amplify-frontend-*/lib
+
+/.nx/cache
+/.nx/workspace-data

lerna.json

@@ -2,6 +2,5 @@
   "packages": ["packages/*"],
   "version": "independent",
   "npmClient": "yarn",
-  "useWorkspaces": true,
-  "useNx": true
+  "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }

nx.json

@@ -1,15 +1,10 @@
 {
-  "extends": "nx/presets/npm.json",
-  "npmScope": "amplify-cli",
-  "tasksRunnerOptions": {
-    "default": {
-      "runner": "nx/tasks-runners/default",
-      "options": {
-        "cacheableOperations": ["build", "test", "lint", "package", "prepare", "extract-api"],
-        "parallel": 8
-      }
+  "pluginsConfig": {
+    "@nrwl/js": {
+      "analyzeSourceFiles": false
     }
   },
+  "extends": "nx/presets/npm.json",
   "namedInputs": {
     "default": [
       "{projectRoot}/**/*",
@@ -29,40 +24,42 @@
   "targetDefaults": {
     "build": {
       "inputs": ["default", "^production"],
-      "dependsOn": ["^build"]
+      "dependsOn": ["^build"],
+      "cache": true
     },
     "build-tests": {
       "inputs": ["default", "^production"],
       "dependsOn": ["build", "^build"]
     },
     "prepare": {
       "inputs": ["default", "^default"],
-      "dependsOn": ["^prepare"]
+      "dependsOn": ["^prepare"],
+      "cache": true
     },
     "package": {
       "inputs": ["default", "^default"],
-      "dependsOn": ["^package"]
+      "dependsOn": ["^package"],
+      "cache": true
     },
     "smoketest": {
       "inputs": ["default", "^production"],
       "dependsOn": ["build"]
     },
     "test": {
       "inputs": ["default", "^production"],
-      "dependsOn": ["build"]
+      "dependsOn": ["build"],
+      "cache": true
     },
     "extract-api": {
       "dependsOn": ["build"],
       "inputs": ["{projectRoot}/src/**/*", "!{projectRoot}/src/__tests__/**/*"],
-      "outputs": ["{projectRoot}/API.md"]
+      "outputs": ["{projectRoot}/API.md"],
+      "cache": true
+    },
+    "lint": {
+      "cache": true
     }
   },
-  "affected": {
-    "defaultBase": "dev"
-  },
-  "pluginsConfig": {
-    "@nrwl/js": {
-      "analyzeSourceFiles": false
-    }
-  }
+  "parallel": 8,
+  "defaultBase": "dev"
 }

package.json

@@ -89,7 +89,7 @@
   "author": "Amazon Web Services",
   "license": "Apache-2.0",
   "dependencies": {
-    "lerna": "^6.6.1",
+    "lerna": "^8.2.1",
     "node-gyp": "^9.3.1",
     "strip-ansi": "^6.0.0",
     "yargs": "^17.7.2"

packages/amplify-app/CHANGELOG.md

@@ -3,23 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [5.0.41-next-4.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-app@5.0.41-next-3.0...@aws-amplify/amplify-app@5.0.41-next-4.0) (2025-03-12)
-
-**Note:** Version bump only for package @aws-amplify/amplify-app
-
-
-
-
-
-## [5.0.41-next-3.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-app@5.0.41-next-2.0...@aws-amplify/amplify-app@5.0.41-next-3.0) (2025-03-05)
-
-**Note:** Version bump only for package @aws-amplify/amplify-app
-
-
-
-
-
-## [5.0.41-next-2.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-app@5.0.40...@aws-amplify/amplify-app@5.0.41-next-2.0) (2025-02-26)
+## [5.0.41](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-app@5.0.40...@aws-amplify/amplify-app@5.0.41) (2025-02-25)
 
 **Note:** Version bump only for package @aws-amplify/amplify-app
 

packages/amplify-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-app",
-  "version": "5.0.41-next-4.0",
+  "version": "5.0.41",
   "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.7.12-next-4.0",
-    "@aws-amplify/amplify-frontend-javascript": "3.10.22-next-4.0",
+    "@aws-amplify/amplify-frontend-ios": "3.7.11",
+    "@aws-amplify/amplify-frontend-javascript": "3.10.21",
     "chalk": "^4.1.1",
     "execa": "^5.1.1",
     "fs-extra": "^8.1.0",

packages/amplify-category-analytics/CHANGELOG.md

@@ -3,23 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [5.0.40-next-4.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-analytics@5.0.40-next-3.0...@aws-amplify/amplify-category-analytics@5.0.40-next-4.0) (2025-03-12)
-
-**Note:** Version bump only for package @aws-amplify/amplify-category-analytics
-
-
-
-
-
-## [5.0.40-next-3.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-analytics@5.0.40-next-2.0...@aws-amplify/amplify-category-analytics@5.0.40-next-3.0) (2025-03-05)
-
-**Note:** Version bump only for package @aws-amplify/amplify-category-analytics
-
-
-
-
-
-## [5.0.40-next-2.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-analytics@5.0.39...@aws-amplify/amplify-category-analytics@5.0.40-next-2.0) (2025-02-26)
+## [5.0.40](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-analytics@5.0.39...@aws-amplify/amplify-category-analytics@5.0.40) (2025-02-25)
 
 **Note:** Version bump only for package @aws-amplify/amplify-category-analytics
 

packages/amplify-category-analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-analytics",
-  "version": "5.0.40-next-4.0",
+  "version": "5.0.40",
   "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.4.1-next-4.0",
-    "@aws-amplify/amplify-environment-parameters": "1.9.19-next-4.0",
+    "@aws-amplify/amplify-cli-core": "4.4.0",
+    "@aws-amplify/amplify-environment-parameters": "1.9.18",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "fs-extra": "^8.1.0",
     "uuid": "^8.3.2"

packages/amplify-category-auth/CHANGELOG.md

@@ -3,23 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [3.7.20-next-4.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-auth@3.7.20-next-3.0...@aws-amplify/amplify-category-auth@3.7.20-next-4.0) (2025-03-12)
-
-**Note:** Version bump only for package @aws-amplify/amplify-category-auth
-
-
-
-
-
-## [3.7.20-next-3.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-auth@3.7.20-next-2.0...@aws-amplify/amplify-category-auth@3.7.20-next-3.0) (2025-03-05)
-
-**Note:** Version bump only for package @aws-amplify/amplify-category-auth
-
-
-
-
-
-## [3.7.20-next-2.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-auth@3.7.19...@aws-amplify/amplify-category-auth@3.7.20-next-2.0) (2025-02-26)
+## [3.7.20](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-auth@3.7.19...@aws-amplify/amplify-category-auth@3.7.20) (2025-02-25)
 
 **Note:** Version bump only for package @aws-amplify/amplify-category-auth
 

packages/amplify-category-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-auth",
-  "version": "3.7.20-next-4.0",
+  "version": "3.7.20",
   "description": "amplify-cli authentication plugin",
   "repository": {
     "type": "git",
@@ -28,15 +28,15 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.4.1-next-4.0",
-    "@aws-amplify/amplify-environment-parameters": "1.9.19-next-4.0",
+    "@aws-amplify/amplify-cli-core": "4.4.0",
+    "@aws-amplify/amplify-environment-parameters": "1.9.18",
     "@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.38-next-4.0",
+    "@aws-amplify/cli-extensibility-helper": "3.0.37",
     "amplify-headless-interface": "1.17.7",
     "amplify-util-headless-input": "1.9.18",
-    "aws-cdk-lib": "~2.177.0",
+    "aws-cdk-lib": "~2.187.0",
     "aws-sdk": "^2.1464.0",
     "axios": "^1.6.7",
     "chalk": "^4.1.1",

packages/amplify-category-custom/package.json

@@ -28,7 +28,7 @@
   "dependencies": {
     "@aws-amplify/amplify-cli-core": "4.4.1-next-4.0",
     "@aws-amplify/amplify-prompts": "2.8.6",
-    "aws-cdk-lib": "~2.177.0",
+    "aws-cdk-lib": "~2.187.0",
     "execa": "^5.1.1",
     "fs-extra": "^8.1.0",
     "glob": "^7.2.0",

packages/amplify-category-custom/resources/package.json

@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@aws-amplify/cli-extensibility-helper": "^3.0.0",
-    "aws-cdk-lib": "~2.177.0",
+    "aws-cdk-lib": "~2.187.0",
     "constructs": "^10.0.5"
   },
   "devDependencies": {

packages/amplify-category-function/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-function",
-  "version": "5.7.14-next-4.0",
+  "version": "5.7.13",
   "description": "amplify-cli function plugin",
   "repository": {
     "type": "git",
@@ -26,8 +26,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.4.1-next-4.0",
-    "@aws-amplify/amplify-environment-parameters": "1.9.19-next-4.0",
+    "@aws-amplify/amplify-cli-core": "4.4.0",
+    "@aws-amplify/amplify-environment-parameters": "1.9.18",
     "@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.16",
+    "graphql-transformer-core": "^8.2.17",
     "inquirer": "^7.3.3",
     "inquirer-datepicker": "^2.0.0",
     "jstreemap": "^1.28.2",

packages/amplify-category-geo/CHANGELOG.md

@@ -3,23 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [3.5.20-next-4.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-geo@3.5.20-next-3.0...@aws-amplify/amplify-category-geo@3.5.20-next-4.0) (2025-03-12)
-
-**Note:** Version bump only for package @aws-amplify/amplify-category-geo
-
-
-
-
-
-## [3.5.20-next-3.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-geo@3.5.20-next-2.0...@aws-amplify/amplify-category-geo@3.5.20-next-3.0) (2025-03-05)
-
-**Note:** Version bump only for package @aws-amplify/amplify-category-geo
-
-
-
-
-
-## [3.5.20-next-2.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-geo@3.5.19...@aws-amplify/amplify-category-geo@3.5.20-next-2.0) (2025-02-26)
+## [3.5.20](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-geo@3.5.19...@aws-amplify/amplify-category-geo@3.5.20) (2025-02-25)
 
 **Note:** Version bump only for package @aws-amplify/amplify-category-geo
 

packages/amplify-category-geo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-geo",
-  "version": "3.5.20-next-4.0",
+  "version": "3.5.20",
   "description": "Amplify CLI plugin to manage the Geo resources for the project",
   "repository": {
     "type": "git",
@@ -26,12 +26,12 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.4.1-next-4.0",
+    "@aws-amplify/amplify-cli-core": "4.4.0",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "ajv": "^6.12.6",
     "amplify-headless-interface": "1.17.7",
     "amplify-util-headless-input": "1.9.18",
-    "aws-cdk-lib": "~2.177.0",
+    "aws-cdk-lib": "~2.187.0",
     "aws-sdk": "^2.1464.0",
     "constructs": "^10.0.5",
     "fs-extra": "^8.1.0",

packages/amplify-category-interactions/CHANGELOG.md

@@ -3,23 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [5.1.33-next-4.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-interactions@5.1.33-next-3.0...@aws-amplify/amplify-category-interactions@5.1.33-next-4.0) (2025-03-12)
-
-**Note:** Version bump only for package @aws-amplify/amplify-category-interactions
-
-
-
-
-
-## [5.1.33-next-3.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-interactions@5.1.33-next-2.0...@aws-amplify/amplify-category-interactions@5.1.33-next-3.0) (2025-03-05)
-
-**Note:** Version bump only for package @aws-amplify/amplify-category-interactions
-
-
-
-
-
-## [5.1.33-next-2.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-interactions@5.1.32...@aws-amplify/amplify-category-interactions@5.1.33-next-2.0) (2025-02-26)
+## [5.1.33](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-interactions@5.1.32...@aws-amplify/amplify-category-interactions@5.1.33) (2025-02-25)
 
 **Note:** Version bump only for package @aws-amplify/amplify-category-interactions
 

packages/amplify-category-interactions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-interactions",
-  "version": "5.1.33-next-4.0",
+  "version": "5.1.33",
   "description": "amplify-cli interactions plugin",
   "repository": {
     "type": "git",
@@ -25,7 +25,7 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.4.1-next-4.0",
+    "@aws-amplify/amplify-cli-core": "4.4.0",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "fs-extra": "^8.1.0",
     "fuzzy": "^0.1.3",