honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "build(animations): adjust animations/browser source to new standard for automatic build (#15043)" 

This reverts commit 21a18d6ceb.
This commit is contained in:
Chuck Jazdzewski 2017-03-13 15:46:07 -07:00
parent 21a18d6ceb
commit 498a95148b
16 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/animations/browser/.babelrc-browser Normal file
View File

@ -0,0 +1,9 @@
{
"presets": ["es2015"],
"plugins": [["transform-es2015-modules-umd", {
"globals": {
},
"exactGlobals": true
}]],
"moduleId": "@angular/animations/browser"
}

11
packages/animations/browser/.babelrc-browser-testing Normal file
View File

@ -0,0 +1,11 @@
{
"presets": ["es2015"],
"plugins": [["transform-es2015-modules-umd", {
"globals": {
"@angular/animations": "ng.animations"
},
"exactGlobals": true
}]],
"moduleId": "@angular/animations/browser/testing"
}

6
packages/animations/browser/package.json
View File

@ -1,6 +0,0 @@
{
"typings": "../typings/browser/index.d.ts",
"main": "../bundles/animation-browser.umd.js",
"module": "../@angular/animations/browser.es5.js",
"es2015": "../@angular/animations/browser.js"
}

19
packages/animations/browser/rollup.config.js
View File

@ -1,19 +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 default {
entry: '../../../dist/packages-dist/animations/@angular/animations/browser.es5.js',
dest: '../../../dist/packages-dist/animations/bundles/animations-browser.umd.js',
format: 'umd',
moduleName: 'ng.animations.browser',
globals: {
'@angular/core': 'ng.core',
'@angular/common': 'ng.common',
'@angular/animations': 'ng.animations'
}
};

4
packages/animations/browser/test/engine/dom_animation_engine_spec.ts
View File

@ -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/src/browser_util';
import {el} from '@angular/platform-browser/testing/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/src/mock_animation_driver';
import {MockAnimationDriver, MockAnimationPlayer} from '../../testing/mock_animation_driver';
function makeTrigger(name: string, steps: any) {
const triggerData = trigger(name, steps);

10
packages/animations/browser/testing/rollup.config.js
View File

@ -7,13 +7,15 @@
*/
export default {
entry: '../../../../dist/packages-dist/animations/@angular/animations/browser/testing.es5.js',
dest: '../../../../dist/packages-dist/animations/bundles/animations-browser-testing.umd.js',
entry:
'../../../../dist/packages-dist/platform-browser/@angular/platform-browser/animations/testing.es5.js',
dest:
'../../../../dist/packages-dist/platform-browser/bundles/platform-browser-animations-testing.umd.js',
format: 'umd',
moduleName: 'ng.animations.browser.testing',
moduleName: 'ng.platformBrowser.testing',
globals: {
'@angular/core': 'ng.core',
'@angular/common': 'ng.common',
'@angular/animations': 'ng.animations'
'@angular/platform-browser': 'ng.platformBrowser'
}
};

2
packages/animations/browser/testing/src/mock_animation_driver.ts
View File

@ -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.

13
packages/animations/browser/testing/tsconfig-build.json
View File

@ -1,15 +1,16 @@
{
"extends": "../../tsconfig-build",
"extends": "./tsconfig-build",
"compilerOptions": {
"outDir": "../../../dist/packages-dist/animations",
"paths": {
"@angular/animations": ["../../dist/packages/animations"]
"@angular/animations": ["../../../dist/packages-dist/animations"]
}
},
"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"
"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

7
packages/animations/browser/tsconfig-build.json
View File

@ -1,13 +1,14 @@
{
"extends": "../tsconfig-build",
"extends": "./tsconfig-build",
"compilerOptions": {
"outDir": "../../../dist/packages-dist/animations",
"paths": {
"@angular/animations": ["../../dist/packages/animations"]
"@angular/animations": ["../../../dist/packages-dist/animations"]
}
},
"files": [
"public_api.ts",
"browser/public_api.ts",
"../../../node_modules/zone.js/dist/zone.js.d.ts",
"../../system.d.ts"
],

6
packages/animations/tsconfig-build.json
View File

@ -6,7 +6,7 @@
"experimentalDecorators": true,
"module": "es2015",
"moduleResolution": "node",
"outDir": "../../dist/packages/animations",
"outDir": "../../../dist/packages-dist/animations",
"paths": {
},
"rootDir": ".",
@ -20,8 +20,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,

2
packages/platform-browser/animations/src/module.ts
View File

@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.io/license
*/
import {NgModule} from '@angular/core';
import {BrowserModule} from '../../src/browser';
import {BrowserModule} from '@angular/platform-browser';
import {BROWSER_ANIMATIONS_PROVIDERS, BROWSER_NOOP_ANIMATIONS_PROVIDERS} from './providers';

8
packages/platform-browser/animations/src/providers.ts
View File

@ -8,7 +8,7 @@
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 '../../src/dom/dom_renderer';
import {ɵDomRendererFactory2} from '@angular/platform-browser';
import {AnimationRendererFactory} from './animation_renderer';
@ -31,7 +31,7 @@ export function instantiateDefaultStyleNormalizer() {
}
export function instantiateRendererFactory(
renderer: DomRendererFactory2, engine: AnimationEngine, zone: NgZone) {
renderer: ɵDomRendererFactory2, engine: AnimationEngine, zone: NgZone) {
return new AnimationRendererFactory(renderer, engine, zone);
}
@ -45,7 +45,7 @@ export const BROWSER_ANIMATIONS_PROVIDERS: Provider[] = [
{provide: AnimationEngine, useClass: InjectableAnimationEngine}, {
provide: RendererFactory2,
useFactory: instantiateRendererFactory,
deps: [DomRendererFactory2, AnimationEngine, NgZone]
deps: [ɵDomRendererFactory2, AnimationEngine, NgZone]
}
];
@ -57,6 +57,6 @@ export const BROWSER_NOOP_ANIMATIONS_PROVIDERS: Provider[] = [
{provide: AnimationEngine, useClass: NoopAnimationEngine}, {
provide: RendererFactory2,
useFactory: instantiateRendererFactory,
deps: [DomRendererFactory2, AnimationEngine, NgZone]
deps: [ɵDomRendererFactory2, AnimationEngine, NgZone]
}
];

2
packages/platform-browser/animations/test/noop_animation_engine_spec.ts
View File

@ -7,7 +7,7 @@
*/
import {state, style, trigger} from '@angular/animations';
import {ɵNoopAnimationEngine as NoopAnimationEngine} from '@angular/animations/browser';
import {el} from '@angular/platform-browser/testing/src/browser_util';
import {el} from '@angular/platform-browser/testing/browser_util';
export function main() {
describe('NoopAnimationEngine', () => {

17
packages/platform-browser/animations/tsconfig-build.json
View File

@ -1,18 +1,19 @@
{
"extends": "../tsconfig-build",
"extends": "./tsconfig-build",
"compilerOptions": {
"outDir": "../../../dist/packages-dist/platform-browser",
"paths": {
"rxjs/*": ["../../node_modules/rxjs/*"],
"@angular/core": ["../../dist/packages/core"],
"@angular/core/testing": ["../../dist/packages/core/testing"],
"@angular/animations": ["../../dist/packages/animations"],
"@angular/animations/browser": ["../../dist/packages/animations/browser"],
"@angular/platform-browser": ["../../dist/packages/platform-browser"]
"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"]
}
},
"files": [
"public_api.ts",
"animations/public_api.ts",
"../../../node_modules/zone.js/dist/zone.js.d.ts",
"../../system.d.ts"
],

6
tools/gulp-tasks/public-api.js
View File

@ -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/index.d.ts',
'dist/packages-dist/upgrade/typings/static/static.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,9 @@ 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/index.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/index.d.ts'
'dist/packages-dist/platform-browser/typings/animations/animations.d.ts'
];
const publicApiDir = 'tools/public_api_guard';

0
tools/public_api_guard/animations/typings/browser/index.d.ts → tools/public_api_guard/animations/typings/browser/browser.d.ts vendored
View File