fix(packages): use ES modules for primary build (#11120)

modules/@angular/platform-browser/src/browser.ts

@@ -9,7 +9,6 @@
 import {CommonModule, PlatformLocation} from '@angular/common';
 import {ApplicationModule, ClassProvider, ErrorHandler, ExistingProvider, FactoryProvider, NgModule, Optional, PLATFORM_INITIALIZER, PlatformRef, Provider, RootRenderer, Sanitizer, SkipSelf, Testability, TypeProvider, ValueProvider, createPlatformFactory, platformCore} from '@angular/core';
 
-import {wtfInit} from '../core_private';
 import {AnimationDriver} from '../src/dom/animation_driver';
 import {WebAnimationsDriver} from '../src/dom/web_animations_driver';
 
@@ -51,7 +50,6 @@ export const platformBrowser =
 
 export function initDomAdapter() {
   BrowserDomAdapter.makeCurrent();
-  wtfInit();
   BrowserGetTestability.init();
 }
 

modules/@angular/platform-browser/src/browser/browser_adapter.ts

@@ -330,7 +330,7 @@ export class BrowserDomAdapter extends GenericBrowserDomAdapter {
   isCommentNode(node: Node): boolean { return node.nodeType === Node.COMMENT_NODE; }
   isElementNode(node: Node): boolean { return node.nodeType === Node.ELEMENT_NODE; }
   hasShadowRoot(node: any /** TODO #9100 */): boolean {
-    return node instanceof HTMLElement && isPresent(node.shadowRoot);
+    return isPresent(node.shadowRoot) && node instanceof HTMLElement;
   }
   isShadowRoot(node: any /** TODO #9100 */): boolean { return node instanceof DocumentFragment; }
   importIntoDoc(node: Node): any {

modules/@angular/platform-browser/src/dom/animation_driver.ts

@@ -8,7 +8,7 @@
 
 import {AnimationPlayer} from '@angular/core';
 
-import {AnimationKeyframe, AnimationStyles, NoOpAnimationPlayer} from '../../core_private';
+import {AnimationKeyframe, AnimationStyles, NoOpAnimationPlayer} from '../private_import_core';
 
 class _NoOpAnimationDriver implements AnimationDriver {
   animate(

modules/@angular/platform-browser/src/dom/debug/ng_probe.ts

@@ -8,8 +8,8 @@
 
 import {ApplicationRef, DebugNode, NgZone, Optional, Provider, RootRenderer, getDebugNode, isDevMode} from '@angular/core';
 
-import {DebugDomRootRenderer} from '../../../core_private';
 import {StringMapWrapper} from '../../facade/collection';
+import {DebugDomRootRenderer} from '../../private_import_core';
 import {getDOM} from '../dom_adapter';
 import {DomRootRenderer} from '../dom_renderer';
 

modules/@angular/platform-browser/src/dom/dom_renderer.ts

@@ -8,9 +8,9 @@
 
 import {Inject, Injectable, OpaqueToken, RenderComponentType, Renderer, RootRenderer, ViewEncapsulation} from '@angular/core';
 
-import {AnimationKeyframe, AnimationPlayer, AnimationStyles, RenderDebugInfo} from '../../core_private';
 import {StringMapWrapper} from '../facade/collection';
 import {Json, StringWrapper, isArray, isBlank, isPresent, isString, stringify} from '../facade/lang';
+import {AnimationKeyframe, AnimationPlayer, AnimationStyles, RenderDebugInfo} from '../private_import_core';
 
 import {AnimationDriver} from './animation_driver';
 import {getDOM} from './dom_adapter';

modules/@angular/platform-browser/src/dom/web_animations_driver.ts

@@ -8,9 +8,10 @@
 
 import {AUTO_STYLE} from '@angular/core';
 
-import {AnimationKeyframe, AnimationPlayer, AnimationStyles, NoOpAnimationPlayer} from '../../core_private';
 import {StringMapWrapper} from '../facade/collection';
 import {StringWrapper, isNumber, isPresent} from '../facade/lang';
+import {AnimationKeyframe, AnimationPlayer, AnimationStyles, NoOpAnimationPlayer} from '../private_import_core';
+
 import {AnimationDriver} from './animation_driver';
 import {DomAnimatePlayer} from './dom_animate_player';
 import {dashCaseToCamelCase} from './util';

modules/@angular/platform-browser/src/dom/web_animations_player.ts

@@ -8,9 +8,9 @@
 
 import {AUTO_STYLE} from '@angular/core';
 
-import {AnimationPlayer} from '../../core_private';
 import {StringMapWrapper} from '../facade/collection';
 import {isPresent} from '../facade/lang';
+import {AnimationPlayer} from '../private_import_core';
 
 import {getDOM} from './dom_adapter';
 import {DomAnimatePlayer} from './dom_animate_player';

modules/@angular/platform-browser/src/platform-browser.ts

@@ -0,0 +1,31 @@
+/**
+ * @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 {BrowserModule, platformBrowser} from './browser';
+export {BrowserPlatformLocation} from './browser/location/browser_platform_location';
+export {Title} from './browser/title';
+export {disableDebugTools, enableDebugTools} from './browser/tools/tools';
+export {AnimationDriver} from './dom/animation_driver';
+export {By} from './dom/debug/by';
+export {DOCUMENT} from './dom/dom_tokens';
+export {EVENT_MANAGER_PLUGINS, EventManager} from './dom/events/event_manager';
+export {HAMMER_GESTURE_CONFIG, HammerGestureConfig} from './dom/events/hammer_gestures';
+export {DomSanitizer, SafeHtml, SafeResourceUrl, SafeScript, SafeStyle, SafeUrl} from './security/dom_sanitization_service';
+// Web Workers
+export {ClientMessageBroker, ClientMessageBrokerFactory, FnArg, UiArguments} from './web_workers/shared/client_message_broker';
+export {PRIMITIVE} from './web_workers/shared/serializer';
+export {ReceivedMessage, ServiceMessageBroker, ServiceMessageBrokerFactory} from './web_workers/shared/service_message_broker';
+
+export * from './web_workers/shared/message_bus';
+export {WORKER_APP_LOCATION_PROVIDERS} from './web_workers/worker/location_providers';
+export {WORKER_UI_LOCATION_PROVIDERS} from './web_workers/ui/location_providers';
+
+export {NgProbeToken} from './dom/debug/ng_probe';
+export {platformWorkerUi, WebWorkerInstance, WORKER_SCRIPT, WORKER_UI_STARTABLE_MESSAGING_SERVICE} from './worker_render';
+export {platformWorkerApp, WorkerAppModule} from './worker_app';
+export * from './private_export';

modules/@angular/platform-browser/src/private_export.ts

@@ -0,0 +1,48 @@
+/**
+ * @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
+ */
+import {ClassProvider, ExistingProvider, FactoryProvider, Provider, TypeProvider, ValueProvider} from '@angular/core';
+
+import * as browser from './browser';
+import * as browserDomAdapter from './browser/browser_adapter';
+import * as ng_probe from './dom/debug/ng_probe';
+import * as dom_adapter from './dom/dom_adapter';
+import * as dom_renderer from './dom/dom_renderer';
+import * as dom_events from './dom/events/dom_events';
+import * as shared_styles_host from './dom/shared_styles_host';
+
+export var __platform_browser_private__: {
+  _DomAdapter?: typeof dom_adapter.DomAdapter; DomAdapter: typeof dom_adapter.DomAdapter;
+  _BrowserDomAdapter?: typeof browserDomAdapter.BrowserDomAdapter;
+  BrowserDomAdapter: typeof browserDomAdapter.BrowserDomAdapter;
+  getDOM: typeof dom_adapter.getDOM;
+  setRootDomAdapter: typeof dom_adapter.setRootDomAdapter;
+  _DomRootRenderer_?: typeof dom_renderer.DomRootRenderer;
+  DomRootRenderer_: typeof dom_renderer.DomRootRenderer_;
+  _DomSharedStylesHost?: typeof shared_styles_host.DomSharedStylesHost;
+  DomSharedStylesHost: typeof shared_styles_host.DomSharedStylesHost;
+  _SharedStylesHost?: typeof shared_styles_host.SharedStylesHost;
+  SharedStylesHost: typeof shared_styles_host.SharedStylesHost;
+  ELEMENT_PROBE_PROVIDERS: typeof ng_probe.ELEMENT_PROBE_PROVIDERS;
+  _DomEventsPlugin?: typeof dom_events.DomEventsPlugin;
+  DomEventsPlugin: typeof dom_events.DomEventsPlugin;
+  _initDomAdapter?: typeof browser.initDomAdapter,
+  initDomAdapter: typeof browser.initDomAdapter,
+  INTERNAL_BROWSER_PLATFORM_PROVIDERS: typeof browser.INTERNAL_BROWSER_PLATFORM_PROVIDERS;
+} = {
+  DomAdapter: dom_adapter.DomAdapter,
+  BrowserDomAdapter: browserDomAdapter.BrowserDomAdapter,
+  getDOM: dom_adapter.getDOM,
+  setRootDomAdapter: dom_adapter.setRootDomAdapter,
+  DomRootRenderer_: dom_renderer.DomRootRenderer_,
+  DomSharedStylesHost: shared_styles_host.DomSharedStylesHost,
+  SharedStylesHost: shared_styles_host.SharedStylesHost,
+  ELEMENT_PROBE_PROVIDERS: ng_probe.ELEMENT_PROBE_PROVIDERS,
+  DomEventsPlugin: dom_events.DomEventsPlugin,
+  initDomAdapter: browser.initDomAdapter,
+  INTERNAL_BROWSER_PLATFORM_PROVIDERS: browser.INTERNAL_BROWSER_PLATFORM_PROVIDERS
+};

modules/@angular/platform-browser/src/private_import_core.ts

@@ -0,0 +1,36 @@
+/**
+ * @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
+ */
+
+import {__core_private__ as r} from '@angular/core';
+
+export type RenderDebugInfo = typeof r._RenderDebugInfo;
+export var RenderDebugInfo: typeof r.RenderDebugInfo = r.RenderDebugInfo;
+export var ReflectionCapabilities: typeof r.ReflectionCapabilities = r.ReflectionCapabilities;
+export var VIEW_ENCAPSULATION_VALUES: typeof r.VIEW_ENCAPSULATION_VALUES =
+    r.VIEW_ENCAPSULATION_VALUES;
+export type DebugDomRootRenderer = typeof r._DebugDomRootRenderer;
+export var DebugDomRootRenderer: typeof r.DebugDomRootRenderer = r.DebugDomRootRenderer;
+export var reflector: typeof r.reflector = r.reflector;
+export type NoOpAnimationPlayer = typeof r._NoOpAnimationPlayer;
+export var NoOpAnimationPlayer: typeof r.NoOpAnimationPlayer = r.NoOpAnimationPlayer;
+export type AnimationPlayer = typeof r._AnimationPlayer;
+export var AnimationPlayer: typeof r.AnimationPlayer = r.AnimationPlayer;
+export type AnimationSequencePlayer = typeof r._AnimationSequencePlayer;
+export var AnimationSequencePlayer: typeof r.AnimationSequencePlayer = r.AnimationSequencePlayer;
+export type AnimationGroupPlayer = typeof r._AnimationGroupPlayer;
+export var AnimationGroupPlayer: typeof r.AnimationGroupPlayer = r.AnimationGroupPlayer;
+export type AnimationKeyframe = typeof r._AnimationKeyframe;
+export var AnimationKeyframe: typeof r.AnimationKeyframe = r.AnimationKeyframe;
+export type AnimationStyles = typeof r._AnimationStyles;
+export var AnimationStyles: typeof r.AnimationStyles = r.AnimationStyles;
+export var prepareFinalAnimationStyles: typeof r.prepareFinalAnimationStyles =
+    r.prepareFinalAnimationStyles;
+export var balanceAnimationKeyframes: typeof r.balanceAnimationKeyframes =
+    r.balanceAnimationKeyframes;
+export var clearStyles: typeof r.clearStyles = r.clearStyles;
+export var collectAndResolveStyles: typeof r.collectAndResolveStyles = r.collectAndResolveStyles;

modules/@angular/platform-browser/src/web_workers/shared/serializer.ts

@@ -8,9 +8,10 @@
 
 import {Injectable, RenderComponentType, Type, ViewEncapsulation} from '@angular/core';
 
-import {VIEW_ENCAPSULATION_VALUES} from '../../../core_private';
 import {Map, MapWrapper, StringMapWrapper} from '../../facade/collection';
 import {isArray, isPresent, serializeEnum} from '../../facade/lang';
+import {VIEW_ENCAPSULATION_VALUES} from '../../private_import_core';
+
 import {RenderStore} from './render_store';
 import {LocationType} from './serialized_types';
 

modules/@angular/platform-browser/src/web_workers/worker/renderer.ts

@@ -8,9 +8,9 @@
 
 import {Injectable, RenderComponentType, Renderer, RootRenderer, ViewEncapsulation} from '@angular/core';
 
-import {AnimationKeyframe, AnimationPlayer, AnimationStyles, RenderDebugInfo} from '../../../core_private';
 import {ListWrapper} from '../../facade/collection';
 import {isBlank, isPresent} from '../../facade/lang';
+import {AnimationKeyframe, AnimationPlayer, AnimationStyles, RenderDebugInfo} from '../../private_import_core';
 import {ClientMessageBrokerFactory, FnArg, UiArguments} from '../shared/client_message_broker';
 import {MessageBus} from '../shared/message_bus';
 import {EVENT_CHANNEL, RENDERER_CHANNEL} from '../shared/messaging_api';

modules/@angular/platform-browser/src/worker_app.ts

@@ -7,7 +7,8 @@
  */
 
 import {CommonModule} from '@angular/common';
-import {APP_INITIALIZER, ApplicationModule, ClassProvider, ErrorHandler, ExistingProvider, FactoryProvider, NgModule, NgZone, OpaqueToken, PlatformRef, ReflectiveInjector, RootRenderer, TypeProvider, ValueProvider, assertPlatform, createPlatform, createPlatformFactory, getPlatform, platformCore} from '@angular/core';
+import {APP_INITIALIZER, ApplicationModule, ClassProvider, ErrorHandler, ExistingProvider, FactoryProvider, NgModule, NgZone, PlatformRef, Provider, RootRenderer, TypeProvider, ValueProvider, createPlatformFactory, platformCore} from '@angular/core';
+
 import {BROWSER_SANITIZATION_PROVIDERS} from './browser';
 import {print} from './facade/lang';
 import {ON_WEB_WORKER} from './web_workers/shared/api';
@@ -21,6 +22,7 @@ import {WebWorkerRootRenderer} from './web_workers/worker/renderer';
 import {WorkerDomAdapter} from './web_workers/worker/worker_adapter';
 
 
+
 /**
  * @experimental
  */

modules/@angular/platform-browser/src/worker_render.ts

@@ -8,8 +8,6 @@
 
 import {ClassProvider, ErrorHandler, ExistingProvider, FactoryProvider, Injectable, Injector, NgZone, OpaqueToken, PLATFORM_INITIALIZER, PlatformRef, Provider, RootRenderer, Testability, TypeProvider, ValueProvider, createPlatformFactory, isDevMode, platformCore} from '@angular/core';
 
-import {wtfInit} from '../core_private';
-
 import {BROWSER_SANITIZATION_PROVIDERS} from './browser';
 import {BrowserDomAdapter} from './browser/browser_adapter';
 import {BrowserGetTestability} from './browser/testability';
@@ -121,7 +119,6 @@ function messageBusFactory(instance: WebWorkerInstance): MessageBus {
 function initWebWorkerRenderPlatform(injector: Injector): () => void {
   return () => {
     BrowserDomAdapter.makeCurrent();
-    wtfInit();
     BrowserGetTestability.init();
     var scriptUri: string;
     try {