Skip to content

Commit

Permalink
feat(angular): ng 10.1 and ns 7 (#2237)
Browse files Browse the repository at this point in the history
  • Loading branch information
NathanWalker authored Sep 4, 2020
1 parent 737a5df commit 548e074
Show file tree
Hide file tree
Showing 7 changed files with 69 additions and 75 deletions.
9 changes: 0 additions & 9 deletions e2e/animation-examples/app/package.json

This file was deleted.

11 changes: 11 additions & 0 deletions e2e/animation-examples/nativescript.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { NativeScriptConfig } from '@nativescript/core'

export default {
id: 'org.nativescript.ng4animations',
appResourcesPath: 'app/App_Resources',
android: {
v8Flags: '--expose_gc',
markingMode: 'none',
},
appPath: 'app',
} as NativeScriptConfig
49 changes: 21 additions & 28 deletions e2e/animation-examples/package.json
Original file line number Diff line number Diff line change
@@ -1,36 +1,30 @@
{
"description": "NativeScript Application",
"main": "main.js",
"license": "SEE LICENSE IN <your-license-filename>",
"readme": "NativeScript Application",
"repository": "<fill-your-repository-here>",
"nativescript": {
"id": "org.nativescript.ng4animations",
"tns-ios": {
"version": "6.5.2"
},
"tns-android": {
"version": "latest"
}
},
"dependencies": {
"@angular/animations": "~10.0.0",
"@angular/common": "~10.0.0",
"@angular/compiler": "~10.0.0",
"@angular/core": "~10.0.0",
"@angular/forms": "~10.0.0",
"@angular/platform-browser": "~10.0.0",
"@angular/platform-browser-dynamic": "~10.0.0",
"@angular/router": "~10.0.0",
"@angular/animations": "~10.1.0",
"@angular/common": "~10.1.0",
"@angular/compiler": "~10.1.0",
"@angular/core": "~10.1.0",
"@angular/forms": "~10.1.0",
"@angular/platform-browser": "~10.1.0",
"@angular/platform-browser-dynamic": "~10.1.0",
"@angular/router": "~10.1.0",
"@nativescript/angular": "file:../../dist/nativescript-angular-scoped.tgz",
"nativescript-theme-core": "~1.0.2",
"reflect-metadata": "~0.1.8",
"rxjs": "~6.5.5",
"@nativescript/core": "rc",
"zone.js": "^0.10.3"
"reflect-metadata": "~0.1.13",
"rxjs": "~6.6.0",
"@nativescript/core": "~7.0.0",
"zone.js": "^0.11.1"
},
"devDependencies": {
"@angular/compiler-cli": "~10.0.0",
"@ngtools/webpack": "~10.0.0",
"@angular/compiler-cli": "~10.1.0",
"@nativescript/ios": "7.0.0",
"@nativescript/webpack": "~3.0.0",
"@ngtools/webpack": "~10.1.0",
"@types/chai": "~4.2.0",
"@types/mocha": "~7.0.0",
"@types/node": "~14.0.0",
Expand All @@ -41,13 +35,12 @@
"lazy": "~1.0.11",
"mocha": "~8.0.1",
"mochawesome": "~6.1.1",
"node-sass": "~4.14.1",
"nativescript-css-loader": "~0.26.0",
"@nativescript/webpack": "rc",
"node-sass": "~4.14.1",
"typescript": "~3.9.0"
},
"scripts": {
"clean": "npx rimraf hooks node_modules platforms package-lock.json",
"clean": "ns clean",
"setup": "cd ../../nativescript-angular && npm run prep.apps && cd ../e2e/animation-examples && npm run clean",
"ngcc": "ngcc --properties es2015 module main --first-only",
"postinstall": "npm run ngcc",
Expand All @@ -56,7 +49,7 @@
"e2e-watch": "tsc -p e2e --watch",
"ns-verify-bundle": "ns-verify-bundle",
"update-ns-webpack": "update-ns-webpack",
"ios": "tns debug ios --emulator --no-hmr",
"android": "tns debug android --emulator --no-hmr"
"ios": "ns debug ios --emulator --no-hmr",
"android": "ns debug android --emulator --no-hmr"
}
}
28 changes: 14 additions & 14 deletions e2e/tests-app-ng/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,31 @@
}
},
"dependencies": {
"@angular/animations": "~10.0.0",
"@angular/common": "~10.0.0",
"@angular/compiler": "~10.0.0",
"@angular/core": "~10.0.0",
"@angular/forms": "~10.0.0",
"@angular/platform-browser": "~10.0.0",
"@angular/platform-browser-dynamic": "~10.0.0",
"@angular/router": "~10.0.0",
"@angular/animations": "~10.1.0",
"@angular/common": "~10.1.0",
"@angular/compiler": "~10.1.0",
"@angular/core": "~10.1.0",
"@angular/forms": "~10.1.0",
"@angular/platform-browser": "~10.1.0",
"@angular/platform-browser-dynamic": "~10.1.0",
"@angular/router": "~10.1.0",
"@nativescript/angular": "file:../../dist/nativescript-angular-scoped.tgz",
"nativescript-theme-core": "^1.0.4",
"reflect-metadata": "~0.1.8",
"rxjs": "~6.5.5",
"@nativescript/core": "rc",
"zone.js": "^0.10.3"
"rxjs": "~6.6.0",
"@nativescript/core": "~7.0.0",
"zone.js": "^0.11.1"
},
"devDependencies": {
"@angular/compiler-cli": "~10.0.0",
"@ngtools/webpack": "~10.0.0",
"@angular/compiler-cli": "~10.1.0",
"@ngtools/webpack": "~10.1.0",
"babel-traverse": "6.24.1",
"babel-types": "6.24.1",
"babylon": "6.17.0",
"codelyzer": "^5.1.0",
"filewalker": "^0.1.3",
"lazy": "1.0.11",
"@nativescript/webpack": "~2.1.1",
"@nativescript/webpack": "~3.0.0",
"typescript": "~3.9.0"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion e2e/tests-app-ng/references.d.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/// <reference path="./node_modules/tns-core-modules/tns-core-modules.d.ts" /> Needed for autocompletion and compilation.
/// <reference path="./node_modules/@nativescript/core/global-types.d.ts" />
2 changes: 1 addition & 1 deletion nativescript-angular/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import '@nativescript/zone-js';
// investigate Ivy with templated-items-comp to allow standard zone below to be used instead of patched {N} zone above
// import 'zone.js/dist/zone';
import './dom-adapter';
import 'nativescript-intl';
// import "./polyfills/array";
import './polyfills/console';
import 'nativescript-intl';

export * from './platform-common';
export * from './platform-providers';
Expand Down
43 changes: 21 additions & 22 deletions nativescript-angular/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nativescript/angular",
"version": "10.0.3",
"version": "10.1.0",
"description": "An Angular renderer that lets you build mobile apps with NativeScript.",
"homepage": "https://www.nativescript.org/",
"bugs": "https://github.com/NativeScript/nativescript-angular/issues",
Expand Down Expand Up @@ -58,42 +58,41 @@
},
"dependencies": {
"@nativescript/zone-js": "~1.0.0",
"nativescript-angular": "~10.0.0",
"nativescript-intl": "^4.0.0"
},
"peerDependencies": {
"@angular/common": "^10.0.0",
"@angular/compiler": "^10.0.0",
"@angular/core": "^10.0.0",
"@angular/forms": "^10.0.0",
"@angular/platform-browser": "^10.0.0",
"@angular/platform-browser-dynamic": "^10.0.0",
"@angular/router": "^10.0.0"
"@angular/common": "^10.1.0",
"@angular/compiler": "^10.1.0",
"@angular/core": "^10.1.0",
"@angular/forms": "^10.1.0",
"@angular/platform-browser": "^10.1.0",
"@angular/platform-browser-dynamic": "^10.1.0",
"@angular/router": "^10.1.0"
},
"devDependencies": {
"@angular/animations": "~10.0.0",
"@angular/common": "~10.0.0",
"@angular/compiler": "~10.0.0",
"@angular/compiler-cli": "~10.0.0",
"@angular/core": "~10.0.0",
"@angular/forms": "~10.0.0",
"@angular/platform-browser": "~10.0.0",
"@angular/platform-browser-dynamic": "~10.0.0",
"@angular/router": "~10.0.0",
"@nativescript/core": "rc",
"@angular/animations": "~10.1.0",
"@angular/common": "~10.1.0",
"@angular/compiler": "~10.1.0",
"@angular/compiler-cli": "~10.1.0",
"@angular/core": "~10.1.0",
"@angular/forms": "~10.1.0",
"@angular/platform-browser": "~10.1.0",
"@angular/platform-browser-dynamic": "~10.1.0",
"@angular/router": "~10.1.0",
"@nativescript/core": "~7.0.0",
"codelyzer": "^5.2.0",
"conventional-changelog-cli": "^2.0.34",
"husky": "^4.2.5",
"lint-staged": "^10.2.11",
"nativescript-typedoc-theme": "git://github.com/NativeScript/nativescript-typedoc-theme.git#master",
"ng-packagr": "~10.0.0",
"ng-packagr": "~10.1.0",
"prettier": "^2.0.5",
"rxjs": "~6.5.5",
"rxjs": "~6.6.0",
"tslint": "^6.1.2",
"tslint-config-prettier": "^1.18.0",
"typedoc": "~0.17.0",
"typescript": "~3.9.0",
"zone.js": "^0.10.3"
"zone.js": "^0.11.1"
},
"husky": {
"hooks": {
Expand Down

0 comments on commit 548e074

Please sign in to comment.