From 2a8656b6a2c4749e0123a7eeb2eef7d73006bd2f Mon Sep 17 00:00:00 2001 From: Marc Laval Date: Sat, 17 Sep 2016 00:01:24 +0200 Subject: [PATCH] chore(deps): update Angular to 2.0.0 --- README.md | 4 ++-- gulpfile.js | 4 +++- package.json | 22 +++++++++++----------- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 644fcd6..c882ea8 100644 --- a/README.md +++ b/README.md @@ -23,11 +23,11 @@ Creating the sample project: Android: * `gulp start.android` to launch the sample on the connected device or emulator, and watch sources for auto update (if enabled in F2/shake dev menu) -*use the `Reload JS` button after the initial red screen* +* `gulp start.android.aot` to launch the some with AoT compilation iOS: * `gulp start.ios` to launch the sample on an emulator, and watch sources for auto update (it will fail the first due to initial compilation, simply restart it) -* OR, `gulp watch` and open `.dist/app/ngReactNative/ios/ngReactNative.xcodeproj` in Xcode and hit `Run` +* `gulp start.ios.aot` to launch the some with AoT compilation Tests: * `gulp test.browser` to run tests in Chrome diff --git a/gulpfile.js b/gulpfile.js index 9313259..a5a862e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -300,7 +300,7 @@ gulp.task('publish.transform', ['publish.copy.source'], function (done) { runSequence('transform', done); }); gulp.task('publish.ngc.src', ['publish.transform'], function (done) { - exec('./node_modules/.bin/ngc -p ./dist/tmp/src', function(e, stdout) { + exec(ngcExecutable + ' -p ./dist/tmp/src', function(e, stdout) { if (e) console.log(e); if (done) done(); }).stdout.on('data', function(data) { @@ -476,6 +476,8 @@ function customReporter() { error: (error) => { if (error.relativeFilename && error.message.indexOf(`Module '"react-native"' has no exported member`) == -1 && error.message.indexOf(`Module ''angular2-react-native'' has no exported member`) == -1 && + error.message.indexOf(`Module ''angular2-react-native/android'' has no exported member`) == -1 && + error.message.indexOf(`Module ''angular2-react-native/ios'' has no exported member`) == -1 && error.message.indexOf(`src\\angular2-react-native.d.ts`) == -1 && error.message.indexOf(`src\\angular2-react-native-android.d.ts`) == -1 && error.message.indexOf(`src\\angular2-react-native-ios.d.ts`) == -1 && diff --git a/package.json b/package.json index e8615db..e255e2f 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ }, "homepage": "https://github.com/angular/react-native-renderer/", "devDependencies": { - "@angular/compiler-cli": "0.6.0", + "@angular/compiler-cli": "0.6.2", "babel-preset-es2015": "^6.14.0", "del": "^1.2.0", "glob": "^4.0.6", @@ -52,18 +52,18 @@ "typescript": "^2.0.2" }, "dependencies": { - "@angular/common": "v2.0.0-rc.6", - "@angular/compiler": "v2.0.0-rc.6", - "@angular/core": "v2.0.0-rc.6", - "@angular/http": "v2.0.0-rc.6", - "@angular/platform-browser": "v2.0.0-rc.6", - "@angular/platform-browser-dynamic": "v2.0.0-rc.6", - "@angular/platform-server": "v2.0.0-rc.6", - "@angular/router": "3.0.0-rc.2", + "@angular/common": "2.0.0", + "@angular/compiler": "2.0.0", + "@angular/core": "2.0.0", + "@angular/http": "2.0.0", + "@angular/platform-browser": "2.0.0", + "@angular/platform-browser-dynamic": "2.0.0", + "@angular/platform-server": "2.0.0", + "@angular/router": "3.0.0", "hammerjs": "2.0.6", "react-native": "0.32.0", "reflect-metadata": "0.1.8", - "rxjs": "5.0.0-beta.11", - "zone.js": "0.6.17" + "rxjs": "5.0.0-beta.12", + "zone.js": "mlaval/zone.js#0.6.23-fixed-for-RN" } }