Nx 20 support

.editorconfig

@@ -7,6 +7,7 @@ indent_style = space
 indent_size = 2
 insert_final_newline = true
 trim_trailing_whitespace = true
+max_line_length = 160
 
 [*.md]
 max_line_length = off

.eslintrc.json

@@ -36,6 +36,13 @@
         "@typescript-eslint/no-extra-semi": "error",
         "no-extra-semi": "off"
       }
+    },
+    {
+      "files": ["*.json"],
+      "parser": "jsonc-eslint-parser",
+      "rules": {
+        "@nx/dependency-checks": ["error", {}]
+      }
     }
   ]
 }

.gitignore

@@ -40,4 +40,6 @@ testem.log
 Thumbs.db
 
 .nx/cache
-.nx/workspace-data
+.nx/workspace-data
+.angular
+.env

.prettierignore

@@ -4,4 +4,5 @@
 /coverage
 
 /.nx/cache
-/.nx/workspace-data
+/.nx/workspace-data
+.angular

.prettierrc

@@ -1,4 +1,4 @@
 {
   "singleQuote": true,
-  "printWidth": 300
+  "printWidth": 160
 }

.vscode/extensions.json

@@ -1,7 +1,3 @@
 {
-  "recommendations": [
-    "ms-vscode.vscode-typescript-tslint-plugin",
-    "esbenp.prettier-vscode",
-    "firsttris.vscode-jest-runner"
-  ]
+  "recommendations": ["ms-vscode.vscode-typescript-tslint-plugin", "esbenp.prettier-vscode", "firsttris.vscode-jest-runner"]
 }

e2e/nx-e2e/jest.config.js

@@ -1,13 +1,13 @@
 module.exports = {
   displayName: 'nx-e2e',
   preset: '../../jest.preset.js',
-  globals: {
-    'ts-jest': {
-      tsConfig: '<rootDir>/tsconfig.spec.json',
-    },
-  },
   transform: {
-    '^.+\\.[tj]s$': 'ts-jest',
+    '^.+\\.[tj]s$': [
+      'ts-jest',
+      {
+        tsConfig: '<rootDir>/tsconfig.spec.json',
+      },
+    ],
   },
   moduleFileExtensions: ['ts', 'js', 'html'],
   coverageDirectory: '../../coverage/e2e/nx-e2e',

migrations.json

@@ -1,12 +1,12 @@
 {
   "migrations": [
-    { "cli": "nx", "version": "19.2.0-beta.2", "description": "Updates the default workspace data directory to .nx/workspace-data", "implementation": "./src/migrations/update-19-2-0/move-workspace-data-directory", "package": "nx", "name": "19-2-0-move-graph-cache-directory" },
-    { "cli": "nx", "version": "19.2.2-beta.0", "description": "Updates the nx wrapper.", "implementation": "./src/migrations/update-17-3-0/update-nxw", "package": "nx", "name": "19-2-2-update-nx-wrapper" },
-    { "version": "19.2.4-beta.0", "description": "Set project name in nx.json explicitly", "implementation": "./src/migrations/update-19-2-4/set-project-name", "x-repair-skip": true, "package": "nx", "name": "19-2-4-set-project-name" },
-    { "cli": "nx", "version": "19.5.0-beta.1", "requires": { "@angular/core": ">=18.1.0" }, "description": "Update the @angular/cli package version to ~18.1.0.", "factory": "./src/migrations/update-19-5-0/update-angular-cli", "package": "@nx/angular", "name": "update-angular-cli-version-18-1-0" },
-    { "cli": "nx", "version": "19.6.0-beta.4", "description": "Ensure Module Federation DTS is turned off by default.", "factory": "./src/migrations/update-19-6-0/turn-off-dts-by-default", "package": "@nx/angular", "name": "update-19-6-0" },
-    { "cli": "nx", "version": "19.6.0-beta.7", "requires": { "@angular/core": ">=18.2.0" }, "description": "Update the @angular/cli package version to ~18.2.0.", "factory": "./src/migrations/update-19-6-0/update-angular-cli", "package": "@nx/angular", "name": "update-angular-cli-version-18-2-0" },
-    { "cli": "nx", "version": "19.6.1-beta.0", "description": "Ensure Target Defaults are set correctly for Module Federation.", "factory": "./src/migrations/update-19-6-1/ensure-depends-on-for-mf", "package": "@nx/angular", "name": "update-19-6-1-ensure-module-federation-target-defaults" },
-    { "version": "18.1.0", "description": "Updates calls to afterRender with an explicit phase to the new API", "factory": "./migrations/after-render-phase/bundle", "package": "@angular/core", "name": "migration-after-render-phase" }
+    {
+      "version": "20.0.1",
+      "description": "Set `useLegacyCache` to true for migrating workspaces",
+      "implementation": "./src/migrations/update-20-0-1/use-legacy-cache",
+      "x-repair-skip": true,
+      "package": "nx",
+      "name": "use-legacy-cache"
+    }
   ]
 }

nx.json

@@ -31,9 +31,16 @@
   "namedInputs": {
     "default": ["{projectRoot}/**/*", "sharedGlobals"],
     "sharedGlobals": ["{workspaceRoot}/workspace.json", "{workspaceRoot}/tsconfig.base.json", "{workspaceRoot}/tslint.json", "{workspaceRoot}/nx.json"],
-    "production": ["default", "!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)", "!{projectRoot}/tsconfig.spec.json", "!{projectRoot}/jest.config.[jt]s", "!{projectRoot}/src/test-setup.[jt]s"]
+    "production": [
+      "default",
+      "!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
+      "!{projectRoot}/tsconfig.spec.json",
+      "!{projectRoot}/jest.config.[jt]s",
+      "!{projectRoot}/src/test-setup.[jt]s"
+    ]
   },
   "parallel": 1,
   "useInferencePlugins": false,
-  "defaultBase": "master"
+  "defaultBase": "main",
+  "useLegacyCache": true
 }

package.json

@@ -25,48 +25,45 @@
     "help": "nx help",
     "doctoc": "doctoc packages/nx/README.md",
     "workspace-generator": "nx workspace-generator",
-    "clean": "npx rimraf node_modules package-lock.json yarn.lock",
+    "clean": "npx rimraf node_modules package-lock.json yarn.lock && yarn",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
     "reset.changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0"
   },
   "private": true,
   "devDependencies": {
-    "@angular-devkit/schematics": "18.2.4",
-    "@angular/core": "18.2.4",
+    "@angular-devkit/core": "~18.2.0",
+    "@nx/angular": "20.0.3",
+    "@nx/devkit": "20.0.3",
+    "@nx/eslint": "20.0.3",
+    "@nx/eslint-plugin": "20.0.3",
+    "@nx/express": "20.0.3",
+    "@nx/jest": "20.0.3",
+    "@nx/js": "20.0.3",
+    "@nx/plugin": "20.0.3",
+    "@nx/web": "20.0.3",
+    "@nx/workspace": "20.0.3",
     "@types/fs-extra": "^11.0.3",
     "@types/jest": "29.5.13",
     "@types/node": "^20.0.0",
     "@types/plist": "^3.0.2",
     "@types/xml2js": "^0.4.9",
-    "@typescript-eslint/eslint-plugin": "7.18.0",
-    "@typescript-eslint/parser": "7.18.0",
-    "conventional-changelog-cli": "^4.1.0",
+    "conventional-changelog-cli": "^5.0.0",
     "cz-conventional-changelog": "^3.3.0",
     "doctoc": "^2.0.0",
     "dotenv": "~16.4.0",
     "eslint": "8.57.0",
     "eslint-config-prettier": "9.1.0",
     "fs-extra": "^11.2.0",
     "jest": "29.7.0",
-    "jsonc-parser": "3.2.1",
-    "nx": "19.7.3",
+    "nx": "20.0.3",
+    "nx-cloud": "19.1.0",
     "plist": "^3.1.0",
-    "prettier": "^2.7.1",
-    "ts-jest": "29.1.3",
+    "prettier": "^3.3.0",
+    "ts-jest": "29.2.5",
     "ts-node": "10.9.2",
-    "tslib": "^2.6.2",
-    "typescript": "5.5.4",
-    "xml2js": "^0.6.2",
-    "nx-cloud": "19.1.0",
-    "@nx/devkit": "19.7.3",
-    "@nx/workspace": "19.7.3",
-    "@nx/plugin": "19.7.3",
-    "@nx/web": "19.7.3",
-    "@nx/js": "19.7.3",
-    "@nx/eslint-plugin": "19.7.3",
-    "@nx/jest": "19.7.3",
-    "@nx/express": "19.7.3",
-    "@nx/angular": "19.7.3",
-    "@nx/eslint": "19.7.3"
-  }
+    "tslib": "^2.8.0",
+    "typescript": "^5.6.0",
+    "xml2js": "^0.6.2"
+  },
+  "dependencies": {}
 }

packages/nx/executors.json

@@ -24,4 +24,4 @@
       "description": "test executor"
     }
   }
-}
+}

packages/nx/generators.json

@@ -58,4 +58,4 @@
       "hidden": true
     }
   }
-}
+}

packages/nx/jest.config.ts

@@ -2,11 +2,8 @@
 export default {
   displayName: 'nx',
   preset: '../../jest.preset.js',
-  globals: {
-    'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' },
-  },
   transform: {
-    '^.+\\.[tj]sx?$': 'ts-jest',
+    '^.+\\.[tj]sx?$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
   coverageDirectory: '../../coverage/packages/nx',

packages/nx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/nx",
-  "version": "19.0.1",
+  "version": "20.0.0-alpha.0",
   "description": "NativeScript Plugin for Nx",
   "repository": {
     "type": "git",
@@ -29,13 +29,14 @@
   },
   "dependencies": {
     "fs-extra": "^11.2.0",
-    "ignore": "^5.3.0",
     "plist": "^3.1.0",
     "xml2js": "~0.6.0"
   },
   "peerDependencies": {
-    "@nx/devkit": ">=19.0.0 <20.0.0",
-    "@nx/js": ">=19.0.0 <20.0.0",
-    "@nx/jest": ">=19.0.0 <20.0.0"
+    "@nx/devkit": "^20.0.0",
+    "@nx/eslint": "^20.0.0",
+    "@nx/js": "^20.0.0",
+    "@nx/workspace": "^20.0.0",
+    "nx": "^20.0.0"
   }
-}
+}

packages/nx/project.json

@@ -8,7 +8,10 @@
   "targets": {
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"]
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["packages/nx/**/*.{ts,tsx,js,jsx}", "packages/nx/package.json"]
+      }
     },
     "test": {
       "executor": "@nx/jest:jest",

packages/nx/src/executors/build/schema.json

@@ -114,10 +114,7 @@
           }
         },
         "additionalProperties": false,
-        "required": [
-          "replace",
-          "with"
-        ]
+        "required": ["replace", "with"]
       },
       "default": []
     },

packages/nx/src/executors/test/executor.spec.ts

@@ -9,7 +9,7 @@ const options: TestExecutorSchema = {
 describe('Executor: test', () => {
   it('sample', () => {
     expect(true).toBe(true);
-  })
+  });
 });
 
 // xdescribe('NativeScript Test Builder', () => {

packages/nx/src/generators/app-resources/app-resources.ts

@@ -1,13 +1,12 @@
 import { Tree, generateFiles, joinPathFragments } from '@nx/devkit';
-import { PluginHelpers, getDefaultTemplateOptions } from '../../utils';
+import { getDefaultTemplateOptions } from '../../utils';
 
 import { Schema as AppResourcesSchema } from './schema';
 
 export function appResources(tree: Tree, options: AppResourcesSchema) {
   generateFiles(tree, joinPathFragments(__dirname, 'files'), options.path, {
     ...getDefaultTemplateOptions(tree),
-    name: options.name || 'App_Resources',
-    libFolderName: PluginHelpers.getLibFoldername('nativescript'),
+    name: options.name ?? 'App_Resources',
   });
 }