build: import tslib rather than output TS helpers (#16901)

build.sh

@@ -123,8 +123,8 @@ downlevelES2015() {
       ts_file="${BASH_REMATCH[1]}${2:-".es5.ts"}"
       cp ${file} ${ts_file}
 
-      echo "======           $TSC ${ts_file} --target es5 --module es2015 --noLib"
+      echo "======           $TSC ${ts_file} --target es5 --module es2015 --noLib --sourceMap --importHelpers"
-      ($TSC ${ts_file} --target es5 --module es2015 --noLib --sourceMap) > /dev/null 2>&1 || true
+      ($TSC ${ts_file} --target es5 --module es2015 --noLib --sourceMap --importHelpers) > /dev/null 2>&1 || true
       mapSources "${BASH_REMATCH[1]}${2:-".es5.js"}"
       rm -f ${ts_file}
     fi
@@ -442,11 +442,7 @@ do
 
       echo "======        Copy ${PACKAGE} typings"
       rsync -a --exclude=*.js --exclude=*.js.map ${OUT_DIR}/ ${NPM_DIR}
-#      echo "$(cat ${LICENSE_BANNER}) ${N} export * from './index'" > ${NPM_DIR}/${PACKAGE}.d.ts
-#      echo "{\"alias\": \"./index.metadata.json\"}" > ${NPM_DIR}/${PACKAGE}.metadata.json
-#      exit 0
       moveTypings ${NPM_DIR} ${PACKAGE}
-#      addNgcPackageJson ${NPM_DIR}/typings
 
       (
         cd  ${SRC_DIR}

package.json

@@ -24,6 +24,7 @@
     "core-js": "^2.4.1",
     "reflect-metadata": "^0.1.3",
     "rxjs": "^5.0.1",
+    "tslib": "^1.7.1",
     "typescript": "^2.3.2",
     "zone.js": "^0.8.10"
   },
@@ -84,6 +85,7 @@
     "rho": "^0.3.0",
     "rollup": "^0.41.6",
     "rollup-plugin-commonjs": "^5.0.5",
+    "rollup-plugin-node-resolve": "^3.0.0",
     "selenium-webdriver": "^2.53.3",
     "semver": "^5.1.0",
     "sorcery": "^0.10.0",

packages/animations/browser/rollup.config.js

@@ -6,15 +6,21 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import resolve from 'rollup-plugin-node-resolve';
+
+const globals = {
+  '@angular/core': 'ng.core',
+  '@angular/common': 'ng.common',
+  '@angular/animations': 'ng.animations'
+};
+
 export default {
   entry: '../../../dist/packages-dist/animations/@angular/animations/browser.es5.js',
   dest: '../../../dist/packages-dist/animations/bundles/animations-browser.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.animations.browser',
-  globals: {
+  plugins: [resolve()],
-    '@angular/core': 'ng.core',
+  external: Object.keys(globals),
-    '@angular/common': 'ng.common',
+  globals: globals
-    '@angular/animations': 'ng.animations'
-  }
 };

packages/animations/browser/testing/rollup.config.js

@@ -6,15 +6,21 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import resolve from 'rollup-plugin-node-resolve';
+
+const globals = {
+  '@angular/core': 'ng.core',
+  'rxjs/Observable': 'Rx',
+  'rxjs/Subject': 'Rx',
+};
+
 export default {
   entry: '../../../../dist/packages-dist/animations/@angular/animations/browser/testing.es5.js',
   dest: '../../../../dist/packages-dist/animations/bundles/animations-browser-testing.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.animations.browser.testing',
-  globals: {
+  plugins: [resolve()],
-    '@angular/core': 'ng.core',
+  external: Object.keys(globals),
-    '@angular/common': 'ng.common',
+  globals: globals
-    '@angular/animations': 'ng.animations'
-  }
 };

packages/animations/package.json

@@ -8,6 +8,9 @@
   "typings": "./animations.d.ts",
   "author": "angular",
   "license": "MIT",
+  "dependencies": {
+    "tslib": "^1.7.1"
+  },
   "peerDependencies": {
     "@angular/core": "0.0.0-PLACEHOLDER"
   },

packages/animations/rollup.config.js

@@ -6,15 +6,21 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import resolve from 'rollup-plugin-node-resolve';
+
+const globals = {
+  '@angular/core': 'ng.core',
+  'rxjs/Observable': 'Rx',
+  'rxjs/Subject': 'Rx',
+};
+
 export default {
   entry: '../../dist/packages-dist/animations/@angular/animations.es5.js',
   dest: '../../dist/packages-dist/animations/bundles/animations.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.animations',
-  globals: {
+  plugins: [resolve()],
-    '@angular/core': 'ng.core',
+  external: Object.keys(globals),
-    'rxjs/Observable': 'Rx',
+  globals: globals
-    'rxjs/Subject': 'Rx',
-  }
 };

packages/common/package.json

@@ -8,6 +8,9 @@
   "typings": "./common.d.ts",
   "author": "angular",
   "license": "MIT",
+  "dependencies": {
+    "tslib": "^1.7.1"
+  },
   "peerDependencies": {
     "@angular/core": "0.0.0-PLACEHOLDER"
   },

packages/common/rollup.config.js

@@ -6,15 +6,21 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import resolve from 'rollup-plugin-node-resolve';
+
+const globals = {
+  '@angular/core': 'ng.core',
+  'rxjs/Observable': 'Rx',
+  'rxjs/Subject': 'Rx',
+};
+
 export default {
   entry: '../../dist/packages-dist/common/@angular/common.es5.js',
   dest: '../../dist/packages-dist/common/bundles/common.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.common',
-  globals: {
+  plugins: [resolve()],
-    '@angular/core': 'ng.core',
+  external: Object.keys(globals),
-    'rxjs/Observable': 'Rx',
+  globals: globals
-    'rxjs/Subject': 'Rx',
-  }
 };

packages/common/testing/rollup.config.js

@@ -6,16 +6,22 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import resolve from 'rollup-plugin-node-resolve';
+
+const globals = {
+  '@angular/core': 'ng.core',
+  '@angular/common': 'ng.common',
+  'rxjs/Observable': 'Rx',
+  'rxjs/Subject': 'Rx'
+};
+
 export default {
   entry: '../../../dist/packages-dist/common/@angular/common/testing.es5.js',
   dest: '../../../dist/packages-dist/common/bundles/common-testing.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.common.testing',
-  globals: {
+  plugins: [resolve()],
-    '@angular/core': 'ng.core',
+  external: Object.keys(globals),
-    '@angular/common': 'ng.common',
+  globals: globals
-    'rxjs/Observable': 'Rx',
-    'rxjs/Subject': 'Rx'
-  }
 };

packages/compiler/package.json

@@ -8,6 +8,9 @@
   "typings": "./compiler.d.ts",
   "author": "angular",
   "license": "MIT",
+  "dependencies": {
+    "tslib": "^1.7.1"
+  },
   "peerDependencies": {
     "@angular/core": "0.0.0-PLACEHOLDER"
   },

packages/compiler/rollup.config.js

@@ -6,18 +6,21 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import resolve from 'rollup-plugin-node-resolve';
+
+const globals = {
+  '@angular/core': 'ng.core',
+  'rxjs/Observable': 'Rx',
+  'rxjs/Subject': 'Rx',
+};
+
 export default {
   entry: '../../dist/packages-dist/compiler/@angular/compiler.es5.js',
   dest: '../../dist/packages-dist/compiler/bundles/compiler.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.compiler',
-  globals: {
+  plugins: [resolve()],
-    '@angular/core': 'ng.core',
+  external: Object.keys(globals),
-    'rxjs/Observable': 'Rx',
+  globals: globals
-    'rxjs/Subject': 'Rx',
-  },
-  plugins: [
-    //    nodeResolve({ jsnext: true, main: true }),
-  ]
 };

packages/compiler/testing/rollup.config.js

@@ -6,17 +6,23 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import resolve from 'rollup-plugin-node-resolve';
+
+const globals = {
+  '@angular/core': 'ng.core',
+  '@angular/core/testing': 'ng.core.testing',
+  '@angular/compiler': 'ng.compiler',
+  'rxjs/Observable': 'Rx',
+  'rxjs/Subject': 'Rx'
+};
+
 export default {
   entry: '../../../dist/packages-dist/compiler/@angular/compiler/testing.es5.js',
   dest: '../../../dist/packages-dist/compiler/bundles/compiler-testing.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.compiler.testing',
-  globals: {
+  plugins: [resolve()],
-    '@angular/core': 'ng.core',
+  external: Object.keys(globals),
-    '@angular/core/testing': 'ng.core.testing',
+  globals: globals
-    '@angular/compiler': 'ng.compiler',
-    'rxjs/Observable': 'Rx',
-    'rxjs/Subject': 'Rx'
-  }
 };

packages/core/package.json

@@ -8,6 +8,9 @@
   "typings": "./core.d.ts",
   "author": "angular",
   "license": "MIT",
+  "dependencies": {
+    "tslib": "^1.7.1"
+  },
   "peerDependencies": {
     "rxjs": "^5.0.1",
     "zone.js": "^0.8.4"

packages/core/rollup.config.js

@@ -6,18 +6,24 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import resolve from 'rollup-plugin-node-resolve';
+
+const globals = {
+  'rxjs/Observable': 'Rx',
+  'rxjs/Subject': 'Rx',
+  'rxjs/Observer': 'Rx',
+  'rxjs/Subscription': 'Rx',
+  'rxjs/observable/merge': 'Rx.Observable',
+  'rxjs/operator/share': 'Rx.Observable.prototype'
+};
+
 export default {
   entry: '../../dist/packages-dist/core/@angular/core.es5.js',
   dest: '../../dist/packages-dist/core/bundles/core.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.core',
-  globals: {
+  plugins: [resolve()],
-    'rxjs/Observable': 'Rx',
+  external: Object.keys(globals),
-    'rxjs/Subject': 'Rx',
+  globals: globals
-    'rxjs/Observer': 'Rx',
-    'rxjs/Subscription': 'Rx',
-    'rxjs/observable/merge': 'Rx.Observable',
-    'rxjs/operator/share': 'Rx.Observable.prototype'
-  }
 };

packages/core/testing/rollup.config.js

@@ -6,15 +6,21 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import resolve from 'rollup-plugin-node-resolve';
+
+const globals = {
+  '@angular/core': 'ng.core',
+  'rxjs/Observable': 'Rx',
+  'rxjs/Subject': 'Rx',
+};
+
 export default {
   entry: '../../../dist/packages-dist/core/@angular/core/testing.es5.js',
   dest: '../../../dist/packages-dist/core/bundles/core-testing.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.core.testing',
-  globals: {
+  plugins: [resolve()],
-    '@angular/core': 'ng.core',
+  external: Object.keys(globals),
-    'rxjs/Observable': 'Rx',
+  globals: globals
-    'rxjs/Subject': 'Rx',
-  }
 };

packages/forms/package.json

@@ -8,6 +8,9 @@
   "typings": "./forms.d.ts",
   "author": "angular",
   "license": "MIT",
+  "dependencies": {
+    "tslib": "^1.7.1"
+  },
   "peerDependencies": {
     "@angular/core": "0.0.0-PLACEHOLDER",
     "@angular/common": "0.0.0-PLACEHOLDER",

packages/forms/rollup.config.js

@@ -6,21 +6,27 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import resolve from 'rollup-plugin-node-resolve';
+
+const globals = {
+  '@angular/core': 'ng.core',
+  '@angular/common': 'ng.common',
+  '@angular/compiler': 'ng.compiler',
+  '@angular/platform-browser': 'ng.platformBrowser',
+  'rxjs/Observable': 'Rx',
+  'rxjs/Subject': 'Rx',
+  'rxjs/observable/fromPromise': 'Rx.Observable',
+  'rxjs/observable/forkJoin': 'Rx.Observable',
+  'rxjs/operator/map': 'Rx.Observable.prototype'
+};
+
 export default {
   entry: '../../dist/packages-dist/forms/@angular/forms.es5.js',
   dest: '../../dist/packages-dist/forms/bundles/forms.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.forms',
-  globals: {
+  plugins: [resolve()],
-    '@angular/core': 'ng.core',
+  external: Object.keys(globals),
-    '@angular/common': 'ng.common',
+  globals: globals
-    '@angular/compiler': 'ng.compiler',
-    '@angular/platform-browser': 'ng.platformBrowser',
-    'rxjs/Observable': 'Rx',
-    'rxjs/Subject': 'Rx',
-    'rxjs/observable/fromPromise': 'Rx.Observable',
-    'rxjs/observable/forkJoin': 'Rx.Observable',
-    'rxjs/operator/map': 'Rx.Observable.prototype'
-  }
 };

packages/http/package.json

@@ -8,6 +8,9 @@
   "typings": "./http.d.ts",
   "author": "angular",
   "license": "MIT",
+  "dependencies": {
+    "tslib": "^1.7.1"
+  },
   "peerDependencies": {
     "rxjs": "^5.0.1",
     "@angular/core": "0.0.0-PLACEHOLDER",

packages/http/rollup.config.js

@@ -6,17 +6,23 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import resolve from 'rollup-plugin-node-resolve';
+
+const globals = {
+  '@angular/core': 'ng.core',
+  '@angular/compiler': 'ng.compiler',
+  '@angular/platform-browser': 'ng.platformBrowser',
+  'rxjs/Observable': 'Rx',
+  'rxjs/Subject': 'Rx'
+};
+
 export default {
   entry: '../../dist/packages-dist/http/@angular/http.es5.js',
   dest: '../../dist/packages-dist/http/bundles/http.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.http',
-  globals: {
+  plugins: [resolve()],
-    '@angular/core': 'ng.core',
+  external: Object.keys(globals),
-    '@angular/compiler': 'ng.compiler',
+  globals: globals
-    '@angular/platform-browser': 'ng.platformBrowser',
-    'rxjs/Observable': 'Rx',
-    'rxjs/Subject': 'Rx'
-  }
 };

packages/http/testing/rollup.config.js

@@ -6,20 +6,26 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import resolve from 'rollup-plugin-node-resolve';
+
+const globals = {
+  '@angular/core': 'ng.core',
+  '@angular/compiler': 'ng.compiler',
+  '@angular/platform-browser': 'ng.platformBrowser',
+  '@angular/http': 'ng.http',
+  'rxjs/Observable': 'Rx',
+  'rxjs/ReplaySubject': 'Rx',
+  'rxjs/Subject': 'Rx',
+  'rxjs/operator/take': 'Rx.Observable.prototype'
+};
+
 export default {
   entry: '../../../dist/packages-dist/http/@angular/http/testing.es5.js',
   dest: '../../../dist/packages-dist/http/bundles/http-testing.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.http.testing',
-  globals: {
+  plugins: [resolve()],
-    '@angular/core': 'ng.core',
+  external: Object.keys(globals),
-    '@angular/compiler': 'ng.compiler',
+  globals: globals
-    '@angular/platform-browser': 'ng.platformBrowser',
-    '@angular/http': 'ng.http',
-    'rxjs/Observable': 'Rx',
-    'rxjs/ReplaySubject': 'Rx',
-    'rxjs/Subject': 'Rx',
-    'rxjs/operator/take': 'Rx.Observable.prototype'
-  }
 };

packages/language-service/package.json

@@ -7,6 +7,9 @@
   "typings": "./language-service.d.ts",
   "author": "angular",
   "license": "MIT",
+  "dependencies": {
+    "tslib": "^1.7.1"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/angular/angular.git"

packages/platform-browser-dynamic/package.json

@@ -8,6 +8,9 @@
   "typings": "./platform-browser-dynamic.d.ts",
   "author": "angular",
   "license": "MIT",
+  "dependencies": {
+    "tslib": "^1.7.1"
+  },
   "peerDependencies": {
     "@angular/core": "0.0.0-PLACEHOLDER",
     "@angular/common": "0.0.0-PLACEHOLDER",

packages/platform-browser-dynamic/rollup.config.js

@@ -6,6 +6,15 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import resolve from 'rollup-plugin-node-resolve';
+
+const globals = {
+  '@angular/core': 'ng.core',
+  '@angular/common': 'ng.common',
+  '@angular/compiler': 'ng.compiler',
+  '@angular/platform-browser': 'ng.platformBrowser',
+};
+
 export default {
   entry:
       '../../dist/packages-dist/platform-browser-dynamic/@angular/platform-browser-dynamic.es5.js',
@@ -13,10 +22,7 @@ export default {
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.platformBrowserDynamic',
-  globals: {
+  plugins: [resolve()],
-    '@angular/core': 'ng.core',
+  external: Object.keys(globals),
-    '@angular/common': 'ng.common',
+  globals: globals
-    '@angular/compiler': 'ng.compiler',
-    '@angular/platform-browser': 'ng.platformBrowser',
-  }
 };

packages/platform-browser-dynamic/testing/rollup.config.js

@@ -6,6 +6,19 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import resolve from 'rollup-plugin-node-resolve';
+
+const globals = {
+  '@angular/core': 'ng.core',
+  '@angular/core/testing': 'ng.core.testing',
+  '@angular/common': 'ng.common',
+  '@angular/compiler': 'ng.compiler',
+  '@angular/compiler/testing': 'ng.compiler.testing',
+  '@angular/platform-browser': 'ng.platformBrowser',
+  '@angular/platform-browser/testing': 'ng.platformBrowser.testing',
+  '@angular/platform-browser-dynamic': 'ng.platformBrowserDynamic'
+};
+
 export default {
   entry:
       '../../../dist/packages-dist/platform-browser-dynamic/@angular/platform-browser-dynamic/testing.es5.js',
@@ -14,14 +27,7 @@ export default {
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.platformBrowserDynamic.testing',
-  globals: {
+  plugins: [resolve()],
-    '@angular/core': 'ng.core',
+  external: Object.keys(globals),
-    '@angular/core/testing': 'ng.core.testing',
+  globals: globals
-    '@angular/common': 'ng.common',
-    '@angular/compiler': 'ng.compiler',
-    '@angular/compiler/testing': 'ng.compiler.testing',
-    '@angular/platform-browser': 'ng.platformBrowser',
-    '@angular/platform-browser/testing': 'ng.platformBrowser.testing',
-    '@angular/platform-browser-dynamic': 'ng.platformBrowserDynamic'
-  }
 };

packages/platform-browser/animations/rollup.config.js

@@ -6,17 +6,23 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import resolve from 'rollup-plugin-node-resolve';
+
+const globals = {
+  '@angular/core': 'ng.core',
+  '@angular/common': 'ng.common',
+  '@angular/platform-browser': 'ng.platformBrowser',
+  '@angular/animations': 'ng.animations',
+  '@angular/animations/browser': 'ng.animations.browser'
+};
+
 export default {
   entry: '../../../dist/packages-dist/platform-browser/@angular/platform-browser/animations.es5.js',
   dest: '../../../dist/packages-dist/platform-browser/bundles/platform-browser-animations.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.platformBrowser.animations',
-  globals: {
+  plugins: [resolve()],
-    '@angular/core': 'ng.core',
+  external: Object.keys(globals),
-    '@angular/common': 'ng.common',
+  globals: globals
-    '@angular/platform-browser': 'ng.platformBrowser',
-    '@angular/animations': 'ng.animations',
-    '@angular/animations/browser': 'ng.animations.browser'
-  }
 };

packages/platform-browser/package.json

@@ -8,6 +8,9 @@
   "typings": "./platform-browser.d.ts",
   "author": "angular",
   "license": "MIT",
+  "dependencies": {
+    "tslib": "^1.7.1"
+  },
   "peerDependencies": {
     "@angular/core": "0.0.0-PLACEHOLDER",
     "@angular/common": "0.0.0-PLACEHOLDER"

packages/platform-browser/rollup.config.js

@@ -6,14 +6,20 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import resolve from 'rollup-plugin-node-resolve';
+
+const globals = {
+  '@angular/core': 'ng.core',
+  '@angular/common': 'ng.common',
+};
+
 export default {
   entry: '../../dist/packages-dist/platform-browser/@angular/platform-browser.es5.js',
   dest: '../../dist/packages-dist/platform-browser/bundles/platform-browser.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.platformBrowser',
-  globals: {
+  plugins: [resolve()],
-    '@angular/core': 'ng.core',
+  external: Object.keys(globals),
-    '@angular/common': 'ng.common',
+  globals: globals
-  }
 };

packages/platform-browser/testing/rollup.config.js

@@ -6,15 +6,21 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import resolve from 'rollup-plugin-node-resolve';
+
+const globals = {
+  '@angular/core': 'ng.core',
+  '@angular/common': 'ng.common',
+  '@angular/platform-browser': 'ng.platformBrowser'
+};
+
 export default {
   entry: '../../../dist/packages-dist/platform-browser/@angular/platform-browser/testing.es5.js',
   dest: '../../../dist/packages-dist/platform-browser/bundles/platform-browser-testing.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.platformBrowser.testing',
-  globals: {
+  plugins: [resolve()],
-    '@angular/core': 'ng.core',
+  external: Object.keys(globals),
-    '@angular/common': 'ng.common',
+  globals: globals
-    '@angular/platform-browser': 'ng.platformBrowser'
-  }
 };

packages/platform-server/package.json

@@ -16,6 +16,7 @@
     "@angular/platform-browser": "0.0.0-PLACEHOLDER"
   },
   "dependencies": {
+    "tslib": "^1.7.1",
     "parse5": "^3.0.1",
     "xhr2": "^0.1.4"
   },

packages/platform-server/rollup.config.js

@@ -6,16 +6,27 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import resolve from 'rollup-plugin-node-resolve';
+
+const globals = {
+  '@angular/core': 'ng.core',
+  '@angular/common': 'ng.common',
+  '@angular/compiler': 'ng.compiler',
+  '@angular/platform-browser': 'ng.platformBrowser',
+  'rxjs/Observable': 'Rx',
+  'rxjs/Subject': 'Rx',
+  'rxjs/operator/toPromise': 'Rx.Observable.prototype',
+  'rxjs/operator/filter': 'Rx.Observable.prototype',
+  'rxjs/operator/first': 'Rx.Observable.prototype'
+};
+
 export default {
   entry: '../../dist/packages-dist/platform-server/@angular/platform-server.es5.js',
   dest: '../../dist/packages-dist/platform-server/bundles/platform-server.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.platformServer',
-  globals: {
+  plugins: [resolve()],
-    '@angular/core': 'ng.core',
+  external: Object.keys(globals),
-    '@angular/common': 'ng.common',
+  globals: globals
-    '@angular/compiler': 'ng.compiler',
-    '@angular/platform-browser': 'ng.platformBrowser'
-  }
 };

packages/platform-server/testing/rollup.config.js

@@ -6,19 +6,25 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import resolve from 'rollup-plugin-node-resolve';
+
+const globals = {
+  '@angular/core': 'ng.core',
+  '@angular/common': 'ng.common',
+  '@angular/compiler': 'ng.compiler',
+  '@angular/compiler/testing': 'ng.compiler.testing',
+  '@angular/platform-browser': 'ng.platformBrowser',
+  '@angular/platform-server': 'ng.platformServer',
+  '@angular/platform-browser-dynamic/testing': 'ng.platformBrowserDynamic.testing'
+};
+
 export default {
   entry: '../../../dist/packages-dist/platform-server/@angular/platform-server/testing.es5.js',
   dest: '../../../dist/packages-dist/platform-server/bundles/platform-server-testing.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.platformServer.testing',
-  globals: {
+  plugins: [resolve()],
-    '@angular/core': 'ng.core',
+  external: Object.keys(globals),
-    '@angular/common': 'ng.common',
+  globals: globals
-    '@angular/compiler': 'ng.compiler',
-    '@angular/compiler/testing': 'ng.compiler.testing',
-    '@angular/platform-browser': 'ng.platformBrowser',
-    '@angular/platform-server': 'ng.platformServer',
-    '@angular/platform-browser-dynamic/testing': 'ng.platformBrowserDynamic.testing'
-  }
 };

packages/platform-webworker-dynamic/package.json

@@ -8,6 +8,9 @@
   "typings": "./platform-webworker-dynamic.d.ts",
   "author": "angular",
   "license": "MIT",
+  "dependencies": {
+    "tslib": "^1.7.1"
+  },
   "peerDependencies": {
     "@angular/common": "0.0.0-PLACEHOLDER",
     "@angular/core": "0.0.0-PLACEHOLDER",

packages/platform-webworker-dynamic/rollup.config.js

@@ -6,6 +6,17 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import resolve from 'rollup-plugin-node-resolve';
+
+const globals = {
+  '@angular/core': 'ng.core',
+  '@angular/common': 'ng.common',
+  '@angular/compiler': 'ng.compiler',
+  '@angular/platform-browser': 'ng.platformBrowser',
+  '@angular/platform-browser-dynamic': 'ng.platformBrowserDynamic',
+  '@angular/platform-webworker': 'ng.platformWebworker',
+};
+
 export default {
   entry:
       '../../dist/packages-dist/platform-webworker-dynamic/@angular/platform-webworker-dynamic.es5.js',
@@ -14,12 +25,7 @@ export default {
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.platformWebworkerDynamic',
-  globals: {
+  plugins: [resolve()],
-    '@angular/core': 'ng.core',
+  external: Object.keys(globals),
-    '@angular/common': 'ng.common',
+  globals: globals
-    '@angular/compiler': 'ng.compiler',
-    '@angular/platform-browser': 'ng.platformBrowser',
-    '@angular/platform-browser-dynamic': 'ng.platformBrowserDynamic',
-    '@angular/platform-webworker': 'ng.platformWebworker',
-  }
 };

packages/platform-webworker/package.json

@@ -8,6 +8,9 @@
   "typings": "./platform-webworker.d.ts",
   "author": "angular",
   "license": "MIT",
+  "dependencies": {
+    "tslib": "^1.7.1"
+  },
   "peerDependencies": {
     "@angular/common": "0.0.0-PLACEHOLDER",
     "@angular/core": "0.0.0-PLACEHOLDER",

packages/platform-webworker/rollup.config.js

@@ -6,17 +6,23 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import resolve from 'rollup-plugin-node-resolve';
+
+const globals = {
+  '@angular/core': 'ng.core',
+  '@angular/common': 'ng.common',
+  '@angular/platform-browser': 'ng.platformBrowser',
+  'rxjs/Observable': 'Rx',
+  'rxjs/Subject': 'Rx'
+};
+
 export default {
   entry: '../../dist/packages-dist/platform-webworker/@angular/platform-webworker.es5.js',
   dest: '../../dist/packages-dist/platform-webworker/bundles/platform-webworker.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.platformWebworker',
-  globals: {
+  plugins: [resolve()],
-    '@angular/core': 'ng.core',
+  external: Object.keys(globals),
-    '@angular/common': 'ng.common',
+  globals: globals
-    '@angular/platform-browser': 'ng.platformBrowser',
-    'rxjs/Observable': 'Rx',
-    'rxjs/Subject': 'Rx'
-  }
 };

packages/router/package.json

@@ -20,6 +20,9 @@
     "url": "https://github.com/angular/angular/issues"
   },
   "homepage": "https://github.com/angular/angular/blob/master/modules/%40angular/router/README.md",
+  "dependencies": {
+    "tslib": "^1.7.1"
+  },
   "peerDependencies": {
     "@angular/core": "0.0.0-PLACEHOLDER",
     "@angular/common": "0.0.0-PLACEHOLDER",

packages/router/rollup.config.js

@@ -6,40 +6,45 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import resolve from 'rollup-plugin-node-resolve';
+
+const globals = {
+  '@angular/core': 'ng.core',
+  '@angular/common': 'ng.common',
+  '@angular/platform-browser': 'ng.platformBrowser',
+
+  'rxjs/BehaviorSubject': 'Rx',
+  'rxjs/Observable': 'Rx',
+  'rxjs/Subject': 'Rx',
+  'rxjs/Subscription': 'Rx',
+  'rxjs/util/EmptyError': 'Rx',
+
+  'rxjs/observable/from': 'Rx.Observable',
+  'rxjs/observable/fromPromise': 'Rx.Observable',
+  'rxjs/observable/forkJoin': 'Rx.Observable',
+  'rxjs/observable/of': 'Rx.Observable',
+
+  'rxjs/operator/toPromise': 'Rx.Observable.prototype',
+  'rxjs/operator/map': 'Rx.Observable.prototype',
+  'rxjs/operator/mergeAll': 'Rx.Observable.prototype',
+  'rxjs/operator/concatAll': 'Rx.Observable.prototype',
+  'rxjs/operator/mergeMap': 'Rx.Observable.prototype',
+  'rxjs/operator/reduce': 'Rx.Observable.prototype',
+  'rxjs/operator/every': 'Rx.Observable.prototype',
+  'rxjs/operator/first': 'Rx.Observable.prototype',
+  'rxjs/operator/catch': 'Rx.Observable.prototype',
+  'rxjs/operator/last': 'Rx.Observable.prototype',
+  'rxjs/operator/filter': 'Rx.Observable.prototype',
+  'rxjs/operator/concatMap': 'Rx.Observable.prototype'
+};
+
 export default {
   entry: '../../dist/packages-dist/router/@angular/router.es5.js',
   dest: '../../dist/packages-dist/router/bundles/router.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.router',
-  globals: {
+  plugins: [resolve()],
-    '@angular/core': 'ng.core',
+  external: Object.keys(globals),
-    '@angular/common': 'ng.common',
+  globals: globals
-    '@angular/platform-browser': 'ng.platformBrowser',
-
-    'rxjs/BehaviorSubject': 'Rx',
-    'rxjs/Observable': 'Rx',
-    'rxjs/Subject': 'Rx',
-    'rxjs/Subscription': 'Rx',
-    'rxjs/util/EmptyError': 'Rx',
-
-    'rxjs/observable/from': 'Rx.Observable',
-    'rxjs/observable/fromPromise': 'Rx.Observable',
-    'rxjs/observable/forkJoin': 'Rx.Observable',
-    'rxjs/observable/of': 'Rx.Observable',
-
-    'rxjs/operator/toPromise': 'Rx.Observable.prototype',
-    'rxjs/operator/map': 'Rx.Observable.prototype',
-    'rxjs/operator/mergeAll': 'Rx.Observable.prototype',
-    'rxjs/operator/concatAll': 'Rx.Observable.prototype',
-    'rxjs/operator/mergeMap': 'Rx.Observable.prototype',
-    'rxjs/operator/reduce': 'Rx.Observable.prototype',
-    'rxjs/operator/every': 'Rx.Observable.prototype',
-    'rxjs/operator/first': 'Rx.Observable.prototype',
-    'rxjs/operator/catch': 'Rx.Observable.prototype',
-    'rxjs/operator/last': 'Rx.Observable.prototype',
-    'rxjs/operator/filter': 'Rx.Observable.prototype',
-    'rxjs/operator/concatMap': 'Rx.Observable.prototype'
-  },
-  plugins: []
 };

packages/router/testing/rollup.config.js

@@ -6,17 +6,23 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import resolve from 'rollup-plugin-node-resolve';
+
+const globals = {
+  '@angular/core': 'ng.core',
+  '@angular/common': 'ng.common',
+  '@angular/common/testing': 'ng.common.testing',
+  '@angular/platform-browser': 'ng.platformBrowser',
+  '@angular/router': 'ng.router'
+};
+
 export default {
   entry: '../../../dist/packages-dist/router/@angular/router/testing.es5.js',
   dest: '../../../dist/packages-dist/router/bundles/router-testing.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.router.testing',
-  globals: {
+  plugins: [resolve()],
-    '@angular/core': 'ng.core',
+  external: Object.keys(globals),
-    '@angular/common': 'ng.common',
+  globals: globals
-    '@angular/common/testing': 'ng.common.testing',
-    '@angular/platform-browser': 'ng.platformBrowser',
-    '@angular/router': 'ng.router'
-  }
 };

packages/router/upgrade/rollup.config.js

@@ -6,16 +6,22 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import resolve from 'rollup-plugin-node-resolve';
+
+const globals = {
+  '@angular/core': 'ng.core',
+  '@angular/common': 'ng.common',
+  '@angular/router': 'ng.router',
+  '@angular/upgrade/static': 'ng.upgrade.static'
+};
+
 export default {
   entry: '../../../dist/packages-dist/router/@angular/router/upgrade.es5.js',
   dest: '../../../dist/packages-dist/router/bundles/router-upgrade.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.router.upgrade',
-  globals: {
+  plugins: [resolve()],
-    '@angular/core': 'ng.core',
+  external: Object.keys(globals),
-    '@angular/common': 'ng.common',
+  globals: globals
-    '@angular/router': 'ng.router',
-    '@angular/upgrade/static': 'ng.upgrade.static'
-  }
 };

packages/upgrade/package.json

@@ -8,6 +8,9 @@
   "typings": "./upgrade.d.ts",
   "author": "angular",
   "license": "MIT",
+  "dependencies": {
+    "tslib": "^1.7.1"
+  },
   "peerDependencies": {
     "@angular/core": "0.0.0-PLACEHOLDER",
     "@angular/compiler": "0.0.0-PLACEHOLDER",

packages/upgrade/rollup.config.js

@@ -6,22 +6,28 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import resolve from 'rollup-plugin-node-resolve';
+
+const globals = {
+  '@angular/core': 'ng.core',
+  '@angular/common': 'ng.common',
+  '@angular/compiler': 'ng.compiler',
+  '@angular/platform-browser': 'ng.platformBrowser',
+  '@angular/platform-browser-dynamic': 'ng.platformBrowserDynamic',
+  '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',
+};
+
 export default {
   entry: '../../dist/packages-dist/upgrade/@angular/upgrade.es5.js',
   dest: '../../dist/packages-dist/upgrade/bundles/upgrade.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.upgrade',
-  globals: {
+  plugins: [resolve()],
-    '@angular/core': 'ng.core',
+  external: Object.keys(globals),
-    '@angular/common': 'ng.common',
+  globals: globals
-    '@angular/compiler': 'ng.compiler',
-    '@angular/platform-browser': 'ng.platformBrowser',
-    '@angular/platform-browser-dynamic': 'ng.platformBrowserDynamic',
-    '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',
-  }
 };

packages/upgrade/static/rollup.config.js

@@ -6,11 +6,19 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import resolve from 'rollup-plugin-node-resolve';
+
+const globals = {
+  '@angular/core': 'ng.core'
+};
+
 export default {
   entry: '../../../dist/packages-dist/upgrade/@angular/upgrade/static.es5.js',
   dest: '../../../dist/packages-dist/upgrade/bundles/upgrade-static.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.upgrade.static',
-  globals: {'@angular/core': 'ng.core'}
+  plugins: [resolve()],
+  external: Object.keys(globals),
+  globals: globals
 };