WIP: fixup stuff after facade remerging

IgorMinar · IgorMinar · commit 1f1ee8347a04 · 2016-04-27T00:37:02.000-07:00
diff --git a/build.sh b/build.sh
@@ -31,7 +31,7 @@ do
   echo "====== (esm)COMPILING: \$(npm bin)/tsc -p ${SRCDIR}/tsconfig-es2015.json ====="
   $(npm bin)/tsc -p ${SRCDIR}/tsconfig-es2015.json
 
-  if (false); then
+  if (true); then
     echo "======      BUNDLING: ${SRCDIR} ====="
     (
       cd  ${SRCDIR}
diff --git a/modules/@angular/common/rollup.config.js b/modules/@angular/common/rollup.config.js
@@ -6,8 +6,11 @@ export default {
   format: 'umd',
   moduleName: 'ng.common',
   globals: {
-    '@angular/facade': 'ng.facade',
-    '@angular/core': 'ng.core'
+    '@angular/core': 'ng.core',
+    '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 }),
diff --git a/modules/@angular/compiler/core_private.ts b/modules/@angular/compiler/core_private.ts
@@ -30,3 +30,5 @@ export var ValueUnwrapper: typeof t.ValueUnwrapper = r.ValueUnwrapper;
 export var TemplateRef_: typeof t.TemplateRef_ = r.TemplateRef_;
 export type RenderDebugInfo = t.RenderDebugInfo;
 export var RenderDebugInfo: typeof t.RenderDebugInfo = r.RenderDebugInfo;
+export var createProvider: typeof t.createProvider = r.createProvider;
+export var isProviderLiteral: typeof t.isProviderLiteral = r.isProviderLiteral;
diff --git a/modules/@angular/compiler/package.json b/modules/@angular/compiler/package.json
@@ -8,7 +8,6 @@
   "author": "angular",
   "license": "MIT",
   "peerDependencies": {
-    "@angular/core": "$$ANGULAR_VERSION$$",
-    "@angular/facade": "$$ANGULAR_VERSION$$"
+    "@angular/core": "$$ANGULAR_VERSION$$"
   }
 }
diff --git a/modules/@angular/compiler/rollup.config.js b/modules/@angular/compiler/rollup.config.js
@@ -6,8 +6,11 @@ export default {
   format: 'umd',
   moduleName: 'ng.compiler',
   globals: {
-    '@angular/facade': 'ng.facade',
-    '@angular/core': 'ng.core'
+    '@angular/core': 'ng.core',
+    '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 }),
diff --git a/modules/@angular/compiler/src/runtime_metadata.ts b/modules/@angular/compiler/src/runtime_metadata.ts
@@ -37,7 +37,7 @@ import {hasLifecycleHook} from './directive_lifecycle_reflector';
 import {MODULE_SUFFIX, sanitizeIdentifier} from './util';
 import {assertArrayOfStrings} from './assertions';
 import {getUrlScheme} from './url_resolver';
-import {createProvider, isProviderLiteral} from "../../core/src/di/provider_util";
+import {createProvider, isProviderLiteral} from "../core_private";
 
 
 @Injectable()
diff --git a/modules/@angular/compiler/src/schema/dom_element_schema_registry.ts b/modules/@angular/compiler/src/schema/dom_element_schema_registry.ts
@@ -1,5 +1,6 @@
 import {Injectable} from '@angular/core';
-import {isPresent, StringMapWrapper} from '@angular/facade';
+import {isPresent} from '../facade/lang';
+import {StringMapWrapper} from '../facade/collection';
 import {ElementSchemaRegistry} from './element_schema_registry';
 
 const EVENT = 'event';
diff --git a/modules/@angular/compiler/tsconfig-es2015.json b/modules/@angular/compiler/tsconfig-es2015.json
@@ -8,8 +8,7 @@
     "moduleResolution": "node",
     "outDir": "../../../dist/packages-dist/compiler/esm",
     "paths": {
-      "@angular/core": ["../../../dist/packages-dist/core/core.d.ts"],
-      "@angular/facade/*": ["../../../dist/packages-dist/facade/*"]
+      "@angular/core": ["../../../dist/packages-dist/core/core.d.ts"]
     },
     "rootDir": ".",
     "sourceMap": true,
diff --git a/modules/@angular/compiler/tsconfig.json b/modules/@angular/compiler/tsconfig.json
@@ -8,8 +8,7 @@
     "moduleResolution": "node",
     "outDir": "../../../dist/packages-dist/compiler/",
     "paths": {
-      "@angular/core": ["../../../dist/packages-dist/core/core.d.ts"],
-      "@angular/facade/*": ["../../../dist/packages-dist/facade/*"]
+      "@angular/core": ["../../../dist/packages-dist/core/core.d.ts"]
     },
     "rootDir": ".",
     "sourceMap": true,
diff --git a/modules/@angular/core/package.json b/modules/@angular/core/package.json
@@ -10,8 +10,5 @@
   "peerDependencies": {
     "rxjs": "5.0.0-beta.2",
     "zone.js": "^0.6.6"
-  },
-  "dependencies": {
-    "@angular/facade": "$$ANGULAR_VERSION$$"
   }
 }
diff --git a/modules/@angular/core/private_export.ts b/modules/@angular/core/private_export.ts
@@ -16,6 +16,8 @@ import * as wtf_init from './src/profile/wtf_init';
 import * as reflection_capabilities from './src/reflection/reflection_capabilities';
 import * as decorators from './src/util/decorators';
 import * as debug from './src/debug/debug_renderer';
+import * as provider_util from './src/di/provider_util';
+import {Provider} from './src/di/provider';
 
 export declare namespace __core_private_types__ {
   export var isDefaultChangeDetectionStrategy: typeof constants.isDefaultChangeDetectionStrategy;
@@ -55,6 +57,8 @@ export declare namespace __core_private_types__ {
   export var makeDecorator: typeof decorators.makeDecorator;
   export type DebugDomRootRenderer = debug.DebugDomRootRenderer;
   export var DebugDomRootRenderer: typeof debug.DebugDomRootRenderer;
+  export var createProvider: typeof provider_util.createProvider;
+  export var isProviderLiteral: typeof provider_util.isProviderLiteral;
 }
 
 export var __core_private__ = {
@@ -85,5 +89,7 @@ export var __core_private__ = {
     wtfInit: wtf_init.wtfInit,
     ReflectionCapabilities: reflection_capabilities.ReflectionCapabilities,
     makeDecorator: decorators.makeDecorator,
-    DebugDomRootRenderer: debug.DebugDomRootRenderer
+    DebugDomRootRenderer: debug.DebugDomRootRenderer,
+    createProvider: provider_util.createProvider,
+    isProviderLiteral: provider_util.isProviderLiteral
 };
diff --git a/modules/@angular/core/rollup.config.js b/modules/@angular/core/rollup.config.js
@@ -6,7 +6,10 @@ export default {
   format: 'umd',
   moduleName: 'ng.core',
   globals: {
-    '@angular/facade': 'ng.facade'
+    '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 }),
diff --git a/modules/@angular/core/tsconfig-es2015.json b/modules/@angular/core/tsconfig-es2015.json
@@ -8,8 +8,7 @@
     "moduleResolution": "node",
     "outDir": "../../../dist/packages-dist/core/esm",
     "paths": {
-      "rxjs/*": ["../../../node_modules/rxjs/*"],
-      "@angular/facade/*": ["../../../dist/packages-dist/facade/*"]
+      "rxjs/*": ["../../../node_modules/rxjs/*"]
     },
     "rootDir": ".",
     "sourceMap": true,
diff --git a/modules/@angular/core/tsconfig.json b/modules/@angular/core/tsconfig.json
@@ -8,8 +8,7 @@
     "moduleResolution": "node",
     "outDir": "../../../dist/packages-dist/core/",
     "paths": {
-      "rxjs/*": ["../../../node_modules/rxjs/*"],
-      "@angular/facade/*": ["../../../dist/packages-dist/facade/*"]
+      "rxjs/*": ["../../../node_modules/rxjs/*"]
     },
     "rootDir": ".",
     "sourceMap": true,
diff --git a/modules/@angular/http/rollup.config.js b/modules/@angular/http/rollup.config.js
@@ -6,11 +6,13 @@ export default {
   format: 'umd',
   moduleName: 'ng.http',
   globals: {
-    '@angular/facade': 'ng.facade',
     '@angular/core': 'ng.core',
     '@angular/compiler': 'ng.compiler',
     '@angular/platform-browser': 'ng.platformBrowser',
-    'rxjs/Observable': 'Rx.Observable'
+    '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 }),
diff --git a/modules/@angular/platform-browser-dynamic/rollup.config.js b/modules/@angular/platform-browser-dynamic/rollup.config.js
@@ -6,11 +6,14 @@ export default {
   format: 'umd',
   moduleName: 'ng.platformBrowserDynamic',
   globals: {
-    '@angular/facade': 'ng.facade',
     '@angular/core': 'ng.core',
     '@angular/common': 'ng.common',
     '@angular/compiler': 'ng.compiler',
-    '@angular/platform-browser': 'ng.platformBrowser'
+    '@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 }),
diff --git a/modules/@angular/platform-browser/rollup.config.js b/modules/@angular/platform-browser/rollup.config.js
@@ -6,9 +6,12 @@ export default {
   format: 'umd',
   moduleName: 'ng.platformBrowser',
   globals: {
-    '@angular/facade': 'ng.facade',
     '@angular/core': 'ng.core',
-    '@angular/common': 'ng.common'
+    '@angular/common': 'ng.common',
+    '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 }),
diff --git a/modules/@angular/platform-server/rollup.config.js b/modules/@angular/platform-server/rollup.config.js
@@ -6,10 +6,13 @@ export default {
   format: 'umd',
   moduleName: 'ng.platformServer',
   globals: {
-    '@angular/facade': 'ng.facade',
     '@angular/core': 'ng.core',
     '@angular/compiler': 'ng.compiler',
-    '@angular/platform-browser': 'ng.platformBrowser'
+    '@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 }),
diff --git a/modules/@angular/router/rollup.config.js b/modules/@angular/router/rollup.config.js
@@ -6,10 +6,13 @@ export default {
   format: 'umd',
   moduleName: 'ng.router',
   globals: {
-    '@angular/facade': 'ng.facade',
     '@angular/core': 'ng.core',
     '@angular/common': 'ng.common',
-    '@angular/platform-browser': 'ng.platformBrowser'
+    '@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 }),
diff --git a/modules/@angular/testing/rollup.config.js b/modules/@angular/testing/rollup.config.js
@@ -6,11 +6,14 @@ export default {
   format: 'umd',
   moduleName: 'ng.testing',
   globals: {
-    '@angular/facade': 'ng.facade',
     '@angular/core': 'ng.core',
     '@angular/compiler': 'ng.compiler',
     '@angular/common': 'ng.common',
-    '@angular/platform-browser': 'ng.platformBrowser'
+    '@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 }),
diff --git a/modules/@angular/upgrade/rollup.config.js b/modules/@angular/upgrade/rollup.config.js
@@ -6,11 +6,14 @@ export default {
   format: 'umd',
   moduleName: 'ng.upgrade',
   globals: {
-    '@angular/facade': 'ng.facade',
     '@angular/core': 'ng.core',
     '@angular/common': 'ng.common',
     '@angular/compiler': 'ng.compiler',
-    '@angular/platform-browser': 'ng.platformBrowser'
+    '@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 }),
diff --git a/modules/rollup-test/hello_world.js b/modules/rollup-test/hello_world.js
@@ -1,10 +1,11 @@
 var HelloWorldComponent = ng.core.Component({
   selector: 'hello-world',
-  template: 'hello world!!!'
+  //template: 'hello world!!!'
+  templateUrl: 'hello-world.html'
 }).Class({
   constructor: function() {}
 });
 
 
 
-ng.platformBrowser.bootstrap(HelloWorldComponent);
+ng.platformBrowserDynamic.bootstrap(HelloWorldComponent);
diff --git a/modules/rollup-test/hello_world.ts b/modules/rollup-test/hello_world.ts
@@ -1,5 +1,5 @@
 import {Component} from '@angular/core';
-import {bootstrap} from '@angular/platform-browser';
+import {bootstrap} from '@angular/platform-browser-dynamic';
 
 @Component({
   selector: 'hello-world',
diff --git a/modules/rollup-test/index-bundle.html b/modules/rollup-test/index-bundle.html
@@ -7,11 +7,11 @@
 <script src="./node_modules/zone.js/dist/zone.js"></script>
 <script src="https://code.angularjs.org/2.0.0-beta.9/Rx.umd.js"></script>
 <script src="./node_modules/reflect-metadata/Reflect.js"></script>
-<script src="dist/facade.umd.js"></script>
 <script src="dist/core.umd.js"></script>
 <script src="dist/common.umd.js"></script>
 <script src="dist/compiler.umd.js"></script>
 <script src="dist/platform-browser.umd.js"></script>
+<script src="dist/platform-browser-dynamic.umd.js"></script>
 <!--<script src="https://code.angularjs.org/2.0.0-beta.9/angular2-all.umd.js"></script>-->
 <script src="./hello_world.js"></script>
 </html>
diff --git a/modules/rollup-test/index-systemjs.html b/modules/rollup-test/index-systemjs.html
@@ -17,11 +17,11 @@
 //      }
 //    },
     map: {
-      "@angular/facade": "http://localhost:8000/dist/facade.umd.js",
       "@angular/core": "http://localhost:8000/dist/core.umd.js",
       "@angular/common": "http://localhost:8000/dist/common.umd.js",
       "@angular/compiler": "http://localhost:8000/dist/compiler.umd.js",
       "@angular/platform-browser": "http://localhost:8000/dist/platform-browser.umd.js",
+      "@angular/platform-browser-dynamic": "http://localhost:8000/dist/platform-browser-dynamic.umd.js",
     }
 
   });
diff --git a/modules/rollup-test/trace.log b/modules/rollup-test/trace.log

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ do`
`31`	`31`	`echo "====== (esm)COMPILING: \$(npm bin)/tsc -p ${SRCDIR}/tsconfig-es2015.json ====="`
`32`	`32`	`$(npm bin)/tsc -p ${SRCDIR}/tsconfig-es2015.json`
`33`	`33`
`34`		`- if (false); then`
	`34`	`+ if (true); then`
`35`	`35`	`echo "====== BUNDLING: ${SRCDIR} ====="`
`36`	`36`	`(`
`37`	`37`	`cd ${SRCDIR}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`"author": "angular",`
`9`	`9`	`"license": "MIT",`
`10`	`10`	`"peerDependencies": {`
`11`		`- "@angular/core": "$$ANGULAR_VERSION$$",`
`12`		`- "@angular/facade": "$$ANGULAR_VERSION$$"`
	`11`	`+ "@angular/core": "$$ANGULAR_VERSION$$"`
`13`	`12`	`}`
`14`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,5 @@`
`10`	`10`	`"peerDependencies": {`
`11`	`11`	`"rxjs": "5.0.0-beta.2",`
`12`	`12`	`"zone.js": "^0.6.6"`
`13`		`- },`
`14`		`- "dependencies": {`
`15`		`- "@angular/facade": "$$ANGULAR_VERSION$$"`
`16`	`13`	`}`
`17`	`14`	`}`