repackaging: all the repackaging changes squashed

modules/@angular/platform-server/compiler_private.dart

@@ -0,0 +1 @@
+export '../compiler.dart';

modules/@angular/platform-server/compiler_private.ts

@@ -0,0 +1,8 @@
+import {__compiler_private__ as _} from '@angular/compiler';
+
+export type SelectorMatcher = typeof _.SelectorMatcher;
+export var SelectorMatcher: typeof _.SelectorMatcher = _.SelectorMatcher;
+
+export type CssSelector = typeof _.CssSelector;
+export var CssSelector: typeof _.CssSelector = _.CssSelector;
+

modules/@angular/platform-server/index.dart

@@ -0,0 +1,2 @@
+// TODO: vsavkin add SERVER_PROVIDERS and SERVER_APP_PROVIDERS
+export 'package:angular2/src/platform/server/html_adapter.dart';

modules/@angular/platform-server/index.ts

@@ -0,0 +1,2 @@
+// TODO: vsavkin add SERVER_PROVIDERS and SERVER_APP_PROVIDERS
+export {Parse5DomAdapter} from './src/parse5_adapter';

modules/@angular/platform-server/package.json

@@ -0,0 +1,16 @@
+{
+  "name": "@angular/platform-server",
+  "version": "$$ANGULAR_VERSION$$",
+  "description": "",
+  "main": "index.js",
+  "jsnext:main": "esm/index.js",
+  "typings": "index.d.ts",
+  "author": "angular",
+  "license": "MIT",
+  "peerDependencies": {
+    "@angular/core": "$$ANGULAR_VERSION$$",
+    "@angular/common": "$$ANGULAR_VERSION$$",
+    "@angular/compiler": "$$ANGULAR_VERSION$$",
+    "@angular/platform-browser": "$$ANGULAR_VERSION$$"
+  }
+}

modules/@angular/platform-server/platform-server.dart

@@ -1,2 +1 @@
-// TODO: vsavkin add SERVER_PROVIDERS and SERVER_APP_PROVIDERS
-export 'package:angular2/src/platform/server/html_adapter.dart';
+export './index.dart';

modules/@angular/platform-server/platform_browser_private.dart

@@ -0,0 +1 @@
+export './platform-browser.dart' show DomAdapter, setRootDomAdapter;

modules/@angular/platform-server/platform_browser_private.ts

@@ -0,0 +1,6 @@
+import {__platform_browser_private__ as _} from '@angular/platform-browser';
+
+export type DomAdapter = typeof _.DomAdapter;
+export var DomAdapter: typeof _.DomAdapter = _.DomAdapter;
+export var setRootDomAdapter: typeof _.setRootDomAdapter = _.setRootDomAdapter;
+export var getDOM: typeof _.getDOM = _.getDOM;

modules/@angular/platform-server/platform_server.ts

@@ -1,2 +0,0 @@
-// TODO: vsavkin add SERVER_PROVIDERS and SERVER_APP_PROVIDERS
-export {Parse5DomAdapter} from 'angular2/src/platform/server/parse5_adapter';

modules/@angular/platform-server/rollup.config.js

@@ -0,0 +1,20 @@
+
+export default {
+  entry: '../../../dist/packages-dist/platform-server/esm/index.js',
+  dest: '../../../dist/packages-dist/platform-server/esm/platform-server.umd.js',
+  sourceMap: true,
+  format: 'umd',
+  moduleName: 'ng.platformServer',
+  globals: {
+    '@angular/core': 'ng.core',
+    '@angular/compiler': 'ng.compiler',
+    '@angular/platform-browser': 'ng.platformBrowser',
+    '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'
+  },
+  plugins: [
+//    nodeResolve({ jsnext: true, main: true }),
+  ]
+}

modules/@angular/platform-server/src/facade

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

modules/@angular/platform-server/src/parse5_adapter.ts

@@ -1,10 +1,7 @@
 var parse5 = require('parse5/index');
-var parser = new parse5.Parser(parse5.TreeAdapters.htmlparser2);
-var serializer = new parse5.Serializer(parse5.TreeAdapters.htmlparser2);
-var treeAdapter = parser.treeAdapter;
 
-import {MapWrapper, ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
-import {DomAdapter, setRootDomAdapter} from 'angular2/platform/common_dom';
+import {ListWrapper, StringMapWrapper} from '../src/facade/collection';
+import {DomAdapter, setRootDomAdapter} from '../platform_browser_private';
 import {
   isPresent,
   isBlank,
@@ -12,10 +9,14 @@ import {
   Type,
   setValueOnPath,
   DateWrapper
-} from 'angular2/src/facade/lang';
-import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
-import {SelectorMatcher, CssSelector} from 'angular2/src/compiler/selector';
-import {XHR} from 'angular2/src/compiler/xhr';
+} from '../src/facade/lang';
+import {BaseException} from '../src/facade/exceptions';
+import {SelectorMatcher, CssSelector} from '../compiler_private';
+import {XHR} from '@angular/compiler';
+
+var parser = null;
+var serializer = null;
+var treeAdapter = null;
 
 var _attrToPropMap: {[key: string]: string} = {
   'class': 'className',
@@ -33,7 +34,12 @@ function _notImplemented(methodName) {
 
 /* tslint:disable:requireParameterType */
 export class Parse5DomAdapter extends DomAdapter {
-  static makeCurrent() { setRootDomAdapter(new Parse5DomAdapter()); }
+  static makeCurrent() {
+    parser = new parse5.Parser(parse5.TreeAdapters.htmlparser2);
+    serializer = new parse5.Serializer(parse5.TreeAdapters.htmlparser2);
+    treeAdapter = parser.treeAdapter;
+    setRootDomAdapter(new Parse5DomAdapter());
+  }
 
   hasProperty(element, name: string): boolean {
     return _HTMLElementPropertyList.indexOf(name) > -1;

modules/@angular/platform-server/testing.ts

@@ -0,0 +1 @@
+export * from './testing/server';

modules/@angular/platform-server/testing/server.ts

@@ -5,40 +5,35 @@ import {
   PLATFORM_INITIALIZER,
   APPLICATION_COMMON_PROVIDERS,
   Renderer
-} from 'angular2/core';
-import {DirectiveResolver, ViewResolver} from 'angular2/compiler';
+} from '@angular/core';
+import {DirectiveResolver, ViewResolver} from '@angular/compiler';
+import {TestComponentBuilder} from '@angular/compiler/testing';
+import {Parse5DomAdapter} from '../index';
 
-import {Parse5DomAdapter} from 'angular2/src/platform/server/parse5_adapter';
+import {AnimationBuilder} from '../../platform-browser/src/animate/animation_builder';
+import {MockAnimationBuilder} from '../../platform-browser/testing/animation_builder_mock';
+import {MockDirectiveResolver, MockViewResolver} from '@angular/compiler/testing';
+import {MockLocationStrategy} from '../../common/testing/mock_location_strategy';
 
-import {AnimationBuilder} from 'angular2/src/animate/animation_builder';
-import {MockAnimationBuilder} from 'angular2/src/mock/animation_builder_mock';
-import {MockDirectiveResolver} from 'angular2/src/mock/directive_resolver_mock';
-import {MockViewResolver} from 'angular2/src/mock/view_resolver_mock';
-import {MockLocationStrategy} from 'angular2/src/mock/mock_location_strategy';
-import {MockNgZone} from 'angular2/src/mock/ng_zone_mock';
-
-import {createNgZone} from 'angular2/src/core/application_ref';
-import {TestComponentBuilder} from 'angular2/src/testing/test_component_builder';
-import {XHR} from 'angular2/src/compiler/xhr';
-import {BrowserDetection} from 'angular2/src/testing/utils';
-
-import {COMPILER_PROVIDERS} from 'angular2/src/compiler/compiler';
-import {DOCUMENT} from 'angular2/src/platform/dom/dom_tokens';
-import {DOM} from 'angular2/src/platform/dom/dom_adapter';
-import {RootRenderer} from 'angular2/src/core/render/api';
-import {DomRootRenderer, DomRootRenderer_} from 'angular2/src/platform/dom/dom_renderer';
-import {DomSharedStylesHost, SharedStylesHost} from 'angular2/src/platform/dom/shared_styles_host';
+import {XHR} from '@angular/compiler';
+import {BrowserDetection} from '@angular/platform-browser/testing';
 
+import {COMPILER_PROVIDERS} from '@angular/compiler';
+import {DOCUMENT} from '@angular/platform-browser';
+import {getDOM} from '../platform_browser_private';
+import {RootRenderer} from '@angular/core';
+import {DomRootRenderer, DomRootRenderer_} from '../../platform-browser/src/dom/dom_renderer';
+import {DomSharedStylesHost, SharedStylesHost} from '../../platform-browser/src/dom/shared_styles_host';
 import {
   EventManager,
   EVENT_MANAGER_PLUGINS,
   ELEMENT_PROBE_PROVIDERS
-} from 'angular2/platform/common_dom';
-import {DomEventsPlugin} from 'angular2/src/platform/dom/events/dom_events';
-import {LocationStrategy} from 'angular2/platform/common';
-
-
-import {Log} from 'angular2/src/testing/utils';
+} from '@angular/platform-browser';
+import {DomEventsPlugin} from '@angular/platform-browser';
+import {LocationStrategy} from '@angular/common';
+import {Log} from '@angular/core/testing';
+import {DOMTestComponentRenderer} from '@angular/platform-browser/testing';
+import {TestComponentRenderer} from '@angular/compiler/testing';
 
 function initServerTests() {
   Parse5DomAdapter.makeCurrent();
@@ -56,12 +51,18 @@ export const TEST_SERVER_PLATFORM_PROVIDERS: Array<any /*Type | Provider | any[]
 
 function appDoc() {
   try {
-    return DOM.defaultDoc();
+    return getDOM().defaultDoc();
   } catch (e) {
     return null;
   }
 }
 
+
+function createNgZone(): NgZone {
+  return new NgZone({enableLongStackTrace: true});
+}
+
+
 /**
  * Default application providers for testing.
  */
@@ -84,6 +85,7 @@ export const TEST_SERVER_APPLICATION_PROVIDERS: Array<any /*Type | Provider | an
       /* @ts2dart_Provider */ {provide: DirectiveResolver, useClass: MockDirectiveResolver},
       /* @ts2dart_Provider */ {provide: ViewResolver, useClass: MockViewResolver},
       Log,
+      /* @ts2dart_Provider */ {provide: TestComponentRenderer, useClass: DOMTestComponentRenderer},
       TestComponentBuilder,
       /* @ts2dart_Provider */ {provide: NgZone, useFactory: createNgZone},
       /* @ts2dart_Provider */ {provide: LocationStrategy, useClass: MockLocationStrategy},

modules/@angular/platform-server/tsconfig-es2015.json

@@ -0,0 +1,26 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "declaration": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "module": "es2015",
+    "moduleResolution": "node",
+    "outDir": "../../../dist/packages-dist/platform-server/esm",
+    "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/"]
+    },
+    "rootDir": ".",
+    "sourceMap": true,
+    "sourceRoot": ".",
+    "target": "es2015"
+  },
+  "files": [
+    "index.ts",
+    "../typings/node/node.d.ts",
+    "../../../node_modules/zone.js/dist/zone.js.d.ts"
+  ]
+}

modules/@angular/platform-server/tsconfig.json

@@ -0,0 +1,29 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "declaration": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "outDir": "../../../dist/packages-dist/platform-server/",
+    "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"]
+    },
+    "rootDir": ".",
+    "sourceMap": true,
+    "sourceRoot": ".",
+    "target": "es5"
+  },
+  "files": [
+    "index.ts",
+    "../typings/es6-collections/es6-collections.d.ts",
+    "../typings/es6-promise/es6-promise.d.ts",
+    "../typings/node/node.d.ts",
+    "../manual_typings/globals.d.ts",
+    "../../../node_modules/zone.js/dist/zone.js.d.ts"
+  ]
+}