Skip to content

Commit 22ecb5a

Browse files
committed
chore: nx migrate @nativescript/plugin-tools
1 parent 19ddd60 commit 22ecb5a

File tree

11 files changed

+88
-102
lines changed

11 files changed

+88
-102
lines changed

.eslintrc.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,18 @@
2424
{
2525
"files": ["*.ts", "*.tsx"],
2626
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier", "plugin:@nx/typescript"],
27-
"rules": {}
27+
"rules": {
28+
"@typescript-eslint/no-extra-semi": "error",
29+
"no-extra-semi": "off"
30+
}
2831
},
2932
{
3033
"files": ["*.js", "*.jsx"],
3134
"extends": ["plugin:@nx/javascript"],
32-
"rules": {}
35+
"rules": {
36+
"@typescript-eslint/no-extra-semi": "error",
37+
"no-extra-semi": "off"
38+
}
3339
},
3440
{
3541
"files": ["references.d.ts"],

.prettierignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
/coverage
55
native-src
66

7-
/.nx/cache
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
@@ -14,7 +14,7 @@
1414
"@nativescript/mlkit-custom-object-detection": "file:../../dist/packages/mlkit-custom-object-detection"
1515
},
1616
"devDependencies": {
17-
"@nativescript/android": "8.8.0-alpha.7",
18-
"@nativescript/ios": "~8.7.0"
17+
"@nativescript/android": "~8.8.0",
18+
"@nativescript/ios": "~8.8.0"
1919
}
2020
}

apps/demo-angular/project.json

Lines changed: 14 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,8 @@
1212
"production": true,
1313
"uglify": true,
1414
"release": true,
15-
"forDevice": true
16-
},
17-
"dependsOn": [
18-
{
19-
"target": "build.all",
20-
"dependencies": true
21-
}
22-
]
23-
},
24-
"ios": {
25-
"executor": "@nativescript/nx:build",
26-
"options": {
27-
"platform": "ios"
28-
},
29-
"dependsOn": [
30-
{
31-
"target": "build.all",
32-
"dependencies": true
33-
}
34-
]
35-
},
36-
"android": {
37-
"executor": "@nativescript/nx:build",
38-
"options": {
39-
"platform": "android"
15+
"forDevice": true,
16+
"tsConfig": "apps/demo-angular/tsconfig.json"
4017
},
4118
"dependsOn": [
4219
{
@@ -46,13 +23,21 @@
4623
]
4724
},
4825
"clean": {
49-
"executor": "@nativescript/nx:build",
50-
"options": {
51-
"clean": true
52-
}
26+
"executor": "@nativescript/nx:clean",
27+
"options": {}
5328
},
5429
"lint": {
5530
"executor": "@nx/eslint:lint"
31+
},
32+
"debug": {
33+
"executor": "@nativescript/nx:debug",
34+
"options": {
35+
"noHmr": true,
36+
"uglify": false,
37+
"release": false,
38+
"forDevice": false,
39+
"prepare": false
40+
}
5641
}
5742
}
5843
}

apps/demo/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"@nativescript/mlkit-custom-object-detection": "file:../../packages/mlkit-custom-object-detection"
1818
},
1919
"devDependencies": {
20-
"@nativescript/android": "8.8.0-alpha.8",
21-
"@nativescript/ios": "~8.7.0"
20+
"@nativescript/android": "~8.8.0",
21+
"@nativescript/ios": "~8.8.0"
2222
}
2323
}

apps/demo/project.json

Lines changed: 14 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,8 @@
1212
"production": true,
1313
"uglify": true,
1414
"release": true,
15-
"forDevice": true
16-
},
17-
"dependsOn": [
18-
{
19-
"target": "build.all",
20-
"dependencies": true
21-
}
22-
]
23-
},
24-
"ios": {
25-
"executor": "@nativescript/nx:build",
26-
"options": {
27-
"platform": "ios",
28-
"noHmr": true
29-
},
30-
"dependsOn": [
31-
{
32-
"target": "build.all",
33-
"dependencies": true
34-
}
35-
]
36-
},
37-
"android": {
38-
"executor": "@nativescript/nx:build",
39-
"options": {
40-
"platform": "android",
41-
"noHmr": true
15+
"forDevice": true,
16+
"tsConfig": "apps/demo/tsconfig.json"
4217
},
4318
"dependsOn": [
4419
{
@@ -48,13 +23,21 @@
4823
]
4924
},
5025
"clean": {
51-
"executor": "@nativescript/nx:build",
52-
"options": {
53-
"clean": true
54-
}
26+
"executor": "@nativescript/nx:clean",
27+
"options": {}
5528
},
5629
"lint": {
5730
"executor": "@nx/eslint:lint"
31+
},
32+
"debug": {
33+
"executor": "@nativescript/nx:debug",
34+
"options": {
35+
"noHmr": true,
36+
"uglify": false,
37+
"release": false,
38+
"forDevice": false,
39+
"prepare": false
40+
}
5841
}
5942
}
6043
}

migrations.json

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

nx.json

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,21 @@
3838
"useDaemonProcess": false,
3939
"parallel": 1,
4040
"useInferencePlugins": false,
41-
"defaultBase": "master"
41+
"defaultBase": "master",
42+
"release": {
43+
"releaseTagPattern": "{version}-{projectName}",
44+
"projects": ["packages/*"],
45+
"projectsRelationship": "independent",
46+
"changelog": {
47+
"workspaceChangelog": false,
48+
"projectChangelogs": {
49+
"renderOptions": {
50+
"authors": true,
51+
"commitReferences": true,
52+
"versionTitleDate": true
53+
}
54+
}
55+
}
56+
},
57+
"useLegacyCache": true
4258
}

package.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,29 @@
1616
},
1717
"private": true,
1818
"devDependencies": {
19-
"@angular/animations": "^17.0.0",
20-
"@angular/common": "^17.0.0",
21-
"@angular/compiler": "^17.0.0",
22-
"@angular/compiler-cli": "^17.0.0",
23-
"@angular/core": "^17.0.0",
24-
"@angular/forms": "^17.0.0",
25-
"@angular/platform-browser": "^17.0.0",
26-
"@angular/platform-browser-dynamic": "^17.0.0",
27-
"@angular/router": "^17.0.0",
28-
"@nativescript/angular": "^17.0.0",
29-
"@nativescript/core": "~8.7.0",
30-
"@nativescript/plugin-tools": "5.2.5",
31-
"@nativescript/types": "~8.7.0",
19+
"@angular/animations": "^19.0.0",
20+
"@angular/common": "^19.0.0",
21+
"@angular/compiler": "^19.0.0",
22+
"@angular/compiler-cli": "^19.0.0",
23+
"@angular/core": "^19.0.0",
24+
"@angular/forms": "^19.0.0",
25+
"@angular/platform-browser": "^19.0.0",
26+
"@angular/platform-browser-dynamic": "^19.0.0",
27+
"@angular/router": "^19.0.0",
28+
"@nativescript/angular": "^19.0.0",
29+
"@nativescript/core": "~8.8.0",
30+
"@nativescript/plugin-tools": "5.5.1",
31+
"@nativescript/types": "~8.8.0",
3232
"@nativescript/webpack": "~5.0.5",
33-
"@ngtools/webpack": "^17.0.0",
33+
"@ngtools/webpack": "^19.0.0",
3434
"husky": "~9.0.0",
3535
"nativescript-vue": "~2.9.0",
3636
"nativescript-vue-template-compiler": "~2.9.0",
37-
"ng-packagr": "^17.0.0",
37+
"ng-packagr": "^19.0.0",
3838
"rxjs": "~7.8.0",
39-
"typescript": "~5.4.0",
40-
"zone.js": "~0.14.0",
41-
"@angular-devkit/build-angular": "^17.0.0"
39+
"typescript": "~5.6.0",
40+
"zone.js": "~0.15.0",
41+
"@angular-devkit/build-angular": "^19.0.0"
4242
},
4343
"lint-staged": {
4444
"**/*.{js,ts,scss,json,html}": [

tools/workspace-scripts.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ module.exports = {
2323
},
2424
demo: {
2525
clean: {
26-
script: 'nx run demo:clean',
26+
script: 'nx clean demo',
2727
description: '⚆ Clean 🧹',
2828
},
2929
ios: {
30-
script: 'nx run demo:ios',
30+
script: 'nx debug demo ios',
3131
description: '⚆ Run iOS ',
3232
},
3333
android: {
34-
script: 'nx run demo:android',
34+
script: 'nx debug demo android',
3535
description: '⚆ Run Android 🤖',
3636
},
3737
},
@@ -41,15 +41,15 @@ module.exports = {
4141
},
4242
'demo-angular': {
4343
clean: {
44-
script: 'nx run demo-angular:clean',
44+
script: 'nx clean demo-angular',
4545
description: '⚆ Clean 🧹',
4646
},
4747
ios: {
48-
script: 'nx run demo-angular:ios',
48+
script: 'nx debug demo-angular ios',
4949
description: '⚆ Run iOS ',
5050
},
5151
android: {
52-
script: 'nx run demo-angular:android',
52+
script: 'nx debug demo-angular android',
5353
description: '⚆ Run Android 🤖',
5454
},
5555
},

0 commit comments

Comments
 (0)