From e6c81d2a42904d75a3eb79adfe0b471ebb0bcda3 Mon Sep 17 00:00:00 2001 From: Chuck Jazdzewski Date: Mon, 13 Mar 2017 15:46:44 -0700 Subject: [PATCH] Revert "refactor(platform-browser): move platform-browser/animations to animations/browser (#15043)" This reverts commit 195b863ea42c3dcfaf60ac43f52bd0f1e0d3ce5d. --- packages/animations/browser/.babelrc-browser | 9 ------- .../browser/.babelrc-browser-testing | 11 -------- packages/animations/browser/index.ts | 14 ---------- packages/animations/browser/public_api.ts | 14 ---------- packages/animations/browser/src/browser.ts | 15 ----------- .../animations/browser/src/private_export.ts | 15 ----------- .../browser/testing/tsconfig-build.json | 18 ------------- .../animations/browser/tsconfig-build.json | 21 --------------- packages/animations/src/version.ts | 16 +---------- packages/animations/tsconfig-build.json | 8 +++--- .../integrationtest/src/module.ts | 3 +-- .../animation/animation_integration_spec.ts | 5 ++-- packages/examples/_common/system-config.ts | 1 - .../animation/ts/dsl/animation_example.ts | 3 +-- .../animations}/src/animation_engine.ts | 0 .../animations/src/animations.ts | 1 + .../animations}/src/dsl/animation.ts | 0 .../src/dsl/animation_dsl_visitor.ts | 0 .../src/dsl/animation_timeline_instruction.ts | 0 .../src/dsl/animation_timeline_visitor.ts | 0 .../src/dsl/animation_transition_expr.ts | 0 .../src/dsl/animation_transition_factory.ts | 0 .../dsl/animation_transition_instruction.ts | 0 .../animations}/src/dsl/animation_trigger.ts | 0 .../src/dsl/animation_validator_visitor.ts | 0 .../animation_style_normalizer.ts | 0 .../web_animations_style_normalizer.ts | 0 .../platform-browser/animations/src/module.ts | 2 +- .../animations/src/private_export.ts | 7 ++++- .../animations/src/providers.ts | 12 ++++++--- .../src/render/animation_driver.ts | 0 .../render/animation_engine_instruction.ts | 0 .../src/{ => render}/animation_renderer.ts | 5 ++-- .../src/render/dom_animation_engine.ts | 0 .../src/render/noop_animation_engine.ts | 0 .../render/web_animations/dom_animation.ts | 0 .../web_animations/web_animations_driver.ts | 0 .../web_animations/web_animations_player.ts | 0 .../animations}/src/util.ts | 0 .../animations}/test/dsl/animation_spec.ts | 0 .../test/dsl/animation_trigger_spec.ts | 0 .../web_animations_style_normalizer_spec.ts | 0 .../test/engine/dom_animation_engine_spec.ts | 4 +-- .../test/noop_animation_engine_spec.ts | 5 ++-- .../test/noop_animations_module_spec.ts | 8 +++--- .../animations}/testing/index.ts | 0 .../animations}/testing/package.json | 0 .../animations}/testing/rollup.config.js | 0 .../testing/src/mock_animation_driver.ts | 2 +- .../animations}/testing/src/testing.ts | 0 .../animations/testing/tsconfig-build.json | 24 +++++++++++++++++ .../animations/tsconfig-build.json | 17 ++++++------ .../test/animation/animation_renderer_spec.ts | 3 +-- test-main.js | 2 -- tools/gulp-tasks/public-api.js | 7 +++-- .../animations/typings/browser/browser.d.ts | 7 ----- .../typings/browser/testing/index.d.ts | 27 ------------------- .../typings/animations/index.d.ts | 8 ++++++ 58 files changed, 84 insertions(+), 210 deletions(-) delete mode 100644 packages/animations/browser/.babelrc-browser delete mode 100644 packages/animations/browser/.babelrc-browser-testing delete mode 100644 packages/animations/browser/index.ts delete mode 100644 packages/animations/browser/public_api.ts delete mode 100644 packages/animations/browser/src/browser.ts delete mode 100644 packages/animations/browser/src/private_export.ts delete mode 100644 packages/animations/browser/testing/tsconfig-build.json delete mode 100644 packages/animations/browser/tsconfig-build.json rename packages/{animations/browser => platform-browser/animations}/src/animation_engine.ts (100%) rename packages/{animations/browser => platform-browser/animations}/src/dsl/animation.ts (100%) rename packages/{animations/browser => platform-browser/animations}/src/dsl/animation_dsl_visitor.ts (100%) rename packages/{animations/browser => platform-browser/animations}/src/dsl/animation_timeline_instruction.ts (100%) rename packages/{animations/browser => platform-browser/animations}/src/dsl/animation_timeline_visitor.ts (100%) rename packages/{animations/browser => platform-browser/animations}/src/dsl/animation_transition_expr.ts (100%) rename packages/{animations/browser => platform-browser/animations}/src/dsl/animation_transition_factory.ts (100%) rename packages/{animations/browser => platform-browser/animations}/src/dsl/animation_transition_instruction.ts (100%) rename packages/{animations/browser => platform-browser/animations}/src/dsl/animation_trigger.ts (100%) rename packages/{animations/browser => platform-browser/animations}/src/dsl/animation_validator_visitor.ts (100%) rename packages/{animations/browser => platform-browser/animations}/src/dsl/style_normalization/animation_style_normalizer.ts (100%) rename packages/{animations/browser => platform-browser/animations}/src/dsl/style_normalization/web_animations_style_normalizer.ts (100%) rename packages/{animations/browser => platform-browser/animations}/src/render/animation_driver.ts (100%) rename packages/{animations/browser => platform-browser/animations}/src/render/animation_engine_instruction.ts (100%) rename packages/platform-browser/animations/src/{ => render}/animation_renderer.ts (97%) rename packages/{animations/browser => platform-browser/animations}/src/render/dom_animation_engine.ts (100%) rename packages/{animations/browser => platform-browser/animations}/src/render/noop_animation_engine.ts (100%) rename packages/{animations/browser => platform-browser/animations}/src/render/web_animations/dom_animation.ts (100%) rename packages/{animations/browser => platform-browser/animations}/src/render/web_animations/web_animations_driver.ts (100%) rename packages/{animations/browser => platform-browser/animations}/src/render/web_animations/web_animations_player.ts (100%) rename packages/{animations/browser => platform-browser/animations}/src/util.ts (100%) rename packages/{animations/browser => platform-browser/animations}/test/dsl/animation_spec.ts (100%) rename packages/{animations/browser => platform-browser/animations}/test/dsl/animation_trigger_spec.ts (100%) rename packages/{animations/browser => platform-browser/animations}/test/dsl/style_normalizer/web_animations_style_normalizer_spec.ts (100%) rename packages/{animations/browser => platform-browser/animations}/test/engine/dom_animation_engine_spec.ts (99%) rename packages/{animations/browser => platform-browser/animations}/testing/index.ts (100%) rename packages/{animations/browser => platform-browser/animations}/testing/package.json (100%) rename packages/{animations/browser => platform-browser/animations}/testing/rollup.config.js (100%) rename packages/{animations/browser => platform-browser/animations}/testing/src/mock_animation_driver.ts (97%) rename packages/{animations/browser => platform-browser/animations}/testing/src/testing.ts (100%) create mode 100644 packages/platform-browser/animations/testing/tsconfig-build.json delete mode 100644 tools/public_api_guard/animations/typings/browser/browser.d.ts delete mode 100644 tools/public_api_guard/animations/typings/browser/testing/index.d.ts diff --git a/packages/animations/browser/.babelrc-browser b/packages/animations/browser/.babelrc-browser deleted file mode 100644 index 946b2f1b3f..0000000000 --- a/packages/animations/browser/.babelrc-browser +++ /dev/null @@ -1,9 +0,0 @@ -{ - "presets": ["es2015"], - "plugins": [["transform-es2015-modules-umd", { - "globals": { - }, - "exactGlobals": true - }]], - "moduleId": "@angular/animations/browser" -} diff --git a/packages/animations/browser/.babelrc-browser-testing b/packages/animations/browser/.babelrc-browser-testing deleted file mode 100644 index f565cc5642..0000000000 --- a/packages/animations/browser/.babelrc-browser-testing +++ /dev/null @@ -1,11 +0,0 @@ - -{ - "presets": ["es2015"], - "plugins": [["transform-es2015-modules-umd", { - "globals": { - "@angular/animations": "ng.animations" - }, - "exactGlobals": true - }]], - "moduleId": "@angular/animations/browser/testing" -} diff --git a/packages/animations/browser/index.ts b/packages/animations/browser/index.ts deleted file mode 100644 index ffe366afa1..0000000000 --- a/packages/animations/browser/index.ts +++ /dev/null @@ -1,14 +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 - */ - -// This file is not used to build this module. It is only used during editing -// by the TypeScript language serivce and during build for verifcation. `ngc` -// replaces this file with production index.ts when it rewrites private symbol -// names. - -export * from './src/browser'; diff --git a/packages/animations/browser/public_api.ts b/packages/animations/browser/public_api.ts deleted file mode 100644 index 9275e0d9de..0000000000 --- a/packages/animations/browser/public_api.ts +++ /dev/null @@ -1,14 +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 - */ - -/** - * @module - * @description - * Entry point for all public APIs of the animation package. - */ -export * from './src/browser'; diff --git a/packages/animations/browser/src/browser.ts b/packages/animations/browser/src/browser.ts deleted file mode 100644 index 108be7b1ae..0000000000 --- a/packages/animations/browser/src/browser.ts +++ /dev/null @@ -1,15 +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 - */ - -/** - * @module - * @description - * Entry point for all animation APIs of the animation browser package. - */ -export {AnimationDriver} from './render/animation_driver'; -export * from './private_export'; diff --git a/packages/animations/browser/src/private_export.ts b/packages/animations/browser/src/private_export.ts deleted file mode 100644 index 8ec3f97de9..0000000000 --- a/packages/animations/browser/src/private_export.ts +++ /dev/null @@ -1,15 +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 - */ -export {AnimationEngine as ɵAnimationEngine} from './animation_engine'; -export {Animation as ɵAnimation} from './dsl/animation'; -export {AnimationStyleNormalizer as ɵAnimationStyleNormalizer, NoopAnimationStyleNormalizer as ɵNoopAnimationStyleNormalizer} from './dsl/style_normalization/animation_style_normalizer'; -export {WebAnimationsStyleNormalizer as ɵWebAnimationsStyleNormalizer} from './dsl/style_normalization/web_animations_style_normalizer'; -export {NoopAnimationDriver as ɵNoopAnimationDriver} from './render/animation_driver'; -export {DomAnimationEngine as ɵDomAnimationEngine} from './render/dom_animation_engine'; -export {NoopAnimationEngine as ɵNoopAnimationEngine} from './render/noop_animation_engine'; -export {WebAnimationsDriver as ɵWebAnimationsDriver, supportsWebAnimations as ɵsupportsWebAnimations} from './render/web_animations/web_animations_driver'; diff --git a/packages/animations/browser/testing/tsconfig-build.json b/packages/animations/browser/testing/tsconfig-build.json deleted file mode 100644 index ab1a41f1e0..0000000000 --- a/packages/animations/browser/testing/tsconfig-build.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "extends": "./tsconfig-build", - "compilerOptions": { - "outDir": "../../../dist/packages-dist/animations", - "paths": { - "@angular/animations": ["../../../dist/packages-dist/animations"] - } - }, - "files": [ - "browser/testing/index.ts", - "../../../node_modules/@types/hammerjs/index.d.ts", - "../../../node_modules/@types/jasmine/index.d.ts", - "../../../node_modules/zone.js/dist/zone.js.d.ts" - ], - "angularCompilerOptions": { - "strictMetadataEmit": true - } -} diff --git a/packages/animations/browser/tsconfig-build.json b/packages/animations/browser/tsconfig-build.json deleted file mode 100644 index 50880dfb4d..0000000000 --- a/packages/animations/browser/tsconfig-build.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "extends": "./tsconfig-build", - - "compilerOptions": { - "outDir": "../../../dist/packages-dist/animations", - "paths": { - "@angular/animations": ["../../../dist/packages-dist/animations"] - } - }, - "files": [ - "browser/public_api.ts", - "../../../node_modules/zone.js/dist/zone.js.d.ts", - "../../system.d.ts" - ], - "angularCompilerOptions": { - "annotateForClosureCompiler": true, - "strictMetadataEmit": true, - "flatModuleOutFile": "index.js", - "flatModuleId": "@angular/animations/browser" - } -} diff --git a/packages/animations/src/version.ts b/packages/animations/src/version.ts index 68ff8e5b3e..1964425208 100644 --- a/packages/animations/src/version.ts +++ b/packages/animations/src/version.ts @@ -12,21 +12,7 @@ * Entry point for all public APIs of the animation package. */ -/** - * @whatItDoes Represents the version of angular/animations - * - * @stable - */ -export class Version { - constructor(public full: string) {} - - get major(): string { return this.full.split('.')[0]; } - - get minor(): string { return this.full.split('.')[1]; } - - get patch(): string { return this.full.split('.').slice(2).join('.'); } -} - +import {Version} from '@angular/core'; /** * @stable */ diff --git a/packages/animations/tsconfig-build.json b/packages/animations/tsconfig-build.json index 44329d1c9d..91550f95ce 100644 --- a/packages/animations/tsconfig-build.json +++ b/packages/animations/tsconfig-build.json @@ -6,8 +6,10 @@ "experimentalDecorators": true, "module": "es2015", "moduleResolution": "node", - "outDir": "../../../dist/packages-dist/animations", + "outDir": "../../dist/packages/animations", "paths": { + "@angular/core": ["../../dist/packages/core"], + "@angular/core/testing": ["../../dist/packages/core/testing"] }, "rootDir": ".", "sourceMap": true, @@ -20,8 +22,8 @@ }, "files": [ "public_api.ts", - "../../../node_modules/zone.js/dist/zone.js.d.ts", - "../../system.d.ts" + "../../node_modules/zone.js/dist/zone.js.d.ts", + "../system.d.ts" ], "angularCompilerOptions": { "annotateForClosureCompiler": true, diff --git a/packages/compiler-cli/integrationtest/src/module.ts b/packages/compiler-cli/integrationtest/src/module.ts index 10149b33c2..58c2857b06 100644 --- a/packages/compiler-cli/integrationtest/src/module.ts +++ b/packages/compiler-cli/integrationtest/src/module.ts @@ -6,10 +6,9 @@ * found in the LICENSE file at https://angular.io/license */ -import {ɵAnimationEngine} from '@angular/animations/browser'; import {ApplicationRef, NgModule, NgZone, Provider, RendererFactory2} from '@angular/core'; import {FormsModule} from '@angular/forms'; -import {NoopAnimationsModule, ɵAnimationRendererFactory} from '@angular/platform-browser/animations'; +import {NoopAnimationsModule, ɵAnimationEngine, ɵAnimationRendererFactory} from '@angular/platform-browser/animations'; import {ServerModule, ɵServerRendererFactory2} from '@angular/platform-server'; import {MdButtonModule} from '@angular2-material/button'; // Note: don't refer to third_party_src as we want to test that diff --git a/packages/core/test/animation/animation_integration_spec.ts b/packages/core/test/animation/animation_integration_spec.ts index 00c5af35d8..970593d5a0 100644 --- a/packages/core/test/animation/animation_integration_spec.ts +++ b/packages/core/test/animation/animation_integration_spec.ts @@ -6,11 +6,10 @@ * found in the LICENSE file at https://angular.io/license */ import {AUTO_STYLE, AnimationEvent, animate, keyframes, state, style, transition, trigger} from '@angular/animations'; -import {AnimationDriver, ɵAnimationEngine} from '@angular/animations/browser'; -import {MockAnimationDriver, MockAnimationPlayer} from '@angular/animations/browser/testing'; import {Component, HostBinding, HostListener, RendererFactory2, ViewChild} from '@angular/core'; import {ɵDomRendererFactory2} from '@angular/platform-browser'; -import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; +import {AnimationDriver, BrowserAnimationsModule, ɵAnimationEngine} from '@angular/platform-browser/animations'; +import {MockAnimationDriver, MockAnimationPlayer} from '@angular/platform-browser/animations/testing'; import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {TestBed} from '../../testing'; diff --git a/packages/examples/_common/system-config.ts b/packages/examples/_common/system-config.ts index 590679e329..d99a44038c 100644 --- a/packages/examples/_common/system-config.ts +++ b/packages/examples/_common/system-config.ts @@ -11,7 +11,6 @@ System.config({ '@angular/common': '/vendor/@angular/common/bundles/common.umd.js', '@angular/compiler': '/vendor/@angular/compiler/bundles/compiler.umd.js', '@angular/animations': '/vendor/@angular/animations/bundles/animations.umd.js', - '@angular/animations/browser': '/vendor/@angular/animations/bundles/animations-browser.umd.js', '@angular/platform-browser/animations': '/vendor/@angular/platform-browser/bundles/platform-browser-animations.umd.js', '@angular/core': '/vendor/@angular/core/bundles/core.umd.js', diff --git a/packages/examples/core/animation/ts/dsl/animation_example.ts b/packages/examples/core/animation/ts/dsl/animation_example.ts index f561085b58..d0cec6075b 100644 --- a/packages/examples/core/animation/ts/dsl/animation_example.ts +++ b/packages/examples/core/animation/ts/dsl/animation_example.ts @@ -7,8 +7,7 @@ */ // #docregion Component -import {animate, state, style, transition, trigger} from '@angular/animations'; -import {Component, NgModule} from '@angular/core'; +import {Component, NgModule, animate, state, style, transition, trigger} from '@angular/core'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; @Component({ diff --git a/packages/animations/browser/src/animation_engine.ts b/packages/platform-browser/animations/src/animation_engine.ts similarity index 100% rename from packages/animations/browser/src/animation_engine.ts rename to packages/platform-browser/animations/src/animation_engine.ts diff --git a/packages/platform-browser/animations/src/animations.ts b/packages/platform-browser/animations/src/animations.ts index 919817e66e..49a6a9c6eb 100644 --- a/packages/platform-browser/animations/src/animations.ts +++ b/packages/platform-browser/animations/src/animations.ts @@ -12,4 +12,5 @@ * Entry point for all animation APIs of the animation browser package. */ export {BrowserAnimationsModule, NoopAnimationsModule} from './module'; +export {AnimationDriver} from './render/animation_driver'; export * from './private_export'; diff --git a/packages/animations/browser/src/dsl/animation.ts b/packages/platform-browser/animations/src/dsl/animation.ts similarity index 100% rename from packages/animations/browser/src/dsl/animation.ts rename to packages/platform-browser/animations/src/dsl/animation.ts diff --git a/packages/animations/browser/src/dsl/animation_dsl_visitor.ts b/packages/platform-browser/animations/src/dsl/animation_dsl_visitor.ts similarity index 100% rename from packages/animations/browser/src/dsl/animation_dsl_visitor.ts rename to packages/platform-browser/animations/src/dsl/animation_dsl_visitor.ts diff --git a/packages/animations/browser/src/dsl/animation_timeline_instruction.ts b/packages/platform-browser/animations/src/dsl/animation_timeline_instruction.ts similarity index 100% rename from packages/animations/browser/src/dsl/animation_timeline_instruction.ts rename to packages/platform-browser/animations/src/dsl/animation_timeline_instruction.ts diff --git a/packages/animations/browser/src/dsl/animation_timeline_visitor.ts b/packages/platform-browser/animations/src/dsl/animation_timeline_visitor.ts similarity index 100% rename from packages/animations/browser/src/dsl/animation_timeline_visitor.ts rename to packages/platform-browser/animations/src/dsl/animation_timeline_visitor.ts diff --git a/packages/animations/browser/src/dsl/animation_transition_expr.ts b/packages/platform-browser/animations/src/dsl/animation_transition_expr.ts similarity index 100% rename from packages/animations/browser/src/dsl/animation_transition_expr.ts rename to packages/platform-browser/animations/src/dsl/animation_transition_expr.ts diff --git a/packages/animations/browser/src/dsl/animation_transition_factory.ts b/packages/platform-browser/animations/src/dsl/animation_transition_factory.ts similarity index 100% rename from packages/animations/browser/src/dsl/animation_transition_factory.ts rename to packages/platform-browser/animations/src/dsl/animation_transition_factory.ts diff --git a/packages/animations/browser/src/dsl/animation_transition_instruction.ts b/packages/platform-browser/animations/src/dsl/animation_transition_instruction.ts similarity index 100% rename from packages/animations/browser/src/dsl/animation_transition_instruction.ts rename to packages/platform-browser/animations/src/dsl/animation_transition_instruction.ts diff --git a/packages/animations/browser/src/dsl/animation_trigger.ts b/packages/platform-browser/animations/src/dsl/animation_trigger.ts similarity index 100% rename from packages/animations/browser/src/dsl/animation_trigger.ts rename to packages/platform-browser/animations/src/dsl/animation_trigger.ts diff --git a/packages/animations/browser/src/dsl/animation_validator_visitor.ts b/packages/platform-browser/animations/src/dsl/animation_validator_visitor.ts similarity index 100% rename from packages/animations/browser/src/dsl/animation_validator_visitor.ts rename to packages/platform-browser/animations/src/dsl/animation_validator_visitor.ts diff --git a/packages/animations/browser/src/dsl/style_normalization/animation_style_normalizer.ts b/packages/platform-browser/animations/src/dsl/style_normalization/animation_style_normalizer.ts similarity index 100% rename from packages/animations/browser/src/dsl/style_normalization/animation_style_normalizer.ts rename to packages/platform-browser/animations/src/dsl/style_normalization/animation_style_normalizer.ts diff --git a/packages/animations/browser/src/dsl/style_normalization/web_animations_style_normalizer.ts b/packages/platform-browser/animations/src/dsl/style_normalization/web_animations_style_normalizer.ts similarity index 100% rename from packages/animations/browser/src/dsl/style_normalization/web_animations_style_normalizer.ts rename to packages/platform-browser/animations/src/dsl/style_normalization/web_animations_style_normalizer.ts diff --git a/packages/platform-browser/animations/src/module.ts b/packages/platform-browser/animations/src/module.ts index effd444d2f..7eb858fd0d 100644 --- a/packages/platform-browser/animations/src/module.ts +++ b/packages/platform-browser/animations/src/module.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ import {NgModule} from '@angular/core'; -import {BrowserModule} from '@angular/platform-browser'; +import {BrowserModule, ɵDomRendererFactory2} from '@angular/platform-browser'; import {BROWSER_ANIMATIONS_PROVIDERS, BROWSER_NOOP_ANIMATIONS_PROVIDERS} from './providers'; diff --git a/packages/platform-browser/animations/src/private_export.ts b/packages/platform-browser/animations/src/private_export.ts index f1411716df..ce1194ce24 100644 --- a/packages/platform-browser/animations/src/private_export.ts +++ b/packages/platform-browser/animations/src/private_export.ts @@ -5,4 +5,9 @@ * 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 */ -export {AnimationRenderer as ɵAnimationRenderer, AnimationRendererFactory as ɵAnimationRendererFactory} from './animation_renderer'; +export {AnimationEngine as ɵAnimationEngine} from './animation_engine'; +export {Animation as ɵAnimation} from './dsl/animation'; +export {AnimationStyleNormalizer as ɵAnimationStyleNormalizer, NoopAnimationStyleNormalizer as ɵNoopAnimationStyleNormalizer} from './dsl/style_normalization/animation_style_normalizer'; +export {NoopAnimationDriver as ɵNoopAnimationDriver} from './render/animation_driver'; +export {AnimationRenderer as ɵAnimationRenderer, AnimationRendererFactory as ɵAnimationRendererFactory} from './render/animation_renderer'; +export {DomAnimationEngine as ɵDomAnimationEngine} from './render/dom_animation_engine'; diff --git a/packages/platform-browser/animations/src/providers.ts b/packages/platform-browser/animations/src/providers.ts index a0a8902b52..1498c228b5 100644 --- a/packages/platform-browser/animations/src/providers.ts +++ b/packages/platform-browser/animations/src/providers.ts @@ -6,11 +6,17 @@ * found in the LICENSE file at https://angular.io/license */ -import {AnimationDriver, ɵAnimationEngine as AnimationEngine, ɵAnimationStyleNormalizer as AnimationStyleNormalizer, ɵDomAnimationEngine as DomAnimationEngine, ɵNoopAnimationDriver as NoopAnimationDriver, ɵNoopAnimationEngine as NoopAnimationEngine, ɵWebAnimationsDriver as WebAnimationsDriver, ɵWebAnimationsStyleNormalizer as WebAnimationsStyleNormalizer, ɵsupportsWebAnimations as supportsWebAnimations} from '@angular/animations/browser'; import {Injectable, NgZone, Provider, RendererFactory2} from '@angular/core'; import {ɵDomRendererFactory2} from '@angular/platform-browser'; -import {AnimationRendererFactory} from './animation_renderer'; +import {AnimationEngine} from './animation_engine'; +import {AnimationStyleNormalizer} from './dsl/style_normalization/animation_style_normalizer'; +import {WebAnimationsStyleNormalizer} from './dsl/style_normalization/web_animations_style_normalizer'; +import {AnimationDriver, NoopAnimationDriver} from './render/animation_driver'; +import {AnimationRendererFactory} from './render/animation_renderer'; +import {DomAnimationEngine} from './render/dom_animation_engine'; +import {NoopAnimationEngine} from './render/noop_animation_engine'; +import {WebAnimationsDriver, supportsWebAnimations} from './render/web_animations/web_animations_driver'; @Injectable() export class InjectableAnimationEngine extends DomAnimationEngine { @@ -59,4 +65,4 @@ export const BROWSER_NOOP_ANIMATIONS_PROVIDERS: Provider[] = [ useFactory: instantiateRendererFactory, deps: [ɵDomRendererFactory2, AnimationEngine, NgZone] } -]; +]; \ No newline at end of file diff --git a/packages/animations/browser/src/render/animation_driver.ts b/packages/platform-browser/animations/src/render/animation_driver.ts similarity index 100% rename from packages/animations/browser/src/render/animation_driver.ts rename to packages/platform-browser/animations/src/render/animation_driver.ts diff --git a/packages/animations/browser/src/render/animation_engine_instruction.ts b/packages/platform-browser/animations/src/render/animation_engine_instruction.ts similarity index 100% rename from packages/animations/browser/src/render/animation_engine_instruction.ts rename to packages/platform-browser/animations/src/render/animation_engine_instruction.ts diff --git a/packages/platform-browser/animations/src/animation_renderer.ts b/packages/platform-browser/animations/src/render/animation_renderer.ts similarity index 97% rename from packages/platform-browser/animations/src/animation_renderer.ts rename to packages/platform-browser/animations/src/render/animation_renderer.ts index 6da022fccb..319501189e 100644 --- a/packages/platform-browser/animations/src/animation_renderer.ts +++ b/packages/platform-browser/animations/src/render/animation_renderer.ts @@ -5,10 +5,11 @@ * 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 {AnimationTriggerMetadata} from '@angular/animations'; -import {ɵAnimationEngine as AnimationEngine} from '@angular/animations/browser'; +import {AnimationEvent, AnimationTriggerMetadata} from '@angular/animations'; import {Injectable, NgZone, Renderer2, RendererFactory2, RendererStyleFlags2, RendererType2} from '@angular/core'; +import {AnimationEngine} from '../animation_engine'; + @Injectable() export class AnimationRendererFactory implements RendererFactory2 { constructor( diff --git a/packages/animations/browser/src/render/dom_animation_engine.ts b/packages/platform-browser/animations/src/render/dom_animation_engine.ts similarity index 100% rename from packages/animations/browser/src/render/dom_animation_engine.ts rename to packages/platform-browser/animations/src/render/dom_animation_engine.ts diff --git a/packages/animations/browser/src/render/noop_animation_engine.ts b/packages/platform-browser/animations/src/render/noop_animation_engine.ts similarity index 100% rename from packages/animations/browser/src/render/noop_animation_engine.ts rename to packages/platform-browser/animations/src/render/noop_animation_engine.ts diff --git a/packages/animations/browser/src/render/web_animations/dom_animation.ts b/packages/platform-browser/animations/src/render/web_animations/dom_animation.ts similarity index 100% rename from packages/animations/browser/src/render/web_animations/dom_animation.ts rename to packages/platform-browser/animations/src/render/web_animations/dom_animation.ts diff --git a/packages/animations/browser/src/render/web_animations/web_animations_driver.ts b/packages/platform-browser/animations/src/render/web_animations/web_animations_driver.ts similarity index 100% rename from packages/animations/browser/src/render/web_animations/web_animations_driver.ts rename to packages/platform-browser/animations/src/render/web_animations/web_animations_driver.ts diff --git a/packages/animations/browser/src/render/web_animations/web_animations_player.ts b/packages/platform-browser/animations/src/render/web_animations/web_animations_player.ts similarity index 100% rename from packages/animations/browser/src/render/web_animations/web_animations_player.ts rename to packages/platform-browser/animations/src/render/web_animations/web_animations_player.ts diff --git a/packages/animations/browser/src/util.ts b/packages/platform-browser/animations/src/util.ts similarity index 100% rename from packages/animations/browser/src/util.ts rename to packages/platform-browser/animations/src/util.ts diff --git a/packages/animations/browser/test/dsl/animation_spec.ts b/packages/platform-browser/animations/test/dsl/animation_spec.ts similarity index 100% rename from packages/animations/browser/test/dsl/animation_spec.ts rename to packages/platform-browser/animations/test/dsl/animation_spec.ts diff --git a/packages/animations/browser/test/dsl/animation_trigger_spec.ts b/packages/platform-browser/animations/test/dsl/animation_trigger_spec.ts similarity index 100% rename from packages/animations/browser/test/dsl/animation_trigger_spec.ts rename to packages/platform-browser/animations/test/dsl/animation_trigger_spec.ts diff --git a/packages/animations/browser/test/dsl/style_normalizer/web_animations_style_normalizer_spec.ts b/packages/platform-browser/animations/test/dsl/style_normalizer/web_animations_style_normalizer_spec.ts similarity index 100% rename from packages/animations/browser/test/dsl/style_normalizer/web_animations_style_normalizer_spec.ts rename to packages/platform-browser/animations/test/dsl/style_normalizer/web_animations_style_normalizer_spec.ts diff --git a/packages/animations/browser/test/engine/dom_animation_engine_spec.ts b/packages/platform-browser/animations/test/engine/dom_animation_engine_spec.ts similarity index 99% rename from packages/animations/browser/test/engine/dom_animation_engine_spec.ts rename to packages/platform-browser/animations/test/engine/dom_animation_engine_spec.ts index 3829b10113..365eaa02f5 100644 --- a/packages/animations/browser/test/engine/dom_animation_engine_spec.ts +++ b/packages/platform-browser/animations/test/engine/dom_animation_engine_spec.ts @@ -6,13 +6,13 @@ * found in the LICENSE file at https://angular.io/license */ import {AnimationEvent, NoopAnimationPlayer, animate, keyframes, state, style, transition, trigger} from '@angular/animations'; -import {el} from '@angular/platform-browser/testing/browser_util'; +import {el} from '@angular/platform-browser/testing/src/browser_util'; import {buildAnimationKeyframes} from '../../src/dsl/animation_timeline_visitor'; import {buildTrigger} from '../../src/dsl/animation_trigger'; import {AnimationStyleNormalizer, NoopAnimationStyleNormalizer} from '../../src/dsl/style_normalization/animation_style_normalizer'; import {DomAnimationEngine} from '../../src/render/dom_animation_engine'; -import {MockAnimationDriver, MockAnimationPlayer} from '../../testing/mock_animation_driver'; +import {MockAnimationDriver, MockAnimationPlayer} from '../../testing/src/mock_animation_driver'; function makeTrigger(name: string, steps: any) { const triggerData = trigger(name, steps); diff --git a/packages/platform-browser/animations/test/noop_animation_engine_spec.ts b/packages/platform-browser/animations/test/noop_animation_engine_spec.ts index 11c364f8cf..114bbd2f2f 100644 --- a/packages/platform-browser/animations/test/noop_animation_engine_spec.ts +++ b/packages/platform-browser/animations/test/noop_animation_engine_spec.ts @@ -6,8 +6,9 @@ * found in the LICENSE file at https://angular.io/license */ import {state, style, trigger} from '@angular/animations'; -import {ɵNoopAnimationEngine as NoopAnimationEngine} from '@angular/animations/browser'; -import {el} from '@angular/platform-browser/testing/browser_util'; +import {el} from '@angular/platform-browser/testing/src/browser_util'; + +import {NoopAnimationEngine} from '../src/render/noop_animation_engine'; export function main() { describe('NoopAnimationEngine', () => { diff --git a/packages/platform-browser/animations/test/noop_animations_module_spec.ts b/packages/platform-browser/animations/test/noop_animations_module_spec.ts index 0735104a85..56d0182ba0 100644 --- a/packages/platform-browser/animations/test/noop_animations_module_spec.ts +++ b/packages/platform-browser/animations/test/noop_animations_module_spec.ts @@ -5,12 +5,12 @@ * 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 {animate, style, transition, trigger} from '@angular/animations'; -import {ɵAnimationEngine, ɵNoopAnimationEngine} from '@angular/animations/browser'; +import {animate, state, style, transition, trigger} from '@angular/animations'; import {Component} from '@angular/core'; import {TestBed} from '@angular/core/testing'; - +import {ɵAnimationEngine} from '@angular/platform-browser/animations'; import {NoopAnimationsModule} from '../src/module'; +import {NoopAnimationEngine} from '../src/render/noop_animation_engine'; export function main() { describe('NoopAnimationsModule', () => { @@ -18,7 +18,7 @@ export function main() { it('the engine should be a Noop engine', () => { const engine = TestBed.get(ɵAnimationEngine); - expect(engine instanceof ɵNoopAnimationEngine).toBeTruthy(); + expect(engine instanceof NoopAnimationEngine).toBeTruthy(); }); it('should flush and fire callbacks when the zone becomes stable', (async) => { diff --git a/packages/animations/browser/testing/index.ts b/packages/platform-browser/animations/testing/index.ts similarity index 100% rename from packages/animations/browser/testing/index.ts rename to packages/platform-browser/animations/testing/index.ts diff --git a/packages/animations/browser/testing/package.json b/packages/platform-browser/animations/testing/package.json similarity index 100% rename from packages/animations/browser/testing/package.json rename to packages/platform-browser/animations/testing/package.json diff --git a/packages/animations/browser/testing/rollup.config.js b/packages/platform-browser/animations/testing/rollup.config.js similarity index 100% rename from packages/animations/browser/testing/rollup.config.js rename to packages/platform-browser/animations/testing/rollup.config.js diff --git a/packages/animations/browser/testing/src/mock_animation_driver.ts b/packages/platform-browser/animations/testing/src/mock_animation_driver.ts similarity index 97% rename from packages/animations/browser/testing/src/mock_animation_driver.ts rename to packages/platform-browser/animations/testing/src/mock_animation_driver.ts index cec7c66476..b349ef45b9 100644 --- a/packages/animations/browser/testing/src/mock_animation_driver.ts +++ b/packages/platform-browser/animations/testing/src/mock_animation_driver.ts @@ -7,7 +7,7 @@ */ import {AUTO_STYLE, AnimationPlayer, NoopAnimationPlayer, ɵStyleData} from '@angular/animations'; -import {AnimationDriver} from '../src/render/animation_driver'; +import {AnimationDriver} from '../../src/render/animation_driver'; /** * @experimental Animation support is experimental. diff --git a/packages/animations/browser/testing/src/testing.ts b/packages/platform-browser/animations/testing/src/testing.ts similarity index 100% rename from packages/animations/browser/testing/src/testing.ts rename to packages/platform-browser/animations/testing/src/testing.ts diff --git a/packages/platform-browser/animations/testing/tsconfig-build.json b/packages/platform-browser/animations/testing/tsconfig-build.json new file mode 100644 index 0000000000..661aed0ea3 --- /dev/null +++ b/packages/platform-browser/animations/testing/tsconfig-build.json @@ -0,0 +1,24 @@ +{ + "extends": "../../tsconfig-build", + "compilerOptions": { + "outDir": "../../../../dist/packages/platform-browser", + "paths": { + "@angular/core": ["../../dist/packages/core"], + "@angular/core/testing": ["../../dist/packages/core/testing"], + "@angular/animations": ["../../dist/packages/animations"], + "@angular/platform-browser": ["../../dist/packages/platform-browser"], + "@angular/platform-browser/animations": ["../../dist/packages/platform-browser/animations"], + "@angular/common": ["../../dist/packages/common"], + "@angular/common/testing": ["../../dist/packages/common/testing"] + } + }, + "files": [ + "index.ts", + "../../../../node_modules/@types/hammerjs/index.d.ts", + "../../../../node_modules/@types/jasmine/index.d.ts", + "../../../../node_modules/zone.js/dist/zone.js.d.ts" + ], + "angularCompilerOptions": { + "strictMetadataEmit": true + } +} diff --git a/packages/platform-browser/animations/tsconfig-build.json b/packages/platform-browser/animations/tsconfig-build.json index b1ae369a3f..14bb7a3c08 100644 --- a/packages/platform-browser/animations/tsconfig-build.json +++ b/packages/platform-browser/animations/tsconfig-build.json @@ -1,19 +1,18 @@ { - "extends": "./tsconfig-build", + "extends": "../tsconfig-build", "compilerOptions": { - "outDir": "../../../dist/packages-dist/platform-browser", + "outDir": "../../../dist/packages/platform-browser", "paths": { - "rxjs/*": ["../../../node_modules/rxjs/*"], - "@angular/core": ["../../../dist/packages-dist/core"], - "@angular/core/testing": ["../../../dist/packages-dist/core/testing"], - "@angular/animations": ["../../../dist/packages-dist/animations"], - "@angular/animations/browser": ["../../../dist/packages-dist/animations/browser"], - "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"] + "rxjs/*": ["../../node_modules/rxjs/*"], + "@angular/core": ["../../dist/packages/core"], + "@angular/core/testing": ["../../dist/packages/core/testing"], + "@angular/animations": ["../../dist/packages/animations"], + "@angular/platform-browser": ["../../dist/packages/platform-browser"] } }, "files": [ - "animations/public_api.ts", + "public_api.ts", "../../../node_modules/zone.js/dist/zone.js.d.ts", "../../system.d.ts" ], diff --git a/packages/platform-browser/test/animation/animation_renderer_spec.ts b/packages/platform-browser/test/animation/animation_renderer_spec.ts index cc8cf3d199..66fb69c4f6 100644 --- a/packages/platform-browser/test/animation/animation_renderer_spec.ts +++ b/packages/platform-browser/test/animation/animation_renderer_spec.ts @@ -6,10 +6,9 @@ * found in the LICENSE file at https://angular.io/license */ import {AnimationPlayer, AnimationTriggerMetadata, animate, state, style, transition, trigger} from '@angular/animations'; -import {ɵAnimationEngine} from '@angular/animations/browser'; import {Component, Injectable, RendererFactory2, RendererType2, ViewChild} from '@angular/core'; import {TestBed} from '@angular/core/testing'; -import {BrowserAnimationsModule, ɵAnimationRendererFactory} from '@angular/platform-browser/animations'; +import {BrowserAnimationsModule, ɵAnimationEngine, ɵAnimationRendererFactory} from '@angular/platform-browser/animations'; import {InjectableAnimationEngine} from '../../animations/src/providers'; import {el} from '../../testing/src/browser_util'; diff --git a/test-main.js b/test-main.js index 1627fbd7fd..6130b6410d 100644 --- a/test-main.js +++ b/test-main.js @@ -33,8 +33,6 @@ System.config({ packages: { '@angular/core/testing': {main: 'index.js', defaultExtension: 'js'}, '@angular/core': {main: 'index.js', defaultExtension: 'js'}, - '@angular/animations/browser/testing': {main: 'index.js', defaultExtension: 'js'}, - '@angular/animations/browser': {main: 'index.js', defaultExtension: 'js'}, '@angular/animations/testing': {main: 'index.js', defaultExtension: 'js'}, '@angular/animations': {main: 'index.js', defaultExtension: 'js'}, '@angular/compiler/testing': {main: 'index.js', defaultExtension: 'js'}, diff --git a/tools/gulp-tasks/public-api.js b/tools/gulp-tasks/public-api.js index 33ffa5bfe5..380bdca8b1 100644 --- a/tools/gulp-tasks/public-api.js +++ b/tools/gulp-tasks/public-api.js @@ -7,7 +7,7 @@ const entrypoints = [ //'dist/packages-dist/compiler/index.d.ts', //'dist/packages-dist/compiler/testing.d.ts', 'dist/packages-dist/upgrade/typings/upgrade.d.ts', - 'dist/packages-dist/upgrade/typings/static/static.d.ts', + 'dist/packages-dist/upgrade/typings/static/index.d.ts', 'dist/packages-dist/platform-browser/typings/platform-browser.d.ts', 'dist/packages-dist/platform-browser/typings/testing/index.d.ts', 'dist/packages-dist/platform-browser-dynamic/typings/platform-browser-dynamic.d.ts', @@ -19,9 +19,8 @@ const entrypoints = [ 'dist/packages-dist/http/typings/http.d.ts', 'dist/packages-dist/http/typings/testing/index.d.ts', 'dist/packages-dist/forms/typings/forms.d.ts', 'dist/packages-dist/router/typings/router.d.ts', 'dist/packages-dist/animations/typings/animations.d.ts', - 'dist/packages-dist/animations/typings/browser/browser.d.ts', - 'dist/packages-dist/animations/typings/browser/testing/index.d.ts', - 'dist/packages-dist/platform-browser/typings/animations/animations.d.ts' + 'dist/packages-dist/platform-browser/typings/animations/index.d.ts', + 'dist/packages-dist/platform-browser/typings/animations/testing/index.d.ts' ]; const publicApiDir = 'tools/public_api_guard'; diff --git a/tools/public_api_guard/animations/typings/browser/browser.d.ts b/tools/public_api_guard/animations/typings/browser/browser.d.ts deleted file mode 100644 index 26904af387..0000000000 --- a/tools/public_api_guard/animations/typings/browser/browser.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -/** @experimental */ -export declare abstract class AnimationDriver { - abstract animate(element: any, keyframes: { - [key: string]: string | number; - }[], duration: number, delay: number, easing: string, previousPlayers?: any[]): any; - static NOOP: AnimationDriver; -} diff --git a/tools/public_api_guard/animations/typings/browser/testing/index.d.ts b/tools/public_api_guard/animations/typings/browser/testing/index.d.ts deleted file mode 100644 index 8452f075a0..0000000000 --- a/tools/public_api_guard/animations/typings/browser/testing/index.d.ts +++ /dev/null @@ -1,27 +0,0 @@ -/** @experimental */ -export declare class MockAnimationDriver implements AnimationDriver { - animate(element: any, keyframes: { - [key: string]: string | number; - }[], duration: number, delay: number, easing: string, previousPlayers?: any[]): MockAnimationPlayer; - static log: AnimationPlayer[]; -} - -/** @experimental */ -export declare class MockAnimationPlayer extends NoopAnimationPlayer { - delay: number; - duration: number; - easing: string; - element: any; - keyframes: { - [key: string]: string | number; - }[]; - previousPlayers: any[]; - previousStyles: { - [key: string]: string | number; - }; - constructor(element: any, keyframes: { - [key: string]: string | number; - }[], duration: number, delay: number, easing: string, previousPlayers: any[]); - destroy(): void; - finish(): void; -} diff --git a/tools/public_api_guard/platform-browser/typings/animations/index.d.ts b/tools/public_api_guard/platform-browser/typings/animations/index.d.ts index f9a80e456c..786f09b601 100644 --- a/tools/public_api_guard/platform-browser/typings/animations/index.d.ts +++ b/tools/public_api_guard/platform-browser/typings/animations/index.d.ts @@ -1,3 +1,11 @@ +/** @experimental */ +export declare abstract class AnimationDriver { + abstract animate(element: any, keyframes: { + [key: string]: string | number; + }[], duration: number, delay: number, easing: string, previousPlayers?: any[]): any; + static NOOP: AnimationDriver; +} + /** @experimental */ export declare class BrowserAnimationsModule { }