Skip to content

Commit 4d50f8c

Browse files
NathanWalkerNathanWalker
committed
chore: nx migrate latest
1 parent 26cf157 commit 4d50f8c

14 files changed

+55
-58
lines changed

‎apps/nativescript-demo-ng/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
"dependencies": {
99
"@nativescript/angular": "file:../../packages/angular",
1010
"@nativescript/core": "file:../../node_modules/@nativescript/core",
11-
"@nativescript-community/ui-material-bottom-navigation": "^6.2.5"
11+
"@nativescript-community/ui-material-bottom-navigation": "^7.0.0"
1212
},
1313
"devDependencies": {
14-
"@nativescript/android": "~8.1.1",
15-
"@nativescript/ios": "~8.1.0",
14+
"@nativescript/android": "~8.2.0",
15+
"@nativescript/ios": "~8.2.0",
1616
"@nativescript/unit-test-runner": "^3.0.1"
1717
}
1818
}

‎apps/nativescript-demo-ng/project.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"root": "apps/nativescript-demo-ng/",
32
"sourceRoot": "apps/nativescript-demo-ng/src",
43
"projectType": "application",
54
"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,3 +1,3 @@
1-
const nxPreset = require('@nrwl/jest/preset');
1+
const nxPreset = require('@nrwl/jest/preset').default;
22

33
module.exports = { ...nxPreset };

‎nx.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,12 @@
1616
},
1717
"tasksRunnerOptions": {
1818
"default": {
19-
"runner": "@nrwl/workspace/tasks-runners/default",
19+
"runner": "nx/tasks-runners/default",
2020
"options": {
21+
"useDaemonProcess": false,
2122
"cacheableOperations": ["build", "lint", "test", "e2e"],
23+
"canTrackAnalytics": false,
24+
"showUsageWarnings": true,
2225
"parallel": 1
2326
}
2427
}

‎package.json

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s"
3636
},
3737
"dependencies": {
38-
"@angular/animations": "~13.3.0",
39-
"@angular/common": "~13.3.0",
40-
"@angular/compiler": "~13.3.0",
41-
"@angular/core": "~13.3.0",
42-
"@angular/forms": "~13.3.0",
43-
"@angular/platform-browser": "~13.3.0",
44-
"@angular/platform-browser-dynamic": "~13.3.0",
45-
"@angular/router": "~13.3.0",
38+
"@angular/animations": "13.3.10",
39+
"@angular/common": "13.3.10",
40+
"@angular/compiler": "13.3.10",
41+
"@angular/core": "13.3.10",
42+
"@angular/forms": "13.3.10",
43+
"@angular/platform-browser": "13.3.10",
44+
"@angular/platform-browser-dynamic": "13.3.10",
45+
"@angular/router": "13.3.10",
4646
"@nativescript/core": "~8.1.0",
4747
"@nativescript/theme": "~3.0.0",
4848
"@ngx-translate/core": "~14.0.0",
@@ -51,29 +51,29 @@
5151
"zone.js": "~0.11.4"
5252
},
5353
"devDependencies": {
54-
"@angular-devkit/build-angular": "13.2.2",
54+
"@angular-devkit/build-angular": "13.3.7",
5555
"@angular-eslint/eslint-plugin": "13.0.1",
5656
"@angular-eslint/eslint-plugin-template": "13.0.1",
5757
"@angular-eslint/template-parser": "13.0.1",
58-
"@angular/compiler-cli": "~13.3.0",
58+
"@angular/compiler-cli": "13.3.10",
5959
"@jsdevtools/coverage-istanbul-loader": "3.0.5",
60-
"@nativescript/types": "~8.1.0",
60+
"@nativescript/types": "~8.2.0",
6161
"@nativescript/unit-test-runner": "^3.0.2",
6262
"@nativescript/webpack": "~5.0.0",
63-
"@ngtools/webpack": "13.2.2",
64-
"@nrwl/angular": "13.7.3",
65-
"@nrwl/cli": "13.7.3",
66-
"@nrwl/eslint-plugin-nx": "13.7.3",
67-
"@nrwl/jest": "13.7.3",
68-
"@nrwl/node": "13.7.3",
69-
"@nrwl/tao": "13.7.3",
70-
"@nrwl/workspace": "13.7.3",
71-
"@nstudio/angular": "13.4.3",
72-
"@nstudio/nativescript": "13.4.3",
73-
"@nstudio/nativescript-angular": "13.4.3",
74-
"@nstudio/xplat": "13.4.3",
63+
"@ngtools/webpack": "13.3.7",
64+
"@nrwl/angular": "14.1.9",
65+
"@nrwl/cli": "14.1.9",
66+
"@nrwl/eslint-plugin-nx": "14.1.9",
67+
"@nrwl/jest": "14.1.9",
68+
"@nrwl/js": "14.1.9",
69+
"@nrwl/node": "14.1.9",
70+
"@nrwl/workspace": "14.1.9",
71+
"@nstudio/angular": "14.0.1",
72+
"@nstudio/nativescript": "14.0.1",
73+
"@nstudio/nativescript-angular": "14.0.1",
74+
"@nstudio/xplat": "14.0.1",
7575
"@types/jasmine": "^3.7.2",
76-
"@types/jest": "27.0.2",
76+
"@types/jest": "27.4.1",
7777
"@types/node": "14.14.33",
7878
"@types/sinon": "^10.0.2",
7979
"@typescript-eslint/eslint-plugin": "4.19.0",
@@ -84,27 +84,28 @@
8484
"eslint-config-prettier": "8.1.0",
8585
"fs-extra": "^9.0.1",
8686
"husky": "~7.0.1",
87-
"jest": "27.2.3",
88-
"karma": "6.3.9",
87+
"jest": "27.5.1",
88+
"karma": "6.3.20",
8989
"karma-coverage": "2.0.3",
9090
"karma-jasmine": "4.0.1",
91-
"karma-nativescript-launcher": "0.4.0",
9291
"karma-mocha-reporter": "^2.2.5",
92+
"karma-nativescript-launcher": "0.4.0",
9393
"karma-sinon": "^1.0.5",
9494
"lint-staged": "^11.0.0",
95-
"ng-packagr": "~13.3.0",
95+
"ng-packagr": "13.3.1",
96+
"nx": "14.1.9",
9697
"nyc": "15.1.0",
9798
"postcss": "^8.3.9",
98-
"postcss-import": "^14.0.2",
99-
"postcss-preset-env": "^6.7.0",
100-
"postcss-url": "^10.1.1",
99+
"postcss-import": "14.1.0",
100+
"postcss-preset-env": "7.5.0",
101+
"postcss-url": "10.1.3",
101102
"prettier": "2.5.1",
102103
"sass": "^1.32.0",
103104
"sinon": "^11.1.1",
104-
"ts-jest": "27.0.5",
105+
"ts-jest": "27.1.4",
105106
"ts-node": "9.1.1",
106107
"tslib": "^2.1.0",
107-
"typescript": "4.5.5"
108+
"typescript": "4.6.4"
108109
},
109110
"xplat": {
110111
"prefix": "nativescript",

‎packages/angular/jest.config.js renamed to ‎packages/angular/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
displayName: 'angular',
34
preset: '../../jest.preset.js',
45
globals: {

‎packages/angular/project.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
{
2-
"root": "packages/angular",
32
"sourceRoot": "packages/angular/src",
43
"projectType": "library",
54
"generators": {},
65
"targets": {
76
"build": {
8-
"builder": "@angular-devkit/build-angular:ng-packagr",
7+
"executor": "@angular-devkit/build-angular:ng-packagr",
98
"options": {
109
"tsConfig": "packages/angular/tsconfig.lib.prod.json",
1110
"project": "packages/angular/ng-package.json"
@@ -20,7 +19,7 @@
2019
"test": {
2120
"executor": "@nrwl/jest:jest",
2221
"options": {
23-
"jestConfig": "packages/angular/jest.config.js",
22+
"jestConfig": "packages/angular/jest.config.ts",
2423
"passWithNoTests": true
2524
},
2625
"outputs": ["coverage/packages/angular"]

‎packages/angular/tsconfig.lib.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"types": ["node", "./references"],
55
"outDir": "../../dist/out-tsc"
66
},
7-
"exclude": ["**/*.spec.ts", "dist/**/*"],
7+
"exclude": ["**/*.spec.ts", "dist/**/*", "jest.config.ts"],
88
"include": ["**/*.ts"]
99
}

‎packages/angular/tsconfig.spec.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,5 @@
55
"module": "commonjs",
66
"types": ["jest", "node"]
77
},
8-
"include": [
9-
"**/*.spec.ts",
10-
"**/*.spec.tsx",
11-
"**/*.spec.js",
12-
"**/*.spec.jsx",
13-
"**/*.d.ts"
14-
]
8+
"include": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.spec.js", "**/*.spec.jsx", "**/*.d.ts", "jest.config.ts"]
159
}

‎packages/zone-js/jest.config.js renamed to ‎packages/zone-js/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
displayName: 'zone-js',
34
preset: '../../jest.preset.js',
45
globals: {

‎packages/zone-js/project.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{
2-
"root": "packages/zone-js",
32
"sourceRoot": "packages/zone-js/src",
43
"projectType": "library",
54
"targets": {
65
"build": {
7-
"executor": "@nrwl/node:package",
6+
"executor": "@nrwl/js:tsc",
87
"options": {
98
"outputPath": "dist/packages/zone-js",
109
"tsConfig": "packages/zone-js/tsconfig.lib.json",
@@ -23,7 +22,7 @@
2322
"executor": "@nrwl/jest:jest",
2423
"outputs": ["coverage/packages/zone-js"],
2524
"options": {
26-
"jestConfig": "packages/zone-js/jest.config.js",
25+
"jestConfig": "packages/zone-js/jest.config.ts",
2726
"passWithNoTests": true
2827
}
2928
}

‎packages/zone-js/tsconfig.lib.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"types": []
77
},
88
"include": ["**/*.ts"],
9-
"exclude": ["**/*.spec.ts"]
9+
"exclude": ["**/*.spec.ts", "jest.config.ts"]
1010
}

‎packages/zone-js/tsconfig.spec.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
"module": "commonjs",
66
"types": ["jest", "node"]
77
},
8-
"include": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.spec.js", "**/*.spec.jsx", "**/*.d.ts"]
8+
"include": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.spec.js", "**/*.spec.jsx", "**/*.d.ts", "jest.config.ts"]
99
}

0 commit comments

Comments
 (0)