diff --git a/aio/content/examples/router/src/app/animations.ts b/aio/content/examples/router/src/app/animations.ts index d7a55d721f..39a0b1840a 100644 --- a/aio/content/examples/router/src/app/animations.ts +++ b/aio/content/examples/router/src/app/animations.ts @@ -1,8 +1,8 @@ // #docregion -import { animate, AnimationEntryMetadata, state, style, transition, trigger } from '@angular/core'; +import { animate, state, style, transition, trigger } from '@angular/animations'; // Component transition animations -export const slideInDownAnimation: AnimationEntryMetadata = +export const slideInDownAnimation = trigger('routeAnimation', [ state('*', style({ diff --git a/modules/playground/src/animate/app/animate-app.ts b/modules/playground/src/animate/app/animate-app.ts index 9df5fd62b6..0dba74ec69 100644 --- a/modules/playground/src/animate/app/animate-app.ts +++ b/modules/playground/src/animate/app/animate-app.ts @@ -6,7 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ -import {Component, animate, keyframes, state, style, transition, trigger} from '@angular/core'; +import {animate, keyframes, state, style, transition, trigger} from '@angular/animations'; +import {Component} from '@angular/core'; @Component({ host: { diff --git a/modules/playground/src/animate/index.ts b/modules/playground/src/animate/index.ts index 8a6d93f448..68ef663588 100644 --- a/modules/playground/src/animate/index.ts +++ b/modules/playground/src/animate/index.ts @@ -6,12 +6,12 @@ * found in the LICENSE file at https://angular.io/license */ import {NgModule} from '@angular/core'; -import {BrowserModule} from '@angular/platform-browser'; import {platformBrowserDynamic} from '@angular/platform-browser-dynamic'; +import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import {AnimateApp} from './app/animate-app'; -@NgModule({declarations: [AnimateApp], bootstrap: [AnimateApp], imports: [BrowserModule]}) +@NgModule({declarations: [AnimateApp], bootstrap: [AnimateApp], imports: [BrowserAnimationsModule]}) class ExampleModule { } diff --git a/modules/playground/src/web_workers/animations/index_common.ts b/modules/playground/src/web_workers/animations/index_common.ts index 5f6d1d2a2e..bd15fc482a 100644 --- a/modules/playground/src/web_workers/animations/index_common.ts +++ b/modules/playground/src/web_workers/animations/index_common.ts @@ -6,7 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ -import {Component, animate, state, style, transition, trigger} from '@angular/core'; +import {animate, state, style, transition, trigger} from '@angular/animations'; +import {Component} from '@angular/core'; @Component({ selector: 'animation-app', diff --git a/packages/animations/browser/test/dsl/animation_spec.ts b/packages/animations/browser/test/dsl/animation_spec.ts index b683604796..c73f49fee1 100644 --- a/packages/animations/browser/test/dsl/animation_spec.ts +++ b/packages/animations/browser/test/dsl/animation_spec.ts @@ -5,8 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import {AUTO_STYLE, AnimationMetadata, AnimationMetadataType, animate, animation, group, keyframes, query, sequence, state, style, transition, trigger, useAnimation, ɵStyleData} from '@angular/animations'; -import {AnimationOptions} from '@angular/core/src/animation/dsl'; +import {AUTO_STYLE, AnimationMetadata, AnimationMetadataType, AnimationOptions, animate, animation, group, keyframes, query, sequence, state, style, transition, trigger, useAnimation, ɵStyleData} from '@angular/animations'; import {Animation} from '../../src/dsl/animation'; import {buildAnimationAst} from '../../src/dsl/animation_ast_builder'; diff --git a/packages/core/src/animation/animation_metadata_wrapped.ts b/packages/core/src/animation/animation_metadata_wrapped.ts deleted file mode 100644 index 86d6c15ed6..0000000000 --- a/packages/core/src/animation/animation_metadata_wrapped.ts +++ /dev/null @@ -1,150 +0,0 @@ -/** - * @license - * Copyright Google Inc. All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.io/license - */ -import {AnimateTimings, AnimationMetadataType, animate as _animate, group as _group, keyframes as _keyframes, sequence as _sequence, state as _state, style as _style, transition as _transition, trigger as _trigger} from './dsl'; - - -/** - * @deprecated This symbol has moved. Please Import from @angular/animations instead! - */ -export const AUTO_STYLE = '*'; - -/** - * @deprecated This symbol has moved. Please Import from @angular/animations instead! - */ -export interface AnimationMetadata { type: AnimationMetadataType; } - -/** - * @deprecated This symbol has moved. Please Import from @angular/animations instead! - */ -export interface AnimationTriggerMetadata { - name: string; - definitions: AnimationMetadata[]; -} - -/** - * @deprecated This symbol has moved. Please Import from @angular/animations instead! - */ -export interface AnimationStateMetadata extends AnimationMetadata { - name: string; - styles: AnimationStyleMetadata; -} - -/** - * @deprecated This symbol has moved. Please Import from @angular/animations instead! - */ -export interface AnimationTransitionMetadata extends AnimationMetadata { - expr: string| - ((fromState: string, toState: string, element: any, params: {[key: string]: any}) => boolean); - animation: AnimationMetadata|AnimationMetadata[]; -} - -/** - * @deprecated This symbol has moved. Please Import from @angular/animations instead! - */ -export interface AnimationKeyframesSequenceMetadata extends AnimationMetadata { - steps: AnimationStyleMetadata[]; -} - -/** - * @deprecated This symbol has moved. Please Import from @angular/animations instead! - */ -export interface AnimationStyleMetadata extends AnimationMetadata { - styles: '*'|{[key: string]: string | number}|Array<{[key: string]: string | number}|'*'>; - offset: number|null; -} - -/** - * @deprecated This symbol has moved. Please Import from @angular/animations instead! - */ -export interface AnimationAnimateMetadata extends AnimationMetadata { - timings: string|number|AnimateTimings; - styles: AnimationStyleMetadata|AnimationKeyframesSequenceMetadata|null; -} - -/** - * @deprecated This symbol has moved. Please Import from @angular/animations instead! - */ -export interface AnimationSequenceMetadata extends AnimationMetadata { steps: AnimationMetadata[]; } - -/** - * @deprecated This symbol has moved. Please Import from @angular/animations instead! - */ -export interface AnimationGroupMetadata extends AnimationMetadata { steps: AnimationMetadata[]; } - -/** - * @deprecated This symbol has moved. Please Import from @angular/animations instead! - */ -export function trigger(name: string, definitions: AnimationMetadata[]): AnimationTriggerMetadata { - return _trigger(name, definitions); -} - -/** - * @deprecated This symbol has moved. Please Import from @angular/animations instead! - */ -export function animate( - timings: string | number, styles?: AnimationStyleMetadata | - AnimationKeyframesSequenceMetadata): AnimationAnimateMetadata { - return _animate(timings, styles); -} - -/** - * @deprecated This symbol has moved. Please Import from @angular/animations instead! - */ -export function group(steps: AnimationMetadata[]): AnimationGroupMetadata { - return _group(steps); -} - -/** - * @deprecated This symbol has moved. Please Import from @angular/animations instead! - */ -export function sequence(steps: AnimationMetadata[]): AnimationSequenceMetadata { - return _sequence(steps); -} - -/** - * @deprecated This symbol has moved. Please Import from @angular/animations instead! - */ -export function style( - tokens: {[key: string]: string | number} | - Array<{[key: string]: string | number}>): AnimationStyleMetadata { - return _style(tokens); -} - -/** - * @deprecated This symbol has moved. Please Import from @angular/animations instead! - */ -export function state(name: string, styles: AnimationStyleMetadata): AnimationStateMetadata { - return _state(name, styles); -} - -/** - * @deprecated This symbol has moved. Please Import from @angular/animations instead! - */ -export function keyframes(steps: AnimationStyleMetadata[]): AnimationKeyframesSequenceMetadata { - return _keyframes(steps); -} - -/** - * @deprecated This symbol has moved. Please Import from @angular/animations instead! - */ -export function transition(stateChangeExpr: string, steps: AnimationMetadata | AnimationMetadata[]): - AnimationTransitionMetadata { - return _transition(stateChangeExpr, steps); -} - -/** - * @deprecated This has been renamed to `AnimationEvent`. Please import it from @angular/animations. - */ -export interface AnimationTransitionEvent { - fromState: string; - toState: string; - totalTime: number; - phaseName: string; - element: any; - triggerName: string; -} diff --git a/packages/core/src/animation/dsl.ts b/packages/core/src/animation/dsl.ts deleted file mode 120000 index a39f319031..0000000000 --- a/packages/core/src/animation/dsl.ts +++ /dev/null @@ -1 +0,0 @@ -../../../animations/src/animation_metadata.ts \ No newline at end of file diff --git a/packages/core/src/core.ts b/packages/core/src/core.ts index eae4219f21..0444eea601 100644 --- a/packages/core/src/core.ts +++ b/packages/core/src/core.ts @@ -35,28 +35,3 @@ export * from './core_private_export'; export * from './core_render3_private_export'; export {Sanitizer, SecurityContext} from './sanitization/security'; export * from './codegen_private_exports'; -export * from './animation/animation_metadata_wrapped'; -import {AnimationTriggerMetadata} from './animation/animation_metadata_wrapped'; - - -// For backwards compatibility. -/** - * @deprecated from v4 - */ -export type AnimationEntryMetadata = any; -/** - * @deprecated from v4 - */ -export type AnimationStateTransitionMetadata = any; -/** - * @deprecated from v4 - */ -export type AnimationPlayer = any; -/** - * @deprecated from v4 - */ -export type AnimationStyles = any; -/** - * @deprecated from v4 - */ -export type AnimationKeyframe = any; diff --git a/tools/public_api_guard/core/core.d.ts b/tools/public_api_guard/core/core.d.ts index 11ed54c2bb..f7ceb352dc 100644 --- a/tools/public_api_guard/core/core.d.ts +++ b/tools/public_api_guard/core/core.d.ts @@ -21,90 +21,6 @@ export interface AfterViewInit { /** @experimental */ export declare const ANALYZE_FOR_ENTRY_COMPONENTS: InjectionToken; -/** @deprecated */ -export declare function animate(timings: string | number, styles?: AnimationStyleMetadata | AnimationKeyframesSequenceMetadata): AnimationAnimateMetadata; - -/** @deprecated */ -export interface AnimationAnimateMetadata extends AnimationMetadata { - styles: AnimationStyleMetadata | AnimationKeyframesSequenceMetadata | null; - timings: string | number | AnimateTimings; -} - -/** @deprecated */ -export declare type AnimationEntryMetadata = any; - -/** @deprecated */ -export interface AnimationGroupMetadata extends AnimationMetadata { - steps: AnimationMetadata[]; -} - -/** @deprecated */ -export declare type AnimationKeyframe = any; - -/** @deprecated */ -export interface AnimationKeyframesSequenceMetadata extends AnimationMetadata { - steps: AnimationStyleMetadata[]; -} - -/** @deprecated */ -export interface AnimationMetadata { - type: AnimationMetadataType; -} - -/** @deprecated */ -export declare type AnimationPlayer = any; - -/** @deprecated */ -export interface AnimationSequenceMetadata extends AnimationMetadata { - steps: AnimationMetadata[]; -} - -/** @deprecated */ -export interface AnimationStateMetadata extends AnimationMetadata { - name: string; - styles: AnimationStyleMetadata; -} - -/** @deprecated */ -export declare type AnimationStateTransitionMetadata = any; - -/** @deprecated */ -export interface AnimationStyleMetadata extends AnimationMetadata { - offset: number | null; - styles: '*' | { - [key: string]: string | number; - } | Array<{ - [key: string]: string | number; - } | '*'>; -} - -/** @deprecated */ -export declare type AnimationStyles = any; - -/** @deprecated */ -export interface AnimationTransitionEvent { - element: any; - fromState: string; - phaseName: string; - toState: string; - totalTime: number; - triggerName: string; -} - -/** @deprecated */ -export interface AnimationTransitionMetadata extends AnimationMetadata { - animation: AnimationMetadata | AnimationMetadata[]; - expr: string | ((fromState: string, toState: string, element: any, params: { - [key: string]: any; - }) => boolean); -} - -/** @deprecated */ -export interface AnimationTriggerMetadata { - definitions: AnimationMetadata[]; - name: string; -} - /** @experimental */ export declare const APP_BOOTSTRAP_LISTENER: InjectionToken<((compRef: ComponentRef) => void)[]>; @@ -147,9 +63,6 @@ export declare function assertPlatform(requiredToken: any): PlatformRef; /** @stable */ export declare const Attribute: AttributeDecorator; -/** @deprecated */ -export declare const AUTO_STYLE = "*"; - /** @stable */ export declare enum ChangeDetectionStrategy { OnPush = 0, @@ -431,9 +344,6 @@ export interface GetTestability { findTestabilityInTree(registry: TestabilityRegistry, elem: any, findInAncestors: boolean): Testability | null; } -/** @deprecated */ -export declare function group(steps: AnimationMetadata[]): AnimationGroupMetadata; - /** @stable */ export declare const Host: HostDecorator; @@ -562,9 +472,6 @@ export declare class IterableDiffers { static extend(factories: IterableDifferFactory[]): StaticProvider; } -/** @deprecated */ -export declare function keyframes(steps: AnimationStyleMetadata[]): AnimationKeyframesSequenceMetadata; - /** @stable */ export interface KeyValueChangeRecord { readonly currentValue: V | null; @@ -935,9 +842,6 @@ export interface SelfDecorator { new (): Self; } -/** @deprecated */ -export declare function sequence(steps: AnimationMetadata[]): AnimationSequenceMetadata; - /** @experimental */ export declare function setTestabilityGetter(getter: GetTestability): void; @@ -964,19 +868,9 @@ export interface SkipSelfDecorator { new (): SkipSelf; } -/** @deprecated */ -export declare function state(name: string, styles: AnimationStyleMetadata): AnimationStateMetadata; - /** @stable */ export declare type StaticProvider = ValueProvider | ExistingProvider | StaticClassProvider | ConstructorProvider | FactoryProvider | any[]; -/** @deprecated */ -export declare function style(tokens: { - [key: string]: string | number; -} | Array<{ - [key: string]: string | number; -}>): AnimationStyleMetadata; - /** @experimental */ export declare class SystemJsNgModuleLoader implements NgModuleFactoryLoader { constructor(_compiler: Compiler, config?: SystemJsNgModuleLoaderConfig); @@ -1023,18 +917,12 @@ export interface TrackByFunction { (index: number, item: T): any; } -/** @deprecated */ -export declare function transition(stateChangeExpr: string, steps: AnimationMetadata | AnimationMetadata[]): AnimationTransitionMetadata; - /** @experimental */ export declare const TRANSLATIONS: InjectionToken; /** @experimental */ export declare const TRANSLATIONS_FORMAT: InjectionToken; -/** @deprecated */ -export declare function trigger(name: string, definitions: AnimationMetadata[]): AnimationTriggerMetadata; - /** @stable */ export declare const Type: FunctionConstructor;