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 #2752
Fix #3309

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';

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';

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",

tests/e2e/tests/build/scripts-array.ts

@@ -18,14 +18,14 @@ export default function () {
   })
     .then(() => updateJsonFile('angular-cli.json', configJson => {
       const app = configJson['apps'][0];
-      app['scripts'] = [
+      app['scripts'] = app['scripts'].concat([
         'string-script.js',
         { input: 'input-script.js' },
         { input: 'lazy-script.js', lazy: true },
         { input: 'pre-rename-script.js', output: 'renamed-script' },
         { input: 'pre-rename-lazy-script.js', output: 'renamed-lazy-script', lazy: true },
         { input: 'common-entry-script.js', output: 'common-entry' }
-      ];
+      ]);
       app['styles'] = [{ input: 'common-entry-style.css', output: 'common-entry' }];
     }))
     .then(() => ng('build'))

tests/e2e/tests/build/styles/styles-array.ts

@@ -28,7 +28,9 @@ export default function () {
         { input: 'pre-rename-lazy-style.css', output: 'renamed-lazy-style', lazy: true },
         { input: 'common-entry-style.css', output: 'common-entry' }
       ];
-      app['scripts'] = [{ input: 'common-entry-script.js', output: 'common-entry' }];
+      app['scripts'] = app['scripts'].concat(
+        [{ input: 'common-entry-script.js', output: 'common-entry' }]
+      );
     }))
     .then(() => ng('build'))
     // files were created successfully
@@ -52,8 +54,9 @@ export default function () {
     `))
     .then(() => expectFileToMatch('dist/index.html', oneLineTrim`
       <script type="text/javascript" src="inline.bundle.js"></script>
-      <script type="text/javascript" src="vendor.bundle.js"></script>
       <script type="text/javascript" src="common-entry.bundle.js"></script>
+      <script type="text/javascript" src="scripts.bundle.js"></script>
+      <script type="text/javascript" src="vendor.bundle.js"></script>
       <script type="text/javascript" src="main.bundle.js"></script>
     `));
 }

tests/e2e/tests/test/test-scripts.ts

@@ -60,10 +60,10 @@ export default function () {
     .then(() => expectToFail(() => ng('test', '--single-run')))
     .then(() => updateJsonFile('angular-cli.json', configJson => {
       const app = configJson['apps'][0];
-      app['scripts'] = [
+      app['scripts'] = app['scripts'].concat([
         'string-script.js',
         { input: 'input-script.js' }
-      ];
+      ]);
     }))
     // should pass now
     .then(() => ng('test', '--single-run'));