chore: nx migrate latest 15 (#1188)

angular-eslint · Nov 14, 2022 · 2ae0646 · 2ae0646
1 parent 53aad04
commit 2ae0646
Show file tree

Hide file tree

Showing 12 changed files with 150 additions and 175 deletions.
diff --git a/nx.json b/nx.json
@@ -1,18 +1,6 @@
 {
   "$schema": "./node_modules/nx/schemas/nx-schema.json",
   "npmScope": "angular-eslint",
-  "implicitDependencies": {
-    "package.json": {
-      "dependencies": "*",
-      "devDependencies": "*"
-    },
-    ".eslintrc.json": "*",
-    ".github/workflows/ci.yml": "*",
-    "tools/scripts/generate-rule-docs.ts": [
-      "eslint-plugin",
-      "eslint-plugin-template"
-    ]
-  },
   "workspaceLayout": {
     "libsDir": "packages"
   },
@@ -43,13 +31,28 @@
   },
   "targetDefaults": {
     "build": {
-      "dependsOn": ["^build"]
+      "dependsOn": ["^build"],
+      "inputs": ["production", "^production"]
     },
     "typecheck": {
       "dependsOn": ["^build"]
     },
     "update-rule-docs": {
       "dependsOn": ["^build"]
+    },
+    "test": {
+      "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"]
     }
+  },
+  "namedInputs": {
+    "default": ["{projectRoot}/**/*", "sharedGlobals", "projectSpecificFiles"],
+    "sharedGlobals": ["{workspaceRoot}/.github/workflows/ci.yml"],
+    "production": [
+      "default",
+      "!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
+      "!{projectRoot}/tsconfig.spec.json",
+      "!{projectRoot}/jest.config.[jt]s"
+    ],
+    "projectSpecificFiles": []
   }
 }
diff --git a/package.json b/package.json
@@ -57,10 +57,10 @@
     "@angular/compiler": "14.2.10",
     "@commitlint/cli": "17.2.0",
     "@commitlint/config-conventional": "17.2.0",
-    "@nrwl/devkit": "14.7.17",
-    "@nrwl/jest": "14.7.17",
-    "@nrwl/nx-cloud": "14.7.0",
-    "@nrwl/workspace": "14.7.17",
+    "@nrwl/devkit": "15.0.13",
+    "@nrwl/jest": "15.0.13",
+    "@nrwl/nx-cloud": "15.0.2",
+    "@nrwl/workspace": "15.0.13",
     "@schematics/angular": "14.2.9",
     "@types/eslint": "8.4.6",
     "@types/eslint-scope": "3.7.4",
@@ -83,7 +83,7 @@
     "lint-staged": "13.0.3",
     "microbundle": "0.15.1",
     "ncp": "2.0.0",
-    "nx": "14.7.17",
+    "nx": "15.0.13",
     "prettier": "2.7.1",
     "rimraf": "3.0.2",
     "strip-ansi": "6.0.1",

diff --git a/packages/builder/project.json b/packages/builder/project.json
@@ -1,10 +1,11 @@
 {
+  "name": "builder",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "type": "library",
   "targets": {
     "build": {
-      "executor": "@nrwl/workspace:run-commands",
-      "outputs": ["packages/builder/dist"],
+      "executor": "nx:run-commands",
+      "outputs": ["{projectRoot}/dist"],
       "options": {
         "cwd": "packages/builder",
         "parallel": false,
@@ -18,22 +19,22 @@
     },
     "test": {
       "executor": "@nrwl/jest:jest",
-      "outputs": ["coverage/packages/builder"],
+      "outputs": ["{workspaceRoot}/coverage/packages/builder"],
       "options": {
         "jestConfig": "packages/builder/jest.config.ts",
         "passWithNoTests": true
       }
     },
     "clean": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "cwd": "packages/builder",
         "parallel": false,
         "commands": ["npx rimraf ./dist"]
       }
     },
     "typecheck": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "cwd": "packages/builder",
         "parallel": false,

diff --git a/packages/bundled-angular-compiler/project.json b/packages/bundled-angular-compiler/project.json
@@ -1,10 +1,11 @@
 {
+  "name": "bundled-angular-compiler",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "type": "library",
   "targets": {
     "build": {
-      "executor": "@nrwl/workspace:run-commands",
-      "outputs": ["packages/bundled-angular-compiler/dist"],
+      "executor": "nx:run-commands",
+      "outputs": ["{projectRoot}/dist"],
       "options": {
         "cwd": "packages/bundled-angular-compiler",
         "parallel": false,
@@ -15,15 +16,15 @@
       }
     },
     "clean": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "cwd": "packages/bundled-angular-compiler",
         "parallel": false,
         "commands": ["npx rimraf ./dist"]
       }
     },
     "typecheck": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "cwd": "packages/bundled-angular-compiler",
         "parallel": false,

diff --git a/packages/eslint-plugin-template/project.json b/packages/eslint-plugin-template/project.json
@@ -1,10 +1,11 @@
 {
+  "name": "eslint-plugin-template",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "type": "library",
   "targets": {
     "build": {
-      "executor": "@nrwl/workspace:run-commands",
-      "outputs": ["packages/eslint-plugin-template/dist"],
+      "executor": "nx:run-commands",
+      "outputs": ["{projectRoot}/dist"],
       "options": {
         "cwd": "packages/eslint-plugin-template",
         "parallel": false,
@@ -23,22 +24,22 @@
         }
       ],
       "executor": "@nrwl/jest:jest",
-      "outputs": ["coverage/packages/eslint-plugin-template"],
+      "outputs": ["{workspaceRoot}/coverage/packages/eslint-plugin-template"],
       "options": {
         "jestConfig": "packages/eslint-plugin-template/jest.config.ts",
         "passWithNoTests": false
       }
     },
     "clean": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "cwd": "packages/eslint-plugin-template",
         "parallel": false,
         "commands": ["npx rimraf ./dist"]
       }
     },
     "typecheck": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "cwd": "packages/eslint-plugin-template",
         "parallel": false,
@@ -52,7 +53,7 @@
           "target": "update-rule-docs"
         }
       ],
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "parallel": false,
         "commands": [
@@ -61,8 +62,8 @@
       }
     },
     "update-rule-docs": {
-      "executor": "@nrwl/workspace:run-commands",
-      "outputs": ["packages/eslint-plugin-template/docs"],
+      "executor": "nx:run-commands",
+      "outputs": ["{projectRoot}/docs"],
       "options": {
         "parallel": false,
         "commands": [
@@ -71,5 +72,10 @@
       }
     }
   },
-  "implicitDependencies": ["template-parser", "bundled-angular-compiler"]
+  "implicitDependencies": ["template-parser", "bundled-angular-compiler"],
+  "namedInputs": {
+    "projectSpecificFiles": [
+      "{workspaceRoot}/tools/scripts/generate-rule-docs.ts"
+    ]
+  }
 }
diff --git a/packages/eslint-plugin/project.json b/packages/eslint-plugin/project.json
@@ -1,10 +1,11 @@
 {
+  "name": "eslint-plugin",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "type": "library",
   "targets": {
     "build": {
-      "executor": "@nrwl/workspace:run-commands",
-      "outputs": ["packages/eslint-plugin/dist"],
+      "executor": "nx:run-commands",
+      "outputs": ["{projectRoot}/dist"],
       "options": {
         "cwd": "packages/eslint-plugin",
         "parallel": false,
@@ -17,22 +18,22 @@
     },
     "test": {
       "executor": "@nrwl/jest:jest",
-      "outputs": ["coverage/packages/eslint-plugin"],
+      "outputs": ["{workspaceRoot}/coverage/packages/eslint-plugin"],
       "options": {
         "jestConfig": "packages/eslint-plugin/jest.config.ts",
         "passWithNoTests": false
       }
     },
     "clean": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "cwd": "packages/eslint-plugin",
         "parallel": false,
         "commands": ["npx rimraf ./dist"]
       }
     },
     "typecheck": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "cwd": "packages/eslint-plugin",
         "parallel": false,
@@ -46,7 +47,7 @@
           "target": "update-rule-docs"
         }
       ],
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "parallel": false,
         "commands": [
@@ -55,8 +56,8 @@
       }
     },
     "update-rule-docs": {
-      "executor": "@nrwl/workspace:run-commands",
-      "outputs": ["packages/eslint-plugin/docs"],
+      "executor": "nx:run-commands",
+      "outputs": ["{projectRoot}/docs"],
       "options": {
         "parallel": false,
         "commands": [
@@ -65,5 +66,10 @@
       }
     }
   },
-  "implicitDependencies": ["bundled-angular-compiler"]
+  "implicitDependencies": ["bundled-angular-compiler"],
+  "namedInputs": {
+    "projectSpecificFiles": [
+      "{workspaceRoot}/tools/scripts/generate-rule-docs.ts"
+    ]
+  }
 }
diff --git a/packages/integration-tests/project.json b/packages/integration-tests/project.json
@@ -1,33 +1,34 @@
 {
+  "name": "integration-tests",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "type": "library",
   "targets": {
     "clean": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "cwd": "packages/integration-tests",
         "parallel": false,
         "commands": ["npx rimraf tmp", "npx rimraf fixtures/**/node_modules"]
       }
     },
     "typecheck": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "cwd": "packages/integration-tests",
         "parallel": false,
         "commands": ["npx tsc -p tsconfig.json --noEmit"]
       }
     },
     "kill-existing-verdaccio": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "cwd": "packages/integration-tests",
         "parallel": false,
         "commands": ["kill $(lsof -t -i:4872) || true"]
       }
     },
     "reset-verdaccio-storage": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "cwd": "packages/integration-tests",
         "parallel": false,
@@ -49,7 +50,7 @@
           "projects": "self"
         }
       ],
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "cwd": "packages/integration-tests",
         "commands": [

diff --git a/packages/schematics/project.json b/packages/schematics/project.json
@@ -1,10 +1,11 @@
 {
+  "name": "schematics",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "type": "library",
   "targets": {
     "build": {
-      "executor": "@nrwl/workspace:run-commands",
-      "outputs": ["packages/schematics/dist"],
+      "executor": "nx:run-commands",
+      "outputs": ["{projectRoot}/dist"],
       "options": {
         "cwd": "packages/schematics",
         "parallel": false,
@@ -32,22 +33,22 @@
         }
       ],
       "executor": "@nrwl/jest:jest",
-      "outputs": ["coverage/packages/schematics"],
+      "outputs": ["{workspaceRoot}/coverage/packages/schematics"],
       "options": {
         "jestConfig": "packages/schematics/jest.config.ts",
         "passWithNoTests": false
       }
     },
     "clean": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "cwd": "packages/schematics",
         "parallel": false,
         "commands": ["npx rimraf ./dist"]
       }
     },
     "typecheck": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "cwd": "packages/schematics",
         "parallel": false,