Skip to content

Support NG RC7 #448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 13, 2016
Merged

Support NG RC7 #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2eb4f8
feat(zone): Use zone-nativescript vendored below ./zone.js
hdeshev Sep 13, 2016
4f20e0f
feat(ng): Upgrade to RC7
hdeshev Sep 13, 2016
c29da8f
Version bump: 0.6.0
hdeshev Sep 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions doc/upgrading-zonejs.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Upgrading Zone.js

`nativescript-angular` uses a fork of the `zone.js` package in order to work around incompatibilities between node, browser, and mobile implementations.

The fork resides at https://github.com/NativeScript/zone.js in the `zone-nativescript` branch. It adds a separate `lib/nativescript/nativescript.ts` entry point that is used to generate a new bundle: `dist/zone-nativescript.js`.

To upgrade to a newer release of `zone.js`:

1. Identify the upgrade target -- most likely a release tag.
2. Rebase the `zone-nativescript` branch on top of the upgrade target.
3. Rebuild: `gulp build`
4. Run the node-based smoke tests: `gulp test/nativescript`
5. Run the browser tests: `node_modules/.bin/karma start karma.conf.js --single-run` (You need to run node `test/ws-server.js` in a separate console first)
6. Commit `dist/zone-nativescript.js`, drop the previous `dist/zone-nativescript.js` commit from the branch. Force push the new `zone-nativescript` branch to GitHub.
7. Update your copy of `nativescript-angular/zone.js/dist/zone-nativescript.js` with the bundle you just built.
24 changes: 12 additions & 12 deletions nativescript-angular/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "nativescript-angular",
"version": "0.5.1",
"version": "0.6.0",
"description": "An Angular 2 renderer that lets you build mobile apps with NativeScript.",
"homepage": "http://www.telerik.com",
"bugs": "http://www.telerik.com",
Expand All @@ -19,17 +19,16 @@
},
"dependencies": {
"nativescript-intl": "^0.0.4",
"@angular/core": "2.0.0-rc.6",
"@angular/common": "2.0.0-rc.6",
"@angular/compiler": "2.0.0-rc.6",
"@angular/http": "2.0.0-rc.6",
"@angular/platform-browser": "2.0.0-rc.6",
"@angular/platform-browser-dynamic": "2.0.0-rc.6",
"@angular/platform-server": "2.0.0-rc.6",
"@angular/forms": "2.0.0-rc.6",
"@angular/router": "3.0.0-rc.2",
"rxjs": "5.0.0-beta.11",
"zone.js": "^0.6.17",
"@angular/core": "2.0.0-rc.7",
"@angular/common": "2.0.0-rc.7",
"@angular/compiler": "2.0.0-rc.7",
"@angular/http": "2.0.0-rc.7",
"@angular/platform-browser": "2.0.0-rc.7",
"@angular/platform-browser-dynamic": "2.0.0-rc.7",
"@angular/platform-server": "2.0.0-rc.7",
"@angular/forms": "2.0.0-rc.7",
"@angular/router": "3.0.0-rc.3",
"rxjs": "5.0.0-beta.12",
"reflect-metadata": "^0.1.8",
"parse5": "1.3.2",
"punycode": "1.3.2",
Expand All @@ -38,6 +37,7 @@
},
"devDependencies": {
"tns-core-modules": ">=2.2.0 || >=2.2.0-2016",
"zone.js": "^0.6.21",
"typescript": "^1.8.10"
},
"nativescript": {}
Expand Down
2 changes: 1 addition & 1 deletion nativescript-angular/platform.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'globals';
import "zone.js/dist/zone-node";
import "./zone.js/dist/zone-nativescript";

import 'reflect-metadata';
import './polyfills/array';
Expand Down
Loading