Skip to content

Commit 548e074

Browse files
NathanWalkerNathanWalker
authored
feat(angular): ng 10.1 and ns 7 (#2237)
1 parent 737a5df commit 548e074

File tree

7 files changed

+69
-75
lines changed

7 files changed

+69
-75
lines changed

Diff for: ‎e2e/animation-examples/app/package.json

-9
This file was deleted.

Diff for: ‎e2e/animation-examples/nativescript.config.ts

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import { NativeScriptConfig } from '@nativescript/core'
2+
3+
export default {
4+
id: 'org.nativescript.ng4animations',
5+
appResourcesPath: 'app/App_Resources',
6+
android: {
7+
v8Flags: '--expose_gc',
8+
markingMode: 'none',
9+
},
10+
appPath: 'app',
11+
} as NativeScriptConfig

Diff for: ‎e2e/animation-examples/package.json

+21-28
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,30 @@
11
{
22
"description": "NativeScript Application",
3+
"main": "main.js",
34
"license": "SEE LICENSE IN <your-license-filename>",
45
"readme": "NativeScript Application",
56
"repository": "<fill-your-repository-here>",
6-
"nativescript": {
7-
"id": "org.nativescript.ng4animations",
8-
"tns-ios": {
9-
"version": "6.5.2"
10-
},
11-
"tns-android": {
12-
"version": "latest"
13-
}
14-
},
157
"dependencies": {
16-
"@angular/animations": "~10.0.0",
17-
"@angular/common": "~10.0.0",
18-
"@angular/compiler": "~10.0.0",
19-
"@angular/core": "~10.0.0",
20-
"@angular/forms": "~10.0.0",
21-
"@angular/platform-browser": "~10.0.0",
22-
"@angular/platform-browser-dynamic": "~10.0.0",
23-
"@angular/router": "~10.0.0",
8+
"@angular/animations": "~10.1.0",
9+
"@angular/common": "~10.1.0",
10+
"@angular/compiler": "~10.1.0",
11+
"@angular/core": "~10.1.0",
12+
"@angular/forms": "~10.1.0",
13+
"@angular/platform-browser": "~10.1.0",
14+
"@angular/platform-browser-dynamic": "~10.1.0",
15+
"@angular/router": "~10.1.0",
2416
"@nativescript/angular": "file:../../dist/nativescript-angular-scoped.tgz",
2517
"nativescript-theme-core": "~1.0.2",
26-
"reflect-metadata": "~0.1.8",
27-
"rxjs": "~6.5.5",
28-
"@nativescript/core": "rc",
29-
"zone.js": "^0.10.3"
18+
"reflect-metadata": "~0.1.13",
19+
"rxjs": "~6.6.0",
20+
"@nativescript/core": "~7.0.0",
21+
"zone.js": "^0.11.1"
3022
},
3123
"devDependencies": {
32-
"@angular/compiler-cli": "~10.0.0",
33-
"@ngtools/webpack": "~10.0.0",
24+
"@angular/compiler-cli": "~10.1.0",
25+
"@nativescript/ios": "7.0.0",
26+
"@nativescript/webpack": "~3.0.0",
27+
"@ngtools/webpack": "~10.1.0",
3428
"@types/chai": "~4.2.0",
3529
"@types/mocha": "~7.0.0",
3630
"@types/node": "~14.0.0",
@@ -41,13 +35,12 @@
4135
"lazy": "~1.0.11",
4236
"mocha": "~8.0.1",
4337
"mochawesome": "~6.1.1",
44-
"node-sass": "~4.14.1",
4538
"nativescript-css-loader": "~0.26.0",
46-
"@nativescript/webpack": "rc",
39+
"node-sass": "~4.14.1",
4740
"typescript": "~3.9.0"
4841
},
4942
"scripts": {
50-
"clean": "npx rimraf hooks node_modules platforms package-lock.json",
43+
"clean": "ns clean",
5144
"setup": "cd ../../nativescript-angular && npm run prep.apps && cd ../e2e/animation-examples && npm run clean",
5245
"ngcc": "ngcc --properties es2015 module main --first-only",
5346
"postinstall": "npm run ngcc",
@@ -56,7 +49,7 @@
5649
"e2e-watch": "tsc -p e2e --watch",
5750
"ns-verify-bundle": "ns-verify-bundle",
5851
"update-ns-webpack": "update-ns-webpack",
59-
"ios": "tns debug ios --emulator --no-hmr",
60-
"android": "tns debug android --emulator --no-hmr"
52+
"ios": "ns debug ios --emulator --no-hmr",
53+
"android": "ns debug android --emulator --no-hmr"
6154
}
6255
}

Diff for: ‎e2e/tests-app-ng/package.json

+14-14
Original file line numberDiff line numberDiff line change
@@ -13,31 +13,31 @@
1313
}
1414
},
1515
"dependencies": {
16-
"@angular/animations": "~10.0.0",
17-
"@angular/common": "~10.0.0",
18-
"@angular/compiler": "~10.0.0",
19-
"@angular/core": "~10.0.0",
20-
"@angular/forms": "~10.0.0",
21-
"@angular/platform-browser": "~10.0.0",
22-
"@angular/platform-browser-dynamic": "~10.0.0",
23-
"@angular/router": "~10.0.0",
16+
"@angular/animations": "~10.1.0",
17+
"@angular/common": "~10.1.0",
18+
"@angular/compiler": "~10.1.0",
19+
"@angular/core": "~10.1.0",
20+
"@angular/forms": "~10.1.0",
21+
"@angular/platform-browser": "~10.1.0",
22+
"@angular/platform-browser-dynamic": "~10.1.0",
23+
"@angular/router": "~10.1.0",
2424
"@nativescript/angular": "file:../../dist/nativescript-angular-scoped.tgz",
2525
"nativescript-theme-core": "^1.0.4",
2626
"reflect-metadata": "~0.1.8",
27-
"rxjs": "~6.5.5",
28-
"@nativescript/core": "rc",
29-
"zone.js": "^0.10.3"
27+
"rxjs": "~6.6.0",
28+
"@nativescript/core": "~7.0.0",
29+
"zone.js": "^0.11.1"
3030
},
3131
"devDependencies": {
32-
"@angular/compiler-cli": "~10.0.0",
33-
"@ngtools/webpack": "~10.0.0",
32+
"@angular/compiler-cli": "~10.1.0",
33+
"@ngtools/webpack": "~10.1.0",
3434
"babel-traverse": "6.24.1",
3535
"babel-types": "6.24.1",
3636
"babylon": "6.17.0",
3737
"codelyzer": "^5.1.0",
3838
"filewalker": "^0.1.3",
3939
"lazy": "1.0.11",
40-
"@nativescript/webpack": "~2.1.1",
40+
"@nativescript/webpack": "~3.0.0",
4141
"typescript": "~3.9.0"
4242
},
4343
"scripts": {

Diff for: ‎e2e/tests-app-ng/references.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
/// <reference path="./node_modules/tns-core-modules/tns-core-modules.d.ts" /> Needed for autocompletion and compilation.
1+
/// <reference path="./node_modules/@nativescript/core/global-types.d.ts" />

Diff for: ‎nativescript-angular/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import '@nativescript/zone-js';
55
// investigate Ivy with templated-items-comp to allow standard zone below to be used instead of patched {N} zone above
66
// import 'zone.js/dist/zone';
77
import './dom-adapter';
8-
import 'nativescript-intl';
98
// import "./polyfills/array";
109
import './polyfills/console';
10+
import 'nativescript-intl';
1111

1212
export * from './platform-common';
1313
export * from './platform-providers';

Diff for: ‎nativescript-angular/package.json

+21-22
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/angular",
3-
"version": "10.0.3",
3+
"version": "10.1.0",
44
"description": "An Angular renderer that lets you build mobile apps with NativeScript.",
55
"homepage": "https://www.nativescript.org/",
66
"bugs": "https://github.com/NativeScript/nativescript-angular/issues",
@@ -58,42 +58,41 @@
5858
},
5959
"dependencies": {
6060
"@nativescript/zone-js": "~1.0.0",
61-
"nativescript-angular": "~10.0.0",
6261
"nativescript-intl": "^4.0.0"
6362
},
6463
"peerDependencies": {
65-
"@angular/common": "^10.0.0",
66-
"@angular/compiler": "^10.0.0",
67-
"@angular/core": "^10.0.0",
68-
"@angular/forms": "^10.0.0",
69-
"@angular/platform-browser": "^10.0.0",
70-
"@angular/platform-browser-dynamic": "^10.0.0",
71-
"@angular/router": "^10.0.0"
64+
"@angular/common": "^10.1.0",
65+
"@angular/compiler": "^10.1.0",
66+
"@angular/core": "^10.1.0",
67+
"@angular/forms": "^10.1.0",
68+
"@angular/platform-browser": "^10.1.0",
69+
"@angular/platform-browser-dynamic": "^10.1.0",
70+
"@angular/router": "^10.1.0"
7271
},
7372
"devDependencies": {
74-
"@angular/animations": "~10.0.0",
75-
"@angular/common": "~10.0.0",
76-
"@angular/compiler": "~10.0.0",
77-
"@angular/compiler-cli": "~10.0.0",
78-
"@angular/core": "~10.0.0",
79-
"@angular/forms": "~10.0.0",
80-
"@angular/platform-browser": "~10.0.0",
81-
"@angular/platform-browser-dynamic": "~10.0.0",
82-
"@angular/router": "~10.0.0",
83-
"@nativescript/core": "rc",
73+
"@angular/animations": "~10.1.0",
74+
"@angular/common": "~10.1.0",
75+
"@angular/compiler": "~10.1.0",
76+
"@angular/compiler-cli": "~10.1.0",
77+
"@angular/core": "~10.1.0",
78+
"@angular/forms": "~10.1.0",
79+
"@angular/platform-browser": "~10.1.0",
80+
"@angular/platform-browser-dynamic": "~10.1.0",
81+
"@angular/router": "~10.1.0",
82+
"@nativescript/core": "~7.0.0",
8483
"codelyzer": "^5.2.0",
8584
"conventional-changelog-cli": "^2.0.34",
8685
"husky": "^4.2.5",
8786
"lint-staged": "^10.2.11",
8887
"nativescript-typedoc-theme": "git://github.com/NativeScript/nativescript-typedoc-theme.git#master",
89-
"ng-packagr": "~10.0.0",
88+
"ng-packagr": "~10.1.0",
9089
"prettier": "^2.0.5",
91-
"rxjs": "~6.5.5",
90+
"rxjs": "~6.6.0",
9291
"tslint": "^6.1.2",
9392
"tslint-config-prettier": "^1.18.0",
9493
"typedoc": "~0.17.0",
9594
"typescript": "~3.9.0",
96-
"zone.js": "^0.10.3"
95+
"zone.js": "^0.11.1"
9796
},
9897
"husky": {
9998
"hooks": {

0 commit comments

Comments
 (0)