Skip to content

Commit 4f20e0f

Browse files
hdeshevhdeshev
committed
feat(ng): Upgrade to RC7
1 parent d2eb4f8 commit 4f20e0f

File tree

5 files changed

+36
-36
lines changed

5 files changed

+36
-36
lines changed

‎nativescript-angular/package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@
1919
},
2020
"dependencies": {
2121
"nativescript-intl": "^0.0.4",
22-
"@angular/core": "2.0.0-rc.6",
23-
"@angular/common": "2.0.0-rc.6",
24-
"@angular/compiler": "2.0.0-rc.6",
25-
"@angular/http": "2.0.0-rc.6",
26-
"@angular/platform-browser": "2.0.0-rc.6",
27-
"@angular/platform-browser-dynamic": "2.0.0-rc.6",
28-
"@angular/platform-server": "2.0.0-rc.6",
29-
"@angular/forms": "2.0.0-rc.6",
30-
"@angular/router": "3.0.0-rc.2",
31-
"rxjs": "5.0.0-beta.11",
22+
"@angular/core": "2.0.0-rc.7",
23+
"@angular/common": "2.0.0-rc.7",
24+
"@angular/compiler": "2.0.0-rc.7",
25+
"@angular/http": "2.0.0-rc.7",
26+
"@angular/platform-browser": "2.0.0-rc.7",
27+
"@angular/platform-browser-dynamic": "2.0.0-rc.7",
28+
"@angular/platform-server": "2.0.0-rc.7",
29+
"@angular/forms": "2.0.0-rc.7",
30+
"@angular/router": "3.0.0-rc.3",
31+
"rxjs": "5.0.0-beta.12",
3232
"reflect-metadata": "^0.1.8",
3333
"parse5": "1.3.2",
3434
"punycode": "1.3.2",
@@ -37,7 +37,7 @@
3737
},
3838
"devDependencies": {
3939
"tns-core-modules": ">=2.2.0 || >=2.2.0-2016",
40-
"zone.js": "^0.6.17",
40+
"zone.js": "^0.6.21",
4141
"typescript": "^1.8.10"
4242
},
4343
"nativescript": {}

‎ng-sample/app/app.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ import { AnimationKeyframesTest } from "./examples/animation/animation-keyframes
4545
import { AnimationNgClassTest } from "./examples/animation/animation-ngclass-test";
4646
import { AnimationStatesTest } from "./examples/animation/animation-states-test";
4747

48-
//nativeScriptBootstrap(ActionBarTest, [NS_ROUTER_PROVIDERS_DEPRECATED], { startPageActionBarHidden: false });
49-
//nativeScriptBootstrap(ActionBarTest, [NS_ROUTER_PROVIDERS_DEPRECATED]);
50-
5148
@NgModule({
5249
declarations: [
5350
],
@@ -122,7 +119,7 @@ function makeExampleModule(componentType) {
122119
//platformNativeScriptDynamic().bootstrapModule(makeExampleModule(AnimationStatesTest));
123120
//platformNativeScriptDynamic().bootstrapModule(makeExampleModule(AnimationNgClassTest));
124121
//platformNativeScriptDynamic().bootstrapModule(makeExampleModule(AnimationKeyframesTest));
125-
platformNativeScriptDynamic().bootstrapModule(makeExampleModule(AnimationEnterLeaveTest));
122+
//platformNativeScriptDynamic().bootstrapModule(makeExampleModule(AnimationEnterLeaveTest));
126123

127124
//Livesync test
128125
var cachedUrl: string;
@@ -144,5 +141,5 @@ onAfterLivesync.subscribe((moduleRef) => {
144141
}
145142
});
146143

147-
//platformNativeScriptDynamic().bootstrapModule(makeExampleModule(LivesyncApp));
144+
platformNativeScriptDynamic().bootstrapModule(makeExampleModule(LivesyncApp));
148145
console.log("APP RESTART");

‎ng-sample/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,23 @@
2626
"tns-core-modules": "2.2.1",
2727
"nativescript-angular": "file:../nativescript-angular",
2828
"nativescript-intl": "^0.0.2",
29-
"@angular/core": "2.0.0-rc.6",
30-
"@angular/common": "2.0.0-rc.6",
31-
"@angular/compiler": "2.0.0-rc.6",
32-
"@angular/http": "2.0.0-rc.6",
33-
"@angular/platform-browser": "2.0.0-rc.6",
34-
"@angular/platform-browser-dynamic": "2.0.0-rc.6",
35-
"@angular/platform-server": "2.0.0-rc.6",
36-
"@angular/router": "3.0.0-rc.2",
37-
"rxjs": "5.0.0-beta.11",
29+
"@angular/core": "2.0.0-rc.7",
30+
"@angular/common": "2.0.0-rc.7",
31+
"@angular/compiler": "2.0.0-rc.7",
32+
"@angular/http": "2.0.0-rc.7",
33+
"@angular/platform-browser": "2.0.0-rc.7",
34+
"@angular/platform-browser-dynamic": "2.0.0-rc.7",
35+
"@angular/platform-server": "2.0.0-rc.7",
36+
"@angular/router": "3.0.0-rc.3",
37+
"rxjs": "5.0.0-beta.12",
3838
"reflect-metadata": "^0.1.8",
3939
"parse5": "1.3.2",
4040
"punycode": "1.3.2",
4141
"querystring": "0.2.0",
4242
"url": "0.10.3"
4343
},
4444
"devDependencies": {
45-
"zone.js": "^0.6.17",
45+
"zone.js": "^0.6.21",
4646
"babel-traverse": "6.9.0",
4747
"babel-types": "6.10.0",
4848
"babylon": "6.8.1",

‎tests/app/tests/modal-dialog.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ export class ModalComponent {
2424

2525
@Component({
2626
selector: "fail-comp",
27+
providers: [ModalDialogService],
2728
template: `<Label text="This app is doomed"></Label>`
2829

2930
})
@@ -34,6 +35,7 @@ export class FailComponent {
3435

3536
@Component({
3637
selector: "sucess-comp",
38+
providers: [ModalDialogService],
3739
template: `
3840
<GridLayout modal-dialog-host margin="20">
3941
<Label text="Modal dialogs"></Label>

‎tests/package.json

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,23 @@
2626
"nativescript-unit-test-runner": "^0.3.3",
2727
"tns-core-modules": "2.2.1",
2828
"nativescript-angular": "file:../nativescript-angular",
29-
"@angular/core": "2.0.0-rc.6",
30-
"@angular/common": "2.0.0-rc.6",
31-
"@angular/compiler": "2.0.0-rc.6",
32-
"@angular/http": "2.0.0-rc.6",
33-
"@angular/platform-browser": "2.0.0-rc.6",
34-
"@angular/platform-browser-dynamic": "2.0.0-rc.6",
35-
"@angular/platform-server": "2.0.0-rc.6",
36-
"@angular/router": "3.0.0-rc.2",
37-
"rxjs": "5.0.0-beta.11",
29+
"@angular/core": "2.0.0-rc.7",
30+
"@angular/common": "2.0.0-rc.7",
31+
"@angular/compiler": "2.0.0-rc.7",
32+
"@angular/http": "2.0.0-rc.7",
33+
"@angular/platform-browser": "2.0.0-rc.7",
34+
"@angular/platform-browser-dynamic": "2.0.0-rc.7",
35+
"@angular/platform-server": "2.0.0-rc.7",
36+
"@angular/router": "3.0.0-rc.3",
37+
"rxjs": "5.0.0-beta.12",
3838
"reflect-metadata": "^0.1.8",
3939
"parse5": "1.3.2",
4040
"punycode": "1.3.2",
4141
"querystring": "0.2.0",
4242
"url": "0.10.3"
4343
},
4444
"devDependencies": {
45+
"zone.js": "^0.6.21",
4546
"babel-traverse": "6.8.0",
4647
"babel-types": "6.8.1",
4748
"babylon": "6.8.0",
@@ -67,4 +68,4 @@
6768
"run-appium-android": "nativescript-dev-appium android",
6869
"appium-ios-simulator": "tns build ios && nativescript-dev-appium ios-simulator"
6970
}
70-
}
71+
}

0 commit comments

Comments
 (0)