From 2f4602db08abe08cc641ffdeb39d67430ad327cc Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Sun, 3 Mar 2019 14:35:04 -0500
Subject: [PATCH] feat(@angular-devkit/build-angular): change es5BrowserSupport
  output filename to `polyfills.es5.js`

Closes #13808
---
 .../src/angular-cli-files/models/webpack-configs/browser.ts | 4 ++--
 .../src/angular-cli-files/models/webpack-configs/common.ts  | 6 +++---
 .../src/angular-cli-files/utilities/package-chunk-sort.ts   | 2 +-
 tests/legacy-cli/e2e/tests/basic/scripts-array.ts           | 2 +-
 tests/legacy-cli/e2e/tests/basic/styles-array.ts            | 2 +-
 tests/legacy-cli/e2e/tests/build/polyfills.ts               | 4 ++--
 tests/legacy-cli/e2e/tests/build/styles/extract-css.ts      | 4 ++--
 tests/legacy-cli/e2e/tests/misc/support-ie.ts               | 6 +++---
 tests/legacy-cli/e2e/tests/third-party/bootstrap.ts         | 4 ++--
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
index 7930a438c0..31bdbab5b4 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
@@ -44,7 +44,7 @@ export function getBrowserConfig(wco: WebpackConfigOptions) {
       entrypoints: generateEntryPoints(buildOptions),
       deployUrl: buildOptions.deployUrl,
       sri: buildOptions.subresourceIntegrity,
-      noModuleEntrypoints: ['es2015-polyfills'],
+      noModuleEntrypoints: ['polyfills.es5'],
     }));
   }
 
@@ -113,7 +113,7 @@ export function getBrowserConfig(wco: WebpackConfigOptions) {
               const moduleName = module.nameForCondition ? module.nameForCondition() : '';
 
               return /[\\/]node_modules[\\/]/.test(moduleName)
-                && !chunks.some(({ name }) => name === 'polyfills' || name === 'es2015-polyfills'
+                && !chunks.some(({ name }) => name === 'polyfills' || name === 'polyfills.es5'
                   || globalStylesBundleNames.includes(name));
             },
           },
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 59d5c3152f..0ce6147463 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -54,7 +54,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
   }
 
   if (buildOptions.es5BrowserSupport) {
-    entryPoints['es2015-polyfills'] = [path.join(__dirname, '..', 'es2015-polyfills.js')];
+    entryPoints['polyfills.es5'] = [path.join(__dirname, '..', 'es2015-polyfills.js')];
   }
 
   if (buildOptions.polyfills) {
@@ -68,8 +68,8 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
     ];
 
     if (buildOptions.es5BrowserSupport) {
-      entryPoints['es2015-polyfills'] = [
-        ...entryPoints['es2015-polyfills'],
+      entryPoints['polyfills.es5'] = [
+        ...entryPoints['polyfills.es5'],
         path.join(__dirname, '..', 'es2015-jit-polyfills.js'),
       ];
     }
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts
index ee2a2e450e..6e08a5b614 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts
@@ -26,7 +26,7 @@ export function generateEntryPoints(
   };
 
   const entryPoints = [
-    'es2015-polyfills',
+    'polyfills.es5',
     'polyfills',
     'sw-register',
     ...extraEntryPoints(appConfig.styles, 'styles'),
diff --git a/tests/legacy-cli/e2e/tests/basic/scripts-array.ts b/tests/legacy-cli/e2e/tests/basic/scripts-array.ts
index 54a221ad01..9ece63173a 100644
--- a/tests/legacy-cli/e2e/tests/basic/scripts-array.ts
+++ b/tests/legacy-cli/e2e/tests/basic/scripts-array.ts
@@ -54,7 +54,7 @@ export default function () {
     // index.html lists the right bundles
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script src="runtime.js"></script>
-      <script src="es2015-polyfills.js" nomodule></script>
+      <script src="polyfills.es5.js" nomodule></script>
       <script src="polyfills.js"></script>
       <script src="scripts.js"></script>
       <script src="renamed-script.js"></script>
diff --git a/tests/legacy-cli/e2e/tests/basic/styles-array.ts b/tests/legacy-cli/e2e/tests/basic/styles-array.ts
index 114aa641e7..e8360c80a6 100644
--- a/tests/legacy-cli/e2e/tests/basic/styles-array.ts
+++ b/tests/legacy-cli/e2e/tests/basic/styles-array.ts
@@ -43,7 +43,7 @@ export default function () {
     `))
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script src="runtime.js"></script>
-      <script src="es2015-polyfills.js" nomodule></script>
+      <script src="polyfills.es5.js" nomodule></script>
       <script src="polyfills.js"></script>
       <script src="vendor.js"></script>
       <script src="main.js"></script>
diff --git a/tests/legacy-cli/e2e/tests/build/polyfills.ts b/tests/legacy-cli/e2e/tests/build/polyfills.ts
index fe86643c07..c1ef73372b 100644
--- a/tests/legacy-cli/e2e/tests/build/polyfills.ts
+++ b/tests/legacy-cli/e2e/tests/build/polyfills.ts
@@ -15,7 +15,7 @@ export default async function () {
     await expectFileToMatch('dist/test-project/polyfills.js', 'zone.js');
     expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script src="runtime.js"></script>
-      <script src="es2015-polyfills.js" nomodule></script>
+      <script src="polyfills.es5.js" nomodule></script>
       <script src="polyfills.js"></script>
     `);
     const jitPolyfillSize = await getFileSize('dist/test-project/polyfills.js');
@@ -28,7 +28,7 @@ export default async function () {
     await expectFileToMatch('dist/test-project/polyfills.js', 'zone.js');
     expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script src="runtime.js"></script>
-      <script src="es2015-polyfills.js" nomodule></script>
+      <script src="polyfills.es5.js" nomodule></script>
       <script src="polyfills.js"></script>
     `);
 }
diff --git a/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts b/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts
index 1f3b30c92c..e731432521 100644
--- a/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts
+++ b/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts
@@ -48,7 +48,7 @@ export default function () {
     `)))
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script src="runtime.js"></script>
-      <script src="es2015-polyfills.js" nomodule></script>
+      <script src="polyfills.es5.js" nomodule></script>
       <script src="polyfills.js"></script>
       <script src="vendor.js"></script>
       <script src="main.js"></script>
@@ -64,7 +64,7 @@ export default function () {
     // index.html lists the right bundles
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script src="runtime.js"></script>
-      <script src="es2015-polyfills.js" nomodule></script>
+      <script src="polyfills.es5.js" nomodule></script>
       <script src="polyfills.js"></script>
       <script src="styles.js"></script>
       <script src="renamed-style.js"></script>
diff --git a/tests/legacy-cli/e2e/tests/misc/support-ie.ts b/tests/legacy-cli/e2e/tests/misc/support-ie.ts
index 5d82fd3aba..332f36e1da 100644
--- a/tests/legacy-cli/e2e/tests/misc/support-ie.ts
+++ b/tests/legacy-cli/e2e/tests/misc/support-ie.ts
@@ -10,7 +10,7 @@ export default async function () {
   });
 
   await ng('build');
-  await expectFileNotToExist('dist/test-project/es2015-polyfills.js');
+  await expectFileNotToExist('dist/test-project/polyfills.es5.js');
   await expectFileToMatch('dist/test-project/index.html', oneLineTrim`
     <script src="runtime.js"></script>
     <script src="polyfills.js"></script>
@@ -20,10 +20,10 @@ export default async function () {
   `);
 
   await ng('build', `--es5BrowserSupport`);
-  await expectFileToMatch('dist/test-project/es2015-polyfills.js', 'core-js');
+  await expectFileToMatch('dist/test-project/polyfills.es5.js', 'core-js');
   await expectFileToMatch('dist/test-project/index.html', oneLineTrim`
     <script src="runtime.js"></script>
-    <script src="es2015-polyfills.js" nomodule></script>
+    <script src="polyfills.es5.js" nomodule></script>
     <script src="polyfills.js"></script>
     <script src="styles.js"></script>
     <script src="vendor.js"></script>
diff --git a/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts b/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts
index bfd35c5453..b84d65e340 100644
--- a/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts
+++ b/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts
@@ -23,7 +23,7 @@ export default function() {
     .then(() => expectFileToMatch('dist/test-project/styles.css', '* Bootstrap'))
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script src="runtime.js"></script>
-      <script src="es2015-polyfills.js" nomodule></script>
+      <script src="polyfills.es5.js" nomodule></script>
       <script src="polyfills.js"></script>
       <script src="scripts.js"></script>
       <script src="vendor.js"></script>
@@ -40,7 +40,7 @@ export default function() {
     .then(() => expectFileToMatch('dist/test-project/styles.css', '* Bootstrap'))
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script src="runtime.js"></script>
-      <script src="es2015-polyfills.js" nomodule></script>
+      <script src="polyfills.es5.js" nomodule></script>
       <script src="polyfills.js"></script>
       <script src="scripts.js"></script>
       <script src="main.js"></script>