From 22409f01cfd6f6d1b6a9c2960282e63c1ec61273 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Mon, 1 Jul 2019 11:21:41 +0200 Subject: [PATCH] fix(@angular-devkit/build-angular): IE11 errors when using scripts and differential loading Invert the builds so that es2015 scripts output don't override the es5 version. Fixes #14777 --- packages/angular_devkit/build_angular/src/browser/index.ts | 4 ++-- .../build_angular/src/utils/webpack-browser-config.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts index 27a42bdbaeb9..6397ee7174a7 100644 --- a/packages/angular_devkit/build_angular/src/browser/index.ts +++ b/packages/angular_devkit/build_angular/src/browser/index.ts @@ -236,8 +236,8 @@ export function buildWebpackBrowser( const [firstBuild, secondBuild] = buildEvents; if (buildEvents.length === 2) { - noModuleFiles = firstBuild.emittedFiles; - moduleFiles = secondBuild.emittedFiles || []; + moduleFiles = firstBuild.emittedFiles || []; + noModuleFiles = secondBuild.emittedFiles; files = moduleFiles.filter(x => x.extension === '.css'); } else if (options.watch && isDifferentialLoadingNeeded) { // differential loading is not enabled in watch mode diff --git a/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts b/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts index 44e09b02f977..727934a9beee 100644 --- a/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts +++ b/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts @@ -62,7 +62,7 @@ export async function generateWebpackConfig( const scriptTargets = [scriptTarget]; if (differentialLoading) { - scriptTargets.unshift(ts.ScriptTarget.ES5); + scriptTargets.push(ts.ScriptTarget.ES5); } // For differential loading, we can have several targets