chore: nx migrate @nativescript/plugin-tools

nstudio · Jan 24, 2025 · 5baa960 · 5baa960
1 parent c2245dc
commit 5baa960
Show file tree

Hide file tree

Showing 45 changed files with 702 additions and 900 deletions.
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,13 +23,19 @@
 		},
 		{
 			"files": ["*.ts", "*.tsx"],
-			"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier", "plugin:@nrwl/nx/typescript"],
-			"rules": {}
+			"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier", "plugin:@nx/typescript"],
+			"rules": {
+				"@typescript-eslint/no-extra-semi": "error",
+				"no-extra-semi": "off"
+			}
 		},
 		{
 			"files": ["*.js", "*.jsx"],
-			"extends": ["plugin:@nrwl/nx/javascript"],
-			"rules": {}
+			"extends": ["plugin:@nx/javascript"],
+			"rules": {
+				"@typescript-eslint/no-extra-semi": "error",
+				"no-extra-semi": "off"
+			}
 		},
 		{
 			"files": ["references.d.ts"],

diff --git a/.gitignore b/.gitignore
@@ -94,3 +94,6 @@ packages/**/src-native/web-server-ios/**/xcuserdata/
 packages/**/src-native/web-server-ios/**/project.xcworkspace/
 packages/**/src-native/web-server-ios/**/build
 packages/**/src-native/web-server-ios/**/dist
+
+.nx/cache
+.nx/workspace-data
diff --git a/.prettierignore b/.prettierignore
@@ -3,3 +3,8 @@
 /dist
 /coverage
 native-src
+*.aar
+*/*.xcframework/**/*
+
+/.nx/cache
+/.nx/workspace-data
diff --git a/apps/demo-angular/package.json b/apps/demo-angular/package.json
@@ -1,38 +1,38 @@
 {
-  "main": "./src/main.ts",
-  "dependencies": {
-    "@nativescript/core": "file:../../node_modules/@nativescript/core",
-    "@nstudio/nativescript-aptabase": "file:../../dist/packages/nativescript-aptabase",
-    "@nstudio/nativescript-airship": "file:../../dist/packages/nativescript-airship",
-    "@nstudio/nativescript-airship-adm": "file:../../dist/packages/nativescript-airship-adm",
-    "@nstudio/nativescript-airship-fcm": "file:../../dist/packages/nativescript-airship-fcm",
-    "@nstudio/nativescript-airship-hms": "file:../../dist/packages/nativescript-airship-hms",
-    "@nstudio/nativescript-appcues": "file:../../dist/packages/nativescript-appcues",
-    "@nstudio/nativescript-barcodescanner": "file:../../dist/packages/nativescript-barcodescanner",
-    "@nstudio/nativescript-blur": "file:../../dist/packages/nativescript-blur",
-    "@nstudio/nativescript-camera-plus": "file:../../dist/packages/nativescript-camera-plus",
-    "@nstudio/nativescript-cardview": "file:../../dist/packages/nativescript-cardview",
-    "@nstudio/nativescript-carousel": "file:../../dist/packages/nativescript-carousel",
-    "@nstudio/nativescript-checkbox": "file:../../dist/packages/nativescript-checkbox",
-    "@nstudio/nativescript-dynatrace": "file:../../dist/packages/nativescript-dynatrace",
-    "@nstudio/nativescript-embrace": "file:../../dist/packages/nativescript-embrace",
-    "@nstudio/nativescript-exoplayer": "file:../../dist/packages/nativescript-exoplayer",
-    "@nstudio/nativescript-fancyalert": "file:../../dist/packages/nativescript-fancyalert",
-    "@nstudio/nativescript-filterable-listpicker": "file:../../dist/packages/nativescript-filterable-listpicker",
-    "@nstudio/nativescript-freshchat": "file:../../dist/packages/nativescript-freshchat",
-    "@nstudio/nativescript-input-mask": "file:../../dist/packages/nativescript-input-mask",
-    "@nstudio/nativescript-intercom": "file:../../dist/packages/nativescript-intercom",
-    "@nstudio/nativescript-loading-indicator": "file:../../dist/packages/nativescript-loading-indicator",
-    "@nstudio/nativescript-onfido": "file:../../dist/packages/nativescript-onfido",
-    "@nstudio/nativescript-persona": "file:../../dist/packages/nativescript-persona",
-    "@nstudio/nativescript-plaid": "file:../../dist/packages/nativescript-plaid",
-    "@nstudio/nativescript-qr": "file:../../dist/packages/nativescript-qr",
-    "@nstudio/nativescript-tracking-transparency": "file:../../dist/packages/nativescript-tracking-transparency",
-    "@nstudio/nativescript-walletconnect": "file:../../dist/packages/nativescript-walletconnect",
-    "@nstudio/nativescript-web-server": "file:../../dist/packages/nativescript-web-server"
-  },
-  "devDependencies": {
-    "@nativescript/android": "~8.6.0",
-    "@nativescript/ios": "~8.6.0"
-  }
+	"main": "./src/main.ts",
+	"dependencies": {
+		"@nativescript/core": "file:../../node_modules/@nativescript/core",
+		"@nstudio/nativescript-aptabase": "file:../../dist/packages/nativescript-aptabase",
+		"@nstudio/nativescript-airship": "file:../../dist/packages/nativescript-airship",
+		"@nstudio/nativescript-airship-adm": "file:../../dist/packages/nativescript-airship-adm",
+		"@nstudio/nativescript-airship-fcm": "file:../../dist/packages/nativescript-airship-fcm",
+		"@nstudio/nativescript-airship-hms": "file:../../dist/packages/nativescript-airship-hms",
+		"@nstudio/nativescript-appcues": "file:../../dist/packages/nativescript-appcues",
+		"@nstudio/nativescript-barcodescanner": "file:../../dist/packages/nativescript-barcodescanner",
+		"@nstudio/nativescript-blur": "file:../../dist/packages/nativescript-blur",
+		"@nstudio/nativescript-camera-plus": "file:../../dist/packages/nativescript-camera-plus",
+		"@nstudio/nativescript-cardview": "file:../../dist/packages/nativescript-cardview",
+		"@nstudio/nativescript-carousel": "file:../../dist/packages/nativescript-carousel",
+		"@nstudio/nativescript-checkbox": "file:../../dist/packages/nativescript-checkbox",
+		"@nstudio/nativescript-dynatrace": "file:../../dist/packages/nativescript-dynatrace",
+		"@nstudio/nativescript-embrace": "file:../../dist/packages/nativescript-embrace",
+		"@nstudio/nativescript-exoplayer": "file:../../dist/packages/nativescript-exoplayer",
+		"@nstudio/nativescript-fancyalert": "file:../../dist/packages/nativescript-fancyalert",
+		"@nstudio/nativescript-filterable-listpicker": "file:../../dist/packages/nativescript-filterable-listpicker",
+		"@nstudio/nativescript-freshchat": "file:../../dist/packages/nativescript-freshchat",
+		"@nstudio/nativescript-input-mask": "file:../../dist/packages/nativescript-input-mask",
+		"@nstudio/nativescript-intercom": "file:../../dist/packages/nativescript-intercom",
+		"@nstudio/nativescript-loading-indicator": "file:../../dist/packages/nativescript-loading-indicator",
+		"@nstudio/nativescript-onfido": "file:../../dist/packages/nativescript-onfido",
+		"@nstudio/nativescript-persona": "file:../../dist/packages/nativescript-persona",
+		"@nstudio/nativescript-plaid": "file:../../dist/packages/nativescript-plaid",
+		"@nstudio/nativescript-qr": "file:../../dist/packages/nativescript-qr",
+		"@nstudio/nativescript-tracking-transparency": "file:../../dist/packages/nativescript-tracking-transparency",
+		"@nstudio/nativescript-walletconnect": "file:../../dist/packages/nativescript-walletconnect",
+		"@nstudio/nativescript-web-server": "file:../../dist/packages/nativescript-web-server"
+	},
+	"devDependencies": {
+		"@nativescript/android": "~8.8.0",
+		"@nativescript/ios": "~8.8.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
@@ -1,39 +1,39 @@
 {
-  "main": "./src/app.ts",
-  "description": "NativeScript Application",
-  "dependencies": {
-    "@nativescript/core": "file:../../node_modules/@nativescript/core",
-    "@nstudio/nativescript-aptabase": "file:../../packages/nativescript-aptabase",
-    "@nstudio/nativescript-airship": "file:../../packages/nativescript-airship",
-    "@nstudio/nativescript-airship-adm": "file:../../packages/nativescript-airship-adm",
-    "@nstudio/nativescript-airship-fcm": "file:../../packages/nativescript-airship-fcm",
-    "@nstudio/nativescript-airship-hms": "file:../../packages/nativescript-airship-hms",
-    "@nstudio/nativescript-appcues": "file:../../packages/nativescript-appcues",
-    "@nstudio/nativescript-barcodescanner": "file:../../packages/nativescript-barcodescanner",
-    "@nstudio/nativescript-blur": "file:../../packages/nativescript-blur",
-    "@nstudio/nativescript-camera-plus": "file:../../packages/nativescript-camera-plus",
-    "@nstudio/nativescript-cardview": "file:../../packages/nativescript-cardview",
-    "@nstudio/nativescript-carousel": "file:../../packages/nativescript-carousel",
-    "@nstudio/nativescript-checkbox": "file:../../packages/nativescript-checkbox",
-    "@nstudio/nativescript-dynatrace": "file:../../dist/packages/nativescript-dynatrace",
-    "@nstudio/nativescript-embrace": "file:../../dist/packages/nativescript-embrace",
-    "@nstudio/nativescript-exoplayer": "file:../../packages/nativescript-exoplayer",
-    "@nstudio/nativescript-fancyalert": "file:../../packages/nativescript-fancyalert",
-    "@nstudio/nativescript-filterable-listpicker": "file:../../packages/nativescript-filterable-listpicker",
-    "@nstudio/nativescript-freshchat": "file:../../packages/nativescript-freshchat",
-    "@nstudio/nativescript-input-mask": "file:../../packages/nativescript-input-mask",
-    "@nstudio/nativescript-intercom": "file:../../packages/nativescript-intercom",
-    "@nstudio/nativescript-loading-indicator": "file:../../packages/nativescript-loading-indicator",
-    "@nstudio/nativescript-onfido": "file:../../packages/nativescript-onfido",
-    "@nstudio/nativescript-persona": "file:../../packages/nativescript-persona",
-    "@nstudio/nativescript-plaid": "file:../../packages/nativescript-plaid",
-    "@nstudio/nativescript-qr": "file:../../packages/nativescript-qr",
-    "@nstudio/nativescript-tracking-transparency": "file:../../packages/nativescript-tracking-transparency",
-    "@nstudio/nativescript-walletconnect": "file:../../packages/nativescript-walletconnect",
-    "@nstudio/nativescript-web-server": "file:../../packages/nativescript-web-server"
-  },
-  "devDependencies": {
-    "@nativescript/android": "~8.6.0",
-    "@nativescript/ios": "~8.6.0"
-  }
+	"main": "./src/app.ts",
+	"description": "NativeScript Application",
+	"dependencies": {
+		"@nativescript/core": "file:../../node_modules/@nativescript/core",
+		"@nstudio/nativescript-aptabase": "file:../../packages/nativescript-aptabase",
+		"@nstudio/nativescript-airship": "file:../../packages/nativescript-airship",
+		"@nstudio/nativescript-airship-adm": "file:../../packages/nativescript-airship-adm",
+		"@nstudio/nativescript-airship-fcm": "file:../../packages/nativescript-airship-fcm",
+		"@nstudio/nativescript-airship-hms": "file:../../packages/nativescript-airship-hms",
+		"@nstudio/nativescript-appcues": "file:../../packages/nativescript-appcues",
+		"@nstudio/nativescript-barcodescanner": "file:../../packages/nativescript-barcodescanner",
+		"@nstudio/nativescript-blur": "file:../../packages/nativescript-blur",
+		"@nstudio/nativescript-camera-plus": "file:../../packages/nativescript-camera-plus",
+		"@nstudio/nativescript-cardview": "file:../../packages/nativescript-cardview",
+		"@nstudio/nativescript-carousel": "file:../../packages/nativescript-carousel",
+		"@nstudio/nativescript-checkbox": "file:../../packages/nativescript-checkbox",
+		"@nstudio/nativescript-dynatrace": "file:../../dist/packages/nativescript-dynatrace",
+		"@nstudio/nativescript-embrace": "file:../../dist/packages/nativescript-embrace",
+		"@nstudio/nativescript-exoplayer": "file:../../packages/nativescript-exoplayer",
+		"@nstudio/nativescript-fancyalert": "file:../../packages/nativescript-fancyalert",
+		"@nstudio/nativescript-filterable-listpicker": "file:../../packages/nativescript-filterable-listpicker",
+		"@nstudio/nativescript-freshchat": "file:../../packages/nativescript-freshchat",
+		"@nstudio/nativescript-input-mask": "file:../../packages/nativescript-input-mask",
+		"@nstudio/nativescript-intercom": "file:../../packages/nativescript-intercom",
+		"@nstudio/nativescript-loading-indicator": "file:../../packages/nativescript-loading-indicator",
+		"@nstudio/nativescript-onfido": "file:../../packages/nativescript-onfido",
+		"@nstudio/nativescript-persona": "file:../../packages/nativescript-persona",
+		"@nstudio/nativescript-plaid": "file:../../packages/nativescript-plaid",
+		"@nstudio/nativescript-qr": "file:../../packages/nativescript-qr",
+		"@nstudio/nativescript-tracking-transparency": "file:../../packages/nativescript-tracking-transparency",
+		"@nstudio/nativescript-walletconnect": "file:../../packages/nativescript-walletconnect",
+		"@nstudio/nativescript-web-server": "file:../../packages/nativescript-web-server"
+	},
+	"devDependencies": {
+		"@nativescript/android": "~8.8.0",
+		"@nativescript/ios": "~8.8.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/nx.json b/nx.json
@@ -1,35 +1,42 @@
 {
-	"npmScope": "nstudio",
-	"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,30 +16,30 @@
 	},
 	"private": true,
 	"devDependencies": {
-		"@angular-devkit/build-angular": "^15.0.0",
-		"@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",
+		"@angular-devkit/build-angular": "^18.0.0",
+		"@angular/animations": "^18.0.0",
+		"@angular/common": "^18.0.0",
+		"@angular/compiler": "^18.0.0",
+		"@angular/compiler-cli": "^18.0.0",
+		"@angular/core": "^18.0.0",
+		"@angular/forms": "^18.0.0",
+		"@angular/platform-browser": "^18.0.0",
+		"@angular/platform-browser-dynamic": "^18.0.0",
+		"@angular/router": "^18.0.0",
 		"@nativescript-community/perms": "~2.3.0",
-		"@nativescript/angular": "^15.0.0",
-		"@nativescript/core": "~8.6.0",
-		"@nativescript/plugin-tools": "5.1.0",
-		"@nativescript/types": "~8.6.0",
+		"@nativescript/angular": "^18.0.0",
+		"@nativescript/core": "~8.8.0",
+		"@nativescript/plugin-tools": "5.4.4",
+		"@nativescript/types": "~8.8.0",
 		"@nativescript/webpack": "~5.0.5",
-		"@ngtools/webpack": "^15.0.0",
-		"husky": "^8.0.0",
+		"@ngtools/webpack": "^18.0.0",
+		"husky": "~9.0.0",
 		"nativescript-dev-xcode": "^0.3.0",
-		"ng-packagr": "^15.0.0",
+		"ng-packagr": "^18.0.0",
 		"patch-package": "~7.0.0",
 		"rxjs": "~7.8.0",
-		"typescript": "~4.9.0",
-		"zone.js": "~0.13.0"
+		"typescript": "~5.5.0",
+		"zone.js": "~0.14.0"
 	},
 	"lint-staged": {
 		"**/*.{js,ts,scss,json,html}": [