Skip to content

Commit ef85fce

Browse files
NathanWalkerNathanWalker
committed
chore: nx migrate @nativescript/plugin-tools
1 parent ff516e0 commit ef85fce

File tree

37 files changed

+216
-251
lines changed

37 files changed

+216
-251
lines changed

‎.eslintrc.json

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"root": true,
33
"ignorePatterns": ["**/*"],
4-
"plugins": ["@nrwl/nx"],
4+
"plugins": ["@nx"],
55
"overrides": [
66
{
77
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
88
"rules": {
9-
"@nrwl/nx/enforce-module-boundaries": [
9+
"@nx/enforce-module-boundaries": [
1010
"error",
1111
{
1212
"enforceBuildableLibDependency": true,
@@ -23,13 +23,19 @@
2323
},
2424
{
2525
"files": ["*.ts", "*.tsx"],
26-
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier", "plugin:@nrwl/nx/typescript"],
27-
"rules": {}
26+
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier", "plugin:@nx/typescript"],
27+
"rules": {
28+
"@typescript-eslint/no-extra-semi": "error",
29+
"no-extra-semi": "off"
30+
}
2831
},
2932
{
3033
"files": ["*.js", "*.jsx"],
31-
"extends": ["plugin:@nrwl/nx/javascript"],
32-
"rules": {}
34+
"extends": ["plugin:@nx/javascript"],
35+
"rules": {
36+
"@typescript-eslint/no-extra-semi": "error",
37+
"no-extra-semi": "off"
38+
}
3339
},
3440
{
3541
"files": ["references.d.ts"],

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,6 @@ Thumbs.db
4444

4545
*.tgz
4646
packages/**/angular/dist
47+
48+
.nx/cache
49+
.nx/workspace-data

‎.prettierignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@
33
/dist
44
/coverage
55
native-src
6+
7+
/.nx/cache
8+
/.nx/workspace-data

‎apps/demo-angular/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"@nativescript/firebase-ui": "file:../../dist/packages/firebase-ui"
2424
},
2525
"devDependencies": {
26-
"@nativescript/android": "~8.4.0",
27-
"@nativescript/ios": "~8.4.0"
26+
"@nativescript/android": "~8.8.0",
27+
"@nativescript/ios": "~8.8.0"
2828
}
2929
}

‎apps/demo-angular/project.json

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"dependsOn": [
1818
{
1919
"target": "build.all",
20-
"projects": "dependencies"
20+
"dependencies": true
2121
}
2222
]
2323
},
@@ -30,7 +30,7 @@
3030
"dependsOn": [
3131
{
3232
"target": "build.all",
33-
"projects": "dependencies"
33+
"dependencies": true
3434
}
3535
]
3636
},
@@ -43,7 +43,7 @@
4343
"dependsOn": [
4444
{
4545
"target": "build.all",
46-
"projects": "dependencies"
46+
"dependencies": true
4747
}
4848
]
4949
},
@@ -54,10 +54,7 @@
5454
}
5555
},
5656
"lint": {
57-
"executor": "@nrwl/linter:eslint",
58-
"options": {
59-
"lintFilePatterns": ["apps/demo-angular/**/*.ts"]
60-
}
57+
"executor": "@nx/eslint:lint"
6158
}
6259
}
6360
}

‎apps/demo-vue/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"@nativescript/firebase-ui": "file:../../packages/firebase-ui"
2525
},
2626
"devDependencies": {
27-
"@nativescript/android": "~8.4.0",
28-
"@nativescript/ios": "~8.4.0"
27+
"@nativescript/android": "~8.8.0",
28+
"@nativescript/ios": "~8.8.0"
2929
}
3030
}

‎apps/demo-vue/project.json

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"dependsOn": [
1717
{
1818
"target": "build.all",
19-
"projects": "dependencies"
19+
"dependencies": true
2020
}
2121
]
2222
},
@@ -29,7 +29,7 @@
2929
"dependsOn": [
3030
{
3131
"target": "build.all",
32-
"projects": "dependencies"
32+
"dependencies": true
3333
}
3434
]
3535
},
@@ -42,7 +42,7 @@
4242
"dependsOn": [
4343
{
4444
"target": "build.all",
45-
"projects": "dependencies"
45+
"dependencies": true
4646
}
4747
]
4848
},
@@ -53,10 +53,7 @@
5353
}
5454
},
5555
"lint": {
56-
"executor": "@nrwl/linter:eslint",
57-
"options": {
58-
"lintFilePatterns": ["apps/demo-vue/**/*.ts"]
59-
}
56+
"executor": "@nx/eslint:lint"
6057
}
6158
}
6259
}

‎apps/demo/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"@nativescript/firebase-ui": "file:../../packages/firebase-ui"
2828
},
2929
"devDependencies": {
30-
"@nativescript/android": "~8.5.3",
31-
"@nativescript/ios": "~8.5.2"
30+
"@nativescript/android": "~8.8.0",
31+
"@nativescript/ios": "~8.8.0"
3232
}
3333
}

‎apps/demo/project.json

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"dependsOn": [
1818
{
1919
"target": "build.all",
20-
"projects": "dependencies"
20+
"dependencies": true
2121
}
2222
]
2323
},
@@ -30,7 +30,7 @@
3030
"dependsOn": [
3131
{
3232
"target": "build.all",
33-
"projects": "dependencies"
33+
"dependencies": true
3434
}
3535
]
3636
},
@@ -43,7 +43,7 @@
4343
"dependsOn": [
4444
{
4545
"target": "build.all",
46-
"projects": "dependencies"
46+
"dependencies": true
4747
}
4848
]
4949
},
@@ -54,10 +54,7 @@
5454
}
5555
},
5656
"lint": {
57-
"executor": "@nrwl/linter:eslint",
58-
"options": {
59-
"lintFilePatterns": ["apps/demo/**/*.ts"]
60-
}
57+
"executor": "@nx/eslint:lint"
6158
}
6259
}
6360
}

‎jest.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
const { getJestProjects } = require('@nrwl/jest');
1+
const { getJestProjects } = require('@nx/jest');
22

33
export default { projects: [...getJestProjects()] };

‎migrations.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"migrations": [
3+
{ "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" },
4+
{ "cli": "nx", "version": "5.3.0", "description": "Migrate tools to 5.3.0", "implementation": "./src/migrations/update-5-3-0/update-5-3-0", "package": "@nativescript/plugin-tools", "name": "update-to-5.3.0" },
5+
{ "cli": "nx", "version": "5.4.0", "description": "Migrate tools to 5.4.0", "implementation": "./src/migrations/update-5-4-0/update-5-4-0", "package": "@nativescript/plugin-tools", "name": "update-to-5.4.0" }
6+
]
7+
}

‎nx.json

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,42 @@
11
{
2-
"npmScope": "nativescript",
3-
"affected": {
4-
"defaultBase": "master"
5-
},
62
"workspaceLayout": {
73
"appsDir": "apps",
84
"libsDir": "packages"
95
},
106
"tasksRunnerOptions": {
117
"default": {
12-
"runner": "nx/tasks-runners/default",
138
"options": {
14-
"cacheableOperations": ["build", "build.all", "lint", "test", "e2e"],
15-
"runtimeCacheInputs": ["node -v"],
16-
"parallel": 1,
17-
"useDaemonProcess": false
9+
"runtimeCacheInputs": ["node -v"]
1810
}
1911
}
2012
},
2113
"$schema": "./node_modules/nx/schemas/nx-schema.json",
2214
"namedInputs": {
2315
"default": ["{projectRoot}/**/*", "sharedGlobals"],
2416
"sharedGlobals": ["{workspaceRoot}/workspace.json", "{workspaceRoot}/tsconfig.base.json", "{workspaceRoot}/tslint.json", "{workspaceRoot}/nx.json"],
25-
"production": ["default", "!{projectRoot}/.eslintrc.json"]
17+
"production": ["default", "!{projectRoot}/.eslintrc.json", "!{projectRoot}/src/test-setup.[jt]s"]
2618
},
2719
"targetDefaults": {
2820
"build": {
29-
"inputs": ["production", "^production"]
21+
"inputs": ["production", "^production"],
22+
"cache": true
3023
},
3124
"lint": {
32-
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
25+
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
26+
"cache": true
27+
},
28+
"build.all": {
29+
"cache": true
30+
},
31+
"test": {
32+
"cache": true
33+
},
34+
"e2e": {
35+
"cache": true
3336
}
34-
}
37+
},
38+
"useDaemonProcess": false,
39+
"parallel": 1,
40+
"useInferencePlugins": false,
41+
"defaultBase": "master"
3542
}

‎package.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "3.3.1",
44
"license": "MIT",
55
"scripts": {
6-
"postinstall": "husky install && npx ts-patch install",
6+
"postinstall": "husky && npx ts-patch install",
77
"setup": "npx rimraf node_modules package-lock.json dist tmp yarn.lock && yarn config set ignore-engines true && ns package-manager set npm && yarn",
88
"start": "nps",
99
"add": "nx g @nativescript/plugin-tools:add-package",
@@ -17,32 +17,32 @@
1717
},
1818
"private": true,
1919
"devDependencies": {
20-
"@angular-devkit/build-angular": "^15.0.0",
21-
"@angular/animations": "^15.0.0",
22-
"@angular/common": "^15.0.0",
23-
"@angular/compiler": "^15.0.0",
24-
"@angular/compiler-cli": "^15.0.0",
25-
"@angular/core": "^15.0.0",
26-
"@angular/forms": "^15.0.0",
27-
"@angular/platform-browser": "^15.0.0",
28-
"@angular/platform-browser-dynamic": "^15.0.0",
29-
"@angular/router": "^15.0.0",
30-
"@nativescript/angular": "^15.0.0",
31-
"@nativescript/core": "~8.4.0",
32-
"@nativescript/plugin-tools": "5.1.0",
33-
"@nativescript/types": "~8.4.0",
20+
"@angular-devkit/build-angular": "^18.0.0",
21+
"@angular/animations": "^18.0.0",
22+
"@angular/common": "^18.0.0",
23+
"@angular/compiler": "^18.0.0",
24+
"@angular/compiler-cli": "^18.0.0",
25+
"@angular/core": "^18.0.0",
26+
"@angular/forms": "^18.0.0",
27+
"@angular/platform-browser": "^18.0.0",
28+
"@angular/platform-browser-dynamic": "^18.0.0",
29+
"@angular/router": "^18.0.0",
30+
"@nativescript/angular": "^18.0.0",
31+
"@nativescript/core": "~8.8.0",
32+
"@nativescript/plugin-tools": "5.4.1",
33+
"@nativescript/types": "~8.8.0",
3434
"@nativescript/webpack": "~5.0.5",
35-
"@ngtools/webpack": "^15.0.0",
35+
"@ngtools/webpack": "^18.0.0",
3636
"conventional-changelog-cli": "^2.2.2",
37-
"husky": "^8.0.0",
37+
"husky": "~9.0.0",
3838
"nativescript-vue": "~2.9.0",
3939
"nativescript-vue-template-compiler": "~2.9.0",
40-
"ng-packagr": "^15.0.0",
41-
"rxjs": "~7.6.0",
40+
"ng-packagr": "^18.0.0",
41+
"rxjs": "~7.8.0",
4242
"stacktrace-js": "~2.0.2",
43-
"typescript": "~4.8.0",
43+
"typescript": "~5.5.0",
4444
"vue": "~2.6.12",
45-
"zone.js": "~0.13.0"
45+
"zone.js": "~0.14.0"
4646
},
4747
"lint-staged": {
4848
"**/*.{js,ts,scss,json,html}": [

‎packages/firebase-admob/angular/.eslintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{
99
"files": ["*.ts", "*.tsx"],
1010
"rules": {
11-
"@nrwl/nx/enforce-module-boundaries": [
11+
"@nx/enforce-module-boundaries": [
1212
"error",
1313
{
1414
"allowCircularSelfDependency": true

‎packages/firebase-admob/project.json

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"sourceRoot": "packages/firebase-admob",
66
"targets": {
77
"build": {
8-
"executor": "@nrwl/js:tsc",
8+
"executor": "@nx/js:tsc",
99
"options": {
1010
"outputPath": "dist/packages/firebase-admob",
1111
"tsConfig": "packages/firebase-admob/tsconfig.json",
@@ -36,7 +36,7 @@
3636
"dependsOn": [
3737
{
3838
"target": "build.all",
39-
"projects": "dependencies"
39+
"dependencies": true
4040
}
4141
]
4242
},
@@ -50,11 +50,10 @@
5050
"dependsOn": [
5151
{
5252
"target": "build.all",
53-
"projects": "dependencies"
53+
"dependencies": true
5454
},
5555
{
56-
"target": "build",
57-
"projects": "self"
56+
"target": "build"
5857
}
5958
]
6059
},
@@ -66,10 +65,7 @@
6665
}
6766
},
6867
"lint": {
69-
"executor": "@nrwl/linter:eslint",
70-
"options": {
71-
"lintFilePatterns": ["packages/firebase-admob/**/*.ts"]
72-
}
68+
"executor": "@nx/eslint:lint"
7369
}
7470
}
7571
}

0 commit comments

Comments
 (0)