diff --git a/packages/animations/package.json b/packages/animations/package.json index c5eee8ab58..5ddb7d1123 100644 --- a/packages/animations/package.json +++ b/packages/animations/package.json @@ -5,7 +5,7 @@ "main": "./bundles/animations.umd.js", "module": "./@angular/animations.es5.js", "es2015": "./@angular/animations.js", - "typings": "./typings/animations.d.ts", + "typings": "./typings/animations/index.d.ts", "author": "angular", "license": "MIT", "peerDependencies": { diff --git a/packages/animations/rollup-testing.config.js b/packages/animations/rollup-testing.config.js new file mode 100644 index 0000000000..3c37bc8f76 --- /dev/null +++ b/packages/animations/rollup-testing.config.js @@ -0,0 +1,20 @@ +/** + * @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/animation/testing/index.js', + dest: '../../../dist/packages-dist/animation/bundles/animation-testing.umd.js', + format: 'umd', + moduleName: 'ng.animation.testing', + globals: { + '@angular/core': 'ng.core', + '@angular/animation': 'ng.animation', + 'rxjs/Observable': 'Rx', + 'rxjs/Subject': 'Rx' + } +}; diff --git a/packages/animations/rollup.config.js b/packages/animations/rollup.config.js new file mode 100644 index 0000000000..9ecbc1047a --- /dev/null +++ b/packages/animations/rollup.config.js @@ -0,0 +1,19 @@ +/** + * @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/animation/index.js', + dest: '../../../dist/packages-dist/animation/bundles/animation.umd.js', + format: 'umd', + moduleName: 'ng.animation', + globals: { + '@angular/core': 'ng.core', + 'rxjs/Observable': 'Rx', + 'rxjs/Subject': 'Rx', + } +}; diff --git a/packages/animations/tsconfig-build.json b/packages/animations/tsconfig-build.json index 7bca914a07..91550f95ce 100644 --- a/packages/animations/tsconfig-build.json +++ b/packages/animations/tsconfig-build.json @@ -6,10 +6,10 @@ "experimentalDecorators": true, "module": "es2015", "moduleResolution": "node", - "outDir": "../../../dist/packages-dist/animations", + "outDir": "../../dist/packages/animations", "paths": { - "@angular/core": ["../../../dist/packages-dist/core"], - "@angular/core/testing": ["../../../dist/packages-dist/core/testing"] + "@angular/core": ["../../dist/packages/core"], + "@angular/core/testing": ["../../dist/packages/core/testing"] }, "rootDir": ".", "sourceMap": true, @@ -22,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/benchpress/test/metric/multi_metric_spec.ts b/packages/benchpress/test/metric/multi_metric_spec.ts index e845dd9c9c..53f2892bbd 100644 --- a/packages/benchpress/test/metric/multi_metric_spec.ts +++ b/packages/benchpress/test/metric/multi_metric_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal'; +import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal'; import {Metric, MultiMetric, ReflectiveInjector} from '../../index'; export function main() { diff --git a/packages/benchpress/test/metric/perflog_metric_spec.ts b/packages/benchpress/test/metric/perflog_metric_spec.ts index 49841e0d20..09e71352ba 100644 --- a/packages/benchpress/test/metric/perflog_metric_spec.ts +++ b/packages/benchpress/test/metric/perflog_metric_spec.ts @@ -7,7 +7,7 @@ */ import {Provider} from '@angular/core'; -import {AsyncTestCompleter, beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal'; +import {AsyncTestCompleter, beforeEach, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal'; import {Metric, Options, PerfLogEvent, PerfLogFeatures, PerflogMetric, ReflectiveInjector, WebDriverExtension} from '../../index'; import {TraceEventFactory} from '../trace_event_factory'; diff --git a/packages/benchpress/test/metric/user_metric_spec.ts b/packages/benchpress/test/metric/user_metric_spec.ts index c064c9d9f7..fe0c382efd 100644 --- a/packages/benchpress/test/metric/user_metric_spec.ts +++ b/packages/benchpress/test/metric/user_metric_spec.ts @@ -7,7 +7,7 @@ */ import {Provider, ReflectiveInjector} from '@angular/core'; -import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal'; +import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal'; import {Options, PerfLogEvent, PerfLogFeatures, UserMetric, WebDriverAdapter} from '../../index'; diff --git a/packages/benchpress/test/reporter/console_reporter_spec.ts b/packages/benchpress/test/reporter/console_reporter_spec.ts index f0f577a751..cc8028233b 100644 --- a/packages/benchpress/test/reporter/console_reporter_spec.ts +++ b/packages/benchpress/test/reporter/console_reporter_spec.ts @@ -7,7 +7,7 @@ */ import {Provider} from '@angular/core'; -import {describe, expect, it} from '@angular/core/testing/testing_internal'; +import {describe, expect, it} from '@angular/core/testing/src/testing_internal'; import {ConsoleReporter, MeasureValues, ReflectiveInjector, SampleDescription} from '../../index'; diff --git a/packages/benchpress/test/reporter/json_file_reporter_spec.ts b/packages/benchpress/test/reporter/json_file_reporter_spec.ts index 193458f44b..27c4b25584 100644 --- a/packages/benchpress/test/reporter/json_file_reporter_spec.ts +++ b/packages/benchpress/test/reporter/json_file_reporter_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal'; +import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal'; import {JsonFileReporter, MeasureValues, Options, ReflectiveInjector, SampleDescription} from '../../index'; diff --git a/packages/benchpress/test/reporter/multi_reporter_spec.ts b/packages/benchpress/test/reporter/multi_reporter_spec.ts index 61fdef5719..1ee54f2cde 100644 --- a/packages/benchpress/test/reporter/multi_reporter_spec.ts +++ b/packages/benchpress/test/reporter/multi_reporter_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal'; +import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal'; import {MeasureValues, MultiReporter, ReflectiveInjector, Reporter} from '../../index'; diff --git a/packages/benchpress/test/runner_spec.ts b/packages/benchpress/test/runner_spec.ts index d5a82eaea6..7e56c1aee2 100644 --- a/packages/benchpress/test/runner_spec.ts +++ b/packages/benchpress/test/runner_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal'; +import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal'; import {Injector, Metric, Options, ReflectiveInjector, Runner, SampleDescription, SampleState, Sampler, Validator, WebDriverAdapter} from '../index'; diff --git a/packages/benchpress/test/sampler_spec.ts b/packages/benchpress/test/sampler_spec.ts index 4542527384..9d095fd736 100644 --- a/packages/benchpress/test/sampler_spec.ts +++ b/packages/benchpress/test/sampler_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal'; +import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal'; import {MeasureValues, Metric, Options, ReflectiveInjector, Reporter, Sampler, Validator, WebDriverAdapter} from '../index'; diff --git a/packages/benchpress/test/statistic_spec.ts b/packages/benchpress/test/statistic_spec.ts index 23124061a0..a1680fe34e 100644 --- a/packages/benchpress/test/statistic_spec.ts +++ b/packages/benchpress/test/statistic_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {describe, expect, it} from '@angular/core/testing/testing_internal'; +import {describe, expect, it} from '@angular/core/testing/src/testing_internal'; import {Statistic} from '../src/statistic'; export function main() { diff --git a/packages/benchpress/test/validator/regression_slope_validator_spec.ts b/packages/benchpress/test/validator/regression_slope_validator_spec.ts index 47741c9889..75be174bef 100644 --- a/packages/benchpress/test/validator/regression_slope_validator_spec.ts +++ b/packages/benchpress/test/validator/regression_slope_validator_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {describe, expect, it} from '@angular/core/testing/testing_internal'; +import {describe, expect, it} from '@angular/core/testing/src/testing_internal'; import {MeasureValues, ReflectiveInjector, RegressionSlopeValidator} from '../../index'; diff --git a/packages/benchpress/test/validator/size_validator_spec.ts b/packages/benchpress/test/validator/size_validator_spec.ts index b5b43ef37f..99bc4b9951 100644 --- a/packages/benchpress/test/validator/size_validator_spec.ts +++ b/packages/benchpress/test/validator/size_validator_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {describe, expect, it} from '@angular/core/testing/testing_internal'; +import {describe, expect, it} from '@angular/core/testing/src/testing_internal'; import {MeasureValues, ReflectiveInjector, SizeValidator} from '../../index'; diff --git a/packages/benchpress/test/web_driver_extension_spec.ts b/packages/benchpress/test/web_driver_extension_spec.ts index c6666e159c..37fdab29ab 100644 --- a/packages/benchpress/test/web_driver_extension_spec.ts +++ b/packages/benchpress/test/web_driver_extension_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal'; +import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal'; import {Options, ReflectiveInjector, WebDriverExtension} from '../index'; diff --git a/packages/benchpress/test/webdriver/chrome_driver_extension_spec.ts b/packages/benchpress/test/webdriver/chrome_driver_extension_spec.ts index 8e1958fe5a..41ba956469 100644 --- a/packages/benchpress/test/webdriver/chrome_driver_extension_spec.ts +++ b/packages/benchpress/test/webdriver/chrome_driver_extension_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal'; +import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal'; import {ChromeDriverExtension, Options, ReflectiveInjector, WebDriverAdapter, WebDriverExtension} from '../../index'; import {TraceEventFactory} from '../trace_event_factory'; diff --git a/packages/benchpress/test/webdriver/ios_driver_extension_spec.ts b/packages/benchpress/test/webdriver/ios_driver_extension_spec.ts index cccdfa7997..d6661b0ca3 100644 --- a/packages/benchpress/test/webdriver/ios_driver_extension_spec.ts +++ b/packages/benchpress/test/webdriver/ios_driver_extension_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal'; +import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal'; import {IOsDriverExtension, ReflectiveInjector, WebDriverAdapter, WebDriverExtension} from '../../index'; import {TraceEventFactory} from '../trace_event_factory'; diff --git a/packages/benchpress/tsconfig-build.json b/packages/benchpress/tsconfig-build.json index 8cd835afda..39d6cbd0ff 100644 --- a/packages/benchpress/tsconfig-build.json +++ b/packages/benchpress/tsconfig-build.json @@ -6,9 +6,9 @@ "noImplicitAny": true, "sourceMap": true, "baseUrl": ".", - "outDir": "../../../dist/packages-dist/benchpress", + "outDir": "../../../dist/packages/benchpress", "paths": { - "@angular/core": ["../../../dist/packages-dist/core"] + "@angular/core": ["../../../dist/packages/core"] }, "experimentalDecorators": true, "rootDir": ".", @@ -20,8 +20,8 @@ }, "files": [ "index.ts", - "../../../node_modules/@types/node/index.d.ts", - "../../../node_modules/@types/jasmine/index.d.ts", - "../../../node_modules/zone.js/dist/zone.js.d.ts" + "../../node_modules/@types/node/index.d.ts", + "../../node_modules/@types/jasmine/index.d.ts", + "../../node_modules/zone.js/dist/zone.js.d.ts" ] } diff --git a/packages/common/package.json b/packages/common/package.json index 448b0285db..1454624d84 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -5,7 +5,7 @@ "main": "./bundles/common.umd.js", "module": "./@angular/common.es5.js", "es2015": "./@angular/common.js", - "typings": "./typings/common.d.ts", + "typings": "./typings/index.d.ts", "author": "angular", "license": "MIT", "peerDependencies": { diff --git a/packages/common/rollup-testing.config.js b/packages/common/rollup-testing.config.js new file mode 100644 index 0000000000..8c0e1d7618 --- /dev/null +++ b/packages/common/rollup-testing.config.js @@ -0,0 +1,20 @@ +/** + * @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/common/testing/index.js', + dest: '../../../dist/packages-dist/common/bundles/common-testing.umd.js', + format: 'umd', + moduleName: 'ng.common.testing', + globals: { + '@angular/core': 'ng.core', + '@angular/common': 'ng.common', + 'rxjs/Observable': 'Rx', + 'rxjs/Subject': 'Rx' + } +}; diff --git a/packages/common/rollup.config.js b/packages/common/rollup.config.js new file mode 100644 index 0000000000..1e6b494fc8 --- /dev/null +++ b/packages/common/rollup.config.js @@ -0,0 +1,19 @@ +/** + * @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/common/index.js', + dest: '../../../dist/packages-dist/common/bundles/common.umd.js', + format: 'umd', + moduleName: 'ng.common', + globals: { + '@angular/core': 'ng.core', + 'rxjs/Observable': 'Rx', + 'rxjs/Subject': 'Rx', + } +}; diff --git a/packages/common/test/directives/ng_component_outlet_spec.ts b/packages/common/test/directives/ng_component_outlet_spec.ts index 99250f33e6..8c0b487d40 100644 --- a/packages/common/test/directives/ng_component_outlet_spec.ts +++ b/packages/common/test/directives/ng_component_outlet_spec.ts @@ -10,7 +10,7 @@ import {CommonModule} from '@angular/common'; import {NgComponentOutlet} from '@angular/common/src/directives/ng_component_outlet'; import {Compiler, Component, ComponentRef, Inject, InjectionToken, Injector, NO_ERRORS_SCHEMA, NgModule, NgModuleFactory, Optional, Provider, QueryList, ReflectiveInjector, TemplateRef, Type, ViewChild, ViewChildren, ViewContainerRef} from '@angular/core'; import {TestBed, async, fakeAsync} from '@angular/core/testing'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; export function main() { describe('insert/remove', () => { @@ -275,4 +275,4 @@ class Module3InjectedComponent { entryComponents: [Module3InjectedComponent] }) export class TestModule3 { -} \ No newline at end of file +} diff --git a/packages/common/test/directives/ng_for_spec.ts b/packages/common/test/directives/ng_for_spec.ts index 50bc9bfcfe..4c5829c679 100644 --- a/packages/common/test/directives/ng_for_spec.ts +++ b/packages/common/test/directives/ng_for_spec.ts @@ -10,7 +10,7 @@ import {CommonModule, NgFor, NgForOf} from '@angular/common'; import {Component, Directive} from '@angular/core'; import {ComponentFixture, TestBed, async} from '@angular/core/testing'; import {By} from '@angular/platform-browser/src/dom/debug/by'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; let thisArg: any; @@ -385,4 +385,4 @@ const TEMPLATE = '
{{item.toString()}}; { return TestBed.overrideComponent(TestComponent, {set: {template: template}}) .createComponent(TestComponent); -} \ No newline at end of file +} diff --git a/packages/common/test/directives/ng_if_spec.ts b/packages/common/test/directives/ng_if_spec.ts index 44b7280365..c1c17f6235 100644 --- a/packages/common/test/directives/ng_if_spec.ts +++ b/packages/common/test/directives/ng_if_spec.ts @@ -11,7 +11,7 @@ import {Component} from '@angular/core'; import {ComponentFixture, TestBed, async} from '@angular/core/testing'; import {By} from '@angular/platform-browser/src/dom/debug/by'; import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; export function main() { describe('ngIf directive', () => { diff --git a/packages/common/test/directives/ng_plural_spec.ts b/packages/common/test/directives/ng_plural_spec.ts index bdb71aba9d..f33580572a 100644 --- a/packages/common/test/directives/ng_plural_spec.ts +++ b/packages/common/test/directives/ng_plural_spec.ts @@ -9,7 +9,7 @@ import {CommonModule, NgLocalization} from '@angular/common'; import {Component, Injectable} from '@angular/core'; import {ComponentFixture, TestBed, async} from '@angular/core/testing'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; export function main() { describe('ngPlural', () => { diff --git a/packages/common/test/directives/ng_switch_spec.ts b/packages/common/test/directives/ng_switch_spec.ts index 11a80a5327..0c6d9f6c2d 100644 --- a/packages/common/test/directives/ng_switch_spec.ts +++ b/packages/common/test/directives/ng_switch_spec.ts @@ -9,7 +9,7 @@ import {CommonModule} from '@angular/common'; import {Attribute, Component, Directive} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; export function main() { describe('NgSwitch', () => { diff --git a/packages/common/test/directives/ng_template_outlet_spec.ts b/packages/common/test/directives/ng_template_outlet_spec.ts index 3c9c060a03..290bf7d6b1 100644 --- a/packages/common/test/directives/ng_template_outlet_spec.ts +++ b/packages/common/test/directives/ng_template_outlet_spec.ts @@ -9,7 +9,7 @@ import {CommonModule} from '@angular/common'; import {Component, ContentChildren, Directive, NO_ERRORS_SCHEMA, QueryList, TemplateRef} from '@angular/core'; import {ComponentFixture, TestBed, async} from '@angular/core/testing'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; export function main() { describe('NgTemplateOutlet', () => { diff --git a/packages/common/test/directives/non_bindable_spec.ts b/packages/common/test/directives/non_bindable_spec.ts index 77da487371..84648ac901 100644 --- a/packages/common/test/directives/non_bindable_spec.ts +++ b/packages/common/test/directives/non_bindable_spec.ts @@ -10,7 +10,7 @@ import {Component, Directive} from '@angular/core'; import {ElementRef} from '@angular/core/src/linker/element_ref'; import {ComponentFixture, TestBed, async} from '@angular/core/testing'; import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; export function main() { describe('non-bindable', () => { diff --git a/packages/common/test/pipes/async_pipe_spec.ts b/packages/common/test/pipes/async_pipe_spec.ts index aed1b22ef1..84ac8fd257 100644 --- a/packages/common/test/pipes/async_pipe_spec.ts +++ b/packages/common/test/pipes/async_pipe_spec.ts @@ -8,9 +8,9 @@ import {AsyncPipe} from '@angular/common'; import {EventEmitter, WrappedValue} from '@angular/core'; -import {AsyncTestCompleter, beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal'; +import {AsyncTestCompleter, beforeEach, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal'; import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; -import {browserDetection} from '@angular/platform-browser/testing/browser_util'; +import {browserDetection} from '@angular/platform-browser/testing/src/browser_util'; import {SpyChangeDetectorRef} from '../spies'; diff --git a/packages/common/test/pipes/date_pipe_spec.ts b/packages/common/test/pipes/date_pipe_spec.ts index 292eabc67d..537d2ae37f 100644 --- a/packages/common/test/pipes/date_pipe_spec.ts +++ b/packages/common/test/pipes/date_pipe_spec.ts @@ -8,7 +8,7 @@ import {DatePipe} from '@angular/common'; import {PipeResolver} from '@angular/compiler/src/pipe_resolver'; -import {browserDetection} from '@angular/platform-browser/testing/browser_util'; +import {browserDetection} from '@angular/platform-browser/testing/src/browser_util'; export function main() { describe('DatePipe', () => { diff --git a/packages/common/test/pipes/i18n_plural_pipe_spec.ts b/packages/common/test/pipes/i18n_plural_pipe_spec.ts index c0aa60a936..dff70dba6e 100644 --- a/packages/common/test/pipes/i18n_plural_pipe_spec.ts +++ b/packages/common/test/pipes/i18n_plural_pipe_spec.ts @@ -8,7 +8,7 @@ import {I18nPluralPipe, NgLocalization} from '@angular/common'; import {PipeResolver} from '@angular/compiler/src/pipe_resolver'; -import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal'; +import {beforeEach, describe, expect, it} from '@angular/core/testing/src/testing_internal'; export function main() { describe('I18nPluralPipe', () => { diff --git a/packages/common/test/pipes/json_pipe_spec.ts b/packages/common/test/pipes/json_pipe_spec.ts index 5c2f338ba7..36b5621b59 100644 --- a/packages/common/test/pipes/json_pipe_spec.ts +++ b/packages/common/test/pipes/json_pipe_spec.ts @@ -9,7 +9,7 @@ import {CommonModule, JsonPipe} from '@angular/common'; import {Component} from '@angular/core'; import {TestBed, async} from '@angular/core/testing'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; export function main() { describe('JsonPipe', () => { diff --git a/packages/common/test/pipes/number_pipe_spec.ts b/packages/common/test/pipes/number_pipe_spec.ts index 030f8e2051..92c6f77e03 100644 --- a/packages/common/test/pipes/number_pipe_spec.ts +++ b/packages/common/test/pipes/number_pipe_spec.ts @@ -8,8 +8,8 @@ import {CurrencyPipe, DecimalPipe, PercentPipe} from '@angular/common'; import {isNumeric} from '@angular/common/src/pipes/number_pipe'; -import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal'; -import {browserDetection} from '@angular/platform-browser/testing/browser_util'; +import {beforeEach, describe, expect, it} from '@angular/core/testing/src/testing_internal'; +import {browserDetection} from '@angular/platform-browser/testing/src/browser_util'; export function main() { describe('Number pipes', () => { diff --git a/packages/common/test/pipes/slice_pipe_spec.ts b/packages/common/test/pipes/slice_pipe_spec.ts index d535dd0463..4dc7aa9c7f 100644 --- a/packages/common/test/pipes/slice_pipe_spec.ts +++ b/packages/common/test/pipes/slice_pipe_spec.ts @@ -9,7 +9,7 @@ import {CommonModule, SlicePipe} from '@angular/common'; import {Component} from '@angular/core'; import {TestBed, async} from '@angular/core/testing'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; export function main() { describe('SlicePipe', () => { diff --git a/packages/common/test/spies.ts b/packages/common/test/spies.ts index 6338e5252c..e956a4821c 100644 --- a/packages/common/test/spies.ts +++ b/packages/common/test/spies.ts @@ -7,7 +7,7 @@ */ import {ChangeDetectorRef} from '@angular/core/src/change_detection/change_detector_ref'; -import {SpyObject} from '@angular/core/testing/testing_internal'; +import {SpyObject} from '@angular/core/testing/src/testing_internal'; export class SpyChangeDetectorRef extends SpyObject { constructor() { diff --git a/packages/common/testing/index.ts b/packages/common/testing/index.ts new file mode 100644 index 0000000000..4e8c99c410 --- /dev/null +++ b/packages/common/testing/index.ts @@ -0,0 +1,15 @@ +/** + * @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 core/testing package. + */ + +export * from './src/testing'; diff --git a/packages/common/testing/package.json b/packages/common/testing/package.json new file mode 100644 index 0000000000..5611599bf6 --- /dev/null +++ b/packages/common/testing/package.json @@ -0,0 +1,6 @@ +{ + "typings": "../typings/testing/index.d.ts", + "main": "../bundles/common-testing.umd.js", + "module": "../@angular/common/testing.es5.js", + "es2015": "../@angular/common/testing.js" +} diff --git a/packages/common/testing/src/index.ts b/packages/common/testing/src/testing.ts similarity index 100% rename from packages/common/testing/src/index.ts rename to packages/common/testing/src/testing.ts diff --git a/packages/common/testing/tsconfig-build.json b/packages/common/testing/tsconfig-build.json index 5a6d939e50..766d5659b6 100644 --- a/packages/common/testing/tsconfig-build.json +++ b/packages/common/testing/tsconfig-build.json @@ -1,14 +1,14 @@ { - "extends": "./tsconfig-build", + "extends": "../tsconfig-build", "compilerOptions": { "paths": { - "@angular/core": ["../../../dist/packages-dist/core/"], - "@angular/common": ["../../../dist/packages-dist/common"] + "@angular/core": ["../../dist/packages/core/"], + "@angular/common": ["../../dist/packages/common"] } }, "files": [ - "testing/index.ts", + "index.ts", "../../../node_modules/zone.js/dist/zone.js.d.ts" ], "angularCompilerOptions": { diff --git a/packages/common/tsconfig-build.json b/packages/common/tsconfig-build.json index ee54e17dd3..8cd3b7541c 100644 --- a/packages/common/tsconfig-build.json +++ b/packages/common/tsconfig-build.json @@ -6,9 +6,9 @@ "experimentalDecorators": true, "module": "es2015", "moduleResolution": "node", - "outDir": "../../../dist/packages-dist/common", + "outDir": "../../dist/packages/common", "paths": { - "@angular/core": ["../../../dist/packages-dist/core"] + "@angular/core": ["../../dist/packages/core"] }, "rootDir": ".", "sourceMap": true, @@ -21,7 +21,7 @@ }, "files": [ "public_api.ts", - "../../../node_modules/zone.js/dist/zone.js.d.ts" + "../../node_modules/zone.js/dist/zone.js.d.ts" ], "angularCompilerOptions": { "annotateForClosureCompiler": true, diff --git a/packages/compiler-cli/esm5/index.ts b/packages/compiler-cli/esm5/index.ts new file mode 100644 index 0000000000..4b6a078c14 --- /dev/null +++ b/packages/compiler-cli/esm5/index.ts @@ -0,0 +1,15 @@ +/** + * @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 compiler-cli/esm5 package. + */ + +export * from '../index'; diff --git a/packages/compiler-cli/esm5/tsconfig-build.json b/packages/compiler-cli/esm5/tsconfig-build.json index 93dc59d24a..525457123e 100644 --- a/packages/compiler-cli/esm5/tsconfig-build.json +++ b/packages/compiler-cli/esm5/tsconfig-build.json @@ -1,8 +1,7 @@ { - "extends": "./tsconfig-build", - "compilerOptions": { - "module": "es2015", - "moduleResolution": "node", - "outDir": "../../../dist/esm/compiler-cli" - } + "extends": "../tsconfig-build", + "compilerOptions": { + "module": "es2015", + "moduleResolution": "node" + } } diff --git a/packages/compiler-cli/tsconfig-build.json b/packages/compiler-cli/tsconfig-build.json index feeb281c8e..173ee83cc5 100644 --- a/packages/compiler-cli/tsconfig-build.json +++ b/packages/compiler-cli/tsconfig-build.json @@ -1,34 +1,39 @@ { - "compilerOptions": { - "baseUrl": ".", - "declaration": true, - "experimentalDecorators": true, - "noImplicitAny": true, - "module": "commonjs", - "outDir": "../../../dist/packages-dist/compiler-cli", - "paths": { - "@angular/core": ["../../../dist/packages-dist/core"], - "@angular/common": ["../../../dist/packages-dist/common"], - "@angular/compiler": ["../../../dist/packages-dist/compiler"], - "@angular/http": ["../../../dist/packages-dist/http"], - "@angular/platform-server": ["../../../dist/packages-dist/platform-server"], - "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"], - "@angular/tsc-wrapped": ["../../../dist/tools/@angular/tsc-wrapped"] - }, - "rootDir": ".", - "sourceMap": true, - "inlineSources": true, - "target": "es5", - "lib": ["es6", "dom"], - "skipLibCheck": true + "compilerOptions": { + "baseUrl": ".", + "declaration": true, + "experimentalDecorators": true, + "noImplicitAny": true, + "module": "commonjs", + "outDir": "../../dist/packages/compiler-cli", + "paths": { + "@angular/core": ["../../dist/packages/core"], + "@angular/common": ["../../dist/packages/common"], + "@angular/compiler": ["../../dist/packages/compiler"], + "@angular/http": ["../../dist/packages/http"], + "@angular/platform-server": ["../../dist/packages/platform-server"], + "@angular/platform-browser": ["../../dist/packages/platform-browser"], + "@angular/tsc-wrapped": ["../../dist/tools/@angular/tsc-wrapped"] }, - "exclude": ["integrationtest"], - "files": [ - "index.ts", - "src/main.ts", - "src/extract_i18n.ts", - "../../../node_modules/@types/node/index.d.ts", - "../../../node_modules/@types/jasmine/index.d.ts", - "../../../node_modules/zone.js/dist/zone.js.d.ts" - ] + "rootDir": ".", + "sourceMap": true, + "inlineSources": true, + "target": "es5", + "lib": [ + "es6", + "dom" + ], + "skipLibCheck": true + }, + "exclude": [ + "integrationtest" + ], + "files": [ + "index.ts", + "src/main.ts", + "src/extract_i18n.ts", + "../../node_modules/@types/node/index.d.ts", + "../../node_modules/@types/jasmine/index.d.ts", + "../../node_modules/zone.js/dist/zone.js.d.ts" + ] } diff --git a/packages/compiler/es5/index.ts b/packages/compiler/es5/index.ts new file mode 100644 index 0000000000..de2680e673 --- /dev/null +++ b/packages/compiler/es5/index.ts @@ -0,0 +1,15 @@ +/** + * @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 compiler/testing package. + */ + +export * from '../index'; diff --git a/packages/compiler/es5/tsconfig-build.json b/packages/compiler/es5/tsconfig-build.json index 855d8fcce6..28a9dcf8b0 100644 --- a/packages/compiler/es5/tsconfig-build.json +++ b/packages/compiler/es5/tsconfig-build.json @@ -1,9 +1,12 @@ { - "extends": "./tsconfig-build", + "extends": "../tsconfig-build", "compilerOptions": { - "outDir": "../../../dist/packages-dist/compiler/es5", "target": "es5" - } + }, + "files": [ + "index.ts", + "../../../node_modules/zone.js/dist/zone.js.d.ts" + ] } diff --git a/packages/compiler/esm5/index.ts b/packages/compiler/esm5/index.ts new file mode 100644 index 0000000000..3dffc899bc --- /dev/null +++ b/packages/compiler/esm5/index.ts @@ -0,0 +1,15 @@ +/** + * @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 compiler/esm5 package. + */ + +export * from '../index'; diff --git a/packages/compiler/esm5/tsconfig-build.json b/packages/compiler/esm5/tsconfig-build.json index e86a8362e4..46757662ff 100644 --- a/packages/compiler/esm5/tsconfig-build.json +++ b/packages/compiler/esm5/tsconfig-build.json @@ -1,7 +1,11 @@ { - "extends": "./tsconfig-build", + "extends": "../tsconfig-build", + "compilerOptions": { - "outDir": "../../../dist/esm/compiler", "target": "es5" - } + }, + "files": [ + "index.ts", + "../../../node_modules/zone.js/dist/zone.js.d.ts" + ] } diff --git a/packages/compiler/package.json b/packages/compiler/package.json index 72e6de1a38..f8faddaf5d 100644 --- a/packages/compiler/package.json +++ b/packages/compiler/package.json @@ -5,7 +5,7 @@ "main": "./bundles/compiler.umd.js", "module": "./@angular/compiler.es5.js", "es2015": "./@angular/compiler.js", - "typings": "./typings/compiler.d.ts", + "typings": "./typings/index.d.ts", "author": "angular", "license": "MIT", "peerDependencies": { diff --git a/packages/compiler/rollup-testing.config.js b/packages/compiler/rollup-testing.config.js new file mode 100644 index 0000000000..8772530d02 --- /dev/null +++ b/packages/compiler/rollup-testing.config.js @@ -0,0 +1,21 @@ +/** + * @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/compiler/testing/index.js', + dest: '../../../dist/packages-dist/compiler/bundles/compiler-testing.umd.js', + format: 'umd', + moduleName: 'ng.compiler.testing', + globals: { + '@angular/core': 'ng.core', + '@angular/core/testing': 'ng.core.testing', + '@angular/compiler': 'ng.compiler', + 'rxjs/Observable': 'Rx', + 'rxjs/Subject': 'Rx' + } +}; diff --git a/packages/compiler/rollup.config.js b/packages/compiler/rollup.config.js new file mode 100644 index 0000000000..4aa5777651 --- /dev/null +++ b/packages/compiler/rollup.config.js @@ -0,0 +1,22 @@ +/** + * @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/compiler/index.js', + dest: '../../../dist/packages-dist/compiler/bundles/compiler.umd.js', + format: 'umd', + moduleName: 'ng.compiler', + globals: { + '@angular/core': 'ng.core', + 'rxjs/Observable': 'Rx', + 'rxjs/Subject': 'Rx', + }, + plugins: [ + // nodeResolve({ jsnext: true, main: true }), + ] +}; diff --git a/packages/compiler/test/css_parser/css_lexer_spec.ts b/packages/compiler/test/css_parser/css_lexer_spec.ts index 616b092a22..cd8a89ee26 100644 --- a/packages/compiler/test/css_parser/css_lexer_spec.ts +++ b/packages/compiler/test/css_parser/css_lexer_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {describe, expect, it} from '../../../core/testing/testing_internal'; +import {describe, expect, it} from '../../../core/testing/src/testing_internal'; import {CssLexer, CssLexerMode, CssToken, CssTokenType, cssScannerError, getRawMessage, getToken} from '../../src/css_parser/css_lexer'; export function main() { diff --git a/packages/compiler/test/css_parser/css_parser_spec.ts b/packages/compiler/test/css_parser/css_parser_spec.ts index d2f7149e00..5e2ed67838 100644 --- a/packages/compiler/test/css_parser/css_parser_spec.ts +++ b/packages/compiler/test/css_parser/css_parser_spec.ts @@ -7,7 +7,7 @@ */ -import {describe, expect, it} from '../../../core/testing/testing_internal'; +import {describe, expect, it} from '../../../core/testing/src/testing_internal'; import {CssBlockAst, CssBlockDefinitionRuleAst, CssBlockRuleAst, CssDefinitionAst, CssInlineRuleAst, CssKeyframeDefinitionAst, CssKeyframeRuleAst, CssMediaQueryRuleAst, CssSelectorRuleAst, CssStyleSheetAst, CssStyleValueAst} from '../../src/css_parser/css_ast'; import {BlockType, CssParseError, CssParser, CssToken, ParsedCssResult} from '../../src/css_parser/css_parser'; import {ParseLocation} from '../../src/parse_util'; diff --git a/packages/compiler/test/css_parser/css_visitor_spec.ts b/packages/compiler/test/css_parser/css_visitor_spec.ts index 53325ad0e7..f0c6516b1f 100644 --- a/packages/compiler/test/css_parser/css_visitor_spec.ts +++ b/packages/compiler/test/css_parser/css_visitor_spec.ts @@ -7,7 +7,7 @@ */ -import {beforeEach, describe, expect, it} from '../../../core/testing/testing_internal'; +import {beforeEach, describe, expect, it} from '../../../core/testing/src/testing_internal'; import {CssAst, CssAstVisitor, CssAtRulePredicateAst, CssBlockAst, CssDefinitionAst, CssInlineRuleAst, CssKeyframeDefinitionAst, CssKeyframeRuleAst, CssMediaQueryRuleAst, CssPseudoSelectorAst, CssRuleAst, CssSelectorAst, CssSelectorRuleAst, CssSimpleSelectorAst, CssStyleSheetAst, CssStyleValueAst, CssStylesBlockAst, CssUnknownRuleAst, CssUnknownTokenListAst} from '../../src/css_parser/css_ast'; import {BlockType, CssParseError, CssParser, CssToken} from '../../src/css_parser/css_parser'; diff --git a/packages/compiler/test/directive_normalizer_spec.ts b/packages/compiler/test/directive_normalizer_spec.ts index 42755f9f42..25c0aa9f8f 100644 --- a/packages/compiler/test/directive_normalizer_spec.ts +++ b/packages/compiler/test/directive_normalizer_spec.ts @@ -9,11 +9,11 @@ import {CompileDirectiveMetadata, CompileStylesheetMetadata, CompileTemplateMeta import {CompilerConfig} from '@angular/compiler/src/config'; import {DirectiveNormalizer} from '@angular/compiler/src/directive_normalizer'; import {ResourceLoader} from '@angular/compiler/src/resource_loader'; -import {MockResourceLoader} from '@angular/compiler/testing/resource_loader_mock'; -import {TEST_COMPILER_PROVIDERS} from '@angular/compiler/testing/test_bindings'; +import {MockResourceLoader} from '@angular/compiler/testing/src/resource_loader_mock'; +import {TEST_COMPILER_PROVIDERS} from '@angular/compiler/testing/src/test_bindings'; import {ViewEncapsulation} from '@angular/core/src/metadata/view'; import {TestBed} from '@angular/core/testing'; -import {AsyncTestCompleter, beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal'; +import {AsyncTestCompleter, beforeEach, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal'; import {SpyResourceLoader} from './spies'; diff --git a/packages/compiler/test/directive_resolver_mock_spec.ts b/packages/compiler/test/directive_resolver_mock_spec.ts index 240a6f6289..e74d4e06ca 100644 --- a/packages/compiler/test/directive_resolver_mock_spec.ts +++ b/packages/compiler/test/directive_resolver_mock_spec.ts @@ -8,7 +8,7 @@ import {Component, Directive, Injector, ɵViewMetadata as ViewMetadata} from '@angular/core'; import {TestBed, inject} from '@angular/core/testing'; -import {MockDirectiveResolver} from '../testing/index'; +import {MockDirectiveResolver} from '../testing'; export function main() { describe('MockDirectiveResolver', () => { diff --git a/packages/compiler/test/expression_parser/parser_spec.ts b/packages/compiler/test/expression_parser/parser_spec.ts index f5d42723e0..50f2c76c5e 100644 --- a/packages/compiler/test/expression_parser/parser_spec.ts +++ b/packages/compiler/test/expression_parser/parser_spec.ts @@ -9,7 +9,7 @@ import {ASTWithSource, BindingPipe, Interpolation, ParserError, TemplateBinding} from '@angular/compiler/src/expression_parser/ast'; import {Lexer} from '@angular/compiler/src/expression_parser/lexer'; import {Parser, SplitInterpolation, TemplateBindingParseResult} from '@angular/compiler/src/expression_parser/parser'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; import {unparse} from './unparser'; diff --git a/packages/compiler/test/i18n/integration_spec.ts b/packages/compiler/test/i18n/integration_spec.ts index b7a36dd371..573737e7c3 100644 --- a/packages/compiler/test/i18n/integration_spec.ts +++ b/packages/compiler/test/i18n/integration_spec.ts @@ -15,8 +15,8 @@ import {DEFAULT_INTERPOLATION_CONFIG} from '@angular/compiler/src/ml_parser/inte import {Component, DebugElement, TRANSLATIONS, TRANSLATIONS_FORMAT} from '@angular/core'; import {TestBed, async} from '@angular/core/testing'; import {By} from '@angular/platform-browser/src/dom/debug/by'; -import {stringifyElement} from '@angular/platform-browser/testing/browser_util'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {stringifyElement} from '@angular/platform-browser/testing/src/browser_util'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; import {SpyResourceLoader} from '../spies'; diff --git a/packages/compiler/test/integration_spec.ts b/packages/compiler/test/integration_spec.ts index 95051bc688..a4d995a2b4 100644 --- a/packages/compiler/test/integration_spec.ts +++ b/packages/compiler/test/integration_spec.ts @@ -9,7 +9,7 @@ import {Component, Directive, Input} from '@angular/core'; import {ComponentFixture, TestBed, async} from '@angular/core/testing'; import {By} from '@angular/platform-browser/src/dom/debug/by'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; export function main() { describe('integration tests', () => { diff --git a/packages/compiler/test/metadata_overrider_spec.ts b/packages/compiler/test/metadata_overrider_spec.ts index 4d6ca8ca28..aa038c4edd 100644 --- a/packages/compiler/test/metadata_overrider_spec.ts +++ b/packages/compiler/test/metadata_overrider_spec.ts @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ -import {expect} from '@angular/platform-browser/testing/matchers'; -import {MetadataOverrider} from '../testing/metadata_overrider'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; +import {MetadataOverrider} from '../testing/src/metadata_overrider'; interface SomeMetadataType { plainProp?: string; diff --git a/packages/compiler/test/metadata_resolver_spec.ts b/packages/compiler/test/metadata_resolver_spec.ts index 841b2c7800..3cd1040e60 100644 --- a/packages/compiler/test/metadata_resolver_spec.ts +++ b/packages/compiler/test/metadata_resolver_spec.ts @@ -6,14 +6,14 @@ * found in the LICENSE file at https://angular.io/license */ -import {TEST_COMPILER_PROVIDERS} from '@angular/compiler/testing/test_bindings'; +import {TEST_COMPILER_PROVIDERS} from '@angular/compiler/testing/src/test_bindings'; import {AfterContentChecked, AfterContentInit, AfterViewChecked, AfterViewInit, ChangeDetectionStrategy, Component, Directive, DoCheck, Injectable, NgModule, OnChanges, OnDestroy, OnInit, Pipe, SimpleChanges, ViewEncapsulation, ɵstringify as stringify} from '@angular/core'; import {LIFECYCLE_HOOKS_VALUES} from '@angular/core/src/metadata/lifecycle_hooks'; import {TestBed, async, inject} from '@angular/core/testing'; import {identifierName} from '../src/compile_metadata'; import {CompileMetadataResolver} from '../src/metadata_resolver'; import {ResourceLoader} from '../src/resource_loader'; -import {MockResourceLoader} from '../testing/resource_loader_mock'; +import {MockResourceLoader} from '../testing/src/resource_loader_mock'; import {MalformedStylesComponent} from './metadata_resolver_fixture'; export function main() { diff --git a/packages/compiler/test/ng_module_resolver_mock_spec.ts b/packages/compiler/test/ng_module_resolver_mock_spec.ts index 5d072592dd..a0131eb350 100644 --- a/packages/compiler/test/ng_module_resolver_mock_spec.ts +++ b/packages/compiler/test/ng_module_resolver_mock_spec.ts @@ -7,8 +7,8 @@ */ import {Injector, NgModule} from '@angular/core'; -import {beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal'; -import {MockNgModuleResolver} from '../testing/index'; +import {beforeEach, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal'; +import {MockNgModuleResolver} from '../testing'; export function main() { describe('MockNgModuleResolver', () => { diff --git a/packages/compiler/test/pipe_resolver_mock_spec.ts b/packages/compiler/test/pipe_resolver_mock_spec.ts index e2740a8a9d..141afb2285 100644 --- a/packages/compiler/test/pipe_resolver_mock_spec.ts +++ b/packages/compiler/test/pipe_resolver_mock_spec.ts @@ -7,8 +7,8 @@ */ import {Injector, Pipe} from '@angular/core'; -import {beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal'; -import {MockPipeResolver} from '../testing/index'; +import {beforeEach, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal'; +import {MockPipeResolver} from '../testing'; export function main() { describe('MockPipeResolver', () => { diff --git a/packages/compiler/test/resource_loader_mock_spec.ts b/packages/compiler/test/resource_loader_mock_spec.ts index af1532bd95..8d4b0ff1ce 100644 --- a/packages/compiler/test/resource_loader_mock_spec.ts +++ b/packages/compiler/test/resource_loader_mock_spec.ts @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ -import {MockResourceLoader} from '@angular/compiler/testing/resource_loader_mock'; -import {AsyncTestCompleter, beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal'; +import {MockResourceLoader} from '@angular/compiler/testing/src/resource_loader_mock'; +import {AsyncTestCompleter, beforeEach, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal'; export function main() { describe('MockResourceLoader', () => { diff --git a/packages/compiler/test/runtime_compiler_spec.ts b/packages/compiler/test/runtime_compiler_spec.ts index 4d55943758..95184596dc 100644 --- a/packages/compiler/test/runtime_compiler_spec.ts +++ b/packages/compiler/test/runtime_compiler_spec.ts @@ -9,8 +9,8 @@ import {DirectiveResolver, ResourceLoader} from '@angular/compiler'; import {Compiler, Component, Injector, NgModule, NgModuleFactory, ɵViewMetadata as ViewMetadata, ɵstringify as stringify} from '@angular/core'; import {TestBed, async, fakeAsync, inject, tick} from '@angular/core/testing'; -import {expect} from '@angular/platform-browser/testing/matchers'; -import {MockDirectiveResolver} from '../testing/index'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; +import {MockDirectiveResolver} from '../testing'; import {SpyResourceLoader} from './spies'; @Component({selector: 'child-cmp'}) diff --git a/packages/compiler/test/schema/dom_element_schema_registry_spec.ts b/packages/compiler/test/schema/dom_element_schema_registry_spec.ts index 0e93a53c7f..e6d8763dab 100644 --- a/packages/compiler/test/schema/dom_element_schema_registry_spec.ts +++ b/packages/compiler/test/schema/dom_element_schema_registry_spec.ts @@ -8,8 +8,8 @@ import {DomElementSchemaRegistry} from '@angular/compiler/src/schema/dom_element_schema_registry'; import {CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA, SecurityContext} from '@angular/core'; -import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal'; -import {browserDetection} from '@angular/platform-browser/testing/browser_util'; +import {beforeEach, describe, expect, it} from '@angular/core/testing/src/testing_internal'; +import {browserDetection} from '@angular/platform-browser/testing/src/browser_util'; import {Element} from '../../src/ml_parser/ast'; import {HtmlParser} from '../../src/ml_parser/html_parser'; diff --git a/packages/compiler/test/selector_spec.ts b/packages/compiler/test/selector_spec.ts index f21ead93d5..0d14b212bd 100644 --- a/packages/compiler/test/selector_spec.ts +++ b/packages/compiler/test/selector_spec.ts @@ -8,7 +8,7 @@ import {CssSelector, SelectorMatcher} from '@angular/compiler/src/selector'; import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; -import {el} from '@angular/platform-browser/testing/browser_util'; +import {el} from '@angular/platform-browser/testing/src/browser_util'; export function main() { describe('SelectorMatcher', () => { @@ -457,4 +457,4 @@ function getSelectorFor( classes.trim().split(/\s+/g).forEach(cName => { selector.addClassName(cName); }); return selector; -} \ No newline at end of file +} diff --git a/packages/compiler/test/shadow_css_spec.ts b/packages/compiler/test/shadow_css_spec.ts index 298df15bc1..067e829579 100644 --- a/packages/compiler/test/shadow_css_spec.ts +++ b/packages/compiler/test/shadow_css_spec.ts @@ -7,7 +7,7 @@ */ import {CssRule, ShadowCss, processRules} from '@angular/compiler/src/shadow_css'; -import {normalizeCSS} from '@angular/platform-browser/testing/browser_util'; +import {normalizeCSS} from '@angular/platform-browser/testing/src/browser_util'; export function main() { describe('ShadowCss', function() { diff --git a/packages/compiler/test/spies.ts b/packages/compiler/test/spies.ts index 118808a2c9..b86939489a 100644 --- a/packages/compiler/test/spies.ts +++ b/packages/compiler/test/spies.ts @@ -8,7 +8,7 @@ import {ResourceLoader} from '@angular/compiler/src/resource_loader'; -import {SpyObject} from '@angular/core/testing/testing_internal'; +import {SpyObject} from '@angular/core/testing/src/testing_internal'; export class SpyResourceLoader extends SpyObject { constructor() { super(ResourceLoader); } diff --git a/packages/compiler/test/template_parser/template_parser_spec.ts b/packages/compiler/test/template_parser/template_parser_spec.ts index 95cadeeb5b..c87ef9cf3e 100644 --- a/packages/compiler/test/template_parser/template_parser_spec.ts +++ b/packages/compiler/test/template_parser/template_parser_spec.ts @@ -11,14 +11,14 @@ import {DomElementSchemaRegistry} from '@angular/compiler/src/schema/dom_element import {ElementSchemaRegistry} from '@angular/compiler/src/schema/element_schema_registry'; import {AttrAst, BoundDirectivePropertyAst, BoundElementPropertyAst, BoundEventAst, BoundTextAst, DirectiveAst, ElementAst, EmbeddedTemplateAst, NgContentAst, PropertyBindingType, ProviderAstType, ReferenceAst, TemplateAst, TemplateAstVisitor, TextAst, VariableAst, templateVisitAll} from '@angular/compiler/src/template_parser/template_ast'; import {TEMPLATE_TRANSFORMS, TemplateParser, splitClasses} from '@angular/compiler/src/template_parser/template_parser'; -import {TEST_COMPILER_PROVIDERS} from '@angular/compiler/testing/test_bindings'; +import {TEST_COMPILER_PROVIDERS} from '@angular/compiler/testing/src/test_bindings'; import {SchemaMetadata, SecurityContext} from '@angular/core'; import {Console} from '@angular/core/src/console'; import {TestBed, inject} from '@angular/core/testing'; import {Identifiers, createIdentifierToken, identifierToken} from '../../src/identifiers'; import {DEFAULT_INTERPOLATION_CONFIG, InterpolationConfig} from '../../src/ml_parser/interpolation_config'; -import {MockSchemaRegistry} from '../../testing/index'; +import {MockSchemaRegistry} from '../../testing'; import {unparse} from '../expression_parser/unparser'; const someModuleUrl = 'package:someModule'; diff --git a/packages/compiler/test/template_parser/template_preparser_spec.ts b/packages/compiler/test/template_parser/template_preparser_spec.ts index 2bb27e7e0f..6325fe216e 100644 --- a/packages/compiler/test/template_parser/template_preparser_spec.ts +++ b/packages/compiler/test/template_parser/template_preparser_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {beforeEach, describe, expect, inject, it} from '../../../core/testing/testing_internal'; +import {beforeEach, describe, expect, inject, it} from '../../../core/testing/src/testing_internal'; import {Element} from '../../src/ml_parser/ast'; import {HtmlParser} from '../../src/ml_parser/html_parser'; import {PreparsedElement, PreparsedElementType, preparseElement} from '../../src/template_parser/template_preparser'; diff --git a/packages/compiler/test/url_resolver_spec.ts b/packages/compiler/test/url_resolver_spec.ts index b6a538d04b..5ff34842bc 100644 --- a/packages/compiler/test/url_resolver_spec.ts +++ b/packages/compiler/test/url_resolver_spec.ts @@ -7,7 +7,7 @@ */ import {UrlResolver, createOfflineCompileUrlResolver} from '@angular/compiler/src/url_resolver'; -import {beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal'; +import {beforeEach, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal'; export function main() { describe('UrlResolver', () => { diff --git a/packages/compiler/test/util_spec.ts b/packages/compiler/test/util_spec.ts index 642f931e65..9c9d883228 100644 --- a/packages/compiler/test/util_spec.ts +++ b/packages/compiler/test/util_spec.ts @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ -import {fakeAsync} from '@angular/core/testing/fake_async'; -import {describe, expect, it} from '@angular/core/testing/testing_internal'; +import {fakeAsync} from '@angular/core/testing/src/fake_async'; +import {describe, expect, it} from '@angular/core/testing/src/testing_internal'; import {SyncAsyncResult, escapeRegExp, splitAtColon} from '../src/util'; diff --git a/packages/compiler/testing/index.ts b/packages/compiler/testing/index.ts new file mode 100644 index 0000000000..ff6c4f031f --- /dev/null +++ b/packages/compiler/testing/index.ts @@ -0,0 +1,15 @@ +/** + * @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 compiler/testing package. + */ + +export * from './src/testing'; diff --git a/packages/compiler/testing/package.json b/packages/compiler/testing/package.json new file mode 100644 index 0000000000..46beb8e2f2 --- /dev/null +++ b/packages/compiler/testing/package.json @@ -0,0 +1,6 @@ +{ + "typings": "../typings/testing/index.d.ts", + "main": "../bundles/compiler-testing.umd.js", + "module": "../@angular/compiler/testing.es5.js", + "es2015": "../@angular/compiler/testing.js" +} diff --git a/packages/compiler/testing/src/index.ts b/packages/compiler/testing/src/testing.ts similarity index 100% rename from packages/compiler/testing/src/index.ts rename to packages/compiler/testing/src/testing.ts diff --git a/packages/compiler/testing/tsconfig-build.json b/packages/compiler/testing/tsconfig-build.json index cd278208ac..48497dfcce 100644 --- a/packages/compiler/testing/tsconfig-build.json +++ b/packages/compiler/testing/tsconfig-build.json @@ -1,17 +1,17 @@ { - "extends": "./tsconfig-build", + "extends": "../tsconfig-build", "compilerOptions": { // Test that we rely on decorator downleveling "emitDecoratorMetadata": false, "paths": { - "@angular/core": ["../../../dist/packages-dist/core"], - "@angular/core/testing": ["../../../dist/packages-dist/core/testing"], - "@angular/compiler": ["../../../dist/packages-dist/compiler"] + "@angular/core": ["../../dist/packages/core"], + "@angular/core/testing": ["../../dist/packages/core/testing"], + "@angular/compiler": ["../../dist/packages/compiler"] } }, "files": [ - "testing/index.ts", + "index.ts", "../../../node_modules/zone.js/dist/zone.js.d.ts" ] } diff --git a/packages/compiler/tsconfig-build.json b/packages/compiler/tsconfig-build.json index 85e3335637..5ea0aa7e89 100644 --- a/packages/compiler/tsconfig-build.json +++ b/packages/compiler/tsconfig-build.json @@ -7,10 +7,10 @@ "experimentalDecorators": true, "module": "es2015", "moduleResolution": "node", - "outDir": "../../../dist/packages-dist/compiler", + "outDir": "../../dist/packages/compiler", "paths": { - "@angular/core": ["../../../dist/packages-dist/core"], - "@angular/core/testing": ["../../../dist/packages-dist/core/testing"] + "@angular/core": ["../../dist/packages/core"], + "@angular/core/testing": ["../../dist/packages/core/testing"] }, "rootDir": ".", "sourceMap": true, @@ -23,7 +23,7 @@ }, "files": [ "index.ts", - "../../../node_modules/zone.js/dist/zone.js.d.ts" + "../../node_modules/zone.js/dist/zone.js.d.ts" ], "angularCompilerOptions": { "annotateForClosureCompiler": true diff --git a/packages/core/esm5/index.ts b/packages/core/esm5/index.ts new file mode 100644 index 0000000000..de206ae5c0 --- /dev/null +++ b/packages/core/esm5/index.ts @@ -0,0 +1,15 @@ +/** + * @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 core/esm5 package. + */ + +export * from './src/core'; diff --git a/packages/core/esm5/src b/packages/core/esm5/src new file mode 120000 index 0000000000..5cd551cf26 --- /dev/null +++ b/packages/core/esm5/src @@ -0,0 +1 @@ +../src \ No newline at end of file diff --git a/packages/core/esm5/tsconfig-build.json b/packages/core/esm5/tsconfig-build.json index 2265ab6574..56148d3c1f 100644 --- a/packages/core/esm5/tsconfig-build.json +++ b/packages/core/esm5/tsconfig-build.json @@ -1,7 +1,6 @@ { - "extends": "./tsconfig-build", + "extends": "../tsconfig-build", "compilerOptions": { - "outDir": "../../../dist/esm/core", "target": "es5" }, "files": [ diff --git a/packages/core/package.json b/packages/core/package.json index b01e73f373..827567ce10 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -5,7 +5,7 @@ "main": "./bundles/core.umd.js", "module": "./@angular/core.es5.js", "es2015": "./@angular/core.js", - "typings": "./typings/core.d.ts", + "typings": "./typings/index.d.ts", "author": "angular", "license": "MIT", "peerDependencies": { diff --git a/packages/core/rollup-testing.config.js b/packages/core/rollup-testing.config.js new file mode 100644 index 0000000000..bf27b75a40 --- /dev/null +++ b/packages/core/rollup-testing.config.js @@ -0,0 +1,19 @@ +/** + * @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/core/testing/index.js', + dest: '../../../dist/packages-dist/core/bundles/core-testing.umd.js', + format: 'umd', + moduleName: 'ng.core.testing', + globals: { + '@angular/core': 'ng.core', + 'rxjs/Observable': 'Rx', + 'rxjs/Subject': 'Rx', + } +}; diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js new file mode 100644 index 0000000000..ec3cd290ef --- /dev/null +++ b/packages/core/rollup.config.js @@ -0,0 +1,23 @@ +/** + * @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/core/@angular/core.es5.js', + dest: '../../dist/packages-dist/core/bundles/core.umd.js', + format: 'umd', + moduleName: 'ng.core', + globals: { + 'rxjs/Observable': 'Rx', + 'rxjs/Subject': 'Rx', + 'rxjs/Observer': 'Rx', + 'rxjs/Subscription': 'Rx', + 'rxjs/symbol/observable': 'Rx.Symbol.observable', + 'rxjs/observable/merge': 'Rx.Observable', + 'rxjs/operator/share': 'Rx.Observable.prototype' + } +}; diff --git a/packages/core/test/application_module_spec.ts b/packages/core/test/application_module_spec.ts index e60f3af880..969ba61233 100644 --- a/packages/core/test/application_module_spec.ts +++ b/packages/core/test/application_module_spec.ts @@ -7,7 +7,7 @@ */ import {LOCALE_ID} from '@angular/core'; -import {describe, expect, inject, it} from '../testing/testing_internal'; +import {describe, expect, inject, it} from '../testing/src/testing_internal'; export function main() { describe('Application module', () => { diff --git a/packages/core/test/application_ref_spec.ts b/packages/core/test/application_ref_spec.ts index ebe21cd52e..fd3c48c7ff 100644 --- a/packages/core/test/application_ref_spec.ts +++ b/packages/core/test/application_ref_spec.ts @@ -14,8 +14,8 @@ import {TestComponentRenderer} from '@angular/core/testing'; import {BrowserModule} from '@angular/platform-browser'; import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {DOCUMENT} from '@angular/platform-browser/src/dom/dom_tokens'; -import {dispatchEvent} from '@angular/platform-browser/testing/browser_util'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {dispatchEvent} from '@angular/platform-browser/testing/src/browser_util'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; import {ServerModule} from '@angular/platform-server'; import {ComponentFixture, ComponentFixtureNoNgZone, TestBed, async, inject, withModule} from '../testing'; diff --git a/packages/core/test/change_detection/change_detector_util_spec.ts b/packages/core/test/change_detection/change_detector_util_spec.ts index 42387a69d8..a9ed81dfbd 100644 --- a/packages/core/test/change_detection/change_detector_util_spec.ts +++ b/packages/core/test/change_detection/change_detector_util_spec.ts @@ -7,7 +7,7 @@ */ import {devModeEqual} from '@angular/core/src/change_detection/change_detection_util'; -import {describe, expect, it} from '@angular/core/testing/testing_internal'; +import {describe, expect, it} from '@angular/core/testing/src/testing_internal'; export function main() { describe('ChangeDetectionUtil', () => { diff --git a/packages/core/test/change_detection/differs/default_iterable_differ_spec.ts b/packages/core/test/change_detection/differs/default_iterable_differ_spec.ts index 65c1852913..5e25db3b7d 100644 --- a/packages/core/test/change_detection/differs/default_iterable_differ_spec.ts +++ b/packages/core/test/change_detection/differs/default_iterable_differ_spec.ts @@ -7,7 +7,7 @@ */ import {DefaultIterableDiffer, DefaultIterableDifferFactory} from '@angular/core/src/change_detection/differs/default_iterable_differ'; -import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal'; +import {beforeEach, describe, expect, it} from '@angular/core/testing/src/testing_internal'; import {TestIterable} from '../../change_detection/iterable'; import {iterableChangesAsString} from '../../change_detection/util'; diff --git a/packages/core/test/change_detection/differs/default_keyvalue_differ_spec.ts b/packages/core/test/change_detection/differs/default_keyvalue_differ_spec.ts index d745ba699b..c47af412e0 100644 --- a/packages/core/test/change_detection/differs/default_keyvalue_differ_spec.ts +++ b/packages/core/test/change_detection/differs/default_keyvalue_differ_spec.ts @@ -7,7 +7,7 @@ */ import {DefaultKeyValueDiffer, DefaultKeyValueDifferFactory} from '@angular/core/src/change_detection/differs/default_keyvalue_differ'; -import {afterEach, beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal'; +import {afterEach, beforeEach, describe, expect, it} from '@angular/core/testing/src/testing_internal'; import {kvChangesAsString} from '../../change_detection/util'; // todo(vicb): Update the code & tests for object equality diff --git a/packages/core/test/change_detection/differs/iterable_differs_spec.ts b/packages/core/test/change_detection/differs/iterable_differs_spec.ts index 702c27165f..24410f0249 100644 --- a/packages/core/test/change_detection/differs/iterable_differs_spec.ts +++ b/packages/core/test/change_detection/differs/iterable_differs_spec.ts @@ -8,7 +8,7 @@ import {ReflectiveInjector} from '@angular/core'; import {IterableDiffers} from '@angular/core/src/change_detection/differs/iterable_differs'; -import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal'; +import {beforeEach, describe, expect, it} from '@angular/core/testing/src/testing_internal'; import {SpyIterableDifferFactory} from '../../spies'; diff --git a/packages/core/test/component_fixture_spec.ts b/packages/core/test/component_fixture_spec.ts index 92ba1a5d20..97abe805e6 100644 --- a/packages/core/test/component_fixture_spec.ts +++ b/packages/core/test/component_fixture_spec.ts @@ -8,8 +8,8 @@ import {Component, Injectable, Input} from '@angular/core'; import {ComponentFixtureAutoDetect, ComponentFixtureNoNgZone, TestBed, async, withModule} from '@angular/core/testing'; -import {dispatchEvent} from '@angular/platform-browser/testing/browser_util'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {dispatchEvent} from '@angular/platform-browser/testing/src/browser_util'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; @Component({selector: 'simple-comp', template: `Original {{simpleBinding}}`}) @Injectable() diff --git a/packages/core/test/debug/debug_node_spec.ts b/packages/core/test/debug/debug_node_spec.ts index bf226e1d16..3b00da8659 100644 --- a/packages/core/test/debug/debug_node_spec.ts +++ b/packages/core/test/debug/debug_node_spec.ts @@ -12,7 +12,7 @@ import {Component, Directive, Input} from '@angular/core/src/metadata'; import {ComponentFixture, TestBed, async} from '@angular/core/testing'; import {By} from '@angular/platform-browser/src/dom/debug/by'; import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; @Injectable() class Logger { diff --git a/packages/core/test/di/forward_ref_spec.ts b/packages/core/test/di/forward_ref_spec.ts index 948ecbe93c..932331531f 100644 --- a/packages/core/test/di/forward_ref_spec.ts +++ b/packages/core/test/di/forward_ref_spec.ts @@ -8,7 +8,7 @@ import {Type} from '@angular/core'; import {forwardRef, resolveForwardRef} from '@angular/core/src/di'; -import {describe, expect, it} from '@angular/core/testing/testing_internal'; +import {describe, expect, it} from '@angular/core/testing/src/testing_internal'; export function main() { describe('forwardRef', function() { diff --git a/packages/core/test/di/injector_spec.ts b/packages/core/test/di/injector_spec.ts index 1f16e4cf62..753741fe25 100644 --- a/packages/core/test/di/injector_spec.ts +++ b/packages/core/test/di/injector_spec.ts @@ -8,7 +8,7 @@ import {Injector} from '@angular/core'; -import {describe, expect, it} from '@angular/core/testing/testing_internal'; +import {describe, expect, it} from '@angular/core/testing/src/testing_internal'; export function main() { describe('Injector.NULL', () => { diff --git a/packages/core/test/di/reflective_injector_spec.ts b/packages/core/test/di/reflective_injector_spec.ts index 6371a3dedf..76f4fb9ef4 100644 --- a/packages/core/test/di/reflective_injector_spec.ts +++ b/packages/core/test/di/reflective_injector_spec.ts @@ -10,7 +10,7 @@ import {Inject, Injectable, InjectionToken, Injector, Optional, Provider, Reflec import {ReflectiveInjector_} from '@angular/core/src/di/reflective_injector'; import {ResolvedReflectiveProvider_} from '@angular/core/src/di/reflective_provider'; import {getOriginalError} from '@angular/core/src/errors'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; import {stringify} from '../../src/util'; class Engine {} diff --git a/packages/core/test/directive_lifecycle_integration_spec.ts b/packages/core/test/directive_lifecycle_integration_spec.ts index 57f44abe35..d218f0b737 100644 --- a/packages/core/test/directive_lifecycle_integration_spec.ts +++ b/packages/core/test/directive_lifecycle_integration_spec.ts @@ -9,7 +9,7 @@ import {AfterContentChecked, AfterContentInit, AfterViewChecked, AfterViewInit, DoCheck, OnChanges, OnInit} from '@angular/core'; import {Component, Directive} from '@angular/core/src/metadata'; import {TestBed, inject} from '@angular/core/testing'; -import {Log} from '@angular/core/testing/testing_internal'; +import {Log} from '@angular/core/testing/src/testing_internal'; export function main() { describe('directive lifecycle integration spec', () => { diff --git a/packages/core/test/dom/dom_adapter_spec.ts b/packages/core/test/dom/dom_adapter_spec.ts index b892a9b34f..14b62b01ee 100644 --- a/packages/core/test/dom/dom_adapter_spec.ts +++ b/packages/core/test/dom/dom_adapter_spec.ts @@ -6,9 +6,9 @@ * found in the LICENSE file at https://angular.io/license */ -import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal'; +import {beforeEach, describe, expect, it} from '@angular/core/testing/src/testing_internal'; import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; -import {el, stringifyElement} from '@angular/platform-browser/testing/browser_util'; +import {el, stringifyElement} from '@angular/platform-browser/testing/src/browser_util'; export function main() { describe('dom adapter', () => { diff --git a/packages/core/test/dom/shim_spec.ts b/packages/core/test/dom/shim_spec.ts index 14a71213b8..71319edc5c 100644 --- a/packages/core/test/dom/shim_spec.ts +++ b/packages/core/test/dom/shim_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {describe, expect, it} from '@angular/core/testing/testing_internal'; +import {describe, expect, it} from '@angular/core/testing/src/testing_internal'; export function main() { describe('Shim', () => { diff --git a/packages/core/test/event_emitter_spec.ts b/packages/core/test/event_emitter_spec.ts index c31546dccb..f2aea739bc 100644 --- a/packages/core/test/event_emitter_spec.ts +++ b/packages/core/test/event_emitter_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {AsyncTestCompleter, beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal'; +import {AsyncTestCompleter, beforeEach, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal'; import {EventEmitter} from '../src/event_emitter'; export function main() { diff --git a/packages/core/test/fake_async_spec.ts b/packages/core/test/fake_async_spec.ts index c7cdcbd86f..7dcce2de59 100644 --- a/packages/core/test/fake_async_spec.ts +++ b/packages/core/test/fake_async_spec.ts @@ -7,8 +7,8 @@ */ import {discardPeriodicTasks, fakeAsync, flushMicrotasks, tick} from '@angular/core/testing'; -import {Log, beforeEach, describe, inject, it} from '@angular/core/testing/testing_internal'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {Log, beforeEach, describe, inject, it} from '@angular/core/testing/src/testing_internal'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; import {Parser} from '../../compiler/src/expression_parser/parser'; diff --git a/packages/core/test/forward_ref_integration_spec.ts b/packages/core/test/forward_ref_integration_spec.ts index 51d137ca18..998a9f9f7a 100644 --- a/packages/core/test/forward_ref_integration_spec.ts +++ b/packages/core/test/forward_ref_integration_spec.ts @@ -9,7 +9,7 @@ import {CommonModule} from '@angular/common'; import {Component, ContentChildren, Directive, Inject, NO_ERRORS_SCHEMA, NgModule, QueryList, asNativeElements, forwardRef} from '@angular/core'; import {TestBed} from '@angular/core/testing'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; export function main() { describe('forwardRef integration', function() { diff --git a/packages/core/test/linker/change_detection_integration_spec.ts b/packages/core/test/linker/change_detection_integration_spec.ts index f7dd1807ff..049838cc9e 100644 --- a/packages/core/test/linker/change_detection_integration_spec.ts +++ b/packages/core/test/linker/change_detection_integration_spec.ts @@ -7,12 +7,12 @@ */ import {ElementSchemaRegistry} from '@angular/compiler/src/schema/element_schema_registry'; -import {TEST_COMPILER_PROVIDERS} from '@angular/compiler/testing/test_bindings'; +import {TEST_COMPILER_PROVIDERS} from '@angular/compiler/testing/src/test_bindings'; import {AfterContentChecked, AfterContentInit, AfterViewChecked, AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, DebugElement, Directive, DoCheck, EventEmitter, HostBinding, Inject, Injectable, Input, OnChanges, OnDestroy, OnInit, Output, Pipe, PipeTransform, RenderComponentType, Renderer, RendererFactory2, RootRenderer, SimpleChange, SimpleChanges, TemplateRef, Type, ViewChild, ViewContainerRef, WrappedValue} from '@angular/core'; import {ComponentFixture, TestBed, fakeAsync} from '@angular/core/testing'; import {By} from '@angular/platform-browser/src/dom/debug/by'; import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; import {DomElementSchemaRegistry} from '../../../compiler/index'; import {MockSchemaRegistry} from '../../../compiler/testing/index'; diff --git a/packages/core/test/linker/integration_spec.ts b/packages/core/test/linker/integration_spec.ts index aa5902fd6c..9060280477 100644 --- a/packages/core/test/linker/integration_spec.ts +++ b/packages/core/test/linker/integration_spec.ts @@ -20,8 +20,8 @@ import {Attribute, Component, ContentChildren, Directive, HostBinding, HostListe import {TestBed, async, fakeAsync, getTestBed, tick} from '@angular/core/testing'; import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {DOCUMENT} from '@angular/platform-browser/src/dom/dom_tokens'; -import {dispatchEvent, el} from '@angular/platform-browser/testing/browser_util'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {dispatchEvent, el} from '@angular/platform-browser/testing/src/browser_util'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; import {stringify} from '../../src/util'; const ANCHOR_ELEMENT = new InjectionToken('AnchorElement'); diff --git a/packages/core/test/linker/ng_container_integration_spec.ts b/packages/core/test/linker/ng_container_integration_spec.ts index a79c6939ca..ec05477f54 100644 --- a/packages/core/test/linker/ng_container_integration_spec.ts +++ b/packages/core/test/linker/ng_container_integration_spec.ts @@ -10,7 +10,7 @@ import {AfterContentInit, AfterViewInit, Component, ContentChildren, Directive, Input, QueryList, ViewChildren} from '@angular/core'; import {TestBed} from '@angular/core/testing'; import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; export function main() { describe('jit', () => { declareTests({useJit: true}); }); diff --git a/packages/core/test/linker/ng_module_integration_spec.ts b/packages/core/test/linker/ng_module_integration_spec.ts index fdaf842e66..54dd584860 100644 --- a/packages/core/test/linker/ng_module_integration_spec.ts +++ b/packages/core/test/linker/ng_module_integration_spec.ts @@ -9,7 +9,7 @@ import {ANALYZE_FOR_ENTRY_COMPONENTS, CUSTOM_ELEMENTS_SCHEMA, Compiler, Component, ComponentFactoryResolver, Directive, HostBinding, Inject, Injectable, InjectionToken, Injector, Input, NgModule, NgModuleRef, Optional, Pipe, Provider, Self, Type, forwardRef, getModuleFactory} from '@angular/core'; import {Console} from '@angular/core/src/console'; import {ComponentFixture, TestBed, inject} from '@angular/core/testing'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; import {NgModuleInjector} from '../../src/linker/ng_module_factory'; import {clearModulesForTest} from '../../src/linker/ng_module_factory_loader'; diff --git a/packages/core/test/linker/projection_integration_spec.ts b/packages/core/test/linker/projection_integration_spec.ts index ea8a1a49ea..34111da5b2 100644 --- a/packages/core/test/linker/projection_integration_spec.ts +++ b/packages/core/test/linker/projection_integration_spec.ts @@ -10,7 +10,7 @@ import {Component, Directive, ElementRef, TemplateRef, ViewContainerRef, ViewEnc import {TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser/src/dom/debug/by'; import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; export function main() { describe('projection', () => { diff --git a/packages/core/test/linker/query_integration_spec.ts b/packages/core/test/linker/query_integration_spec.ts index 06e76e6da3..0ca0e0f1c2 100644 --- a/packages/core/test/linker/query_integration_spec.ts +++ b/packages/core/test/linker/query_integration_spec.ts @@ -8,7 +8,7 @@ import {AfterContentChecked, AfterContentInit, AfterViewChecked, AfterViewInit, Component, ContentChild, ContentChildren, Directive, QueryList, TemplateRef, Type, ViewChild, ViewChildren, ViewContainerRef, asNativeElements} from '@angular/core'; import {ComponentFixture, TestBed, async} from '@angular/core/testing'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; import {stringify} from '../../src/util'; diff --git a/packages/core/test/linker/query_list_spec.ts b/packages/core/test/linker/query_list_spec.ts index dc7e56aa12..8e4e85126a 100644 --- a/packages/core/test/linker/query_list_spec.ts +++ b/packages/core/test/linker/query_list_spec.ts @@ -9,7 +9,7 @@ import {iterateListLike} from '@angular/core/src/change_detection/change_detection_util'; import {QueryList} from '@angular/core/src/linker/query_list'; import {fakeAsync, tick} from '@angular/core/testing'; -import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal'; +import {beforeEach, describe, expect, it} from '@angular/core/testing/src/testing_internal'; import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; export function main() { diff --git a/packages/core/test/linker/regression_integration_spec.ts b/packages/core/test/linker/regression_integration_spec.ts index c47fb14c07..ada1445d2c 100644 --- a/packages/core/test/linker/regression_integration_spec.ts +++ b/packages/core/test/linker/regression_integration_spec.ts @@ -8,7 +8,7 @@ import {ANALYZE_FOR_ENTRY_COMPONENTS, Component, InjectionToken, Injector, Pipe, PipeTransform, Provider, Renderer2} from '@angular/core'; import {TestBed} from '@angular/core/testing'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; export function main() { describe('jit', () => { declareTests({useJit: true}); }); diff --git a/packages/core/test/linker/system_ng_module_factory_loader_spec.ts b/packages/core/test/linker/system_ng_module_factory_loader_spec.ts index 780988840f..f743897451 100644 --- a/packages/core/test/linker/system_ng_module_factory_loader_spec.ts +++ b/packages/core/test/linker/system_ng_module_factory_loader_spec.ts @@ -9,7 +9,7 @@ import {Compiler, SystemJsNgModuleLoader} from '@angular/core'; import {global} from '@angular/core/src/util'; import {async} from '@angular/core/testing'; -import {afterEach, beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal'; +import {afterEach, beforeEach, describe, expect, it} from '@angular/core/testing/src/testing_internal'; function mockSystem(modules: {[module: string]: any}) { return { diff --git a/packages/core/test/linker/view_injector_integration_spec.ts b/packages/core/test/linker/view_injector_integration_spec.ts index 360e2f24dd..6b947b6059 100644 --- a/packages/core/test/linker/view_injector_integration_spec.ts +++ b/packages/core/test/linker/view_injector_integration_spec.ts @@ -9,7 +9,7 @@ import {Attribute, ChangeDetectionStrategy, ChangeDetectorRef, Component, DebugElement, Directive, ElementRef, Host, Inject, InjectionToken, Input, Optional, Pipe, PipeTransform, Provider, Self, SkipSelf, TemplateRef, Type, ViewContainerRef} from '@angular/core'; import {ComponentFixture, TestBed, fakeAsync} from '@angular/core/testing'; import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; @Directive({selector: '[simpleDirective]'}) class SimpleDirective { diff --git a/packages/core/test/metadata/decorators_spec.ts b/packages/core/test/metadata/decorators_spec.ts index fd6bf28ae2..bff20fbf66 100644 --- a/packages/core/test/metadata/decorators_spec.ts +++ b/packages/core/test/metadata/decorators_spec.ts @@ -8,7 +8,7 @@ import {Component, Directive} from '@angular/core'; import {reflector} from '@angular/core/src/reflection/reflection'; -import {describe, expect, it} from '@angular/core/testing/testing_internal'; +import {describe, expect, it} from '@angular/core/testing/src/testing_internal'; export function main() { describe('es5 decorators', () => { diff --git a/packages/core/test/spies.ts b/packages/core/test/spies.ts index f7da75bec8..6cf94937db 100644 --- a/packages/core/test/spies.ts +++ b/packages/core/test/spies.ts @@ -8,7 +8,7 @@ import {ElementRef} from '@angular/core'; import {ChangeDetectorRef} from '@angular/core/src/change_detection/change_detection'; -import {SpyObject} from '@angular/core/testing/testing_internal'; +import {SpyObject} from '@angular/core/testing/src/testing_internal'; import {DomAdapter} from '@angular/platform-browser/src/dom/dom_adapter'; export class SpyChangeDetectorRef extends SpyObject { diff --git a/packages/core/test/testability/testability_spec.ts b/packages/core/test/testability/testability_spec.ts index ba40f6fa3b..17fe365830 100644 --- a/packages/core/test/testability/testability_spec.ts +++ b/packages/core/test/testability/testability_spec.ts @@ -10,7 +10,7 @@ import {EventEmitter} from '@angular/core'; import {Injectable} from '@angular/core/src/di'; import {Testability} from '@angular/core/src/testability/testability'; import {NgZone} from '@angular/core/src/zone/ng_zone'; -import {AsyncTestCompleter, SpyObject, beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal'; +import {AsyncTestCompleter, SpyObject, beforeEach, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal'; import {scheduleMicroTask} from '../../src/util'; diff --git a/packages/core/test/testing_internal_spec.ts b/packages/core/test/testing_internal_spec.ts index c366e853bd..49611645ac 100644 --- a/packages/core/test/testing_internal_spec.ts +++ b/packages/core/test/testing_internal_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {SpyObject} from '@angular/core/testing/testing_internal'; +import {SpyObject} from '@angular/core/testing/src/testing_internal'; class TestObj { prop: any; diff --git a/packages/core/test/zone/ng_zone_spec.ts b/packages/core/test/zone/ng_zone_spec.ts index 010857087b..d5bf8c4bb5 100644 --- a/packages/core/test/zone/ng_zone_spec.ts +++ b/packages/core/test/zone/ng_zone_spec.ts @@ -8,8 +8,8 @@ import {NgZone} from '@angular/core/src/zone/ng_zone'; import {async, fakeAsync, flushMicrotasks} from '@angular/core/testing'; -import {AsyncTestCompleter, Log, beforeEach, describe, expect, inject, it, xit} from '@angular/core/testing/testing_internal'; -import {browserDetection} from '@angular/platform-browser/testing/browser_util'; +import {AsyncTestCompleter, Log, beforeEach, describe, expect, inject, it, xit} from '@angular/core/testing/src/testing_internal'; +import {browserDetection} from '@angular/platform-browser/testing/src/browser_util'; import {scheduleMicroTask} from '../../src/util'; const needsLongerTimers = browserDetection.isSlow || browserDetection.isEdge; diff --git a/packages/core/testing/index.ts b/packages/core/testing/index.ts new file mode 100644 index 0000000000..4e8c99c410 --- /dev/null +++ b/packages/core/testing/index.ts @@ -0,0 +1,15 @@ +/** + * @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 core/testing package. + */ + +export * from './src/testing'; diff --git a/packages/core/testing/package.json b/packages/core/testing/package.json new file mode 100644 index 0000000000..2429a97862 --- /dev/null +++ b/packages/core/testing/package.json @@ -0,0 +1,6 @@ +{ + "typings": "../typings/testing/index.d.ts", + "main": "../bundles/core-testing.umd.js", + "module": "../@angular/core/testing.es5.js", + "es2015": "../@angular/core/testing.js" +} diff --git a/packages/core/testing/src/index.ts b/packages/core/testing/src/testing.ts similarity index 100% rename from packages/core/testing/src/index.ts rename to packages/core/testing/src/testing.ts diff --git a/packages/core/testing/tsconfig-build.json b/packages/core/testing/tsconfig-build.json index adde454a0f..09d4e20483 100644 --- a/packages/core/testing/tsconfig-build.json +++ b/packages/core/testing/tsconfig-build.json @@ -1,14 +1,13 @@ { - "extends": "./tsconfig-build", - + "extends": "../tsconfig-build", "compilerOptions": { "paths": { - "rxjs/*": ["../../../node_modules/rxjs/*"], - "@angular/core": ["../../../dist/packages-dist/core"] + "rxjs/*": ["../../node_modules/rxjs/*"], + "@angular/core": ["../../dist/packages/core"] } }, "files": [ - "testing/index.ts", + "index.ts", "../../../node_modules/zone.js/dist/zone.js.d.ts", "../../system.d.ts" ], diff --git a/packages/core/tsconfig-build.json b/packages/core/tsconfig-build.json index 9f8f941204..b12d701549 100644 --- a/packages/core/tsconfig-build.json +++ b/packages/core/tsconfig-build.json @@ -6,9 +6,9 @@ "experimentalDecorators": true, "module": "es2015", "moduleResolution": "node", - "outDir": "../../../dist/packages-dist/core", + "outDir": "../../dist/packages/core", "paths": { - "rxjs/*": ["../../../node_modules/rxjs/*"] + "rxjs/*": ["../../node_modules/rxjs/*"] }, "rootDir": ".", "sourceMap": true, @@ -21,8 +21,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/examples/build.sh b/packages/examples/build.sh index 4c7a06f377..877d330323 100755 --- a/packages/examples/build.sh +++ b/packages/examples/build.sh @@ -11,20 +11,20 @@ set -u -e -o pipefail cd `dirname $0` -DIST="../../../dist/examples"; +DIST="../../dist/examples"; rm -rf -- $DIST $(npm bin)/tsc -p ./tsconfig-build.json mkdir $DIST/vendor/ -ln -s ../../../dist/packages-dist/ $DIST/vendor/@angular +ln -s ../../dist/packages-dist/ $DIST/vendor/@angular for FILE in \ - ../../../node_modules/angular/angular.js \ - ../../../node_modules/zone.js/dist/zone.js \ - ../../../node_modules/systemjs/dist/system.js \ - ../../../node_modules/reflect-metadata/Reflect.js \ - ../../../node_modules/rxjs + ../../node_modules/angular/angular.js \ + ../../node_modules/zone.js/dist/zone.js \ + ../../node_modules/systemjs/dist/system.js \ + ../../node_modules/reflect-metadata/Reflect.js \ + ../../node_modules/rxjs do ln -s $FILE $DIST/vendor/`basename $FILE` done diff --git a/packages/examples/tsconfig-build.json b/packages/examples/tsconfig-build.json index 33c53277b8..ff32a45e25 100644 --- a/packages/examples/tsconfig-build.json +++ b/packages/examples/tsconfig-build.json @@ -8,10 +8,10 @@ "emitDecoratorMetadata": true, "module": "commonjs", "moduleResolution": "node", - "outDir": "../../../dist/examples", + "outDir": "../../dist/examples", "paths": { - "@angular/*": ["../../../dist/packages-dist/*"], - "rxjs/*": ["../../../node_modules/rxjs/*"] + "@angular/*": ["../../dist/packages-dist/*"], + "rxjs/*": ["../../node_modules/rxjs/*"] }, "rootDir": ".", "sourceMap": true, @@ -23,8 +23,8 @@ }, "include": [ "./**/*.ts", - "../../../node_modules/zone.js/dist/zone.js.d.ts", + "../../node_modules/zone.js/dist/zone.js.d.ts", // TODO(i): we can't use protractor's built-in typings because they contain lots of ambient definitions - "../../../node_modules/@types/protractor/index.d.ts" + "../../node_modules/@types/protractor/index.d.ts" ] } diff --git a/packages/forms/package.json b/packages/forms/package.json index 44b2c0c005..3c3b006b7a 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -5,7 +5,7 @@ "main": "./bundles/forms.umd.js", "module": "./@angular/forms.es5.js", "es2015": "./@angular/forms.js", - "typings": "./typings/forms.d.ts", + "typings": "./typings/index.d.ts", "author": "angular", "license": "MIT", "peerDependencies": { diff --git a/packages/forms/rollup.config.js b/packages/forms/rollup.config.js new file mode 100644 index 0000000000..89990f851c --- /dev/null +++ b/packages/forms/rollup.config.js @@ -0,0 +1,23 @@ +/** + * @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/forms/index.js', + dest: '../../../dist/packages-dist/forms/bundles/forms.umd.js', + format: 'umd', + moduleName: 'ng.forms', + globals: { + '@angular/core': 'ng.core', + '@angular/common': 'ng.common', + '@angular/compiler': 'ng.compiler', + 'rxjs/Observable': 'Rx', + 'rxjs/Subject': 'Rx', + 'rxjs/observable/fromPromise': 'Rx.Observable', + 'rxjs/operator/toPromise': 'Rx.Observable.prototype' + } +}; diff --git a/packages/forms/test/directives_spec.ts b/packages/forms/test/directives_spec.ts index 317f4d7bb7..15b1ed7c65 100644 --- a/packages/forms/test/directives_spec.ts +++ b/packages/forms/test/directives_spec.ts @@ -8,7 +8,7 @@ import {SimpleChange} from '@angular/core/src/change_detection'; import {fakeAsync, flushMicrotasks, tick} from '@angular/core/testing'; -import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal'; +import {beforeEach, describe, expect, it} from '@angular/core/testing/src/testing_internal'; import {CheckboxControlValueAccessor, ControlValueAccessor, DefaultValueAccessor, FormArray, FormArrayName, FormControl, FormControlDirective, FormControlName, FormGroup, FormGroupDirective, FormGroupName, NgControl, NgForm, NgModel, NgModelGroup, SelectControlValueAccessor, SelectMultipleControlValueAccessor, Validator, Validators} from '@angular/forms'; import {composeValidators, selectValueAccessor} from '@angular/forms/src/directives/shared'; diff --git a/packages/forms/test/form_array_spec.ts b/packages/forms/test/form_array_spec.ts index 717afacd6d..66976e9e74 100644 --- a/packages/forms/test/form_array_spec.ts +++ b/packages/forms/test/form_array_spec.ts @@ -7,7 +7,7 @@ */ import {fakeAsync, tick} from '@angular/core/testing'; -import {AsyncTestCompleter, beforeEach, describe, inject, it} from '@angular/core/testing/testing_internal'; +import {AsyncTestCompleter, beforeEach, describe, inject, it} from '@angular/core/testing/src/testing_internal'; import {AbstractControl, FormArray, FormControl, FormGroup} from '@angular/forms'; import {Validators} from '../src/validators'; diff --git a/packages/forms/test/form_builder_spec.ts b/packages/forms/test/form_builder_spec.ts index 049a25fd44..fbcca1a590 100644 --- a/packages/forms/test/form_builder_spec.ts +++ b/packages/forms/test/form_builder_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal'; +import {beforeEach, describe, expect, it} from '@angular/core/testing/src/testing_internal'; import {FormBuilder} from '@angular/forms'; export function main() { diff --git a/packages/forms/test/form_control_spec.ts b/packages/forms/test/form_control_spec.ts index 11089c3e5b..0543a25669 100644 --- a/packages/forms/test/form_control_spec.ts +++ b/packages/forms/test/form_control_spec.ts @@ -8,7 +8,7 @@ import {EventEmitter} from '@angular/core'; import {fakeAsync, tick} from '@angular/core/testing'; -import {AsyncTestCompleter, beforeEach, describe, inject, it} from '@angular/core/testing/testing_internal'; +import {AsyncTestCompleter, beforeEach, describe, inject, it} from '@angular/core/testing/src/testing_internal'; import {FormControl, FormGroup, Validators} from '@angular/forms'; import {FormArray} from '../src/model'; diff --git a/packages/forms/test/form_group_spec.ts b/packages/forms/test/form_group_spec.ts index 56f52f9dd5..dd2d222d10 100644 --- a/packages/forms/test/form_group_spec.ts +++ b/packages/forms/test/form_group_spec.ts @@ -8,7 +8,7 @@ import {EventEmitter} from '@angular/core'; import {async, fakeAsync, tick} from '@angular/core/testing'; -import {AsyncTestCompleter, beforeEach, describe, inject, it} from '@angular/core/testing/testing_internal'; +import {AsyncTestCompleter, beforeEach, describe, inject, it} from '@angular/core/testing/src/testing_internal'; import {AbstractControl, FormArray, FormControl, FormGroup, Validators} from '@angular/forms'; diff --git a/packages/forms/test/reactive_integration_spec.ts b/packages/forms/test/reactive_integration_spec.ts index 39dd20b24e..24cd6c574a 100644 --- a/packages/forms/test/reactive_integration_spec.ts +++ b/packages/forms/test/reactive_integration_spec.ts @@ -11,7 +11,7 @@ import {ComponentFixture, TestBed, fakeAsync, tick} from '@angular/core/testing' import {AbstractControl, AsyncValidator, ControlValueAccessor, FormArray, FormControl, FormGroup, FormGroupDirective, FormsModule, NG_ASYNC_VALIDATORS, NG_VALIDATORS, NG_VALUE_ACCESSOR, NgControl, ReactiveFormsModule, Validators} from '@angular/forms'; import {By} from '@angular/platform-browser/src/dom/debug/by'; import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; -import {dispatchEvent} from '@angular/platform-browser/testing/browser_util'; +import {dispatchEvent} from '@angular/platform-browser/testing/src/browser_util'; export function main() { describe('reactive forms integration tests', () => { diff --git a/packages/forms/test/spies.ts b/packages/forms/test/spies.ts index 6338e5252c..e956a4821c 100644 --- a/packages/forms/test/spies.ts +++ b/packages/forms/test/spies.ts @@ -7,7 +7,7 @@ */ import {ChangeDetectorRef} from '@angular/core/src/change_detection/change_detector_ref'; -import {SpyObject} from '@angular/core/testing/testing_internal'; +import {SpyObject} from '@angular/core/testing/src/testing_internal'; export class SpyChangeDetectorRef extends SpyObject { constructor() { diff --git a/packages/forms/test/template_integration_spec.ts b/packages/forms/test/template_integration_spec.ts index 5bedc8472a..1f7d957dae 100644 --- a/packages/forms/test/template_integration_spec.ts +++ b/packages/forms/test/template_integration_spec.ts @@ -11,7 +11,7 @@ import {ComponentFixture, TestBed, async, fakeAsync, tick} from '@angular/core/t import {AbstractControl, AsyncValidator, ControlValueAccessor, FormsModule, NG_ASYNC_VALIDATORS, NG_VALUE_ACCESSOR, NgForm} from '@angular/forms'; import {By} from '@angular/platform-browser/src/dom/debug/by'; import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; -import {dispatchEvent} from '@angular/platform-browser/testing/browser_util'; +import {dispatchEvent} from '@angular/platform-browser/testing/src/browser_util'; export function main() { describe('template-driven forms integration tests', () => { diff --git a/packages/forms/test/validators_spec.ts b/packages/forms/test/validators_spec.ts index 3de4dd1acb..78d28126b2 100644 --- a/packages/forms/test/validators_spec.ts +++ b/packages/forms/test/validators_spec.ts @@ -8,7 +8,7 @@ import {EventEmitter} from '@angular/core'; import {fakeAsync, tick} from '@angular/core/testing'; -import {describe, expect, it} from '@angular/core/testing/testing_internal'; +import {describe, expect, it} from '@angular/core/testing/src/testing_internal'; import {AbstractControl, FormArray, FormControl, FormGroup, Validators} from '@angular/forms'; import {Observable} from 'rxjs/Observable'; diff --git a/packages/forms/tsconfig-build.json b/packages/forms/tsconfig-build.json index 32aab2569e..949c0bcaca 100644 --- a/packages/forms/tsconfig-build.json +++ b/packages/forms/tsconfig-build.json @@ -6,14 +6,14 @@ "experimentalDecorators": true, "module": "es2015", "moduleResolution": "node", - "outDir": "../../../dist/packages-dist/forms", + "outDir": "../../dist/packages/forms", "paths": { - "@angular/core": ["../../../dist/packages-dist/core"], - "@angular/core/testing": ["../../../dist/packages-dist/core/testing"], - "@angular/common": ["../../../dist/packages-dist/common"], - "@angular/common/testing": ["../../../dist/packages-dist/common/testing"], - "@angular/compiler": ["../../../dist/packages-dist/compiler"], - "@angular/compiler/testing": ["../../../dist/packages-dist/compiler/testing"] + "@angular/core": ["../../dist/packages/core"], + "@angular/core/testing": ["../../dist/packages/core/testing"], + "@angular/common": ["../../dist/packages/common"], + "@angular/common/testing": ["../../dist/packages/common/testing"], + "@angular/compiler": ["../../dist/packages/compiler"], + "@angular/compiler/testing": ["../../dist/packages/compiler/testing"] }, "rootDir": ".", "sourceMap": true, @@ -26,7 +26,7 @@ }, "files": [ "public_api.ts", - "../../../node_modules/zone.js/dist/zone.js.d.ts" + "../../node_modules/zone.js/dist/zone.js.d.ts" ], "angularCompilerOptions": { "annotateForClosureCompiler": true, diff --git a/packages/http/package.json b/packages/http/package.json index 9e19b9da83..bfb9532eba 100644 --- a/packages/http/package.json +++ b/packages/http/package.json @@ -5,7 +5,7 @@ "main": "./bundles/http.umd.js", "module": "./@angular/http.es5.js", "es2015": "./@angular/http.js", - "typings": "./typings/http.d.ts", + "typings": "./typings/index.d.ts", "author": "angular", "license": "MIT", "peerDependencies": { diff --git a/packages/http/rollup-testing.config.js b/packages/http/rollup-testing.config.js new file mode 100644 index 0000000000..52c3207716 --- /dev/null +++ b/packages/http/rollup-testing.config.js @@ -0,0 +1,24 @@ +/** + * @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/http/testing/index.js', + dest: '../../../dist/packages-dist/http/bundles/http-testing.umd.js', + format: 'umd', + moduleName: 'ng.http.testing', + globals: { + '@angular/core': 'ng.core', + '@angular/compiler': 'ng.compiler', + '@angular/platform-browser': 'ng.platformBrowser', + '@angular/http': 'ng.http', + 'rxjs/Observable': 'Rx', + 'rxjs/ReplaySubject': 'Rx', + 'rxjs/Subject': 'Rx', + 'rxjs/operator/take': 'Rx.Observable.prototype' + } +}; diff --git a/packages/http/rollup.config.js b/packages/http/rollup.config.js new file mode 100644 index 0000000000..69e786cdda --- /dev/null +++ b/packages/http/rollup.config.js @@ -0,0 +1,21 @@ +/** + * @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/http/index.js', + dest: '../../../dist/packages-dist/http/bundles/http.umd.js', + format: 'umd', + moduleName: 'ng.http', + globals: { + '@angular/core': 'ng.core', + '@angular/compiler': 'ng.compiler', + '@angular/platform-browser': 'ng.platformBrowser', + 'rxjs/Observable': 'Rx', + 'rxjs/Subject': 'Rx' + } +}; diff --git a/packages/http/test/backends/jsonp_backend_spec.ts b/packages/http/test/backends/jsonp_backend_spec.ts index 81b5ce6373..5f0e4d501f 100644 --- a/packages/http/test/backends/jsonp_backend_spec.ts +++ b/packages/http/test/backends/jsonp_backend_spec.ts @@ -7,8 +7,8 @@ */ import {ReflectiveInjector} from '@angular/core'; -import {AsyncTestCompleter, SpyObject, afterEach, beforeEach, describe, inject, it} from '@angular/core/testing/testing_internal'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {AsyncTestCompleter, SpyObject, afterEach, beforeEach, describe, inject, it} from '@angular/core/testing/src/testing_internal'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; import {BrowserJsonp} from '../../src/backends/browser_jsonp'; import {JSONPBackend, JSONPBackend_, JSONPConnection, JSONPConnection_} from '../../src/backends/jsonp_backend'; import {BaseRequestOptions, RequestOptions} from '../../src/base_request_options'; diff --git a/packages/http/test/backends/mock_backend_spec.ts b/packages/http/test/backends/mock_backend_spec.ts index cc8317e95a..ee81874791 100644 --- a/packages/http/test/backends/mock_backend_spec.ts +++ b/packages/http/test/backends/mock_backend_spec.ts @@ -7,15 +7,15 @@ */ import {ReflectiveInjector} from '@angular/core'; -import {AsyncTestCompleter, beforeEach, describe, inject, it, xit} from '@angular/core/testing/testing_internal'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {AsyncTestCompleter, beforeEach, describe, inject, it, xit} from '@angular/core/testing/src/testing_internal'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; import {ReplaySubject} from 'rxjs/ReplaySubject'; import {BaseRequestOptions, RequestOptions} from '../../src/base_request_options'; import {BaseResponseOptions, ResponseOptions} from '../../src/base_response_options'; import {Request} from '../../src/static_request'; import {Response} from '../../src/static_response'; -import {MockBackend, MockConnection} from '../../testing/mock_backend'; +import {MockBackend, MockConnection} from '../../testing/src/mock_backend'; export function main() { describe('MockBackend', () => { diff --git a/packages/http/test/backends/xhr_backend_spec.ts b/packages/http/test/backends/xhr_backend_spec.ts index ca9f0c6aa9..f62840474c 100644 --- a/packages/http/test/backends/xhr_backend_spec.ts +++ b/packages/http/test/backends/xhr_backend_spec.ts @@ -7,7 +7,7 @@ */ import {Injectable} from '@angular/core'; -import {AsyncTestCompleter, SpyObject, afterEach, beforeEach, beforeEachProviders, describe, expect, inject, it} from '@angular/core/testing/testing_internal'; +import {AsyncTestCompleter, SpyObject, afterEach, beforeEach, beforeEachProviders, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal'; import {ɵgetDOM as getDOM} from '@angular/platform-browser'; import {BrowserXhr} from '../../src/backends/browser_xhr'; import {CookieXSRFStrategy, XHRBackend, XHRConnection} from '../../src/backends/xhr_backend'; diff --git a/packages/http/test/base_request_options_spec.ts b/packages/http/test/base_request_options_spec.ts index 195e63f277..f42f895e39 100644 --- a/packages/http/test/base_request_options_spec.ts +++ b/packages/http/test/base_request_options_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {describe, expect, it} from '@angular/core/testing/testing_internal'; +import {describe, expect, it} from '@angular/core/testing/src/testing_internal'; import {BaseRequestOptions, RequestOptions} from '../src/base_request_options'; import {RequestMethod} from '../src/enums'; import {Headers} from '../src/headers'; diff --git a/packages/http/test/http_spec.ts b/packages/http/test/http_spec.ts index d149410b86..544d58745c 100644 --- a/packages/http/test/http_spec.ts +++ b/packages/http/test/http_spec.ts @@ -8,14 +8,14 @@ import {Injector, ReflectiveInjector} from '@angular/core'; import {TestBed, getTestBed} from '@angular/core/testing'; -import {AsyncTestCompleter, afterEach, beforeEach, describe, inject, it} from '@angular/core/testing/testing_internal'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {AsyncTestCompleter, afterEach, beforeEach, describe, inject, it} from '@angular/core/testing/src/testing_internal'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; import {Observable} from 'rxjs/Observable'; import {zip} from 'rxjs/observable/zip'; import {BaseRequestOptions, ConnectionBackend, Http, HttpModule, JSONPBackend, Jsonp, JsonpModule, Request, RequestMethod, RequestOptions, Response, ResponseContentType, ResponseOptions, URLSearchParams, XHRBackend} from '../index'; import {stringToArrayBuffer} from '../src/http_utils'; -import {MockBackend, MockConnection} from '../testing/mock_backend'; +import {MockBackend, MockConnection} from '../testing/src/mock_backend'; export function main() { describe('injectables', () => { diff --git a/packages/http/test/static_request_spec.ts b/packages/http/test/static_request_spec.ts index 7e68088a80..41c9d2b586 100644 --- a/packages/http/test/static_request_spec.ts +++ b/packages/http/test/static_request_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {describe, expect, it} from '@angular/core/testing/testing_internal'; +import {describe, expect, it} from '@angular/core/testing/src/testing_internal'; import {RequestOptions} from '../src/base_request_options'; import {ContentType} from '../src/enums'; diff --git a/packages/http/test/static_response_spec.ts b/packages/http/test/static_response_spec.ts index 5c6cf5163d..b820ca4482 100644 --- a/packages/http/test/static_response_spec.ts +++ b/packages/http/test/static_response_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {describe, expect, it} from '@angular/core/testing/testing_internal'; +import {describe, expect, it} from '@angular/core/testing/src/testing_internal'; import {ResponseOptions} from '../src/base_response_options'; import {Response} from '../src/static_response'; diff --git a/packages/http/test/url_search_params_spec.ts b/packages/http/test/url_search_params_spec.ts index 2c06a4dd08..1cb725f147 100644 --- a/packages/http/test/url_search_params_spec.ts +++ b/packages/http/test/url_search_params_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {describe, expect, it} from '@angular/core/testing/testing_internal'; +import {describe, expect, it} from '@angular/core/testing/src/testing_internal'; import {URLSearchParams} from '../src/url_search_params'; export function main() { diff --git a/packages/http/testing/index.ts b/packages/http/testing/index.ts new file mode 100644 index 0000000000..5b24c5aa06 --- /dev/null +++ b/packages/http/testing/index.ts @@ -0,0 +1,15 @@ +/** + * @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 http/testing package. + */ + +export * from './src/testing'; diff --git a/packages/http/testing/package.json b/packages/http/testing/package.json new file mode 100644 index 0000000000..0cdae5bd55 --- /dev/null +++ b/packages/http/testing/package.json @@ -0,0 +1 @@ +{"typings": "../typings/testing/index.d.ts", "main": "../bundles/http-testing.umd.js", "module": "../@angular/http/testing.es5.js", "es2015": "../@angular/http/testing.js"} diff --git a/packages/http/testing/src/index.ts b/packages/http/testing/src/testing.ts similarity index 100% rename from packages/http/testing/src/index.ts rename to packages/http/testing/src/testing.ts diff --git a/packages/http/testing/tsconfig-build.json b/packages/http/testing/tsconfig-build.json index 7f7bd0eac5..2b7421fa40 100644 --- a/packages/http/testing/tsconfig-build.json +++ b/packages/http/testing/tsconfig-build.json @@ -1,14 +1,14 @@ { - "extends": "./tsconfig-build", + "extends": "../tsconfig-build", "compilerOptions": { "paths": { - "@angular/core": ["../../../dist/packages-dist/core"], - "@angular/http": ["../../../dist/packages-dist/http"], - "rxjs/*": ["../../../node_modules/rxjs/*"] + "@angular/core": ["../../dist/packages/core"], + "@angular/http": ["../../dist/packages/http"], + "rxjs/*": ["../../node_modules/rxjs/*"] } }, "files": [ - "testing/index.ts" + "index.ts" ], "angularCompilerOptions": { "strictMetadataEmit": true diff --git a/packages/http/tsconfig-build.json b/packages/http/tsconfig-build.json index cf359918db..aa16e6bfbd 100644 --- a/packages/http/tsconfig-build.json +++ b/packages/http/tsconfig-build.json @@ -6,11 +6,11 @@ "experimentalDecorators": true, "module": "es2015", "moduleResolution": "node", - "outDir": "../../../dist/packages-dist/http", + "outDir": "../../dist/packages/http", "paths": { - "@angular/core": ["../../../dist/packages-dist/core"], - "@angular/common": ["../../../dist/packages-dist/common"], - "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"] + "@angular/core": ["../../dist/packages/core"], + "@angular/common": ["../../dist/packages/common"], + "@angular/platform-browser": ["../../dist/packages/platform-browser"] }, "rootDir": ".", "sourceMap": true, @@ -21,7 +21,7 @@ }, "files": [ "public_api.ts", - "../../../node_modules/zone.js/dist/zone.js.d.ts" + "../../node_modules/zone.js/dist/zone.js.d.ts" ], "angularCompilerOptions": { "annotateForClosureCompiler": true, diff --git a/packages/language-service/rollup.config.js b/packages/language-service/rollup.config.js index e0dd6213d7..c0e158ee5a 100644 --- a/packages/language-service/rollup.config.js +++ b/packages/language-service/rollup.config.js @@ -16,9 +16,7 @@ var esm = 'esm/'; var locations = { 'tsc-wrapped': normalize('../../../dist/tools/@angular') + '/', - 'compiler-cli': normalize('../../../dist/esm') + '/', - 'compiler': normalize('../../../dist/esm') + '/', - 'core': normalize('../../../dist/esm') + '/' + 'compiler-cli': normalize('../../../dist/esm') + '/' }; var esm_suffixes = {}; diff --git a/packages/language-service/test/test_utils.ts b/packages/language-service/test/test_utils.ts index 4c89813dc9..2609449e56 100644 --- a/packages/language-service/test/test_utils.ts +++ b/packages/language-service/test/test_utils.ts @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ -/// -/// +/// +/// import * as fs from 'fs'; import * as path from 'path'; diff --git a/packages/language-service/tsconfig-build.json b/packages/language-service/tsconfig-build.json index 1b5d2d5d15..c30b273fc1 100644 --- a/packages/language-service/tsconfig-build.json +++ b/packages/language-service/tsconfig-build.json @@ -7,20 +7,20 @@ "experimentalDecorators": true, "module": "es2015", "moduleResolution": "node", - "outDir": "../../../dist/packages-dist/language-service", + "outDir": "../../dist/packages/language-service", "paths": { - "@angular/core": ["../../../dist/packages-dist/core"], - "@angular/animation": ["../../../dist/packages-dist/animation"], - "@angular/animation/browser": ["../../../dist/packages-dist/animation/browser"], - "@angular/core/testing": ["../../../dist/packages-dist/core/testing"], - "@angular/common": ["../../../dist/packages-dist/common"], - "@angular/compiler": ["../../../dist/packages-dist/compiler"], - "@angular/compiler-cli": ["../../../dist/esm/compiler-cli"], - "@angular/http": ["../../../dist/packages-dist/http"], - "@angular/platform-server": ["../../../dist/packages-dist/platform-server"], - "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"], - "@angular/tsc-wrapped": ["../../../dist/tools/@angular/tsc-wrapped"], - "@angular/tsc-wrapped/*": ["../../../dist/tools/@angular/tsc-wrapped/*"] + "@angular/core": ["../../dist/packages/core"], + "@angular/animation": ["../../dist/packages/animation"], + "@angular/animation/browser": ["../../dist/packages/animation/browser"], + "@angular/core/testing": ["../../dist/packages/core/testing"], + "@angular/common": ["../../dist/packages/common"], + "@angular/compiler": ["../../dist/packages/compiler"], + "@angular/compiler-cli": ["../../dist/packages/compiler-cli"], + "@angular/http": ["../../dist/packages/http"], + "@angular/platform-server": ["../../dist/packages/platform-server"], + "@angular/platform-browser": ["../../dist/packages/platform-browser"], + "@angular/tsc-wrapped": ["../../dist/tools/@angular/tsc-wrapped"], + "@angular/tsc-wrapped/*": ["../../dist/tools/@angular/tsc-wrapped/*"] }, "rootDir": ".", "sourceMap": true, @@ -31,8 +31,8 @@ }, "files": [ "index.ts", - "../../../node_modules/zone.js/dist/zone.js.d.ts", - "../../../node_modules/@types/node/index.d.ts", - "../../../node_modules/@types/jasmine/index.d.ts" + "../../node_modules/zone.js/dist/zone.js.d.ts", + "../../node_modules/@types/node/index.d.ts", + "../../node_modules/@types/jasmine/index.d.ts" ] } diff --git a/packages/platform-browser-dynamic/package.json b/packages/platform-browser-dynamic/package.json index 29f5366f4f..b515ddb492 100644 --- a/packages/platform-browser-dynamic/package.json +++ b/packages/platform-browser-dynamic/package.json @@ -5,7 +5,7 @@ "main": "./bundles/platform-browser-dynamic.umd.js", "module": "./@angular/platform-browser-dynamic.es5.js", "es2015": "./@angular/platform-browser-dynamic.js", - "typings": "./typings/platform-browser-dynamic.d.ts", + "typings": "./typings/index.d.ts", "author": "angular", "license": "MIT", "peerDependencies": { diff --git a/packages/platform-browser-dynamic/rollup-testing.config.js b/packages/platform-browser-dynamic/rollup-testing.config.js new file mode 100644 index 0000000000..ca88ac7f53 --- /dev/null +++ b/packages/platform-browser-dynamic/rollup-testing.config.js @@ -0,0 +1,25 @@ +/** + * @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/platform-browser-dynamic/testing/index.js', + dest: + '../../../dist/packages-dist/platform-browser-dynamic/bundles/platform-browser-dynamic-testing.umd.js', + format: 'umd', + moduleName: 'ng.platformBrowserDynamic.testing', + globals: { + '@angular/core': 'ng.core', + '@angular/core/testing': 'ng.core.testing', + '@angular/common': 'ng.common', + '@angular/compiler': 'ng.compiler', + '@angular/compiler/testing': 'ng.compiler.testing', + '@angular/platform-browser': 'ng.platformBrowser', + '@angular/platform-browser/testing': 'ng.platformBrowser.testing', + '@angular/platform-browser-dynamic': 'ng.platformBrowserDynamic' + } +}; diff --git a/packages/platform-browser-dynamic/rollup.config.js b/packages/platform-browser-dynamic/rollup.config.js new file mode 100644 index 0000000000..03ed750040 --- /dev/null +++ b/packages/platform-browser-dynamic/rollup.config.js @@ -0,0 +1,21 @@ +/** + * @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/platform-browser-dynamic/index.js', + dest: + '../../../dist/packages-dist/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js', + format: 'umd', + moduleName: 'ng.platformBrowserDynamic', + globals: { + '@angular/core': 'ng.core', + '@angular/common': 'ng.common', + '@angular/compiler': 'ng.compiler', + '@angular/platform-browser': 'ng.platformBrowser', + } +}; diff --git a/packages/platform-browser-dynamic/test/resource_loader/resource_loader_cache_spec.ts b/packages/platform-browser-dynamic/test/resource_loader/resource_loader_cache_spec.ts index 7bca138207..28a9e8aacc 100644 --- a/packages/platform-browser-dynamic/test/resource_loader/resource_loader_cache_spec.ts +++ b/packages/platform-browser-dynamic/test/resource_loader/resource_loader_cache_spec.ts @@ -9,7 +9,7 @@ import {ResourceLoader, UrlResolver} from '@angular/compiler'; import {Component} from '@angular/core'; import {TestBed, async, fakeAsync, tick} from '@angular/core/testing'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; import {CachedResourceLoader} from '../../src/resource_loader/resource_loader_cache'; diff --git a/packages/platform-browser-dynamic/test/resource_loader/resource_loader_impl_spec.ts b/packages/platform-browser-dynamic/test/resource_loader/resource_loader_impl_spec.ts index c953dc91a0..fdd27e8925 100644 --- a/packages/platform-browser-dynamic/test/resource_loader/resource_loader_impl_spec.ts +++ b/packages/platform-browser-dynamic/test/resource_loader/resource_loader_impl_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {AsyncTestCompleter, beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal'; +import {AsyncTestCompleter, beforeEach, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal'; import {ResourceLoaderImpl} from '../../src/resource_loader/resource_loader_impl'; export function main() { diff --git a/packages/platform-browser-dynamic/testing/index.ts b/packages/platform-browser-dynamic/testing/index.ts new file mode 100644 index 0000000000..18bad2a742 --- /dev/null +++ b/packages/platform-browser-dynamic/testing/index.ts @@ -0,0 +1,15 @@ +/** + * @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 platform-browser-dynamic/testing package. + */ + +export * from './src/testing'; diff --git a/packages/platform-browser-dynamic/testing/package.json b/packages/platform-browser-dynamic/testing/package.json new file mode 100644 index 0000000000..d831b9d4d1 --- /dev/null +++ b/packages/platform-browser-dynamic/testing/package.json @@ -0,0 +1,6 @@ +{ + "typings": "../typings/testing/index.d.ts", + "main": "../bundles/platform-browser-dynamic-testing.umd.js", + "module": "../@angular/platform-browser-dynamic/testing.es5.js", + "es2015": "../@angular/platform-browser-dynamic/testing.js" +} diff --git a/packages/platform-browser-dynamic/testing/src/index.ts b/packages/platform-browser-dynamic/testing/src/testing.ts similarity index 100% rename from packages/platform-browser-dynamic/testing/src/index.ts rename to packages/platform-browser-dynamic/testing/src/testing.ts diff --git a/packages/platform-browser-dynamic/testing/tsconfig-build.json b/packages/platform-browser-dynamic/testing/tsconfig-build.json index 2355e245c5..ffadaa85d2 100644 --- a/packages/platform-browser-dynamic/testing/tsconfig-build.json +++ b/packages/platform-browser-dynamic/testing/tsconfig-build.json @@ -1,20 +1,20 @@ { - "extends": "./tsconfig-build", + "extends": "../tsconfig-build", "compilerOptions": { "paths": { - "@angular/core": ["../../../dist/packages-dist/core"], - "@angular/core/testing": ["../../../dist/packages-dist/core/testing"], - "@angular/common": ["../../../dist/packages-dist/common"], - "@angular/common/testing": ["../../../dist/packages-dist/common/testing"], - "@angular/compiler": ["../../../dist/packages-dist/compiler"], - "@angular/compiler/testing": ["../../../dist/packages-dist/compiler/testing"], - "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"], - "@angular/platform-browser/testing": ["../../../dist/packages-dist/platform-browser/testing"], - "@angular/platform-browser-dynamic": ["../../../dist/packages-dist/platform-browser-dynamic"] + "@angular/core": ["../../dist/packages/core"], + "@angular/core/testing": ["../../dist/packages/core/testing"], + "@angular/common": ["../../dist/packages/common"], + "@angular/common/testing": ["../../dist/packages/common/testing"], + "@angular/compiler": ["../../dist/packages/compiler"], + "@angular/compiler/testing": ["../../dist/packages/compiler/testing"], + "@angular/platform-browser": ["../../dist/packages/platform-browser"], + "@angular/platform-browser/testing": ["../../dist/packages/platform-browser/testing"], + "@angular/platform-browser-dynamic": ["../../dist/packages/platform-browser-dynamic"] } }, "files": [ - "testing/index.ts", + "index.ts", "../../../node_modules/@types/jasmine/index.d.ts", "../../../node_modules/zone.js/dist/zone.js.d.ts" ] diff --git a/packages/platform-browser-dynamic/tsconfig-build.json b/packages/platform-browser-dynamic/tsconfig-build.json index 53ab459b53..8f2ecfab7e 100644 --- a/packages/platform-browser-dynamic/tsconfig-build.json +++ b/packages/platform-browser-dynamic/tsconfig-build.json @@ -6,16 +6,16 @@ "experimentalDecorators": true, "module": "es2015", "moduleResolution": "node", - "outDir": "../../../dist/packages-dist/platform-browser-dynamic", + "outDir": "../../dist/packages/platform-browser-dynamic", "paths": { - "@angular/core": ["../../../dist/packages-dist/core"], - "@angular/core/testing": ["../../../dist/packages-dist/core/testing"], - "@angular/common": ["../../../dist/packages-dist/common"], - "@angular/common/testing": ["../../../dist/packages-dist/common/testing"], - "@angular/compiler": ["../../../dist/packages-dist/compiler"], - "@angular/compiler/testing": ["../../../dist/packages-dist/compiler/testing"], - "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"], - "@angular/platform-browser/testing": ["../../../dist/packages-dist/platform-browser/testing"] + "@angular/core": ["../../dist/packages/core"], + "@angular/core/testing": ["../../dist/packages/core/testing"], + "@angular/common": ["../../dist/packages/common"], + "@angular/common/testing": ["../../dist/packages/common/testing"], + "@angular/compiler": ["../../dist/packages/compiler"], + "@angular/compiler/testing": ["../../dist/packages/compiler/testing"], + "@angular/platform-browser": ["../../dist/packages/platform-browser"], + "@angular/platform-browser/testing": ["../../dist/packages/platform-browser/testing"] }, "rootDir": ".", "sourceMap": true, @@ -28,7 +28,7 @@ }, "files": [ "index.ts", - "../../../node_modules/@types/jasmine/index.d.ts", - "../../../node_modules/zone.js/dist/zone.js.d.ts" + "../../node_modules/@types/jasmine/index.d.ts", + "../../node_modules/zone.js/dist/zone.js.d.ts" ] } diff --git a/packages/platform-browser/animations/package.json b/packages/platform-browser/animations/package.json new file mode 100644 index 0000000000..b55e880807 --- /dev/null +++ b/packages/platform-browser/animations/package.json @@ -0,0 +1,6 @@ +{ + "typings": "../typings/animations/animations.d.ts", + "main": "../bundles/platform-browser-animations.umd.js", + "module": "../@angular/platform-browser/animations.es5.js", + "es2015": "../@angular/platform-browser/animations.js" +} diff --git a/packages/platform-browser/animations/test/engine/dom_animation_engine_spec.ts b/packages/platform-browser/animations/test/engine/dom_animation_engine_spec.ts index 3829b10113..365eaa02f5 100644 --- a/packages/platform-browser/animations/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 6b3371f07c..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,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ import {state, style, trigger} from '@angular/animations'; -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'; diff --git a/packages/platform-browser/animations/testing/index.ts b/packages/platform-browser/animations/testing/index.ts new file mode 100644 index 0000000000..1bec069535 --- /dev/null +++ b/packages/platform-browser/animations/testing/index.ts @@ -0,0 +1,15 @@ +/** + * @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 platform-browser/animations/testing package. + */ + +export * from './src/testing'; diff --git a/packages/platform-browser/animations/testing/package.json b/packages/platform-browser/animations/testing/package.json new file mode 100644 index 0000000000..a5c2fda958 --- /dev/null +++ b/packages/platform-browser/animations/testing/package.json @@ -0,0 +1 @@ +{"typings": "../../typings/animations/testing/index.d.ts", "main": "../../bundles/platform-browser-animations-testing.umd.js", "module": "../../@angular/platform-browser/animations/testing.es5.js", "es2015": "../../@angular/platform-browser/animations/testing.js"} diff --git a/packages/platform-browser/animations/testing/src/mock_animation_driver.ts b/packages/platform-browser/animations/testing/src/mock_animation_driver.ts index cec7c66476..b349ef45b9 100644 --- a/packages/platform-browser/animations/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/platform-browser/animations/testing/src/index.ts b/packages/platform-browser/animations/testing/src/testing.ts similarity index 100% rename from packages/platform-browser/animations/testing/src/index.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 index a70bc519a5..661aed0ea3 100644 --- a/packages/platform-browser/animations/testing/tsconfig-build.json +++ b/packages/platform-browser/animations/testing/tsconfig-build.json @@ -1,22 +1,22 @@ { - "extends": "./tsconfig-build", + "extends": "../../tsconfig-build", "compilerOptions": { - "outDir": "../../../dist/packages-dist/platform-browser", + "outDir": "../../../../dist/packages/platform-browser", "paths": { - "@angular/core": ["../../../dist/packages-dist/core"], - "@angular/core/testing": ["../../../dist/packages-dist/core/testing"], - "@angular/animations": ["../../../dist/packages-dist/animations"], - "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"], - "@angular/platform-browser/animations": ["../../../dist/packages-dist/platform-browser/animations"], - "@angular/common": ["../../../dist/packages-dist/common"], - "@angular/common/testing": ["../../../dist/packages-dist/common/testing"] + "@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": [ - "animations/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" + "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 9bbb37a4ba..14bb7a3c08 100644 --- a/packages/platform-browser/animations/tsconfig-build.json +++ b/packages/platform-browser/animations/tsconfig-build.json @@ -1,18 +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/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/package.json b/packages/platform-browser/package.json index 51cfc46a58..64b26b710e 100644 --- a/packages/platform-browser/package.json +++ b/packages/platform-browser/package.json @@ -5,7 +5,7 @@ "main": "./bundles/platform-browser.umd.js", "module": "./@angular/platform-browser.es5.js", "es2015": "./@angular/platform-browser.js", - "typings": "./typings/platform-browser.d.ts", + "typings": "./typings/index.d.ts", "author": "angular", "license": "MIT", "peerDependencies": { diff --git a/packages/platform-browser/rollup-testing.config.js b/packages/platform-browser/rollup-testing.config.js new file mode 100644 index 0000000000..bd8fb02094 --- /dev/null +++ b/packages/platform-browser/rollup-testing.config.js @@ -0,0 +1,19 @@ +/** + * @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/platform-browser/testing/index.js', + dest: '../../../dist/packages-dist/platform-browser/bundles/platform-browser-testing.umd.js', + format: 'umd', + moduleName: 'ng.platformBrowser.testing', + globals: { + '@angular/core': 'ng.core', + '@angular/common': 'ng.common', + '@angular/platform-browser': 'ng.platformBrowser' + } +}; diff --git a/packages/platform-browser/rollup.config.js b/packages/platform-browser/rollup.config.js new file mode 100644 index 0000000000..a02654510a --- /dev/null +++ b/packages/platform-browser/rollup.config.js @@ -0,0 +1,18 @@ +/** + * @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/platform-browser/index.js', + dest: '../../../dist/packages-dist/platform-browser/bundles/platform-browser.umd.js', + format: 'umd', + moduleName: 'ng.platformBrowser', + globals: { + '@angular/core': 'ng.core', + '@angular/common': 'ng.common', + } +}; diff --git a/packages/platform-browser/test/animation/animation_renderer_spec.ts b/packages/platform-browser/test/animation/animation_renderer_spec.ts index 74b7a2f5f9..66fb69c4f6 100644 --- a/packages/platform-browser/test/animation/animation_renderer_spec.ts +++ b/packages/platform-browser/test/animation/animation_renderer_spec.ts @@ -11,7 +11,7 @@ import {TestBed} from '@angular/core/testing'; import {BrowserAnimationsModule, ɵAnimationEngine, ɵAnimationRendererFactory} from '@angular/platform-browser/animations'; import {InjectableAnimationEngine} from '../../animations/src/providers'; -import {el} from '../../testing/browser_util'; +import {el} from '../../testing/src/browser_util'; export function main() { describe('ɵAnimationRenderer', () => { diff --git a/packages/platform-browser/test/browser/bootstrap_spec.ts b/packages/platform-browser/test/browser/bootstrap_spec.ts index 3adc9a6329..27a83bcc30 100644 --- a/packages/platform-browser/test/browser/bootstrap_spec.ts +++ b/packages/platform-browser/test/browser/bootstrap_spec.ts @@ -12,12 +12,12 @@ import {ApplicationRef, destroyPlatform} from '@angular/core/src/application_ref import {Console} from '@angular/core/src/console'; import {ComponentRef} from '@angular/core/src/linker/component_factory'; import {Testability, TestabilityRegistry} from '@angular/core/src/testability/testability'; -import {AsyncTestCompleter, Log, afterEach, beforeEach, beforeEachProviders, ddescribe, describe, iit, inject, it} from '@angular/core/testing/testing_internal'; +import {AsyncTestCompleter, Log, afterEach, beforeEach, beforeEachProviders, ddescribe, describe, iit, inject, it} from '@angular/core/testing/src/testing_internal'; import {BrowserModule} from '@angular/platform-browser'; import {platformBrowserDynamic} from '@angular/platform-browser-dynamic'; import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {DOCUMENT} from '@angular/platform-browser/src/dom/dom_tokens'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; @Component({selector: 'non-existent', template: ''}) class NonExistentComp { diff --git a/packages/platform-browser/test/browser/browser_adapter_spec.ts b/packages/platform-browser/test/browser/browser_adapter_spec.ts index b19e07c097..38a14ac73c 100644 --- a/packages/platform-browser/test/browser/browser_adapter_spec.ts +++ b/packages/platform-browser/test/browser/browser_adapter_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {describe, expect, it} from '@angular/core/testing/testing_internal'; +import {describe, expect, it} from '@angular/core/testing/src/testing_internal'; import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {parseCookieValue} from '../../src/browser/browser_adapter'; diff --git a/packages/platform-browser/test/browser/meta_spec.ts b/packages/platform-browser/test/browser/meta_spec.ts index 271c3884f0..a3a1d8a9e8 100644 --- a/packages/platform-browser/test/browser/meta_spec.ts +++ b/packages/platform-browser/test/browser/meta_spec.ts @@ -10,7 +10,7 @@ import {Injectable} from '@angular/core'; import {TestBed} from '@angular/core/testing'; import {BrowserModule, Meta} from '@angular/platform-browser'; import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; export function main() { describe('Meta service', () => { diff --git a/packages/platform-browser/test/browser/title_spec.ts b/packages/platform-browser/test/browser/title_spec.ts index 4bf89ff636..ee59945026 100644 --- a/packages/platform-browser/test/browser/title_spec.ts +++ b/packages/platform-browser/test/browser/title_spec.ts @@ -10,7 +10,7 @@ import {Injectable} from '@angular/core'; import {TestBed} from '@angular/core/testing'; import {BrowserModule, Title} from '@angular/platform-browser'; import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; export function main() { describe('title service', () => { diff --git a/packages/platform-browser/test/browser/tools/spies.ts b/packages/platform-browser/test/browser/tools/spies.ts index 8312bf7d5a..11d27ad1bd 100644 --- a/packages/platform-browser/test/browser/tools/spies.ts +++ b/packages/platform-browser/test/browser/tools/spies.ts @@ -8,7 +8,7 @@ import {ReflectiveInjector, ɵglobal as global} from '@angular/core'; import {ApplicationRef, ApplicationRef_} from '@angular/core/src/application_ref'; -import {SpyObject} from '@angular/core/testing/testing_internal'; +import {SpyObject} from '@angular/core/testing/src/testing_internal'; export class SpyApplicationRef extends SpyObject { constructor() { super(ApplicationRef_); } diff --git a/packages/platform-browser/test/browser_util_spec.ts b/packages/platform-browser/test/browser_util_spec.ts index 46ee83d587..b62d113cf8 100644 --- a/packages/platform-browser/test/browser_util_spec.ts +++ b/packages/platform-browser/test/browser_util_spec.ts @@ -7,7 +7,7 @@ */ -import {BrowserDetection} from '../testing/browser_util'; +import {BrowserDetection} from '../testing/src/browser_util'; export function main() { describe('BrowserDetection', () => { diff --git a/packages/platform-browser/test/dom/dom_renderer_spec.ts b/packages/platform-browser/test/dom/dom_renderer_spec.ts index dc0618b6bf..448bea205d 100644 --- a/packages/platform-browser/test/dom/dom_renderer_spec.ts +++ b/packages/platform-browser/test/dom/dom_renderer_spec.ts @@ -10,8 +10,8 @@ import {Component, NgModule, ViewEncapsulation} from '@angular/core'; import {TestBed} from '@angular/core/testing'; import {BrowserModule} from '@angular/platform-browser'; import {By} from '@angular/platform-browser/src/dom/debug/by'; -import {browserDetection} from '@angular/platform-browser/testing/browser_util'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {browserDetection} from '@angular/platform-browser/testing/src/browser_util'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; export function main() { describe('DomRenderer', () => { diff --git a/packages/platform-browser/test/dom/events/event_manager_spec.ts b/packages/platform-browser/test/dom/events/event_manager_spec.ts index 8266961d6b..317efb6f04 100644 --- a/packages/platform-browser/test/dom/events/event_manager_spec.ts +++ b/packages/platform-browser/test/dom/events/event_manager_spec.ts @@ -7,11 +7,11 @@ */ import {NgZone} from '@angular/core/src/zone/ng_zone'; -import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_internal'; +import {beforeEach, describe, expect, it} from '@angular/core/testing/src/testing_internal'; import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {DomEventsPlugin} from '@angular/platform-browser/src/dom/events/dom_events'; import {EventManager, EventManagerPlugin} from '@angular/platform-browser/src/dom/events/event_manager'; -import {el} from '../../../testing/browser_util'; +import {el} from '../../../testing/src/browser_util'; export function main() { let domEventPlugin: DomEventsPlugin; diff --git a/packages/platform-browser/test/dom/events/hammer_gestures_spec.ts b/packages/platform-browser/test/dom/events/hammer_gestures_spec.ts index f1db6434b0..1662578ac0 100644 --- a/packages/platform-browser/test/dom/events/hammer_gestures_spec.ts +++ b/packages/platform-browser/test/dom/events/hammer_gestures_spec.ts @@ -5,7 +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 {describe, expect, it} from '@angular/core/testing/testing_internal'; +import {describe, expect, it} from '@angular/core/testing/src/testing_internal'; import {HammerGestureConfig, HammerGesturesPlugin} from '@angular/platform-browser/src/dom/events/hammer_gestures'; export function main() { diff --git a/packages/platform-browser/test/dom/events/key_events_spec.ts b/packages/platform-browser/test/dom/events/key_events_spec.ts index 3cf2b1d24d..ba96007c0e 100644 --- a/packages/platform-browser/test/dom/events/key_events_spec.ts +++ b/packages/platform-browser/test/dom/events/key_events_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {describe, expect, it} from '@angular/core/testing/testing_internal'; +import {describe, expect, it} from '@angular/core/testing/src/testing_internal'; import {KeyEventsPlugin} from '@angular/platform-browser/src/dom/events/key_events'; export function main() { diff --git a/packages/platform-browser/test/dom/shared_styles_host_spec.ts b/packages/platform-browser/test/dom/shared_styles_host_spec.ts index 9305582fbf..c0c10dffab 100644 --- a/packages/platform-browser/test/dom/shared_styles_host_spec.ts +++ b/packages/platform-browser/test/dom/shared_styles_host_spec.ts @@ -6,10 +6,10 @@ * found in the LICENSE file at https://angular.io/license */ -import {beforeEach, describe, it} from '@angular/core/testing/testing_internal'; +import {beforeEach, describe, it} from '@angular/core/testing/src/testing_internal'; import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {DomSharedStylesHost} from '@angular/platform-browser/src/dom/shared_styles_host'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; export function main() { describe('DomSharedStylesHost', () => { diff --git a/packages/platform-browser/test/security/dom_sanitization_service_spec.ts b/packages/platform-browser/test/security/dom_sanitization_service_spec.ts index e51d688e4a..578f9ef7eb 100644 --- a/packages/platform-browser/test/security/dom_sanitization_service_spec.ts +++ b/packages/platform-browser/test/security/dom_sanitization_service_spec.ts @@ -7,7 +7,7 @@ */ import {SecurityContext} from '@angular/core'; -import * as t from '@angular/core/testing/testing_internal'; +import * as t from '@angular/core/testing/src/testing_internal'; import {DomSanitizerImpl} from '../../src/security/dom_sanitization_service'; diff --git a/packages/platform-browser/test/security/html_sanitizer_spec.ts b/packages/platform-browser/test/security/html_sanitizer_spec.ts index 04064a1c7b..e7416e22fe 100644 --- a/packages/platform-browser/test/security/html_sanitizer_spec.ts +++ b/packages/platform-browser/test/security/html_sanitizer_spec.ts @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ -import * as t from '@angular/core/testing/testing_internal'; -import {browserDetection} from '@angular/platform-browser/testing/browser_util'; +import * as t from '@angular/core/testing/src/testing_internal'; +import {browserDetection} from '@angular/platform-browser/testing/src/browser_util'; import {getDOM} from '../../src/dom/dom_adapter'; import {sanitizeHtml} from '../../src/security/html_sanitizer'; diff --git a/packages/platform-browser/test/security/style_sanitizer_spec.ts b/packages/platform-browser/test/security/style_sanitizer_spec.ts index e8118b3d4f..72f3784370 100644 --- a/packages/platform-browser/test/security/style_sanitizer_spec.ts +++ b/packages/platform-browser/test/security/style_sanitizer_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as t from '@angular/core/testing/testing_internal'; +import * as t from '@angular/core/testing/src/testing_internal'; import {getDOM} from '../../src/dom/dom_adapter'; import {sanitizeStyle} from '../../src/security/style_sanitizer'; diff --git a/packages/platform-browser/test/security/url_sanitizer_spec.ts b/packages/platform-browser/test/security/url_sanitizer_spec.ts index 92ff5edd78..a39bc3ad47 100644 --- a/packages/platform-browser/test/security/url_sanitizer_spec.ts +++ b/packages/platform-browser/test/security/url_sanitizer_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as t from '@angular/core/testing/testing_internal'; +import * as t from '@angular/core/testing/src/testing_internal'; import {getDOM} from '../../src/dom/dom_adapter'; import {sanitizeSrcset, sanitizeUrl} from '../../src/security/url_sanitizer'; diff --git a/packages/platform-browser/test/testing_public_spec.ts b/packages/platform-browser/test/testing_public_spec.ts index ae45b33ae3..740818386b 100644 --- a/packages/platform-browser/test/testing_public_spec.ts +++ b/packages/platform-browser/test/testing_public_spec.ts @@ -9,7 +9,7 @@ import {CompilerConfig, ResourceLoader} from '@angular/compiler'; import {CUSTOM_ELEMENTS_SCHEMA, Component, Directive, Injectable, Input, NgModule, Pipe, ɵstringify as stringify} from '@angular/core'; import {TestBed, async, fakeAsync, getTestBed, inject, tick, withModule} from '@angular/core/testing'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; // Services, and components for the tests. diff --git a/packages/platform-browser/testing/index.ts b/packages/platform-browser/testing/index.ts new file mode 100644 index 0000000000..4e8c99c410 --- /dev/null +++ b/packages/platform-browser/testing/index.ts @@ -0,0 +1,15 @@ +/** + * @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 core/testing package. + */ + +export * from './src/testing'; diff --git a/packages/platform-browser/testing/package.json b/packages/platform-browser/testing/package.json new file mode 100644 index 0000000000..bf2ef8312d --- /dev/null +++ b/packages/platform-browser/testing/package.json @@ -0,0 +1,6 @@ +{ + "typings": "../typings/testing/index.d.ts", + "main": "../bundles/platform-browser-testing.umd.js", + "module": "../@angular/platform-browser/testing.es5.js", + "es2015": "../@angular/platform-browser/testing.js" +} diff --git a/packages/platform-browser/testing/src/index.ts b/packages/platform-browser/testing/src/testing.ts similarity index 100% rename from packages/platform-browser/testing/src/index.ts rename to packages/platform-browser/testing/src/testing.ts diff --git a/packages/platform-browser/testing/tsconfig-build.json b/packages/platform-browser/testing/tsconfig-build.json index c14de7e836..174c61c679 100644 --- a/packages/platform-browser/testing/tsconfig-build.json +++ b/packages/platform-browser/testing/tsconfig-build.json @@ -1,16 +1,16 @@ { - "extends": "./tsconfig-build", + "extends": "../tsconfig-build", "compilerOptions": { "paths": { - "@angular/core": ["../../../dist/packages-dist/core"], - "@angular/core/testing": ["../../../dist/packages-dist/core/testing"], - "@angular/common": ["../../../dist/packages-dist/common"], - "@angular/common/testing": ["../../../dist/packages-dist/common/testing"], - "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"] + "@angular/core": ["../../dist/packages/core"], + "@angular/core/testing": ["../../dist/packages/core/testing"], + "@angular/common": ["../../dist/packages/common"], + "@angular/common/testing": ["../../dist/packages/common/testing"], + "@angular/platform-browser": ["../../dist/packages/platform-browser"] } }, "files": [ - "testing/index.ts", + "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" diff --git a/packages/platform-browser/tsconfig-build.json b/packages/platform-browser/tsconfig-build.json index 508c08913b..fb9a8fda97 100644 --- a/packages/platform-browser/tsconfig-build.json +++ b/packages/platform-browser/tsconfig-build.json @@ -6,11 +6,11 @@ "experimentalDecorators": true, "module": "es2015", "moduleResolution": "node", - "outDir": "../../../dist/packages-dist/platform-browser", + "outDir": "../../dist/packages/platform-browser", "paths": { - "@angular/core": ["../../../dist/packages-dist/core"], - "@angular/platform-browser/animations": ["../../../dist/packages-dist/platform-browser/animations"], - "@angular/common": ["../../../dist/packages-dist/common"] + "@angular/core": ["../../dist/packages/core"], + "@angular/platform-browser/animations": ["../../dist/packages/platform-browser/animations"], + "@angular/common": ["../../dist/packages/common"] }, "rootDir": ".", "sourceMap": true, @@ -23,8 +23,8 @@ }, "files": [ "public_api.ts", - "../../../node_modules/@types/hammerjs/index.d.ts", - "../../../node_modules/zone.js/dist/zone.js.d.ts" + "../../node_modules/@types/hammerjs/index.d.ts", + "../../node_modules/zone.js/dist/zone.js.d.ts" ], "angularCompilerOptions": { "annotateForClosureCompiler": true, diff --git a/packages/platform-server/package.json b/packages/platform-server/package.json index 0e0fd87996..69933b6ff0 100644 --- a/packages/platform-server/package.json +++ b/packages/platform-server/package.json @@ -5,7 +5,7 @@ "main": "./bundles/platform-server.umd.js", "module": "./@angular/platform-server.es5.js", "es2015": "./@angular/platform-server.js", - "typings": "./typings/platform-server.d.ts", + "typings": "./typings/index.d.ts", "author": "angular", "license": "MIT", "peerDependencies": { diff --git a/packages/platform-server/rollup-testing.config.js b/packages/platform-server/rollup-testing.config.js new file mode 100644 index 0000000000..94b9763bf2 --- /dev/null +++ b/packages/platform-server/rollup-testing.config.js @@ -0,0 +1,23 @@ +/** + * @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/platform-server/testing/index.js', + dest: '../../../dist/packages-dist/platform-server/bundles/platform-server-testing.umd.js', + format: 'umd', + moduleName: 'ng.platformServer.testing', + globals: { + '@angular/core': 'ng.core', + '@angular/common': 'ng.common', + '@angular/compiler': 'ng.compiler', + '@angular/compiler/testing': 'ng.compiler.testing', + '@angular/platform-browser': 'ng.platformBrowser', + '@angular/platform-server': 'ng.platformServer', + '@angular/platform-browser-dynamic/testing': 'ng.platformBrowserDynamic.testing' + } +}; diff --git a/packages/platform-server/rollup.config.js b/packages/platform-server/rollup.config.js new file mode 100644 index 0000000000..99f753257a --- /dev/null +++ b/packages/platform-server/rollup.config.js @@ -0,0 +1,20 @@ +/** + * @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/platform-server/index.js', + dest: '../../../dist/packages-dist/platform-server/bundles/platform-server.umd.js', + format: 'umd', + moduleName: 'ng.platformServer', + globals: { + '@angular/core': 'ng.core', + '@angular/common': 'ng.common', + '@angular/compiler': 'ng.compiler', + '@angular/platform-browser': 'ng.platformBrowser' + } +}; diff --git a/packages/platform-server/testing/index.ts b/packages/platform-server/testing/index.ts new file mode 100644 index 0000000000..dcd35409c3 --- /dev/null +++ b/packages/platform-server/testing/index.ts @@ -0,0 +1,15 @@ +/** + * @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 platform-server/testing package. + */ + +export * from './src/testing'; diff --git a/packages/platform-server/testing/src/index.ts b/packages/platform-server/testing/src/testing.ts similarity index 100% rename from packages/platform-server/testing/src/index.ts rename to packages/platform-server/testing/src/testing.ts diff --git a/packages/platform-server/testing/tsconfig-build.json b/packages/platform-server/testing/tsconfig-build.json index 2c463a2e55..fee743fcd3 100644 --- a/packages/platform-server/testing/tsconfig-build.json +++ b/packages/platform-server/testing/tsconfig-build.json @@ -1,22 +1,22 @@ { - "extends": "./tsconfig-build", + "extends": "../tsconfig-build", "compilerOptions": { "paths": { - "@angular/core": ["../../../dist/packages-dist/core"], - "@angular/core/testing": ["../../../dist/packages-dist/core/testing"], - "@angular/common": ["../../../dist/packages-dist/common"], - "@angular/common/testing": ["../../../dist/packages-dist/common/testing"], - "@angular/compiler": ["../../../dist/packages-dist/compiler"], - "@angular/compiler/testing": ["../../../dist/packages-dist/compiler/testing"], - "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"], - "@angular/platform-browser/testing": ["../../../dist/packages-dist/platform-browser/testing"], - "@angular/platform-browser-dynamic": ["../../../dist/packages-dist/platform-browser-dynamic"], - "@angular/platform-browser-dynamic/testing": ["../../../dist/packages-dist/platform-browser-dynamic/testing"], - "@angular/platform-server": ["../../../dist/packages-dist/platform-server"] + "@angular/core": ["../../dist/packages/core"], + "@angular/core/testing": ["../../dist/packages/core/testing"], + "@angular/common": ["../../dist/packages/common"], + "@angular/common/testing": ["../../dist/packages/common/testing"], + "@angular/compiler": ["../../dist/packages/compiler"], + "@angular/compiler/testing": ["../../dist/packages/compiler/testing"], + "@angular/platform-browser": ["../../dist/packages/platform-browser"], + "@angular/platform-browser/testing": ["../../dist/packages/platform-browser/testing"], + "@angular/platform-browser-dynamic": ["../../dist/packages/platform-browser-dynamic"], + "@angular/platform-browser-dynamic/testing": ["../../dist/packages/platform-browser-dynamic/testing"], + "@angular/platform-server": ["../../dist/packages/platform-server"] } }, "files": [ - "testing/index.ts", + "index.ts", "../../../node_modules/@types/jasmine/index.d.ts", "../../../node_modules/@types/node/index.d.ts", "../../../node_modules/zone.js/dist/zone.js.d.ts" diff --git a/packages/platform-server/tsconfig-build.json b/packages/platform-server/tsconfig-build.json index 3f3d15c521..c0834766aa 100644 --- a/packages/platform-server/tsconfig-build.json +++ b/packages/platform-server/tsconfig-build.json @@ -6,14 +6,14 @@ "experimentalDecorators": true, "module": "es2015", "moduleResolution": "node", - "outDir": "../../../dist/packages-dist/platform-server", + "outDir": "../../dist/packages/platform-server", "paths": { - "@angular/core": ["../../../dist/packages-dist/core"], - "@angular/common": ["../../../dist/packages-dist/common"], - "@angular/compiler": ["../../../dist/packages-dist/compiler"], - "@angular/http": ["../../../dist/packages-dist/http"], - "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"], - "@angular/platform-browser-dynamic": ["../../../dist/packages-dist/platform-browser-dynamic"] + "@angular/core": ["../../dist/packages/core"], + "@angular/common": ["../../dist/packages/common"], + "@angular/compiler": ["../../dist/packages/compiler"], + "@angular/http": ["../../dist/packages/http"], + "@angular/platform-browser": ["../../dist/packages/platform-browser"], + "@angular/platform-browser-dynamic": ["../../dist/packages/platform-browser-dynamic"] }, "rootDir": ".", "sourceMap": true, @@ -26,8 +26,8 @@ }, "files": [ "public_api.ts", - "../../../node_modules/@types/node/index.d.ts", - "../../../node_modules/zone.js/dist/zone.js.d.ts" + "../../node_modules/@types/node/index.d.ts", + "../../node_modules/zone.js/dist/zone.js.d.ts" ], "angularCompilerOptions": { "annotateForClosureCompiler": true, diff --git a/packages/platform-webworker-dynamic/package.json b/packages/platform-webworker-dynamic/package.json index 2b48517a48..de061c0817 100644 --- a/packages/platform-webworker-dynamic/package.json +++ b/packages/platform-webworker-dynamic/package.json @@ -5,7 +5,7 @@ "main": "./bundles/platform-webworker-dynamic.umd.js", "module": "./@angular/platform-webworker-dynamic.es5.js", "es2015": "./@angular/platform-webworker-dynamic.js", - "typings": "./typings/platform-webworker-dynamic.d.ts", + "typings": "./typings/index.d.ts", "author": "angular", "license": "MIT", "peerDependencies": { diff --git a/packages/platform-webworker-dynamic/rollup.config.js b/packages/platform-webworker-dynamic/rollup.config.js new file mode 100644 index 0000000000..f8b4a0f4d3 --- /dev/null +++ b/packages/platform-webworker-dynamic/rollup.config.js @@ -0,0 +1,23 @@ +/** + * @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/platform-webworker-dynamic/index.js', + dest: + '../../../dist/packages-dist/platform-webworker-dynamic/bundles/platform-webworker-dynamic.umd.js', + format: 'umd', + moduleName: 'ng.platformWebworkerDynamic', + globals: { + '@angular/core': 'ng.core', + '@angular/common': 'ng.common', + '@angular/compiler': 'ng.compiler', + '@angular/platform-browser': 'ng.platformBrowser', + '@angular/platform-browser-dynamic': 'ng.platformBrowserDynamic', + '@angular/platform-webworker': 'ng.platformWebworker', + } +}; diff --git a/packages/platform-webworker-dynamic/tsconfig-build.json b/packages/platform-webworker-dynamic/tsconfig-build.json index ebcf7bc415..4fc26d1998 100644 --- a/packages/platform-webworker-dynamic/tsconfig-build.json +++ b/packages/platform-webworker-dynamic/tsconfig-build.json @@ -6,14 +6,14 @@ "experimentalDecorators": true, "module": "es2015", "moduleResolution": "node", - "outDir": "../../../dist/packages-dist/platform-webworker-dynamic", + "outDir": "../../dist/packages/platform-webworker-dynamic", "paths": { - "@angular/core": ["../../../dist/packages-dist/core"], - "@angular/common": ["../../../dist/packages-dist/common"], - "@angular/compiler": ["../../../dist/packages-dist/compiler"], - "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"], - "@angular/platform-browser-dynamic": ["../../../dist/packages-dist/platform-browser-dynamic"], - "@angular/platform-webworker": ["../../../dist/packages-dist/platform-webworker"] + "@angular/core": ["../../dist/packages/core"], + "@angular/common": ["../../dist/packages/common"], + "@angular/compiler": ["../../dist/packages/compiler"], + "@angular/platform-browser": ["../../dist/packages/platform-browser"], + "@angular/platform-browser-dynamic": ["../../dist/packages/platform-browser-dynamic"], + "@angular/platform-webworker": ["../../dist/packages/platform-webworker"] }, "rootDir": ".", "sourceMap": true, @@ -26,6 +26,6 @@ }, "files": [ "index.ts", - "../../../node_modules/zone.js/dist/zone.js.d.ts" + "../../node_modules/zone.js/dist/zone.js.d.ts" ] } diff --git a/packages/platform-webworker/package.json b/packages/platform-webworker/package.json index 70cd8593ea..a66ddec3ed 100644 --- a/packages/platform-webworker/package.json +++ b/packages/platform-webworker/package.json @@ -5,7 +5,7 @@ "main": "./bundles/platform-webworker.umd.js", "module": "./@angular/platform-webworker.es5.js", "es2015": "./@angular/platform-webworker.js", - "typings": "./typings/platform-webworker.d.ts", + "typings": "./typings/index.d.ts", "author": "angular", "license": "MIT", "peerDependencies": { diff --git a/packages/platform-webworker/rollup.config.js b/packages/platform-webworker/rollup.config.js new file mode 100644 index 0000000000..c195c8be83 --- /dev/null +++ b/packages/platform-webworker/rollup.config.js @@ -0,0 +1,21 @@ +/** + * @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/platform-webworker/index.js', + dest: '../../../dist/packages-dist/platform-webworker/bundles/platform-webworker.umd.js', + format: 'umd', + moduleName: 'ng.platformWebworker', + globals: { + '@angular/core': 'ng.core', + '@angular/common': 'ng.common', + '@angular/platform-browser': 'ng.platformBrowser', + 'rxjs/Observable': 'Rx', + 'rxjs/Subject': 'Rx' + } +}; diff --git a/packages/platform-webworker/test/web_workers/shared/message_bus_spec.ts b/packages/platform-webworker/test/web_workers/shared/message_bus_spec.ts index a08334d593..52705057d0 100644 --- a/packages/platform-webworker/test/web_workers/shared/message_bus_spec.ts +++ b/packages/platform-webworker/test/web_workers/shared/message_bus_spec.ts @@ -7,8 +7,8 @@ */ import {NgZone} from '@angular/core'; -import {withModule} from '@angular/core/testing/test_bed'; -import {AsyncTestCompleter, MockNgZone, beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal'; +import {withModule} from '@angular/core/testing/src/test_bed'; +import {AsyncTestCompleter, MockNgZone, beforeEach, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal'; import {MessageBus} from '@angular/platform-webworker/src/web_workers/shared/message_bus'; import {createConnectedMessageBus} from './message_bus_util'; diff --git a/packages/platform-webworker/test/web_workers/shared/service_message_broker_spec.ts b/packages/platform-webworker/test/web_workers/shared/service_message_broker_spec.ts index 9dc32cdab9..8bdefce66b 100644 --- a/packages/platform-webworker/test/web_workers/shared/service_message_broker_spec.ts +++ b/packages/platform-webworker/test/web_workers/shared/service_message_broker_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {beforeEach, beforeEachProviders, describe, expect, inject, it} from '@angular/core/testing/testing_internal'; +import {beforeEach, beforeEachProviders, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal'; import {ON_WEB_WORKER} from '@angular/platform-webworker/src/web_workers/shared/api'; import {RenderStore} from '@angular/platform-webworker/src/web_workers/shared/render_store'; import {Serializer, SerializerTypes} from '@angular/platform-webworker/src/web_workers/shared/serializer'; diff --git a/packages/platform-webworker/test/web_workers/worker/renderer_v2_integration_spec.ts b/packages/platform-webworker/test/web_workers/worker/renderer_v2_integration_spec.ts index 81de882f25..cc5dadf37a 100644 --- a/packages/platform-webworker/test/web_workers/worker/renderer_v2_integration_spec.ts +++ b/packages/platform-webworker/test/web_workers/worker/renderer_v2_integration_spec.ts @@ -12,8 +12,8 @@ import {platformBrowserDynamicTesting} from '@angular/platform-browser-dynamic/t import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {DomRendererFactory2} from '@angular/platform-browser/src/dom/dom_renderer'; import {BrowserTestingModule} from '@angular/platform-browser/testing'; -import {dispatchEvent} from '@angular/platform-browser/testing/browser_util'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {dispatchEvent} from '@angular/platform-browser/testing/src/browser_util'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; import {ClientMessageBrokerFactory, ClientMessageBrokerFactory_} from '../../../src/web_workers/shared/client_message_broker'; import {RenderStore} from '../../../src/web_workers/shared/render_store'; diff --git a/packages/platform-webworker/test/web_workers/worker/spies.ts b/packages/platform-webworker/test/web_workers/worker/spies.ts index 7055f66510..507e9bd9d4 100644 --- a/packages/platform-webworker/test/web_workers/worker/spies.ts +++ b/packages/platform-webworker/test/web_workers/worker/spies.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {SpyObject} from '@angular/core/testing/testing_internal'; +import {SpyObject} from '@angular/core/testing/src/testing_internal'; import {ClientMessageBroker} from '@angular/platform-webworker/src/web_workers/shared/client_message_broker'; export class SpyMessageBroker extends SpyObject { diff --git a/packages/platform-webworker/tsconfig-build.json b/packages/platform-webworker/tsconfig-build.json index bba8df51f4..8d14abec3e 100644 --- a/packages/platform-webworker/tsconfig-build.json +++ b/packages/platform-webworker/tsconfig-build.json @@ -6,11 +6,11 @@ "experimentalDecorators": true, "module": "es2015", "moduleResolution": "node", - "outDir": "../../../dist/packages-dist/platform-webworker", + "outDir": "../../dist/packages/platform-webworker", "paths": { - "@angular/core": ["../../../dist/packages-dist/core"], - "@angular/common": ["../../../dist/packages-dist/common"], - "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"] + "@angular/core": ["../../dist/packages/core"], + "@angular/common": ["../../dist/packages/common"], + "@angular/platform-browser": ["../../dist/packages/platform-browser"] }, "rootDir": ".", "sourceMap": true, @@ -23,7 +23,7 @@ }, "files": [ "public_api.ts", - "../../../node_modules/zone.js/dist/zone.js.d.ts" + "../../node_modules/zone.js/dist/zone.js.d.ts" ], "angularCompilerOptions": { "annotateForClosureCompiler": true, diff --git a/packages/router/package.json b/packages/router/package.json index 0ed18a5ce7..3ec8a432d9 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -5,7 +5,7 @@ "main": "./bundles/router.umd.js", "module": "./@angular/router.es5.js", "es2015": "./@angular/router.js", - "typings": "./typings/router.d.ts", + "typings": "./typings/index.d.ts", "keywords": [ "angular", "router" diff --git a/packages/router/rollup-testing.config.js b/packages/router/rollup-testing.config.js new file mode 100644 index 0000000000..1943b5793c --- /dev/null +++ b/packages/router/rollup-testing.config.js @@ -0,0 +1,21 @@ +/** + * @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/router/testing/index.js', + dest: '../../../dist/packages-dist/router/bundles/router-testing.umd.js', + format: 'umd', + moduleName: 'ng.router.testing', + globals: { + '@angular/core': 'ng.core', + '@angular/common': 'ng.common', + '@angular/common/testing': 'ng.common.testing', + '@angular/platform-browser': 'ng.platformBrowser', + '@angular/router': 'ng.router' + } +}; diff --git a/packages/router/rollup-upgrade.config.js b/packages/router/rollup-upgrade.config.js new file mode 100644 index 0000000000..a7f56e3d02 --- /dev/null +++ b/packages/router/rollup-upgrade.config.js @@ -0,0 +1,20 @@ +/** + * @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/router/upgrade.js', + dest: '../../../dist/packages-dist/router/bundles/router-upgrade.umd.js', + format: 'umd', + moduleName: 'ng.router.upgrade', + globals: { + '@angular/core': 'ng.core', + '@angular/common': 'ng.common', + '@angular/router': 'ng.router', + '@angular/upgrade/static': 'ng.upgrade.static' + } +}; diff --git a/packages/router/rollup.config.js b/packages/router/rollup.config.js new file mode 100644 index 0000000000..7f899dc72d --- /dev/null +++ b/packages/router/rollup.config.js @@ -0,0 +1,44 @@ +/** + * @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/router/@angular/index.js', + dest: '../../../dist/packages-dist/router/bundles/router.umd.js', + format: 'umd', + moduleName: 'ng.router', + globals: { + '@angular/core': 'ng.core', + '@angular/common': 'ng.common', + '@angular/platform-browser': 'ng.platformBrowser', + + 'rxjs/BehaviorSubject': 'Rx', + 'rxjs/Observable': 'Rx', + 'rxjs/Subject': 'Rx', + 'rxjs/Subscription': 'Rx', + 'rxjs/util/EmptyError': 'Rx', + + 'rxjs/observable/from': 'Rx.Observable', + 'rxjs/observable/fromPromise': 'Rx.Observable', + 'rxjs/observable/forkJoin': 'Rx.Observable', + 'rxjs/observable/of': 'Rx.Observable', + + 'rxjs/operator/toPromise': 'Rx.Observable.prototype', + 'rxjs/operator/map': 'Rx.Observable.prototype', + 'rxjs/operator/mergeAll': 'Rx.Observable.prototype', + 'rxjs/operator/concatAll': 'Rx.Observable.prototype', + 'rxjs/operator/mergeMap': 'Rx.Observable.prototype', + 'rxjs/operator/reduce': 'Rx.Observable.prototype', + 'rxjs/operator/every': 'Rx.Observable.prototype', + 'rxjs/operator/first': 'Rx.Observable.prototype', + 'rxjs/operator/catch': 'Rx.Observable.prototype', + 'rxjs/operator/last': 'Rx.Observable.prototype', + 'rxjs/operator/filter': 'Rx.Observable.prototype', + 'rxjs/operator/concatMap': 'Rx.Observable.prototype' + }, + plugins: [] +}; diff --git a/packages/router/test/integration.spec.ts b/packages/router/test/integration.spec.ts index 46b93332c9..9d459421cb 100644 --- a/packages/router/test/integration.spec.ts +++ b/packages/router/test/integration.spec.ts @@ -10,7 +10,7 @@ import {CommonModule, Location} from '@angular/common'; import {Component, NgModule, NgModuleFactoryLoader} from '@angular/core'; import {ComponentFixture, TestBed, fakeAsync, inject, tick} from '@angular/core/testing'; import {By} from '@angular/platform-browser/src/dom/debug/by'; -import {expect} from '@angular/platform-browser/testing/matchers'; +import {expect} from '@angular/platform-browser/testing/src/matchers'; import {Observable} from 'rxjs/Observable'; import {map} from 'rxjs/operator/map'; diff --git a/packages/router/test/router.spec.ts b/packages/router/test/router.spec.ts index 1ceb58f210..6f293266ad 100644 --- a/packages/router/test/router.spec.ts +++ b/packages/router/test/router.spec.ts @@ -15,7 +15,7 @@ import {RouterOutletMap} from '../src/router_outlet_map'; import {ActivatedRouteSnapshot, RouterStateSnapshot, createEmptyStateSnapshot} from '../src/router_state'; import {DefaultUrlSerializer} from '../src/url_tree'; import {TreeNode} from '../src/utils/tree'; -import {RouterTestingModule} from '../testing/router_testing_module'; +import {RouterTestingModule} from '../testing/src/router_testing_module'; describe('Router', () => { describe('resetRootComponentType', () => { @@ -117,4 +117,4 @@ function createActivatedRouteSnapshot(cmp: string, extra: any = {}): ActivatedRo return new ActivatedRouteSnapshot( [], {}, null, null, null, null, cmp, {}, null, -1, extra.resolve); -} \ No newline at end of file +} diff --git a/packages/router/test/spy_ng_module_factory_loader.spec.ts b/packages/router/test/spy_ng_module_factory_loader.spec.ts index 56e55b64d2..947aff8049 100644 --- a/packages/router/test/spy_ng_module_factory_loader.spec.ts +++ b/packages/router/test/spy_ng_module_factory_loader.spec.ts @@ -7,7 +7,7 @@ */ import {fakeAsync, tick} from '@angular/core/testing'; -import {SpyNgModuleFactoryLoader} from '../testing/router_testing_module'; +import {SpyNgModuleFactoryLoader} from '../testing/src/router_testing_module'; describe('SpyNgModuleFactoryLoader', () => { it('should invoke the compiler when the setter is called', () => { @@ -42,4 +42,4 @@ describe('SpyNgModuleFactoryLoader', () => { expect(error).toEqual(new Error('Cannot find module two')); })); -}); \ No newline at end of file +}); diff --git a/packages/router/testing/index.ts b/packages/router/testing/index.ts new file mode 100644 index 0000000000..31e1e65bf1 --- /dev/null +++ b/packages/router/testing/index.ts @@ -0,0 +1,15 @@ +/** + * @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 router/testing package. + */ + +export * from './src/testing'; diff --git a/packages/router/testing/package.json b/packages/router/testing/package.json new file mode 100644 index 0000000000..f4a9089bb3 --- /dev/null +++ b/packages/router/testing/package.json @@ -0,0 +1,6 @@ +{ + "typings": "../typings/testing/index.d.ts", + "main": "../bundles/router-testing.umd.js", + "module": "../@angular/router/testing.es5.js", + "es2015": "../@angular/router/testing.js" +} diff --git a/packages/router/testing/src/index.ts b/packages/router/testing/src/testing.ts similarity index 100% rename from packages/router/testing/src/index.ts rename to packages/router/testing/src/testing.ts diff --git a/packages/router/testing/tsconfig-build.json b/packages/router/testing/tsconfig-build.json index 5810efc5cc..075945d344 100644 --- a/packages/router/testing/tsconfig-build.json +++ b/packages/router/testing/tsconfig-build.json @@ -1,12 +1,12 @@ { - "extends": "../tsconfig", + "extends": "../tsconfig-build", "compilerOptions": { "paths": { - "@angular/core": ["../../../dist/packages/core"], - "@angular/common": ["../../../dist/packages/common"], - "@angular/common/testing": ["../../../dist/packages/common/testing"], - "@angular/platform-browser": ["../../../dist/packages/platform-browser"], - "@angular/router": ["../../../dist/packages/router"] + "@angular/core": ["../../dist/packages/core"], + "@angular/common": ["../../dist/packages/common"], + "@angular/common/testing": ["../../dist/packages/common/testing"], + "@angular/platform-browser": ["../../dist/packages/platform-browser"], + "@angular/router": ["../../dist/packages/router"] } }, "files": [ diff --git a/packages/router/testingmvsconfig-json.json b/packages/router/testingmvsconfig-json.json new file mode 100644 index 0000000000..5810efc5cc --- /dev/null +++ b/packages/router/testingmvsconfig-json.json @@ -0,0 +1,18 @@ +{ + "extends": "../tsconfig", + "compilerOptions": { + "paths": { + "@angular/core": ["../../../dist/packages/core"], + "@angular/common": ["../../../dist/packages/common"], + "@angular/common/testing": ["../../../dist/packages/common/testing"], + "@angular/platform-browser": ["../../../dist/packages/platform-browser"], + "@angular/router": ["../../../dist/packages/router"] + } + }, + "files": [ + "index.ts" + ], + "angularCompilerOptions": { + "strictMetadataEmit": true + } +} diff --git a/packages/router/tsconfig-build.json b/packages/router/tsconfig-build.json index eac9def5ea..5dd5e957d4 100644 --- a/packages/router/tsconfig-build.json +++ b/packages/router/tsconfig-build.json @@ -10,11 +10,11 @@ "noEmitOnError": false, "noImplicitAny": true, "noImplicitReturns": true, - "outDir": "../../../dist/packages-dist/router", + "outDir": "../../dist/packages/router", "paths": { - "@angular/core": ["../../../dist/packages-dist/core"], - "@angular/common": ["../../../dist/packages-dist/common"], - "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"] + "@angular/core": ["../../dist/packages/core"], + "@angular/common": ["../../dist/packages/common"], + "@angular/platform-browser": ["../../dist/packages/platform-browser"] }, "rootDir": ".", "sourceMap": true, diff --git a/packages/router/upgrade/index.ts b/packages/router/upgrade/index.ts new file mode 100644 index 0000000000..2ac1fa27c4 --- /dev/null +++ b/packages/router/upgrade/index.ts @@ -0,0 +1,15 @@ +/** + * @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 router/upgrade package. + */ + +export * from './src/upgrade'; diff --git a/packages/router/upgrade/package.json b/packages/router/upgrade/package.json new file mode 100644 index 0000000000..b7a934791c --- /dev/null +++ b/packages/router/upgrade/package.json @@ -0,0 +1,6 @@ +{ + "typings": "../typings/upgrade/upgrade.d.ts", + "main": "../bundles/router-upgrade.umd.js", + "module": "../@angular/router/upgrade.es5.js", + "es2015": "../@angular/router/upgrade.js" +} diff --git a/packages/router/upgrade.ts b/packages/router/upgrade/src/upgrade.ts similarity index 100% rename from packages/router/upgrade.ts rename to packages/router/upgrade/src/upgrade.ts diff --git a/packages/router/upgrade/tsconfig-build.json b/packages/router/upgrade/tsconfig-build.json index 0343e3c052..120c343b10 100644 --- a/packages/router/upgrade/tsconfig-build.json +++ b/packages/router/upgrade/tsconfig-build.json @@ -1,16 +1,15 @@ { - "extends": "./tsconfig-build", + "extends": "../tsconfig-build", "compilerOptions": { - "outDir": "../../../dist/packages-dist/router/upgrade", "paths": { - "@angular/core": ["../../../dist/packages-dist/core"], - "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"], - "@angular/router": ["../../../dist/packages-dist/router"], - "@angular/upgrade/static": ["../../../dist/packages-dist/upgrade/static"] + "@angular/core": ["../../dist/packages/core"], + "@angular/platform-browser": ["../../dist/packages/platform-browser"], + "@angular/router": ["../../dist/packages/router"], + "@angular/upgrade/static": ["../../dist/packages/upgrade/static"] } }, "files": [ - "upgrade.ts" + "index.ts" ], "angularCompilerOptions": { "strictMetadataEmit": true diff --git a/packages/tsconfig.json b/packages/tsconfig.json index 26e4004c7c..68a00ac0ea 100644 --- a/packages/tsconfig.json +++ b/packages/tsconfig.json @@ -12,9 +12,10 @@ "paths": { "selenium-webdriver": ["../node_modules/@types/selenium-webdriver/index.d.ts"], "rxjs/*": ["../node_modules/rxjs/*"], - "@angular/*": ["./@angular/*"], + "@angular/*": ["./*"], "@angular/tsc-wrapped": ["../dist/tools/@angular/tsc-wrapped"], - "@angular/tsc-wrapped/*": ["../dist/tools/@angular/tsc-wrapped/*"] + "@angular/tsc-wrapped/*": ["../dist/tools/@angular/tsc-wrapped/*"], + "e2e_util/*": ["../modules/e2e_util/*"] }, "rootDir": ".", "inlineSourceMap": true, @@ -25,13 +26,6 @@ "types": ["angularjs"] }, "exclude": [ - "angular1_router", - "benchmarks/e2e_test/old", - "benchmarks/src/old", - "benchmarks/src/**/index_aot.ts", - "benchmarks_external", - "payload_tests", - "rollup-test", - "@angular/compiler-cli/integrationtest" + "compiler-cli/integrationtest" ] } diff --git a/packages/upgrade/package.json b/packages/upgrade/package.json index fe7229461c..576f4f451c 100644 --- a/packages/upgrade/package.json +++ b/packages/upgrade/package.json @@ -5,7 +5,7 @@ "main": "./bundles/upgrade.umd.js", "module": "./@angular/upgrade.es5.js", "es2015": "./@angular/upgrade.js", - "typings": "./typings/upgrade.d.ts", + "typings": "./typings/upgrade/index.d.ts", "author": "angular", "license": "MIT", "peerDependencies": { diff --git a/packages/upgrade/rollup-static.config.js b/packages/upgrade/rollup-static.config.js new file mode 100644 index 0000000000..a69138c84e --- /dev/null +++ b/packages/upgrade/rollup-static.config.js @@ -0,0 +1,15 @@ +/** + * @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/upgrade/static.js', + dest: '../../../dist/packages-dist/upgrade/bundles/upgrade-static.umd.js', + format: 'umd', + moduleName: 'ng.upgrade.static', + globals: {'@angular/core': 'ng.core'} +}; diff --git a/packages/upgrade/rollup.config.js b/packages/upgrade/rollup.config.js new file mode 100644 index 0000000000..f02a7da579 --- /dev/null +++ b/packages/upgrade/rollup.config.js @@ -0,0 +1,26 @@ +/** + * @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/upgrade/index.js', + dest: '../../../dist/packages-dist/upgrade/bundles/upgrade.umd.js', + format: 'umd', + moduleName: 'ng.upgrade', + globals: { + '@angular/core': 'ng.core', + '@angular/common': 'ng.common', + '@angular/compiler': 'ng.compiler', + '@angular/platform-browser': 'ng.platformBrowser', + '@angular/platform-browser-dynamic': 'ng.platformBrowserDynamic', + 'rxjs/Subject': 'Rx', + 'rxjs/observable/PromiseObservable': 'Rx', // this is wrong, but this stuff has changed in rxjs + // b.6 so we need to fix it when we update. + 'rxjs/operator/toPromise': 'Rx.Observable.prototype', + 'rxjs/Observable': 'Rx', + } +}; diff --git a/packages/upgrade/static.ts b/packages/upgrade/static/index.ts similarity index 76% rename from packages/upgrade/static.ts rename to packages/upgrade/static/index.ts index c2eb778246..e727e2e8a7 100644 --- a/packages/upgrade/static.ts +++ b/packages/upgrade/static/index.ts @@ -8,7 +8,7 @@ // This file is not used to build this module. It is only used during editing // by the TypeScript language service and during build for verification. `ngc` -// replaces this file with production static.ts when it rewrites private symbol +// replaces this file with production index.ts when it rewrites private symbol // names. -export * from './public_api_static'; +export * from './public_api'; diff --git a/packages/upgrade/static/package.json b/packages/upgrade/static/package.json new file mode 100644 index 0000000000..3e9a10e550 --- /dev/null +++ b/packages/upgrade/static/package.json @@ -0,0 +1,6 @@ +{ + "typings": "../typings/static/index.d.ts", + "main": "../bundles/upgrade-static.umd.js", + "module": "../@angular/upgrade/static.es5.js", + "es2015": "../@angular/upgrade/static.js" +} diff --git a/packages/upgrade/public_api_static.ts b/packages/upgrade/static/public_api.ts similarity index 59% rename from packages/upgrade/public_api_static.ts rename to packages/upgrade/static/public_api.ts index 57b16cedc6..1ac3984a56 100644 --- a/packages/upgrade/public_api_static.ts +++ b/packages/upgrade/static/public_api.ts @@ -12,10 +12,10 @@ * Entry point for all public APIs of the upgrade/static package, allowing * Angular 1 and Angular 2+ to run side by side in the same application. */ -export {downgradeComponent} from './src/common/downgrade_component'; -export {downgradeInjectable} from './src/common/downgrade_injectable'; -export {VERSION} from './src/common/version'; -export {UpgradeComponent} from './src/static/upgrade_component'; -export {UpgradeModule} from './src/static/upgrade_module'; +export {downgradeComponent} from '../src/common/downgrade_component'; +export {downgradeInjectable} from '../src/common/downgrade_injectable'; +export {VERSION} from '../src/common/version'; +export {UpgradeComponent} from '../src/static/upgrade_component'; +export {UpgradeModule} from '../src/static/upgrade_module'; // This file only re-exports content of the `src` folder. Keep it that way. diff --git a/packages/upgrade/static/tsconfig-build.json b/packages/upgrade/static/tsconfig-build.json index 1b479d1e39..114f01499c 100644 --- a/packages/upgrade/static/tsconfig-build.json +++ b/packages/upgrade/static/tsconfig-build.json @@ -1,21 +1,20 @@ { - "extends": "./tsconfig-build", + "extends": "../tsconfig-build", "compilerOptions": { - "outDir": "../../../dist/packages-dist/upgrade/static", "target": "es5", "paths": { - "@angular/core": ["../../../dist/packages-dist/core"], - "@angular/common": ["../../../dist/packages-dist/common"], - "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"], - "@angular/platform-browser-dynamic": ["../../../dist/packages-dist/platform-browser-dynamic"] + "@angular/core": ["../../dist/packages/core"], + "@angular/common": ["../../dist/packages/common"], + "@angular/platform-browser": ["../../dist/packages/platform-browser"], + "@angular/platform-browser-dynamic": ["../../dist/packages/platform-browser-dynamic"] } }, "files": [ - "public_api_static.ts", + "public_api.ts", "../../../node_modules/zone.js/dist/zone.js.d.ts" ], "angularCompilerOptions": { - "flatModuleOutFile": "static.js", + "flatModuleOutFile": "index.js", "flatModuleId": "@angular/upgrade/static" } } diff --git a/packages/upgrade/tsconfig-build.json b/packages/upgrade/tsconfig-build.json index 195c8eb4a1..3800b23f13 100644 --- a/packages/upgrade/tsconfig-build.json +++ b/packages/upgrade/tsconfig-build.json @@ -6,13 +6,13 @@ "experimentalDecorators": true, "module": "es2015", "moduleResolution": "node", - "outDir": "../../../dist/packages-dist/upgrade", + "outDir": "../../dist/packages/upgrade", "paths": { - "@angular/core": ["../../../dist/packages-dist/core"], - "@angular/common": ["../../../dist/packages-dist/common"], - "@angular/compiler": ["../../../dist/packages-dist/compiler"], - "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"], - "@angular/platform-browser-dynamic": ["../../../dist/packages-dist/platform-browser-dynamic"] + "@angular/core": ["../../dist/packages/core"], + "@angular/common": ["../../dist/packages/common"], + "@angular/compiler": ["../../dist/packages/compiler"], + "@angular/platform-browser": ["../../dist/packages/platform-browser"], + "@angular/platform-browser-dynamic": ["../../dist/packages/platform-browser-dynamic"] }, "rootDir": ".", "sourceMap": true, @@ -25,7 +25,7 @@ }, "files": [ "public_api.ts", - "../../../node_modules/zone.js/dist/zone.js.d.ts" + "../../node_modules/zone.js/dist/zone.js.d.ts" ], "angularCompilerOptions": { "annotateForClosureCompiler": true,