Skip to content

Commit 6980522

Browse files
NathanWalkerNathanWalker
committed
chore: nx migrate latest
1 parent f5e637d commit 6980522

File tree

19 files changed

+134
-98
lines changed

19 files changed

+134
-98
lines changed

‎apps/automated/project.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"root": "apps/automated/",
2+
"$schema": "../../node_modules/nx/schemas/project-schema.json",
33
"sourceRoot": "apps/automated/app",
44
"projectType": "application",
55
"prefix": "nativescript",

‎apps/toolbox/project.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"root": "apps/toolbox/",
2+
"$schema": "../../node_modules/nx/schemas/project-schema.json",
33
"sourceRoot": "apps/toolbox/src",
44
"projectType": "application",
55
"prefix": "nativescript",

‎apps/ui/project.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"root": "apps/ui/",
2+
"$schema": "../../node_modules/nx/schemas/project-schema.json",
33
"sourceRoot": "apps/ui/src",
44
"projectType": "application",
55
"prefix": "nativescript",

jest.config.js renamed to jest.config.ts

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

3-
module.exports = { projects: getJestProjects() };
3+
export default { projects: getJestProjects() };

‎jest.preset.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const nxPreset = require('@nrwl/jest/preset');
1+
const nxPreset = require('@nrwl/jest/preset').default;
22
module.exports = {
33
...nxPreset,
44
testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'],

‎nx.json‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,17 @@
1111
"nx.json": "*",
1212
".eslintrc.json": "*"
1313
},
14-
"cli": {
15-
"defaultCollection": "@nrwl/workspace"
14+
"tasksRunnerOptions": {
15+
"default": {
16+
"runner": "nx/tasks-runners/default",
17+
"options": {
18+
"useDaemonProcess": false,
19+
"cacheableOperations": ["build", "lint", "test", "e2e"],
20+
"canTrackAnalytics": false,
21+
"showUsageWarnings": true,
22+
"parallel": 1
23+
}
24+
}
1625
},
1726
"generators": {
1827
"@nrwl/workspace": {
@@ -72,5 +81,6 @@
7281
},
7382
"affected": {
7483
"defaultBase": "master"
75-
}
84+
},
85+
"$schema": "./node_modules/nx/schemas/nx-schema.json"
7686
}

‎package.json‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,21 @@
2222
"devDependencies": {
2323
"@nativescript/eslint-plugin": "~0.0.4",
2424
"@nativescript/hook": "^2.0.0",
25-
"@nativescript/nx": "~2.0.8",
26-
"@nrwl/cli": "13.4.1",
27-
"@nrwl/eslint-plugin-nx": "13.4.1",
28-
"@nrwl/jest": "13.4.1",
29-
"@nrwl/node": "13.4.1",
30-
"@nrwl/tao": "13.4.1",
31-
"@nrwl/workspace": "13.4.1",
32-
"@nstudio/focus": "^13.4.1",
25+
"@nativescript/nx": "~3.0.18",
26+
"@nrwl/cli": "14.2.4",
27+
"@nrwl/eslint-plugin-nx": "14.2.4",
28+
"@nrwl/jest": "14.2.4",
29+
"@nrwl/node": "14.2.4",
30+
"@nrwl/workspace": "14.2.4",
31+
"@nstudio/focus": "^14.0.1",
3332
"@nstudio/nps-i": "~2.0.0",
34-
"@prettier/plugin-xml": "^0.13.1",
33+
"@prettier/plugin-xml": "^2.2.0",
3534
"@types/chai": "^4.2.11",
36-
"@types/jest": "27.0.2",
35+
"@types/jest": "27.4.1",
3736
"@types/mocha": "^7.0.2",
38-
"@types/node": "14.14.33",
39-
"@typescript-eslint/eslint-plugin": "4.19.0",
40-
"@typescript-eslint/parser": "4.19.0",
37+
"@types/node": "17.0.41",
38+
"@typescript-eslint/eslint-plugin": "~5.24.0",
39+
"@typescript-eslint/parser": "~5.24.0",
4140
"chai": "^4.2.0",
4241
"conventional-changelog-cli": "^2.1.1",
4342
"copyfiles": "^2.4.0",
@@ -48,36 +47,36 @@
4847
"eslint-config-prettier": "8.1.0",
4948
"eslint-plugin-prettier": "^3.3.1",
5049
"gonzales": "^1.0.7",
51-
"husky": "^5.1.3",
52-
"jest": "27.2.3",
53-
"lint-staged": "^10.5.0",
50+
"husky": "^8.0.1",
51+
"jest": "27.5.1",
52+
"lint-staged": "^13.0.1",
5453
"mocha": "^8.0.1",
5554
"mocha-typescript": "^1.1.17",
5655
"module-alias": "^2.2.2",
57-
"nativescript": "~8.1.5",
56+
"nativescript": "~8.2.0",
5857
"nativescript-typedoc-theme": "1.1.0",
5958
"parse-css": "git+https://github.com/tabatkins/parse-css.git",
6059
"parserlib": "^1.1.1",
61-
"prettier": "2.5.1",
60+
"prettier": "2.6.2",
6261
"reduce-css-calc": "~2.1.7",
6362
"sass": "^1.45.2",
6463
"shady-css-parser": "^0.1.0",
6564
"terser-webpack-plugin": "~3.0.6",
6665
"tree-kill": "^1.2.2",
67-
"ts-jest": "27.0.5",
68-
"ts-node": "9.1.1",
66+
"ts-jest": "27.1.4",
67+
"ts-node": "10.8.1",
6968
"ts-patch": "^1.3.0",
7069
"tslint": "6.1.3",
71-
"typedoc": "^0.20.14",
72-
"typescript": "4.5.4",
70+
"typedoc": "^0.22.17",
71+
"typescript": "4.7.3",
7372
"webpack": "~4.44.1",
7473
"webpack-cli": "~3.3.12",
75-
"zx": "^4.2.0"
74+
"zx": "^4.2.0",
75+
"nx": "14.2.4"
7676
},
7777
"lint-staged": {
7878
"**/*": [
7979
"nx format:write --files"
8080
]
8181
}
8282
}
83-

packages/core/jest.config.js renamed to packages/core/jest.config.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
module.exports = {
1+
/* eslint-disable */
2+
export default {
23
preset: '../../jest.preset.js',
34
displayName: 'core',
45
};

‎packages/core/project.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"root": "packages/core",
2+
"$schema": "../../node_modules/nx/schemas/project-schema.json",
33
"sourceRoot": "packages/core",
44
"projectType": "library",
55
"generators": {},
@@ -13,7 +13,7 @@
1313
"test": {
1414
"executor": "@nrwl/jest:jest",
1515
"options": {
16-
"jestConfig": "packages/core/jest.config.js",
16+
"jestConfig": "packages/core/jest.config.ts",
1717
"passWithNoTests": true
1818
},
1919
"outputs": ["coverage/packages/core"]

‎packages/core/tsconfig.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
"baseUrl": "."
55
},
66
"include": ["**/*.ts", "./references.d.ts"],
7-
"exclude": ["dist", "__tests__"]
7+
"exclude": ["dist", "__tests__", "jest.config.ts"]
88
}

0 commit comments

Comments
 (0)