fix(polyfills): move polyfills to scripts array

Polyfills found in polyfills.ts would not be available for scripts due to being loaded in the main bundle only. Fix angular#2752 Fix angular#3309
filipesilva · Jan 1, 2017 · 92e6387 · 92e6387
1 parent 2a513ca
commit 92e6387
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 24 deletions.
diff --git a/packages/angular-cli/blueprints/ng2/files/__path__/main.ts b/packages/angular-cli/blueprints/ng2/files/__path__/main.ts
@@ -1,5 +1,3 @@
-import './polyfills.ts';
-
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { enableProdMode } from '@angular/core';
 import { environment } from './environments/environment';

diff --git a/packages/angular-cli/blueprints/ng2/files/__path__/polyfills.ts b/packages/angular-cli/blueprints/ng2/files/__path__/polyfills.ts
diff --git a/packages/angular-cli/blueprints/ng2/files/__path__/test.ts b/packages/angular-cli/blueprints/ng2/files/__path__/test.ts
@@ -1,5 +1,3 @@
-import './polyfills.ts';
-
 import 'zone.js/dist/long-stack-trace-zone';
 import 'zone.js/dist/proxy.js';
 import 'zone.js/dist/sync-test';

diff --git a/packages/angular-cli/blueprints/ng2/files/angular-cli.json b/packages/angular-cli/blueprints/ng2/files/angular-cli.json
@@ -20,7 +20,10 @@
       "styles": [
         "styles.<%= styleExt %>"
       ],
-      "scripts": [],
+      "scripts": [
+        "<%= relativeRootPath %>/node_modules/core-js/client/shim.min.js",
+        "<%= relativeRootPath %>/node_modules/zone.js/dist/zone.js"
+      ],
       "environments": {
         "source": "environments/environment.ts",
         "dev": "environments/environment.ts",