Skip to content

Commit 230461e

Browse files
committed
chore: nx migrate latest and cleanup
1 parent 3d0bd10 commit 230461e

File tree

5 files changed

+44
-43
lines changed

5 files changed

+44
-43
lines changed

apps/nativescript-demo-ng/karma.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ module.exports = function (config) {
2020
// test results reporter to use
2121
// possible values: 'dots', 'progress'
2222
// available reporters: https://npmjs.org/browse/keyword/karma-reporter
23-
reporters: ['mocha'],
23+
reporters: ['progress'],
2424

2525
// configure optional coverage, enable via --env.codeCoverage
2626
coverageReporter: {

apps/nativescript-demo-ng/project.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,14 @@
7070
}
7171
},
7272
"test": {
73-
"executor": "@nrwl/workspace:run-commands",
73+
"executor": "@nativescript/nx:test",
74+
"outputs": ["coverage/apps/nativescript-demo-ng"],
7475
"options": {
75-
"commands": ["ns test {args.platform}"],
76-
"cwd": "apps/nativescript-demo-ng",
77-
"parallel": false
76+
"coverage": false
77+
},
78+
"configurations": {
79+
"android": {},
80+
"ios": {}
7881
}
7982
}
8083
},

apps/nativescript-demo-ng/src/main.spec.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,4 @@ import { TestBed } from '@angular/core/testing';
44
import { platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
55
import { NativeScriptTestingModule } from '@nativescript/angular/testing';
66

7-
TestBed.initTestEnvironment(
8-
NativeScriptTestingModule,
9-
platformBrowserDynamicTesting() // NS_COMPILER_PROVIDERS)
10-
);
7+
TestBed.initTestEnvironment(NativeScriptTestingModule, platformBrowserDynamicTesting(), { teardown: { destroyAfterEach: true } });

apps/nativescript-demo-ng/src/test-setup.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

package.json

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"nx": "nx",
1111
"start": "nx serve",
1212
"build": "nx run zone-js:build && nx run angular:build",
13-
"test.android": "nx run nativescript-demo-ng:test --args='--platform=android'",
14-
"test.ios": "nx run nativescript-demo-ng:test --args='--platform=ios'",
13+
"test.android": "nx run nativescript-demo-ng:test:android",
14+
"test.ios": "nx run nativescript-demo-ng:test:ios",
1515
"lint": "nx workspace-lint && nx lint",
1616
"e2e": "nx e2e",
1717
"affected:apps": "nx affected:apps",
@@ -35,42 +35,43 @@
3535
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s"
3636
},
3737
"dependencies": {
38-
"@angular/animations": "13.1.1",
39-
"@angular/common": "13.1.1",
40-
"@angular/compiler": "13.1.1",
41-
"@angular/core": "13.1.1",
42-
"@angular/forms": "13.1.1",
43-
"@angular/platform-browser": "13.1.1",
44-
"@angular/platform-browser-dynamic": "13.1.1",
45-
"@angular/router": "13.1.1",
38+
"@angular/animations": "13.2.1",
39+
"@angular/common": "13.2.1",
40+
"@angular/compiler": "13.2.1",
41+
"@angular/core": "13.2.1",
42+
"@angular/forms": "13.2.1",
43+
"@angular/platform-browser": "13.2.1",
44+
"@angular/platform-browser-dynamic": "13.2.1",
45+
"@angular/router": "13.2.1",
4646
"@nativescript/core": "~8.1.0",
4747
"@nativescript/theme": "~3.0.0",
4848
"@ngx-translate/core": "~14.0.0",
4949
"nativescript-ngx-fonticon": "~7.0.0",
50-
"rxjs": "^7.4.0",
50+
"rxjs": "^7.5.0",
5151
"zone.js": "~0.11.4"
5252
},
5353
"devDependencies": {
54-
"@angular-devkit/build-angular": "~13.1.0",
54+
"@angular-devkit/build-angular": "13.2.2",
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.1.1",
58+
"@angular/compiler-cli": "13.2.1",
59+
"@jsdevtools/coverage-istanbul-loader": "3.0.5",
5960
"@nativescript/types": "~8.1.0",
60-
"@nativescript/unit-test-runner": "^2.0.5",
61-
"@nativescript/webpack": "5.0.2-alpha.0",
62-
"@ngtools/webpack": "next",
63-
"@nrwl/angular": "13.3.12",
64-
"@nrwl/cli": "13.3.12",
65-
"@nrwl/eslint-plugin-nx": "13.3.12",
66-
"@nrwl/jest": "13.3.12",
67-
"@nrwl/node": "13.3.12",
68-
"@nrwl/tao": "13.3.12",
69-
"@nrwl/workspace": "13.3.12",
70-
"@nstudio/angular": "13.0.1",
71-
"@nstudio/nativescript": "13.0.1",
72-
"@nstudio/nativescript-angular": "13.0.1",
73-
"@nstudio/xplat": "13.0.1",
61+
"@nativescript/unit-test-runner": "^3.0.2",
62+
"@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",
7475
"@types/jasmine": "^3.7.2",
7576
"@types/jest": "27.0.2",
7677
"@types/node": "14.14.33",
@@ -84,25 +85,26 @@
8485
"fs-extra": "^9.0.1",
8586
"husky": "~7.0.1",
8687
"jest": "27.2.3",
87-
"karma": "6.3.3",
88+
"karma": "6.3.9",
89+
"karma-coverage": "2.0.3",
8890
"karma-jasmine": "4.0.1",
89-
"karma-mocha-reporter": "^2.2.5",
9091
"karma-nativescript-launcher": "0.4.0",
92+
"karma-mocha-reporter": "^2.2.5",
9193
"karma-sinon": "^1.0.5",
92-
"karma-webpack": "5.0.0",
9394
"lint-staged": "^11.0.0",
94-
"ng-packagr": "13.0.8",
95+
"ng-packagr": "13.2.1",
96+
"nyc": "15.1.0",
9597
"postcss": "^8.3.9",
9698
"postcss-import": "^14.0.2",
9799
"postcss-preset-env": "^6.7.0",
98100
"postcss-url": "^10.1.1",
99-
"prettier": "2.3.2",
101+
"prettier": "2.5.1",
100102
"sass": "^1.32.0",
101103
"sinon": "^11.1.1",
102104
"ts-jest": "27.0.5",
103105
"ts-node": "9.1.1",
104106
"tslib": "^2.1.0",
105-
"typescript": "4.4.4"
107+
"typescript": "4.5.5"
106108
},
107109
"xplat": {
108110
"prefix": "nativescript",

0 commit comments

Comments
 (0)