refactor(core): change module semantics

This contains major changes to the compiler, bootstrap of the platforms and test environment initialization. Main part of #10043 Closes #10164 BREAKING CHANGE: - Semantics and name of `@AppModule` (now `@NgModule`) changed quite a bit. This is actually not breaking as `@AppModules` were not part of rc.4. We will have detailed docs on `@NgModule` separately. - `coreLoadAndBootstrap` and `coreBootstrap` can't be used any more (without migration support). Use `bootstrapModule` / `bootstrapModuleFactory` instead. - All Components listed in routes have to be part of the `declarations` of an NgModule. Either directly on the bootstrap module / lazy loaded module, or in an NgModule imported by them.
2016-07-18 03:50:31 -07:00
parent ca16fc29a6
commit 46b212706b
129 changed files with 3580 additions and 3366 deletions
--- a/modules/@angular/platform-browser/src/browser.ts
+++ b/modules/@angular/platform-browser/src/browser.ts
@ -6,8 +6,8 @@
 * found in the LICENSE file at https://angular.io/license
 */

-import {COMMON_DIRECTIVES, COMMON_PIPES, PlatformLocation} from '@angular/common';
-import {APPLICATION_COMMON_PROVIDERS, AppModule, AppModuleFactory, AppModuleRef, ExceptionHandler, NgZone, OpaqueToken, PLATFORM_COMMON_PROVIDERS, PLATFORM_INITIALIZER, PlatformRef, ReflectiveInjector, RootRenderer, SanitizationService, Testability, assertPlatform, createPlatform, createPlatformFactory, getPlatform, isDevMode} from '@angular/core';
+import {CommonModule, PlatformLocation} from '@angular/common';
+import {ApplicationModule, ExceptionHandler, NgModule, NgModuleFactory, NgModuleRef, NgZone, OpaqueToken, PLATFORM_COMMON_PROVIDERS, PLATFORM_INITIALIZER, PlatformRef, ReflectiveInjector, RootRenderer, SanitizationService, Testability, assertPlatform, corePlatform, createPlatform, createPlatformFactory, getPlatform, isDevMode} from '@angular/core';

 import {wtfInit} from '../core_private';
 import {AnimationDriver} from '../src/dom/animation_driver';
@ -28,18 +28,21 @@ import {DomSharedStylesHost, SharedStylesHost} from './dom/shared_styles_host';
 import {isBlank} from './facade/lang';
 import {DomSanitizationService, DomSanitizationServiceImpl} from './security/dom_sanitization_service';

+export const INTERNAL_BROWSER_PLATFORM_PROVIDERS: Array<any /*Type | Provider | any[]*/> = [
+  {provide: PLATFORM_INITIALIZER, useValue: initDomAdapter, multi: true},
+  {provide: PlatformLocation, useClass: BrowserPlatformLocation}
+];

 /**
 * A set of providers to initialize the Angular platform in a web browser.
 *
 * Used automatically by `bootstrap`, or can be passed to `platform`.
 *
- * @experimental API related to bootstrapping are still under review.
+ * @deprecated Use `browserPlatform()` or create a custom platform factory via
+ * `createPlatformFactory(browserPlatform, ...)`
 */
-export const BROWSER_PLATFORM_PROVIDERS: Array<any /*Type | Provider | any[]*/> = [
-  PLATFORM_COMMON_PROVIDERS, {provide: PLATFORM_INITIALIZER, useValue: initDomAdapter, multi: true},
-  {provide: PlatformLocation, useClass: BrowserPlatformLocation}
-];
+export const BROWSER_PLATFORM_PROVIDERS: Array<any /*Type | Provider | any[]*/> =
+    [PLATFORM_COMMON_PROVIDERS, INTERNAL_BROWSER_PLATFORM_PROVIDERS];

 /**
 * @security Replacing built-in sanitization providers exposes the application to XSS risks.
@ -58,27 +61,18 @@ export const BROWSER_SANITIZATION_PROVIDERS: Array<any> = [
 * Used automatically by `bootstrap`, or can be passed to {@link PlatformRef
 * PlatformRef.application}.
 *
- * @experimental API related to bootstrapping are still under review.
+ * @deprecated Create a module that includes `BrowserModule` instead. This is empty for backwards
+ * compatibility,
+ * as all of our bootstrap methods add a module implicitly, i.e. keeping this filled would add the
+ * providers 2x.
 */
-export const BROWSER_APP_PROVIDERS: Array<any /*Type | Provider | any[]*/> = [
-  APPLICATION_COMMON_PROVIDERS, BROWSER_SANITIZATION_PROVIDERS,
-  {provide: ExceptionHandler, useFactory: _exceptionHandler, deps: []},
-  {provide: DOCUMENT, useFactory: _document, deps: []},
-  {provide: EVENT_MANAGER_PLUGINS, useClass: DomEventsPlugin, multi: true},
-  {provide: EVENT_MANAGER_PLUGINS, useClass: KeyEventsPlugin, multi: true},
-  {provide: EVENT_MANAGER_PLUGINS, useClass: HammerGesturesPlugin, multi: true},
-  {provide: HAMMER_GESTURE_CONFIG, useClass: HammerGestureConfig},
-  {provide: DomRootRenderer, useClass: DomRootRenderer_},
-  {provide: RootRenderer, useExisting: DomRootRenderer},
-  {provide: SharedStylesHost, useExisting: DomSharedStylesHost},
-  {provide: AnimationDriver, useFactory: _resolveDefaultAnimationDriver}, DomSharedStylesHost,
-  Testability, EventManager, ELEMENT_PROBE_PROVIDERS
-];
+export const BROWSER_APP_PROVIDERS: Array<any /*Type | Provider | any[]*/> = [];

 /**
 * @experimental API related to bootstrapping are still under review.
 */
-export const browserPlatform = createPlatformFactory('browser', BROWSER_PLATFORM_PROVIDERS);
+export const browserPlatform =
+    createPlatformFactory(corePlatform, 'browser', INTERNAL_BROWSER_PLATFORM_PROVIDERS);

 export function initDomAdapter() {
  BrowserDomAdapter.makeCurrent();
@ -102,16 +96,26 @@ export function _resolveDefaultAnimationDriver(): AnimationDriver {
 }

 /**
- * The app module for the browser.
+ * The ng module for the browser.
 *
 * @experimental
 */
-@AppModule({
+@NgModule({
  providers: [
-    BROWSER_APP_PROVIDERS,
+    BROWSER_SANITIZATION_PROVIDERS,
+    {provide: ExceptionHandler, useFactory: _exceptionHandler, deps: []},
+    {provide: DOCUMENT, useFactory: _document, deps: []},
+    {provide: EVENT_MANAGER_PLUGINS, useClass: DomEventsPlugin, multi: true},
+    {provide: EVENT_MANAGER_PLUGINS, useClass: KeyEventsPlugin, multi: true},
+    {provide: EVENT_MANAGER_PLUGINS, useClass: HammerGesturesPlugin, multi: true},
+    {provide: HAMMER_GESTURE_CONFIG, useClass: HammerGestureConfig},
+    {provide: DomRootRenderer, useClass: DomRootRenderer_},
+    {provide: RootRenderer, useExisting: DomRootRenderer},
+    {provide: SharedStylesHost, useExisting: DomSharedStylesHost},
+    {provide: AnimationDriver, useFactory: _resolveDefaultAnimationDriver}, DomSharedStylesHost,
+    Testability, EventManager, ELEMENT_PROBE_PROVIDERS
  ],
-  directives: COMMON_DIRECTIVES,
-  pipes: COMMON_PIPES
+  exports: [CommonModule, ApplicationModule]
 })
 export class BrowserModule {
 }
--- a/modules/@angular/platform-browser/src/web_workers/ui/location_providers.ts
+++ b/modules/@angular/platform-browser/src/web_workers/ui/location_providers.ts
@ -6,13 +6,14 @@
 * found in the LICENSE file at https://angular.io/license
 */

-import {APP_INITIALIZER, Injector, NgZone} from '@angular/core';
+import {Injector, NgZone, PLATFORM_INITIALIZER} from '@angular/core';

 import {BrowserPlatformLocation} from '../../browser/location/browser_platform_location';

 import {MessageBasedPlatformLocation} from './platform_location';


+
 /**
 * A list of {@link Provider}s. To use the router in a Worker enabled application you must
 * include these providers when setting up the render thread.
@ -20,7 +21,7 @@ import {MessageBasedPlatformLocation} from './platform_location';
 */
 export const WORKER_UI_LOCATION_PROVIDERS = [
  MessageBasedPlatformLocation, BrowserPlatformLocation,
-  {provide: APP_INITIALIZER, useFactory: initUiLocation, multi: true, deps: [Injector]}
+  {provide: PLATFORM_INITIALIZER, useFactory: initUiLocation, multi: true, deps: [Injector]}
 ];

 function initUiLocation(injector: Injector): () => void {
--- a/modules/@angular/platform-browser/src/worker_app.ts
+++ b/modules/@angular/platform-browser/src/worker_app.ts
@ -6,8 +6,8 @@
 * found in the LICENSE file at https://angular.io/license
 */

-import {COMMON_DIRECTIVES, COMMON_PIPES, FORM_PROVIDERS} from '@angular/common';
-import {APPLICATION_COMMON_PROVIDERS, APP_INITIALIZER, AppModule, ExceptionHandler, NgZone, OpaqueToken, PLATFORM_COMMON_PROVIDERS, PlatformRef, ReflectiveInjector, RootRenderer, assertPlatform, createPlatform, createPlatformFactory, getPlatform} from '@angular/core';
+import {CommonModule, FORM_PROVIDERS} from '@angular/common';
+import {APP_INITIALIZER, ApplicationModule, ExceptionHandler, NgModule, NgZone, OpaqueToken, PLATFORM_COMMON_PROVIDERS, PlatformRef, ReflectiveInjector, RootRenderer, assertPlatform, corePlatform, createPlatform, createPlatformFactory, getPlatform} from '@angular/core';

 import {BROWSER_SANITIZATION_PROVIDERS} from './browser';
 import {isBlank, print} from './facade/lang';
@ -29,29 +29,24 @@ class PrintLogger {
 }

 /**
- * @experimental
+ * @deprecated Use `workerAppPlatform()` or create a custom platform factory via
+ * `createPlatformFactory(workerAppPlatform, ...)`
 */
 export const WORKER_APP_PLATFORM_PROVIDERS: Array<any /*Type | Provider | any[]*/> =
    PLATFORM_COMMON_PROVIDERS;

 /**
- * @experimental
+ * @deprecated Create a module that includes `WorkerAppModule` instead. This is empty for backwards
+ * compatibility,
+ * as all of our bootstrap methods add a module implicitly, i.e. keeping this filled would add the
+ * providers 2x.
 */
-export const WORKER_APP_APPLICATION_PROVIDERS: Array<any /*Type | Provider | any[]*/> = [
-  APPLICATION_COMMON_PROVIDERS, FORM_PROVIDERS, BROWSER_SANITIZATION_PROVIDERS, Serializer,
-  {provide: ClientMessageBrokerFactory, useClass: ClientMessageBrokerFactory_},
-  {provide: ServiceMessageBrokerFactory, useClass: ServiceMessageBrokerFactory_},
-  WebWorkerRootRenderer, {provide: RootRenderer, useExisting: WebWorkerRootRenderer},
-  {provide: ON_WEB_WORKER, useValue: true}, RenderStore,
-  {provide: ExceptionHandler, useFactory: _exceptionHandler, deps: []},
-  {provide: MessageBus, useFactory: createMessageBus, deps: [NgZone]},
-  {provide: APP_INITIALIZER, useValue: setupWebWorker, multi: true}
-];
+export const WORKER_APP_APPLICATION_PROVIDERS: Array<any /*Type | Provider | any[]*/> = [];

 /**
 * @experimental
 */
-export const workerAppPlatform = createPlatformFactory('workerApp', WORKER_APP_PLATFORM_PROVIDERS);
+export const workerAppPlatform = createPlatformFactory(corePlatform, 'workerApp');

 function _exceptionHandler(): ExceptionHandler {
  return new ExceptionHandler(new PrintLogger());
@ -77,14 +72,22 @@ function setupWebWorker(): void {
 }

 /**
- * The app module for the worker app side.
+ * The ng module for the worker app side.
 *
 * @experimental
 */
-@AppModule({
-  providers: WORKER_APP_APPLICATION_PROVIDERS,
-  directives: COMMON_DIRECTIVES,
-  pipes: COMMON_PIPES
+@NgModule({
+  providers: [
+    FORM_PROVIDERS, BROWSER_SANITIZATION_PROVIDERS, Serializer,
+    {provide: ClientMessageBrokerFactory, useClass: ClientMessageBrokerFactory_},
+    {provide: ServiceMessageBrokerFactory, useClass: ServiceMessageBrokerFactory_},
+    WebWorkerRootRenderer, {provide: RootRenderer, useExisting: WebWorkerRootRenderer},
+    {provide: ON_WEB_WORKER, useValue: true}, RenderStore,
+    {provide: ExceptionHandler, useFactory: _exceptionHandler, deps: []},
+    {provide: MessageBus, useFactory: createMessageBus, deps: [NgZone]},
+    {provide: APP_INITIALIZER, useValue: setupWebWorker, multi: true}
+  ],
+  exports: [CommonModule, ApplicationModule]
 })
 export class WorkerAppModule {
-}
+}
--- a/modules/@angular/platform-browser/src/worker_render.ts
+++ b/modules/@angular/platform-browser/src/worker_render.ts
@ -6,7 +6,7 @@
 * found in the LICENSE file at https://angular.io/license
 */

-import {APPLICATION_COMMON_PROVIDERS, APP_INITIALIZER, AppModule, ExceptionHandler, Injectable, Injector, NgZone, OpaqueToken, PLATFORM_COMMON_PROVIDERS, PLATFORM_INITIALIZER, PlatformRef, ReflectiveInjector, RootRenderer, Testability, assertPlatform, createPlatform, createPlatformFactory, getPlatform} from '@angular/core';
+import {ExceptionHandler, Injectable, Injector, NgZone, OpaqueToken, PLATFORM_COMMON_PROVIDERS, PLATFORM_INITIALIZER, PlatformRef, ReflectiveInjector, RootRenderer, Testability, assertPlatform, corePlatform, createPlatform, createPlatformFactory, getPlatform, isDevMode} from '@angular/core';

 import {wtfInit} from '../core_private';

@ -34,6 +34,7 @@ import {ServiceMessageBrokerFactory, ServiceMessageBrokerFactory_} from './web_w
 import {MessageBasedRenderer} from './web_workers/ui/renderer';


+
 /**
 * Wrapper class that exposes the Worker
 * and underlying {@link MessageBus} for lower level message passing.
@ -70,16 +71,8 @@ export const WORKER_UI_STARTABLE_MESSAGING_SERVICE =
 /**
 * @experimental WebWorker support is currently experimental.
 */
-export const WORKER_UI_PLATFORM_PROVIDERS: Array<any /*Type | Provider | any[]*/> = [
-  PLATFORM_COMMON_PROVIDERS,
-  {provide: PLATFORM_INITIALIZER, useValue: initWebWorkerRenderPlatform, multi: true}
-];
-
-/**
- * @experimental WebWorker support is currently experimental.
- */
-export const WORKER_UI_APPLICATION_PROVIDERS: Array<any /*Type | Provider | any[]*/> = [
-  APPLICATION_COMMON_PROVIDERS,
+export const _WORKER_UI_PLATFORM_PROVIDERS: Array<any /*Type | Provider | any[]*/> = [
+  {provide: NgZone, useFactory: createNgZone, deps: []},
  MessageBasedRenderer,
  {provide: WORKER_UI_STARTABLE_MESSAGING_SERVICE, useExisting: MessageBasedRenderer, multi: true},
  BROWSER_SANITIZATION_PROVIDERS,
@ -104,10 +97,27 @@ export const WORKER_UI_APPLICATION_PROVIDERS: Array<any /*Type | Provider | any[
  Testability,
  EventManager,
  WebWorkerInstance,
-  {provide: APP_INITIALIZER, useFactory: initWebWorkerAppFn, multi: true, deps: [Injector]},
+  {
+    provide: PLATFORM_INITIALIZER,
+    useFactory: initWebWorkerRenderPlatform,
+    multi: true,
+    deps: [Injector]
+  },
  {provide: MessageBus, useFactory: messageBusFactory, deps: [WebWorkerInstance]}
 ];

+/**
+ * * @deprecated Use `workerUiPlatform()` or create a custom platform factory via
+ * `createPlatformFactory(workerUiPlatform, ...)`
+ */
+export const WORKER_UI_PLATFORM_PROVIDERS: Array<any /*Type | Provider | any[]*/> =
+    [PLATFORM_COMMON_PROVIDERS, _WORKER_UI_PLATFORM_PROVIDERS];
+
+/**
+ * @deprecated Worker UI only has a platform but no application
+ */
+export const WORKER_UI_APPLICATION_PROVIDERS: Array<any /*Type | Provider | any[]*/> = [];
+
 function initializeGenericWorkerRenderer(injector: Injector) {
  var bus = injector.get(MessageBus);
  let zone = injector.get(NgZone);
@ -122,27 +132,11 @@ function messageBusFactory(instance: WebWorkerInstance): MessageBus {
  return instance.bus;
 }

-function initWebWorkerRenderPlatform(): void {
-  BrowserDomAdapter.makeCurrent();
-  wtfInit();
-  BrowserGetTestability.init();
-}
-
-/**
- * @experimental WebWorker support is currently experimental.
- */
-export const workerUiPlatform = createPlatformFactory('workerUi', WORKER_UI_PLATFORM_PROVIDERS);
-
-function _exceptionHandler(): ExceptionHandler {
-  return new ExceptionHandler(getDOM());
-}
-
-function _document(): any {
-  return getDOM().defaultDoc();
-}
-
-function initWebWorkerAppFn(injector: Injector): () => void {
+function initWebWorkerRenderPlatform(injector: Injector): () => void {
  return () => {
+    BrowserDomAdapter.makeCurrent();
+    wtfInit();
+    BrowserGetTestability.init();
    var scriptUri: string;
    try {
      scriptUri = injector.get(WORKER_SCRIPT);
@ -158,6 +152,24 @@ function initWebWorkerAppFn(injector: Injector): () => void {
  };
 }

+/**
+ * @experimental WebWorker support is currently experimental.
+ */
+export const workerUiPlatform =
+    createPlatformFactory(corePlatform, 'workerUi', _WORKER_UI_PLATFORM_PROVIDERS);
+
+function _exceptionHandler(): ExceptionHandler {
+  return new ExceptionHandler(getDOM());
+}
+
+function _document(): any {
+  return getDOM().defaultDoc();
+}
+
+function createNgZone(): NgZone {
+  return new NgZone({enableLongStackTrace: isDevMode()});
+}
+
 /**
 * Spawns a new class and initializes the WebWorkerInstance
 */
@ -175,14 +187,3 @@ function _resolveDefaultAnimationDriver(): AnimationDriver {
  // work with animations just yet...
  return AnimationDriver.NOOP;
 }
-
-/**
- * The app module for the worker ui side.
- * To use this, you need to create an own module that includes this module
- * and provides the `WORKER_SCRIPT` token.
- *
- * @experimental
- */
-@AppModule({providers: WORKER_UI_APPLICATION_PROVIDERS})
-export class WorkerUiModule {
-}