build: fix file paths after moving modules/@angular/* to packages/*

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": {

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'
+  }
+};

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',
+  }
+};

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": ["../../dist/packages/core"],
-      "@angular/core/testing": ["../../../dist/packages-dist/core/testing"]
+      "@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",
+    "../../node_modules/zone.js/dist/zone.js.d.ts",
-    "../../system.d.ts"
+    "../system.d.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,

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() {

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';

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';
 

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';
 

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';
 

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';
 

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';
 

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';
 

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() {

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';
 

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';
 

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';
 

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';

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';

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/node/index.d.ts",
-    "../../../node_modules/@types/jasmine/index.d.ts",
+    "../../node_modules/@types/jasmine/index.d.ts",
-    "../../../node_modules/zone.js/dist/zone.js.d.ts"
+    "../../node_modules/zone.js/dist/zone.js.d.ts"
   ]
 }

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": {

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'
+  }
+};

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',
+  }
+};

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', () => {

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;
 

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', () => {

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', () => {

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', () => {

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', () => {

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', () => {

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';
 

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', () => {

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', () => {

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', () => {

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 {beforeEach, describe, expect, it} from '@angular/core/testing/src/testing_internal';
-import {browserDetection} from '@angular/platform-browser/testing/browser_util';
+import {browserDetection} from '@angular/platform-browser/testing/src/browser_util';
 
 export function main() {
   describe('Number pipes', () => {

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', () => {

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() {

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';

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"
+}

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/core": ["../../dist/packages/core/"],
-      "@angular/common": ["../../../dist/packages-dist/common"]
+      "@angular/common": ["../../dist/packages/common"]
     }
   },
   "files": [
-    "testing/index.ts",
+    "index.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts"
   ],
   "angularCompilerOptions": {

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,

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';

packages/compiler-cli/esm5/tsconfig-build.json

@@ -1,8 +1,7 @@
 {
-    "extends": "./tsconfig-build",
+  "extends": "../tsconfig-build",
-    "compilerOptions": {
+  "compilerOptions": {
-        "module": "es2015",
+    "module": "es2015",
-        "moduleResolution": "node",
+    "moduleResolution": "node"
-        "outDir": "../../../dist/esm/compiler-cli"
+  }
-    }
 }

packages/compiler-cli/tsconfig-build.json

@@ -1,34 +1,39 @@
 {
-    "compilerOptions": {
+  "compilerOptions": {
-        "baseUrl": ".",
+    "baseUrl": ".",
-        "declaration": true,
+    "declaration": true,
-        "experimentalDecorators": true,
+    "experimentalDecorators": true,
-        "noImplicitAny": true,
+    "noImplicitAny": true,
-        "module": "commonjs",
+    "module": "commonjs",
-        "outDir": "../../../dist/packages-dist/compiler-cli",
+    "outDir": "../../dist/packages/compiler-cli",
-        "paths": {
+    "paths": {
-          "@angular/core": ["../../../dist/packages-dist/core"],
+      "@angular/core": ["../../dist/packages/core"],
-          "@angular/common": ["../../../dist/packages-dist/common"],
+      "@angular/common": ["../../dist/packages/common"],
-          "@angular/compiler": ["../../../dist/packages-dist/compiler"],
+      "@angular/compiler": ["../../dist/packages/compiler"],
-          "@angular/http": ["../../../dist/packages-dist/http"],
+      "@angular/http": ["../../dist/packages/http"],
-          "@angular/platform-server": ["../../../dist/packages-dist/platform-server"],
+      "@angular/platform-server": ["../../dist/packages/platform-server"],
-          "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"],
+      "@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,
-        "inlineSources": true,
-        "target": "es5",
-        "lib": ["es6", "dom"],
-        "skipLibCheck": true
     },
-    "exclude": ["integrationtest"],
+    "rootDir": ".",
-    "files": [
+    "sourceMap": true,
-        "index.ts",
+    "inlineSources": true,
-        "src/main.ts",
+    "target": "es5",
-        "src/extract_i18n.ts",
+    "lib": [
-        "../../../node_modules/@types/node/index.d.ts",
+      "es6",
-        "../../../node_modules/@types/jasmine/index.d.ts",
+      "dom"
-        "../../../node_modules/zone.js/dist/zone.js.d.ts"
+    ],
-    ]
+    "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"
+  ]
 }

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';

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"
+  ]
 }

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';

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"
+  ]
 }

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": {

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'
+  }
+};

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 }),
+  ]
+};

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() {

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';

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';
 

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 {MockResourceLoader} from '@angular/compiler/testing/src/resource_loader_mock';
-import {TEST_COMPILER_PROVIDERS} from '@angular/compiler/testing/test_bindings';
+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';
 

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', () => {

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';

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 {stringifyElement} from '@angular/platform-browser/testing/src/browser_util';
-import {expect} from '@angular/platform-browser/testing/matchers';
+import {expect} from '@angular/platform-browser/testing/src/matchers';
 
 import {SpyResourceLoader} from '../spies';
 

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', () => {

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 {expect} from '@angular/platform-browser/testing/src/matchers';
-import {MetadataOverrider} from '../testing/metadata_overrider';
+import {MetadataOverrider} from '../testing/src/metadata_overrider';
 
 interface SomeMetadataType {
   plainProp?: string;

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() {

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 {beforeEach, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal';
-import {MockNgModuleResolver} from '../testing/index';
+import {MockNgModuleResolver} from '../testing';
 
 export function main() {
   describe('MockNgModuleResolver', () => {

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 {beforeEach, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal';
-import {MockPipeResolver} from '../testing/index';
+import {MockPipeResolver} from '../testing';
 
 export function main() {
   describe('MockPipeResolver', () => {

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 {MockResourceLoader} from '@angular/compiler/testing/src/resource_loader_mock';
-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';
 
 export function main() {
   describe('MockResourceLoader', () => {

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 {expect} from '@angular/platform-browser/testing/src/matchers';
-import {MockDirectiveResolver} from '../testing/index';
+import {MockDirectiveResolver} from '../testing';
 import {SpyResourceLoader} from './spies';
 
 @Component({selector: 'child-cmp'})

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 {beforeEach, describe, expect, it} from '@angular/core/testing/src/testing_internal';
-import {browserDetection} from '@angular/platform-browser/testing/browser_util';
+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';

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', () => {

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() {

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); }

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';

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';

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', () => {

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 {fakeAsync} from '@angular/core/testing/src/fake_async';
-import {describe, expect, it} from '@angular/core/testing/testing_internal';
+import {describe, expect, it} from '@angular/core/testing/src/testing_internal';
 
 import {SyncAsyncResult, escapeRegExp, splitAtColon} from '../src/util';
 

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';

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"
+}

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": ["../../dist/packages/core"],
-      "@angular/core/testing": ["../../../dist/packages-dist/core/testing"],
+      "@angular/core/testing": ["../../dist/packages/core/testing"],
-      "@angular/compiler": ["../../../dist/packages-dist/compiler"]
+      "@angular/compiler": ["../../dist/packages/compiler"]
     }
   },
   "files": [
-    "testing/index.ts",
+    "index.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts"
   ]
 }

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": ["../../dist/packages/core"],
-      "@angular/core/testing": ["../../../dist/packages-dist/core/testing"]
+      "@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

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';

packages/core/esm5/src

@@ -0,0 +1 @@
+../src

packages/core/esm5/tsconfig-build.json

@@ -1,7 +1,6 @@
 {
-  "extends": "./tsconfig-build",
+  "extends": "../tsconfig-build",
   "compilerOptions": {
-      "outDir": "../../../dist/esm/core",
       "target": "es5"
   },
   "files": [

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": {

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',
+  }
+};

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'
+  }
+};

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', () => {

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 {dispatchEvent} from '@angular/platform-browser/testing/src/browser_util';
-import {expect} from '@angular/platform-browser/testing/matchers';
+import {expect} from '@angular/platform-browser/testing/src/matchers';
 import {ServerModule} from '@angular/platform-server';
 
 import {ComponentFixture, ComponentFixtureNoNgZone, TestBed, async, inject, withModule} from '../testing';

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', () => {

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';

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

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';
 

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 {dispatchEvent} from '@angular/platform-browser/testing/src/browser_util';
-import {expect} from '@angular/platform-browser/testing/matchers';
+import {expect} from '@angular/platform-browser/testing/src/matchers';
 
 @Component({selector: 'simple-comp', template: `<span>Original {{simpleBinding}}</span>`})
 @Injectable()

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 {

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() {

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', () => {

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 {}

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', () => {

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', () => {

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', () => {

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() {

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 {Log, beforeEach, describe, inject, it} from '@angular/core/testing/src/testing_internal';
-import {expect} from '@angular/platform-browser/testing/matchers';
+import {expect} from '@angular/platform-browser/testing/src/matchers';
 
 import {Parser} from '../../compiler/src/expression_parser/parser';