Skip to content

Commit dd0a628

Browse files
NathanWalkerNathanWalker
committed
chore: Nx 17+
1 parent 40b2a6a commit dd0a628

File tree

11 files changed

+68
-54
lines changed

11 files changed

+68
-54
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,5 @@ Thumbs.db
5555

5656
# types
5757
ios-typings-prj
58+
59+
.nx/cache

‎.prettierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,5 @@ package.json
2525
*.scss
2626
*.sh
2727
!packages/webpack/templates/*.js
28+
29+
/.nx/cache

‎apps/automated/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"nativescript-theme-core": "file:../../node_modules/nativescript-theme-core"
1212
},
1313
"devDependencies": {
14-
"@nativescript/android": "~8.5.0",
15-
"@nativescript/ios": "~8.5.0",
14+
"@nativescript/android": "~8.6.0",
15+
"@nativescript/ios": "~8.6.0",
1616
"@nativescript/webpack": "file:../../dist/packages/nativescript-webpack.tgz",
1717
"circular-dependency-plugin": "^5.2.2",
1818
"typescript": "~5.2.0"

‎apps/toolbox/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
"dependencies": {
1010
"@nativescript/core": "file:../../packages/core",
1111
"nativescript-theme-core": "file:../../node_modules/nativescript-theme-core",
12-
"@nativescript/imagepicker": "^1.0.6"
12+
"@nativescript/imagepicker": "^3.0.0"
1313
},
1414
"devDependencies": {
15-
"@nativescript/android": "~8.5.0",
16-
"@nativescript/ios": "~8.5.0",
15+
"@nativescript/android": "~8.6.0",
16+
"@nativescript/ios": "~8.6.0",
1717
"@nativescript/webpack": "file:../../dist/packages/nativescript-webpack.tgz",
1818
"typescript": "~5.2.0"
1919
}

‎apps/toolbox/src/pages/image-handling.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@ export class DemoModel extends Observable {
2222
.then(() => {
2323
return context.present();
2424
})
25-
.then((selection) => {
26-
const imageAsset = selection.length > 0 ? selection[0] : null;
27-
if (imageAsset) {
25+
.then((selections) => {
26+
const selection = selections.length > 0 ? selections[0] : null;
27+
if (selection) {
2828
this.addingPhoto = true;
29+
const imageAsset = selection.asset;
2930

3031
ImageSource.fromAsset(imageAsset).then(
3132
(savedImage) => {

‎apps/ui/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"@nativescript/core": "file:../../packages/core"
1212
},
1313
"devDependencies": {
14-
"@nativescript/android": "~8.5.0",
15-
"@nativescript/ios": "~8.5.0",
14+
"@nativescript/android": "~8.6.0",
15+
"@nativescript/ios": "~8.6.0",
1616
"@nativescript/webpack": "file:../../dist/packages/nativescript-webpack.tgz",
1717
"typescript": "~5.2.0"
1818
},

‎nx.json

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
{
2-
"npmScope": "nativescript",
32
"workspaceLayout": {
43
"appsDir": "apps",
54
"libsDir": "packages"
65
},
76
"tasksRunnerOptions": {
87
"default": {
9-
"runner": "nx-cloud",
108
"options": {
11-
"useDaemonProcess": false,
12-
"cacheableOperations": ["build", "lint", "test", "ios", "android", "e2e"],
139
"canTrackAnalytics": false,
14-
"showUsageWarnings": true,
15-
"parallel": 1,
16-
"accessToken": "NzRmNDM3NDgtZjlmNy00MTUwLWIxZDktYjJlZTRhMWM5ODY3fHJlYWQtd3JpdGU="
10+
"showUsageWarnings": true
1711
}
1812
}
1913
},
@@ -84,10 +78,40 @@
8478
},
8579
"targetDefaults": {
8680
"build": {
87-
"inputs": ["production", "^production"]
81+
"inputs": ["production", "^production"],
82+
"cache": true
8883
},
8984
"test": {
90-
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"]
85+
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
86+
"cache": true
87+
},
88+
"lint": {
89+
"cache": true
90+
},
91+
"ios": {
92+
"cache": true
93+
},
94+
"android": {
95+
"cache": true
96+
},
97+
"e2e": {
98+
"cache": true
99+
},
100+
"@nx/jest:jest": {
101+
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
102+
"cache": true,
103+
"options": {
104+
"passWithNoTests": true
105+
},
106+
"configurations": {
107+
"ci": {
108+
"ci": true,
109+
"codeCoverage": true
110+
}
111+
}
91112
}
92-
}
113+
},
114+
"useDaemonProcess": false,
115+
"nxCloudAccessToken": "NzRmNDM3NDgtZjlmNy00MTUwLWIxZDktYjJlZTRhMWM5ODY3fHJlYWQtd3JpdGU=",
116+
"parallel": 1
93117
}

‎package.json

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,25 @@
1818
"url": "https://github.com/NativeScript/NativeScript.git"
1919
},
2020
"dependencies": {
21-
"@nx/devkit": "16.9.1",
22-
"@swc/helpers": "0.5.2",
23-
"nativescript-theme-core": "^1.0.4",
24-
"nx-cloud": "16.4.0"
21+
"@nx/devkit": "17.1.3",
22+
"@swc/helpers": "0.5.3",
23+
"nativescript-theme-core": "^1.0.4"
2524
},
2625
"devDependencies": {
2726
"@nativescript/hook": "^2.0.0",
28-
"@nativescript/nx": "^16.5.0",
29-
"@nstudio/focus": "^16.5.0",
27+
"@nativescript/nx": "^17.0.1",
28+
"@nstudio/focus": "^17.0.1",
3029
"@nstudio/nps-i": "~2.0.0",
31-
"@nx/eslint-plugin": "16.9.1",
32-
"@nx/jest": "16.9.1",
33-
"@nx/js": "16.9.1",
34-
"@nx/node": "16.9.1",
35-
"@nx/plugin": "16.9.1",
36-
"@nx/workspace": "16.9.1",
30+
"@nx/eslint-plugin": "17.1.3",
31+
"@nx/jest": "17.1.3",
32+
"@nx/js": "17.1.3",
33+
"@nx/node": "17.1.3",
34+
"@nx/plugin": "17.1.3",
35+
"@nx/workspace": "17.1.3",
3736
"@prettier/plugin-xml": "^2.2.0",
38-
"@swc-node/register": "~1.4.2",
37+
"@swc-node/register": "1.6.8",
3938
"@swc/cli": "~0.1.62",
40-
"@swc/core": "1.3.90",
39+
"@swc/core": "~1.3.99",
4140
"@types/jest": "~29.5.0",
4241
"@types/node": "^18.7.1",
4342
"@typescript-eslint/eslint-plugin": "^6.6.0",
@@ -47,18 +46,18 @@
4746
"css": "^3.0.0",
4847
"css-tree": "^1.1.2",
4948
"dotenv": "~16.3.1",
50-
"emoji-regex": "^10.2.1",
49+
"emoji-regex": "^10.3.0",
5150
"eslint": "~8.43.0",
5251
"eslint-config-prettier": "~8.8.0",
5352
"gonzales": "^1.0.7",
5453
"husky": "^8.0.1",
5554
"jest": "~29.6.0",
5655
"jest-environment-jsdom": "~29.6.0",
57-
"lint-staged": "^14.0.0",
56+
"lint-staged": "^15.1.0",
5857
"module-alias": "^2.2.2",
5958
"nativescript": "~8.6.0",
6059
"nativescript-typedoc-theme": "1.1.0",
61-
"nx": "16.9.1",
60+
"nx": "17.1.3",
6261
"parse-css": "git+https://github.com/tabatkins/parse-css.git",
6362
"parserlib": "^1.1.1",
6463
"prettier": "^2.6.2",
@@ -72,12 +71,11 @@
7271
"tslib": "^2.6.0",
7372
"typedoc": "^0.24.8",
7473
"typescript": "~5.2.0",
75-
"zx": "^7.0.5"
74+
"zx": "^7.2.0"
7675
},
7776
"lint-staged": {
7877
"**/*.{js,ts,css,scss,json,html}": [
7978
"npx prettier --write"
8079
]
8180
}
82-
}
83-
81+
}

‎packages/core/platforms/android/core.aar

-100 Bytes
Binary file not shown.

‎packages/core/project.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,7 @@
2121
"outputs": ["{workspaceRoot}/dist/out-tsc"],
2222
"options": {
2323
"jestConfig": "packages/core/jest.config.ts",
24-
"passWithNoTests": true,
2524
"verbose": true
26-
},
27-
"configurations": {
28-
"ci": {
29-
"ci": true
30-
}
3125
}
3226
},
3327
"build": {

‎tools/workspace-plugin/project.json

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,7 @@
4646
"executor": "@nx/jest:jest",
4747
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
4848
"options": {
49-
"jestConfig": "tools/workspace-plugin/jest.config.ts",
50-
"passWithNoTests": true
51-
},
52-
"configurations": {
53-
"ci": {
54-
"ci": true,
55-
"codeCoverage": true
56-
}
49+
"jestConfig": "tools/workspace-plugin/jest.config.ts"
5750
}
5851
}
5952
},

0 commit comments

Comments
 (0)