Skip to content

Commit 28c103b

Browse files
committed
fix(animations): use imports from @angular/animations/browser
1 parent b5f3f4d commit 28c103b

File tree

7 files changed

+17
-13
lines changed

7 files changed

+17
-13
lines changed

Diff for: nativescript-angular/animations.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ import {
44
AnimationDriver,
55
ɵAnimationEngine as AnimationEngine,
66
ɵAnimationStyleNormalizer as AnimationStyleNormalizer,
7-
ɵAnimationRendererFactory as AnimationRendererFactory,
8-
ɵg as WebAnimationsStyleNormalizer
9-
} from "@angular/platform-browser/animations";
7+
ɵWebAnimationsStyleNormalizer as WebAnimationsStyleNormalizer
8+
} from "@angular/animations/browser";
9+
10+
import { ɵAnimationRendererFactory as AnimationRendererFactory } from "@angular/platform-browser/animations";
1011

1112
import { NativeScriptAnimationEngine } from "./animations/animation-engine";
1213
import { NativeScriptAnimationDriver } from "./animations/animation-driver";

Diff for: nativescript-angular/animations/animation-engine.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ɵDomAnimationEngine as DomAnimationEngine } from "@angular/platform-browser/animations";
1+
import { ɵDomAnimationEngine as DomAnimationEngine } from "@angular/animations/browser";
22
import { AnimationEvent, AnimationPlayer } from "@angular/animations";
33

44
import { NgView } from "../element-registry";

Diff for: nativescript-angular/index.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import "application";
22

3-
export * from "./animations";
43
export * from "./platform-common";
54
export * from "./platform";
65
export * from "./platform-static";

Diff for: nativescript-angular/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
},
2626
"dependencies": {
2727
"nativescript-intl": "~0.0.8",
28-
"@angular/animations": "4.0.0-rc.5",
2928
"@angular/core": "4.0.0-rc.5",
3029
"@angular/common": "4.0.0-rc.5",
3130
"@angular/compiler": "4.0.0-rc.5",
@@ -41,6 +40,7 @@
4140
"url": "0.10.3"
4241
},
4342
"devDependencies": {
43+
"@angular/animations": "4.0.0-rc.5",
4444
"@angular/compiler-cli": "4.0.0-rc.5",
4545
"codelyzer": "~2.0.0",
4646
"tns-core-modules": "internal-preview",

Diff for: ng-sample/app/app.ts

+6-3
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,10 @@ import { AnimationStatesTest } from "./examples/animation/animation-states-test"
7171
class ExampleModule { }
7272

7373
function makeExampleModule(componentType) {
74-
let imports: any[] = [NativeScriptAnimationsModule, ExampleModule];
74+
let imports: any[] = [
75+
NativeScriptAnimationsModule,
76+
ExampleModule,
77+
];
7578
if (componentType.routes) {
7679
imports.push(NativeScriptRouterModule.forRoot(componentType.routes))
7780
}
@@ -136,9 +139,9 @@ const customPageFactoryProvider = {
136139
// platformNativeScriptDynamic().bootstrapModule(makeExampleModule(LoginAppComponent));
137140

138141
// animations
139-
platformNativeScriptDynamic().bootstrapModule(makeExampleModule(AnimationStatesTest));
142+
// platformNativeScriptDynamic().bootstrapModule(makeExampleModule(AnimationStatesTest));
140143
// platformNativeScriptDynamic().bootstrapModule(makeExampleModule(AnimationNgClassTest));
141-
// platformNativeScriptDynamic().bootstrapModule(makeExampleModule(AnimationKeyframesTest));
144+
platformNativeScriptDynamic().bootstrapModule(makeExampleModule(AnimationKeyframesTest));
142145
// platformNativeScriptDynamic().bootstrapModule(makeExampleModule(AnimationEnterLeaveTest));
143146

144147
//Livesync test

Diff for: ng-sample/package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
},
2424
"homepage": "https://github.com/NativeScript/template-hello-world",
2525
"dependencies": {
26+
"@angular/animations": "4.0.0-rc.5",
2627
"@angular/common": "4.0.0-rc.5",
2728
"@angular/compiler": "4.0.0-rc.5",
2829
"@angular/core": "4.0.0-rc.5",
@@ -33,10 +34,10 @@
3334
"@angular/router": "4.0.0-rc.5",
3435
"nativescript-angular": "file:../nativescript-angular",
3536
"rxjs": "~5.0.1",
36-
"tns-core-modules": "internal-preview"
37+
"tns-core-modules": "internal-preview",
38+
"zone.js": "~0.8.2"
3739
},
3840
"devDependencies": {
39-
"zone.js": "~0.7.2",
4041
"babel-traverse": "6.9.0",
4142
"babel-types": "6.10.0",
4243
"babylon": "6.8.1",

Diff for: tests/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"nativescript-angular": "internal-preview",
3737
"nativescript-unit-test-runner": "^0.3.4",
3838
"rxjs": "~5.0.1",
39+
"zone.js": "^0.8.2",
3940
"tns-core-modules": "internal-preview"
4041
},
4142
"devDependencies": {
@@ -58,8 +59,7 @@
5859
"socket.io": "1.4.8",
5960
"socket.io-client": "1.4.8",
6061
"typescript": "~2.2.0",
61-
"wd": "0.4.0",
62-
"zone.js": "^0.7.2"
62+
"wd": "0.4.0"
6363
},
6464
"scripts": {
6565
"updateTests": "grunt updateTests",

0 commit comments

Comments
 (0)