build: replace lerna task orchestration with nx (#10369)

aws-amplify · May 7, 2022 · 714f2fa · 714f2fa
1 parent 82f05a0
commit 714f2fa
Show file tree

Hide file tree

Showing 40 changed files with 403 additions and 98 deletions.
diff --git a/nx.ignore b/nx.ignore
@@ -0,0 +1,2 @@
+packages/*/resources
+scripts/
diff --git a/nx.json b/nx.json
@@ -0,0 +1,46 @@
+{
+  "extends": "nx/presets/npm.json",
+  "npmScope": "amplify-cli",
+  "tasksRunnerOptions": {
+    "default": {
+      "runner": "nx/tasks-runners/default",
+      "options": {
+        "cacheableOperations": [
+          "build",
+          "test",
+          "lint",
+          "package",
+          "prepare"
+        ]
+      }
+    }
+  },
+  "targetDependencies": {
+    "build": [
+      {
+        "target": "build",
+        "projects": "dependencies"
+      }
+    ],
+    "prepare": [
+      {
+        "target": "prepare",
+        "projects": "dependencies"
+      }
+    ],
+    "package": [
+      {
+        "target": "package",
+        "projects": "dependencies"
+      }
+    ]
+  },
+  "affected": {
+    "defaultBase": "master"
+  },
+  "pluginsConfig": {
+    "@nrwl/js": {
+      "analyzeSourceFiles": false
+    }
+  }
+}
diff --git a/package.json b/package.json
@@ -3,22 +3,22 @@
   "version": "0.1.0",
   "description": "amplify-cli",
   "scripts": {
-    "test-changed": "lerna run test --since master",
-    "test": "lerna run test",
-    "test-ci": "lerna run test --concurrency 1 -- --ci -i",
-    "e2e": "lerna run e2e",
+    "test-changed": "nx affected --target=test",
+    "test": "nx run-many --target=test --all",
+    "test-ci": "nx run-many --target=test --all --parallel=1 -- --ci -i",
+    "e2e": "nx run e2e",
     "cloud-e2e": "CURR_BRANCH=$(git branch | awk '/\\*/{printf \"%s\", $2}') && UPSTREAM_BRANCH=run-e2e/$USER/$CURR_BRANCH && git push $(git remote -v | grep aws-amplify/amplify-cli | head -n1 | awk '{print $1;}') $CURR_BRANCH:$UPSTREAM_BRANCH --no-verify --force-with-lease && echo \"\n\n 🏃 E2E test are running at:\nhttps://app.circleci.com/pipelines/github/aws-amplify/amplify-cli?branch=$UPSTREAM_BRANCH\"",
     "lint-fix": "git diff --name-only --cached --diff-filter d | grep -E '\\.(js|jsx|ts|tsx)$' | xargs eslint --fix --quiet",
     "addwords": "node ./scripts/add-to-dict.js",
     "mergewords": "yarn ts-node ./scripts/handle-dict-conflicts.ts",
-    "clean": "lerna run clean && lerna exec yarn rimraf tsconfig.tsbuildinfo && lerna clean --yes && yarn rimraf node_modules",
+    "clean": "nx run-many --target=clean --all && yarn rimraf tsconfig.tsbuildinfo",
     "check-version-conflicts:beta": "yarn ts-node ./scripts/check-version.ts beta",
     "check-version-conflicts:release": "yarn ts-node ./scripts/check-version.ts",
-    "build": "lerna run build",
-    "build-tests-changed": "lerna run build-tests --since master",
-    "build-tests": "lerna run build-tests",
-    "production-build": "yarn --frozen-lockfile --cache-folder ~/.cache/yarn && lerna run build --concurrency 3 --stream",
-    "dev-build": "yarn --cache-folder ~/.cache/yarn && lerna run build",
+    "build": "nx run-many --target=build --all",
+    "build-tests-changed": "nx affected --target=build-tests",
+    "build-tests": "nx run-many --target=build-tests --all",
+    "production-build": "yarn --frozen-lockfile --cache-folder ~/.cache/yarn && nx run-many --target=build --all",
+    "dev-build": "yarn --cache-folder ~/.cache/yarn && nx run-many --target=build --all",
     "link-aa-dev": "cd packages/amplify-app && ln -s \"$(pwd)/bin/amplify-app\" \"$(yarn global bin)/amplify-app-dev\" && cd -",
     "rm-aa-dev-link": "rimraf -f \"$(yarn global bin)/amplify-app-dev\"",
     "link-dev": "cd packages/amplify-cli && ln -s \"$(pwd)/bin/amplify\" \"$(yarn global bin)/amplify-dev\" && cd -",
@@ -119,6 +119,7 @@
     "js-yaml": "^4.0.0",
     "lnk": "1.1.0",
     "lodash": "^4.17.21",
+    "nx": "^14.1.1",
     "pkg": "^5.4.1",
     "rimraf": "^3.0.0",
     "ts-jest": "^26.4.4",

diff --git a/packages/amplify-app/package.json b/packages/amplify-app/package.json
@@ -21,7 +21,7 @@
     "access": "public"
   },
   "scripts": {
-    "clean": "rimraf ./lib"
+    "clean": "rimraf ./lib node_modules"
   },
   "engines": {
     "node": ">=12.0.0",

diff --git a/packages/amplify-appsync-simulator/package.json b/packages/amplify-appsync-simulator/package.json
@@ -20,7 +20,7 @@
     "copy-assets": "yarn rimraf ./public && yarn copyfiles -u 3 \"../amplify-graphiql-explorer/build/**/*\" ./public",
     "build": "yarn copy-assets && tsc",
     "build-tests": "tsc --build tsconfig.tests.json",
-    "clean": "rimraf ./lib",
+    "clean": "rimraf ./lib tsconfig.tsbuildinfo tsconfig.tests.tsbuildinfo node_modules",
     "watch": "tsc -w",
     "start": "node ./lib/index.js",
     "test": "jest"

diff --git a/packages/amplify-category-analytics/package.json b/packages/amplify-category-analytics/package.json
@@ -16,7 +16,7 @@
   ],
   "scripts": {
     "build": "tsc",
-    "clean": "rimraf lib tsconfig.tsbuildinfo",
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
     "watch": "tsc --watch"
   },
   "dependencies": {

diff --git a/packages/amplify-category-api/package.json b/packages/amplify-category-api/package.json
@@ -13,7 +13,7 @@
   "scripts": {
     "build": "tsc",
     "watch": "tsc -w",
-    "clean": "rimraf lib tsconfig.tsbuildinfo",
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
     "test": "jest",
     "generateSchemas": "ts-node ./scripts/generateApiSchemas.ts"
   },

diff --git a/packages/amplify-category-auth/package.json b/packages/amplify-category-auth/package.json
@@ -21,7 +21,7 @@
   "scripts": {
     "build": "tsc",
     "watch": "tsc -w",
-    "clean": "rimraf lib tsconfig.tsbuildinfo",
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
     "test": "jest",
     "test-watch": "jest --watch",
     "generateSchemas": "ts-node ./scripts/generateAuthSchemas.ts"

diff --git a/packages/amplify-category-custom/package.json b/packages/amplify-category-custom/package.json
@@ -14,7 +14,7 @@
   "scripts": {
     "build": "tsc",
     "test": "jest",
-    "clean": "rimraf lib tsconfig.tsbuildinfo",
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
     "watch": "tsc -w"
   },
   "keywords": [

diff --git a/packages/amplify-category-function/package.json b/packages/amplify-category-function/package.json
@@ -13,7 +13,7 @@
   "types": "lib/index.d.ts",
   "scripts": {
     "build": "tsc",
-    "clean": "rimraf lib tsconfig.tsbuildinfo",
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
     "test": "jest",
     "watch": "tsc -w"
   },

diff --git a/packages/amplify-category-geo/package.json b/packages/amplify-category-geo/package.json
@@ -13,7 +13,7 @@
   "types": "lib/index.d.ts",
   "scripts": {
     "build": "tsc",
-    "clean": "rimraf lib tsconfig.tsbuildinfo",
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
     "test": "jest",
     "watch": "tsc -w"
   },

diff --git a/packages/amplify-category-interactions/package.json b/packages/amplify-category-interactions/package.json
@@ -16,7 +16,7 @@
   ],
   "scripts": {
     "build": "tsc && yarn copy-templates",
-    "clean": "rimraf lib tsconfig.tsbuildinfo",
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
     "watch": "tsc --watch",
     "copy-templates": "copyfiles -u 4 src/provider-utils/awscloudformation/cloudformation-templates/* lib/provider-utils/awscloudformation/cloudformation-templates/ && yarn copyfiles -u 4 src/provider-utils/awscloudformation/function-template-dir/*.ejs lib/provider-utils/awscloudformation/function-template-dir/"
   },

diff --git a/packages/amplify-category-predictions/package.json b/packages/amplify-category-predictions/package.json
@@ -16,7 +16,7 @@
   ],
   "scripts": {
     "build": "tsc && yarn copy-templates",
-    "clean": "rimraf lib tsconfig.tsbuildinfo",
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
     "watch": "tsc --watch",
     "copy-templates": "copyfiles -u 4 src/provider-utils/awscloudformation/cloudformation-templates/* lib/provider-utils/awscloudformation/cloudformation-templates/ && copyfiles -u 4 src/provider-utils/awscloudformation/triggers/**/*.ejs lib/provider-utils/awscloudformation/triggers/"
   },

diff --git a/packages/amplify-category-storage/package.json b/packages/amplify-category-storage/package.json
@@ -14,7 +14,7 @@
   "scripts": {
     "build": "tsc",
     "test": "jest",
-    "clean": "rimraf lib tsconfig.tsbuildinfo",
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
     "watch": "tsc -w",
     "generateSchemas": "ts-node ./resources/genInputSchema.ts"
   },

diff --git a/packages/amplify-cli-core/package.json b/packages/amplify-cli-core/package.json
@@ -21,7 +21,7 @@
     "test-ci": "jest --ci -i",
     "build": "tsc",
     "watch": "tsc -w",
-    "clean": "rimraf lib tsconfig.tsbuildinfo"
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules"
   },
   "dependencies": {
     "ajv": "^6.12.6",

diff --git a/packages/amplify-cli-extensibility-helper/package.json b/packages/amplify-cli-extensibility-helper/package.json
@@ -24,7 +24,7 @@
   "scripts": {
     "build": "tsc",
     "watch": "tsc -w",
-    "clean": "rimraf ./lib"
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules"
   },
   "dependencies": {
     "@aws-amplify/amplify-category-custom": "2.3.29",

diff --git a/packages/amplify-cli-extensibility-helper/tsconfig.json b/packages/amplify-cli-extensibility-helper/tsconfig.json
@@ -1,16 +1,15 @@
 {
-    "extends": "../../tsconfig.base.json",
-    "compilerOptions": {
-      "outDir": "./lib",
-      "rootDir": "./src",
-    },
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "./lib",
+    "rootDir": "./src",
+  },
   "references": [
-    { "path": "../amplify-provider-awscloudformation" },
-    { "path": "../amplify-category-api" },
-    { "path": "../amplify-category-auth" },
-    { "path": "../amplify-category-storage" },
-    { "path": "../amplify-category-custom" },
-    { "path": "../amplify-cli-core" },
-    ]
+    {
+      "path": "../amplify-category-custom"
+    },
+    {
+      "path": "../amplify-cli-core"
+    },
+  ]
 }
-
diff --git a/packages/amplify-cli-logger/package.json b/packages/amplify-cli-logger/package.json
@@ -8,7 +8,7 @@
     "test": "jest",
     "build": "tsc",
     "watch": "tsc -w",
-    "clean": "rimraf lib tsconfig.tsbuildinfo"
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules"
   },
   "repository": {
     "type": "git",

diff --git a/packages/amplify-console-hosting/package.json b/packages/amplify-console-hosting/package.json
@@ -21,7 +21,7 @@
   },
   "scripts": {
     "build": "tsc && copyfiles -u 1 \"./src/hosting/templates/*.json\" \"./lib\"",
-    "clean": "rimraf lib tsconfig.tsbuildinfo",
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
     "watch": "tsc --watch"
   }
 }
diff --git a/packages/amplify-container-hosting/package.json b/packages/amplify-container-hosting/package.json
@@ -17,7 +17,7 @@
   "scripts": {
     "build": "tsc",
     "test-ci": "yarn jest --ci",
-    "clean": "rimraf lib tsconfig.tsbuildinfo",
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
     "watch": "tsc --watch",
     "test": "jest --coverage --passWithNoTests"
   },

diff --git a/packages/amplify-dotnet-function-runtime-provider/package.json b/packages/amplify-dotnet-function-runtime-provider/package.json
@@ -19,7 +19,7 @@
   ],
   "scripts": {
     "build": "tsc",
-    "clean": "rimraf lib tsconfig.tsbuildinfo"
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules"
   },
   "dependencies": {
     "amplify-function-plugin-interface": "1.9.4",

diff --git a/packages/amplify-dotnet-function-template-provider/package.json b/packages/amplify-dotnet-function-template-provider/package.json
@@ -19,7 +19,7 @@
   ],
   "scripts": {
     "build": "tsc",
-    "clean": "rimraf lib tsconfig.tsbuildinfo"
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules"
   },
   "dependencies": {
     "amplify-cli-core": "2.6.0",

diff --git a/packages/amplify-e2e-core/package.json b/packages/amplify-e2e-core/package.json
@@ -19,7 +19,7 @@
   "scripts": {
     "build": "tsc",
     "watch": "tsc -w",
-    "clean": "rimraf ./lib"
+    "clean": "rimraf ./lib tsconfig.tsbuildinfo"
   },
   "dependencies": {
     "amplify-cli-core": "2.6.0",

diff --git a/packages/amplify-function-plugin-interface/package.json b/packages/amplify-function-plugin-interface/package.json
@@ -13,7 +13,7 @@
   "types": "lib/index.d.ts",
   "scripts": {
     "build": "tsc",
-    "clean": "rimraf ./lib",
+    "clean": "rimraf ./lib tsconfig.tsbuildinfo",
     "watch": "tsc -w"
   }
 }
diff --git a/packages/amplify-go-function-template-provider/package.json b/packages/amplify-go-function-template-provider/package.json
@@ -18,7 +18,7 @@
   ],
   "scripts": {
     "build": "tsc",
-    "clean": "rimraf lib tsconfig.tsbuildinfo"
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules"
   },
   "dependencies": {
     "amplify-function-plugin-interface": "1.9.4"

diff --git a/packages/amplify-headless-interface/package.json b/packages/amplify-headless-interface/package.json
@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "scripts": {
     "build": "tsc",
-    "clean": "rimraf lib tsconfig.tsbuildinfo",
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
     "generateSchemas": "ts-node ./scripts/generateSchemas.ts"
   },
   "keywords": [

diff --git a/packages/amplify-java-function-runtime-provider/package.json b/packages/amplify-java-function-runtime-provider/package.json
@@ -18,7 +18,7 @@
   ],
   "scripts": {
     "build": "tsc",
-    "clean": "rimraf lib tsconfig.tsbuildinfo"
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules"
   },
   "dependencies": {
     "amplify-cli-core": "2.6.0",

diff --git a/packages/amplify-java-function-template-provider/package.json b/packages/amplify-java-function-template-provider/package.json
@@ -18,7 +18,7 @@
   ],
   "scripts": {
     "build": "tsc",
-    "clean": "rimraf lib tsconfig.tsbuildinfo"
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules"
   },
   "dependencies": {
     "amplify-function-plugin-interface": "1.9.4",

diff --git a/packages/amplify-nodejs-function-runtime-provider/package.json b/packages/amplify-nodejs-function-runtime-provider/package.json
@@ -19,7 +19,7 @@
   "scripts": {
     "watch": "tsc -w",
     "build": "tsc",
-    "clean": "rimraf lib tsconfig.tsbuildinfo",
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
     "test": "jest"
   },
   "dependencies": {

diff --git a/packages/amplify-nodejs-function-template-provider/package.json b/packages/amplify-nodejs-function-template-provider/package.json
@@ -18,7 +18,7 @@
   ],
   "scripts": {
     "build": "tsc",
-    "clean": "rimraf lib tsconfig.tsbuildinfo"
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules"
   },
   "dependencies": {
     "amplify-cli-core": "2.6.0",

diff --git a/packages/amplify-prompts/package.json b/packages/amplify-prompts/package.json
@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "scripts": {
     "build": "tsc",
-    "clean": "rimraf lib tsconfig.tsbuildinfo",
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
     "demo": "yarn build && node lib/demo/demo.js",
     "test": "jest --color",
     "watch": "tsc -w"

diff --git a/packages/amplify-provider-awscloudformation/package.json b/packages/amplify-provider-awscloudformation/package.json
@@ -20,7 +20,7 @@
     "build": "tsc",
     "test": "yarn jest",
     "test-ci": "yarn jest --ci",
-    "clean": "rimraf lib tsconfig.tsbuildinfo",
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
     "watch": "tsc --watch"
   },
   "dependencies": {

diff --git a/packages/amplify-provider-awscloudformation/tsconfig.json b/packages/amplify-provider-awscloudformation/tsconfig.json
@@ -21,6 +21,9 @@
     {
       "path": "../amplify-cli-core"
     },
+    {
+      "path": "../amplify-cli-extensibility-helper"
+    },
     {
       "path": "../amplify-prompts"
     },

diff --git a/packages/amplify-python-function-runtime-provider/package.json b/packages/amplify-python-function-runtime-provider/package.json
@@ -18,7 +18,7 @@
   ],
   "scripts": {
     "build": "tsc",
-    "clean": "rimraf lib tsconfig.tsbuildinfo"
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules"
   },
   "dependencies": {
     "amplify-cli-core": "2.6.0",
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,9 @@ @@
         {
           "path": "../amplify-cli-core"
         },
+        {
+          "path": "../amplify-cli-extensibility-helper"
+        },
         {
           "path": "../amplify-prompts"
         },
@@ Expand Down @@