chore: nx migrate @nativescript/plugin-tools

NathanWalker · NathanWalker · commit 62375e24aaf7 · 2024-05-24T10:30:39.000-07:00
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,12 +1,12 @@
 {
   "root": true,
   "ignorePatterns": ["**/*"],
-  "plugins": ["@nrwl/nx"],
+  "plugins": ["@nx"],
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
       "rules": {
-        "@nrwl/nx/enforce-module-boundaries": [
+        "@nx/enforce-module-boundaries": [
           "error",
           {
             "enforceBuildableLibDependency": true,
@@ -23,12 +23,12 @@
     },
     {
       "files": ["*.ts", "*.tsx"],
-      "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier", "plugin:@nrwl/nx/typescript"],
+      "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier", "plugin:@nx/typescript"],
       "rules": {}
     },
     {
       "files": ["*.js", "*.jsx"],
-      "extends": ["plugin:@nrwl/nx/javascript"],
+      "extends": ["plugin:@nx/javascript"],
       "rules": {}
     },
     {
diff --git a/.gitignore b/.gitignore
@@ -42,3 +42,5 @@ Thumbs.db
 
 *.tgz
 packages/**/angular/dist
+
+.nx/cache
diff --git a/.prettierignore b/.prettierignore
@@ -3,3 +3,5 @@
 /dist
 /coverage
 native-src
+
+/.nx/cache
diff --git a/apps/demo-angular/package.json b/apps/demo-angular/package.json
@@ -13,7 +13,7 @@
     "@nativescript/mlkit-selfie-segmentation": "file:../../dist/packages/mlkit-selfie-segmentation"
   },
   "devDependencies": {
-    "@nativescript/android": "~8.6.0",
-    "@nativescript/ios": "~8.6.0"
+    "@nativescript/android": "~8.7.0",
+    "@nativescript/ios": "~8.7.0"
   }
 }
diff --git a/apps/demo-angular/project.json b/apps/demo-angular/project.json
@@ -17,7 +17,7 @@
       "dependsOn": [
         {
           "target": "build.all",
-          "projects": "dependencies"
+          "dependencies": true
         }
       ]
     },
@@ -29,7 +29,7 @@
       "dependsOn": [
         {
           "target": "build.all",
-          "projects": "dependencies"
+          "dependencies": true
         }
       ]
     },
@@ -41,7 +41,7 @@
       "dependsOn": [
         {
           "target": "build.all",
-          "projects": "dependencies"
+          "dependencies": true
         }
       ]
     },
@@ -52,10 +52,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
-      "options": {
-        "lintFilePatterns": ["apps/demo-angular/**/*.ts"]
-      }
+      "executor": "@nx/eslint:lint"
     }
   }
 }
diff --git a/apps/demo/package.json b/apps/demo/package.json
@@ -16,7 +16,7 @@
     "@nativescript/mlkit-text-recognition": "file:../../packages/mlkit-text-recognition"
   },
   "devDependencies": {
-    "@nativescript/android": "8.8.0-alpha.7",
-    "@nativescript/ios": "~8.6.0"
+    "@nativescript/android": "~8.7.0",
+    "@nativescript/ios": "~8.7.0"
   }
 }
diff --git a/apps/demo/project.json b/apps/demo/project.json
@@ -17,7 +17,7 @@
       "dependsOn": [
         {
           "target": "build.all",
-          "projects": "dependencies"
+          "dependencies": true
         }
       ]
     },
@@ -30,7 +30,7 @@
       "dependsOn": [
         {
           "target": "build.all",
-          "projects": "dependencies"
+          "dependencies": true
         }
       ]
     },
@@ -43,7 +43,7 @@
       "dependsOn": [
         {
           "target": "build.all",
-          "projects": "dependencies"
+          "dependencies": true
         }
       ]
     },
@@ -54,10 +54,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
-      "options": {
-        "lintFilePatterns": ["apps/demo/**/*.ts"]
-      }
+      "executor": "@nx/eslint:lint"
     }
   }
 }
diff --git a/jest.config.ts b/jest.config.ts
@@ -1,3 +1,3 @@
-const { getJestProjects } = require('@nrwl/jest');
+const { getJestProjects } = require('@nx/jest');
 
 export default { projects: [...getJestProjects()] };
diff --git a/migrations.json b/migrations.json
@@ -0,0 +1,12 @@
+{
+  "migrations": [
+    {
+      "cli": "nx",
+      "version": "5.2.0",
+      "description": "Migrate tools to 5.2.0",
+      "implementation": "./src/migrations/update-5-2-0/update-5-2-0",
+      "package": "@nativescript/plugin-tools",
+      "name": "update-to-5.2.0"
+    }
+  ]
+}
diff --git a/nx.json b/nx.json
@@ -1,35 +1,42 @@
 {
-  "npmScope": "nativescript",
-  "affected": {
-    "defaultBase": "master"
-  },
   "workspaceLayout": {
     "appsDir": "apps",
     "libsDir": "packages"
   },
   "tasksRunnerOptions": {
     "default": {
-      "runner": "nx/tasks-runners/default",
       "options": {
-        "cacheableOperations": ["build", "build.all", "lint", "test", "e2e"],
-        "runtimeCacheInputs": ["node -v"],
-        "parallel": 1,
-        "useDaemonProcess": false
+        "runtimeCacheInputs": ["node -v"]
       }
     }
   },
   "$schema": "./node_modules/nx/schemas/nx-schema.json",
   "namedInputs": {
     "default": ["{projectRoot}/**/*", "sharedGlobals"],
     "sharedGlobals": ["{workspaceRoot}/workspace.json", "{workspaceRoot}/tsconfig.base.json", "{workspaceRoot}/tslint.json", "{workspaceRoot}/nx.json"],
-    "production": ["default", "!{projectRoot}/.eslintrc.json"]
+    "production": ["default", "!{projectRoot}/.eslintrc.json", "!{projectRoot}/src/test-setup.[jt]s"]
   },
   "targetDefaults": {
     "build": {
-      "inputs": ["production", "^production"]
+      "inputs": ["production", "^production"],
+      "cache": true
     },
     "lint": {
-      "inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
+      "inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
+      "cache": true
+    },
+    "build.all": {
+      "cache": true
+    },
+    "test": {
+      "cache": true
+    },
+    "e2e": {
+      "cache": true
     }
-  }
+  },
+  "useDaemonProcess": false,
+  "parallel": 1,
+  "useInferencePlugins": false,
+  "defaultBase": "master"
 }
diff --git a/package.json b/package.json
@@ -16,29 +16,29 @@
   },
   "private": true,
   "devDependencies": {
-    "@angular/animations": "^15.0.0",
-    "@angular/common": "^15.0.0",
-    "@angular/compiler": "^15.0.0",
-    "@angular/compiler-cli": "^15.0.0",
-    "@angular/core": "^15.0.0",
-    "@angular/forms": "^15.0.0",
-    "@angular/platform-browser": "^15.0.0",
-    "@angular/platform-browser-dynamic": "^15.0.0",
-    "@angular/router": "^15.0.0",
-    "@nativescript/angular": "^15.0.0",
-    "@nativescript/core": "~8.6.0",
-    "@nativescript/plugin-tools": "5.1.0",
-    "@nativescript/types": "~8.6.0",
+    "@angular/animations": "^17.0.0",
+    "@angular/common": "^17.0.0",
+    "@angular/compiler": "^17.0.0",
+    "@angular/compiler-cli": "^17.0.0",
+    "@angular/core": "^17.0.0",
+    "@angular/forms": "^17.0.0",
+    "@angular/platform-browser": "^17.0.0",
+    "@angular/platform-browser-dynamic": "^17.0.0",
+    "@angular/router": "^17.0.0",
+    "@nativescript/angular": "^17.0.0",
+    "@nativescript/core": "~8.7.0",
+    "@nativescript/plugin-tools": "5.2.5",
+    "@nativescript/types": "~8.7.0",
     "@nativescript/webpack": "~5.0.5",
-    "@ngtools/webpack": "^15.0.0",
-    "husky": "^8.0.0",
+    "@ngtools/webpack": "^17.0.0",
+    "husky": "~9.0.0",
     "nativescript-vue": "~2.9.0",
     "nativescript-vue-template-compiler": "~2.9.0",
-    "ng-packagr": "^15.0.0",
-    "rxjs": "~7.5.0",
-    "typescript": "~4.8.0",
-    "zone.js": "~0.13.0",
-    "@angular-devkit/build-angular": "^15.0.0"
+    "ng-packagr": "^17.0.0",
+    "rxjs": "~7.8.0",
+    "typescript": "~5.4.0",
+    "zone.js": "~0.14.0",
+    "@angular-devkit/build-angular": "^17.0.0"
   },
   "lint-staged": {
     "**/*.{js,ts,scss,json,html}": [
diff --git a/packages/mlkit-barcode-scanning/project.json b/packages/mlkit-barcode-scanning/project.json
@@ -5,7 +5,7 @@
   "sourceRoot": "packages/mlkit-barcode-scanning",
   "targets": {
     "build": {
-      "executor": "@nrwl/js:tsc",
+      "executor": "@nx/js:tsc",
       "options": {
         "outputPath": "dist/packages/mlkit-barcode-scanning",
         "tsConfig": "packages/mlkit-barcode-scanning/tsconfig.json",
@@ -24,7 +24,7 @@
       "dependsOn": [
         {
           "target": "build.all",
-          "projects": "dependencies"
+          "dependencies": true
         }
       ]
     },
@@ -38,11 +38,10 @@
       "dependsOn": [
         {
           "target": "build.all",
-          "projects": "dependencies"
+          "dependencies": true
         },
         {
-          "target": "build",
-          "projects": "self"
+          "target": "build"
         }
       ]
     },
@@ -54,10 +53,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
-      "options": {
-        "lintFilePatterns": ["packages/mlkit-barcode-scanning/**/*.ts"]
-      }
+      "executor": "@nx/eslint:lint"
     }
   }
 }
diff --git a/packages/mlkit-core/angular/.eslintrc.json b/packages/mlkit-core/angular/.eslintrc.json
@@ -8,7 +8,7 @@
     {
       "files": ["*.ts", "*.tsx"],
       "rules": {
-        "@nrwl/nx/enforce-module-boundaries": [
+        "@nx/enforce-module-boundaries": [
           "error",
           {
             "allowCircularSelfDependency": true
diff --git a/packages/mlkit-core/project.json b/packages/mlkit-core/project.json
@@ -5,7 +5,7 @@
   "sourceRoot": "packages/mlkit-core",
   "targets": {
     "build": {
-      "executor": "@nrwl/js:tsc",
+      "executor": "@nx/js:tsc",
       "options": {
         "outputPath": "dist/packages/mlkit-core",
         "tsConfig": "packages/mlkit-core/tsconfig.json",
@@ -25,7 +25,7 @@
       "dependsOn": [
         {
           "target": "build.all",
-          "projects": "dependencies"
+          "dependencies": true
         }
       ]
     },
@@ -39,11 +39,10 @@
       "dependsOn": [
         {
           "target": "build.all",
-          "projects": "dependencies"
+          "dependencies": true
         },
         {
-          "target": "build",
-          "projects": "self"
+          "target": "build"
         }
       ]
     },
@@ -55,10 +54,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
-      "options": {
-        "lintFilePatterns": ["packages/mlkit-core/**/*.ts"]
-      }
+      "executor": "@nx/eslint:lint"
     }
   }
 }
diff --git a/packages/mlkit-digital-ink-recognition/project.json b/packages/mlkit-digital-ink-recognition/project.json
diff --git a/packages/mlkit-face-detection/project.json b/packages/mlkit-face-detection/project.json
diff --git a/packages/mlkit-image-labeling/project.json b/packages/mlkit-image-labeling/project.json
diff --git a/packages/mlkit-object-detection/project.json b/packages/mlkit-object-detection/project.json
diff --git a/packages/mlkit-pose-detection/project.json b/packages/mlkit-pose-detection/project.json
diff --git a/packages/mlkit-selfie-segmentation/project.json b/packages/mlkit-selfie-segmentation/project.json
diff --git a/packages/mlkit-text-recognition/project.json b/packages/mlkit-text-recognition/project.json

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`{`
`2`	`2`	`"root": true,`
`3`	`3`	`"ignorePatterns": ["*/"],`
`4`		`- "plugins": ["@nrwl/nx"],`
	`4`	`+ "plugins": ["@nx"],`
`5`	`5`	`"overrides": [`
`6`	`6`	`{`
`7`	`7`	`"files": [".ts", ".tsx", ".js", ".jsx"],`
`8`	`8`	`"rules": {`
`9`		`- "@nrwl/nx/enforce-module-boundaries": [`
	`9`	`+ "@nx/enforce-module-boundaries": [`
`10`	`10`	`"error",`
`11`	`11`	`{`
`12`	`12`	`"enforceBuildableLibDependency": true,`
`@@ -23,12 +23,12 @@`
`23`	`23`	`},`
`24`	`24`	`{`
`25`	`25`	`"files": [".ts", ".tsx"],`
`26`		`- "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier", "plugin:@nrwl/nx/typescript"],`
	`26`	`+ "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier", "plugin:@nx/typescript"],`
`27`	`27`	`"rules": {}`
`28`	`28`	`},`
`29`	`29`	`{`
`30`	`30`	`"files": [".js", ".jsx"],`
`31`		`- "extends": ["plugin:@nrwl/nx/javascript"],`
	`31`	`+ "extends": ["plugin:@nx/javascript"],`
`32`	`32`	`"rules": {}`
`33`	`33`	`},`
`34`	`34`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`"@nativescript/mlkit-selfie-segmentation": "file:../../dist/packages/mlkit-selfie-segmentation"`
`14`	`14`	`},`
`15`	`15`	`"devDependencies": {`
`16`		`- "@nativescript/android": "~8.6.0",`
`17`		`- "@nativescript/ios": "~8.6.0"`
	`16`	`+ "@nativescript/android": "~8.7.0",`
	`17`	`+ "@nativescript/ios": "~8.7.0"`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`"dependsOn": [`
`18`	`18`	`{`
`19`	`19`	`"target": "build.all",`
`20`		`- "projects": "dependencies"`
	`20`	`+ "dependencies": true`
`21`	`21`	`}`
`22`	`22`	`]`
`23`	`23`	`},`
`@@ -29,7 +29,7 @@`
`29`	`29`	`"dependsOn": [`
`30`	`30`	`{`
`31`	`31`	`"target": "build.all",`
`32`		`- "projects": "dependencies"`
	`32`	`+ "dependencies": true`
`33`	`33`	`}`
`34`	`34`	`]`
`35`	`35`	`},`
`@@ -41,7 +41,7 @@`
`41`	`41`	`"dependsOn": [`
`42`	`42`	`{`
`43`	`43`	`"target": "build.all",`
`44`		`- "projects": "dependencies"`
	`44`	`+ "dependencies": true`
`45`	`45`	`}`
`46`	`46`	`]`
`47`	`47`	`},`
`@@ -52,10 +52,7 @@`
`52`	`52`	`}`
`53`	`53`	`},`
`54`	`54`	`"lint": {`
`55`		`- "executor": "@nrwl/linter:eslint",`
`56`		`- "options": {`
`57`		`- "lintFilePatterns": ["apps/demo-angular/*/.ts"]`
`58`		`- }`
	`55`	`+ "executor": "@nx/eslint:lint"`
`59`	`56`	`}`
`60`	`57`	`}`
`61`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`"@nativescript/mlkit-text-recognition": "file:../../packages/mlkit-text-recognition"`
`17`	`17`	`},`
`18`	`18`	`"devDependencies": {`
`19`		`- "@nativescript/android": "8.8.0-alpha.7",`
`20`		`- "@nativescript/ios": "~8.6.0"`
	`19`	`+ "@nativescript/android": "~8.7.0",`
	`20`	`+ "@nativescript/ios": "~8.7.0"`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-const { getJestProjects } = require('@nrwl/jest');`
	`1`	`+const { getJestProjects } = require('@nx/jest');`
`2`	`2`
`3`	`3`	`export default { projects: [...getJestProjects()] };`