Skip to content

Commit 4e15564

Browse files
committed
chore: Nx 12.4
1 parent 83b14ea commit 4e15564

File tree

7 files changed

+11677
-46
lines changed

7 files changed

+11677
-46
lines changed

apps/nativescript-demo-ng/package.json

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,37 +7,11 @@
77
"ngcc": "ngcc --tsconfig tsconfig.json --properties es2015 module main --first-only"
88
},
99
"dependencies": {
10-
"@angular/animations": "~12.0.0",
11-
"@angular/common": "~12.0.0",
12-
"@angular/compiler": "~12.0.0",
13-
"@angular/core": "~12.0.0",
14-
"@angular/forms": "~12.0.0",
15-
"@angular/platform-browser": "~12.0.0",
16-
"@angular/platform-browser-dynamic": "~12.0.0",
17-
"@angular/router": "~12.0.0",
1810
"@nativescript/angular": "file:../../packages/angular",
19-
"@nativescript/core": "next",
20-
"@nativescript/theme": "^3.0.1",
21-
"rxjs": "^6.6.0",
22-
"zone.js": "~0.11.1"
11+
"@nativescript/core": "next"
2312
},
2413
"devDependencies": {
25-
"@angular/compiler-cli": "~12.0.0",
2614
"@nativescript/android": "8.0.0",
27-
"@nativescript/ios": "8.0.0",
28-
"@nativescript/types": "8.0.0",
29-
"@nativescript/unit-test-runner": "^2.0.5",
30-
"@nativescript/webpack": "beta",
31-
"@ngtools/webpack": "~12.0.0",
32-
"@types/jasmine": "^3.7.2",
33-
"@types/sinon": "^10.0.2",
34-
"karma": "6.3.3",
35-
"karma-jasmine": "4.0.1",
36-
"karma-mocha-reporter": "^2.2.5",
37-
"karma-nativescript-launcher": "0.4.0",
38-
"karma-sinon": "^1.0.5",
39-
"karma-webpack": "5.0.0",
40-
"sinon": "^11.1.1",
41-
"typescript": "~4.2.0"
15+
"@nativescript/ios": "8.0.0"
4216
}
4317
}

apps/nativescript-demo-ng/references.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/// <reference path="./node_modules/@nativescript/types-ios/index.d.ts" />
2-
/// <reference path="./node_modules/@nativescript/types-android/lib/android-29.d.ts" />
1+
/// <reference path="../../node_modules/@nativescript/types-ios/index.d.ts" />
2+
/// <reference path="../../node_modules/@nativescript/types-android/lib/android-29.d.ts" />
33

44
declare namespace NodeJS {
55
interface Global {

package.json

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,25 @@
5050
"@angular-eslint/eslint-plugin-template": "~12.0.0",
5151
"@angular-eslint/template-parser": "~12.0.0",
5252
"@angular/compiler-cli": "^12.0.0",
53+
"@nativescript/types": "^8.0.0",
54+
"@nativescript/webpack": "beta",
55+
"@nativescript/unit-test-runner": "^2.0.5",
5356
"@ngtools/webpack": "^12.0.0",
54-
"@nrwl/angular": "12.3.5",
55-
"@nrwl/cli": "12.3.5",
56-
"@nrwl/eslint-plugin-nx": "12.3.5",
57-
"@nrwl/jest": "12.3.5",
58-
"@nrwl/node": "12.3.5",
59-
"@nrwl/tao": "12.3.5",
60-
"@nrwl/workspace": "12.3.5",
57+
"@nrwl/angular": "12.4.0",
58+
"@nrwl/cli": "12.4.0",
59+
"@nrwl/eslint-plugin-nx": "12.4.0",
60+
"@nrwl/jest": "12.4.0",
61+
"@nrwl/node": "12.4.0",
62+
"@nrwl/tao": "12.4.0",
63+
"@nrwl/workspace": "12.4.0",
6164
"@nstudio/angular": "~12.0.0",
6265
"@nstudio/nativescript": "~12.0.0",
6366
"@nstudio/nativescript-angular": "~12.0.0",
6467
"@nstudio/xplat": "~12.0.0",
68+
"@types/jasmine": "^3.7.2",
6569
"@types/jest": "~26.0.8",
6670
"@types/node": "14.14.33",
71+
"@types/sinon": "^10.0.2",
6772
"@typescript-eslint/eslint-plugin": "4.19.0",
6873
"@typescript-eslint/parser": "4.19.0",
6974
"conventional-changelog-cli": "^2.1.1",
@@ -72,12 +77,19 @@
7277
"eslint-config-prettier": "8.1.0",
7378
"fs-extra": "^9.0.1",
7479
"husky": "~5.1.3",
75-
"jest": "~26.2.2",
80+
"jest": "27.0.3",
81+
"karma": "6.3.3",
82+
"karma-jasmine": "4.0.1",
83+
"karma-mocha-reporter": "^2.2.5",
84+
"karma-nativescript-launcher": "0.4.0",
85+
"karma-sinon": "^1.0.5",
86+
"karma-webpack": "5.0.0",
7687
"lint-staged": "~10.5.0",
7788
"ng-packagr": "^12.0.2",
7889
"prettier": "2.2.1",
7990
"sass": "~1.32.0",
80-
"ts-jest": "26.5.5",
91+
"sinon": "^11.1.1",
92+
"ts-jest": "27.0.3",
8193
"ts-node": "9.1.1",
8294
"tslint": "6.1.3",
8395
"typescript": "4.2.4"

packages/angular/.eslintrc.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
{
66
"files": ["*.ts"],
77
"extends": ["plugin:@nrwl/nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
8-
"parserOptions": {
9-
"project": ["packages/angular/tsconfig.*?.json"]
10-
},
118
"rules": {
129
"@angular-eslint/directive-selector": [
1310
"error",

packages/zone-js/.eslintrc.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
"overrides": [
66
{
77
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
8-
"parserOptions": {
9-
"project": ["packages/zone-js/tsconfig.*?.json"]
10-
},
118
"rules": {}
129
},
1310
{

tsconfig.base.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"paths": {
1919
"@nativescript/angular": ["packages/angular/src/index.ts"],
2020
"@nativescript/angular/*": ["packages/angular/src/*"],
21-
"@nativescript/angular/testing": ["packages/angular/testing/src/index.ts"],
2221
"@nativescript/angular/polyfills": ["packages/angular/polyfills/src/index.ts"],
22+
"@nativescript/angular/testing": ["packages/angular/testing/src/index.ts"],
2323
"@nativescript/zone-js": ["packages/zone-js/dist/index.ts"],
2424
"@nativescript/zone-js/*": ["packages/zone-js/*"]
2525
}

0 commit comments

Comments
 (0)