Skip to content

Commit 9feea4b

Browse files
committed
chore: ng 10.1 and ns 7
1 parent 7d49a4d commit 9feea4b

File tree

6 files changed

+38
-43
lines changed

6 files changed

+38
-43
lines changed

e2e/animation-examples/app/package.json

-9
This file was deleted.
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

e2e/animation-examples/package.json

+7-14
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
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": {
168
"@angular/animations": "~10.1.0",
179
"@angular/common": "~10.1.0",
@@ -30,6 +22,8 @@
3022
},
3123
"devDependencies": {
3224
"@angular/compiler-cli": "~10.1.0",
25+
"@nativescript/ios": "7.0.0",
26+
"@nativescript/webpack": "~3.0.0",
3327
"@ngtools/webpack": "~10.1.0",
3428
"@types/chai": "~4.2.0",
3529
"@types/mocha": "~7.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": "~3.0.0",
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
}

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": {

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" />

nativescript-angular/index.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// Initial imports and polyfills
2-
require('@nativescript/core');
3-
require('@nativescript/zone-js');
2+
import '@nativescript/core';
3+
import '@nativescript/zone-js';
44
// TODO: migrate to standard zone.js if possible
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';
7-
require('./dom-adapter');
8-
require('nativescript-intl');
7+
import './dom-adapter';
98
// import "./polyfills/array";
10-
require('./polyfills/console');
9+
import './polyfills/console';
10+
import 'nativescript-intl';
1111

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

0 commit comments

Comments
 (0)