From 2039d6201fa91136a0815f0622787dcccedf0e65 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 30 Jun 2021 18:52:03 +0200
Subject: [PATCH] fix(@angular-devkit/build-angular): configure webpack target
 in common configuration

Previously, `target` was unset for `test` which caused the target to be set incorrectly.

Closes #21239

(cherry picked from commit 070a1336478d721bbbb474622f50fab455cda26c)
---
 .../build_angular/src/webpack/configs/browser.ts       |  4 ----
 .../build_angular/src/webpack/configs/common.ts        | 10 ++++++++--
 .../build_angular/src/webpack/configs/server.ts        |  1 -
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/webpack/configs/browser.ts b/packages/angular_devkit/build_angular/src/webpack/configs/browser.ts
index 97139d3c8cff..051bb46951f8 100644
--- a/packages/angular_devkit/build_angular/src/webpack/configs/browser.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/configs/browser.ts
@@ -81,10 +81,6 @@ export function getBrowserConfig(wco: WebpackConfigOptions): webpack.Configurati
     resolve: {
       mainFields: ['es2015', 'browser', 'module', 'main'],
     },
-    target:
-      wco.tsConfig.options.target === ScriptTarget.ES5 || buildBrowserFeatures.isEs5SupportNeeded()
-        ? ['web', 'es5']
-        : 'web',
     output: {
       crossOriginLoading,
       trustedTypes: 'angular#bundler',
diff --git a/packages/angular_devkit/build_angular/src/webpack/configs/common.ts b/packages/angular_devkit/build_angular/src/webpack/configs/common.ts
index aacdec7a50f9..bc1f0fd4d234 100644
--- a/packages/angular_devkit/build_angular/src/webpack/configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/configs/common.ts
@@ -40,7 +40,6 @@ import {
   maxWorkers,
   persistentBuildCacheEnabled,
   profilingEnabled,
-  shouldBeautify,
 } from '../../utils/environment-options';
 import { findAllNodeModules } from '../../utils/find-up';
 import { Spinner } from '../../utils/spinner';
@@ -395,12 +394,19 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
   return {
     mode: scriptsOptimization || stylesOptimization.minify ? 'production' : 'development',
     devtool: false,
+    target: [
+      platform === 'server' ? 'node' : 'web',
+      tsConfig.options.target === ScriptTarget.ES5 ||
+      (platform !== 'server' && buildBrowserFeatures.isEs5SupportNeeded())
+        ? 'es5'
+        : 'es2015',
+    ],
     profile: buildOptions.statsJson,
     resolve: {
       roots: [projectRoot],
       extensions: ['.ts', '.tsx', '.mjs', '.js'],
       symlinks: !buildOptions.preserveSymlinks,
-      modules: [wco.tsConfig.options.baseUrl || projectRoot, 'node_modules'],
+      modules: [tsConfig.options.baseUrl || projectRoot, 'node_modules'],
     },
     resolveLoader: {
       symlinks: !buildOptions.preserveSymlinks,
diff --git a/packages/angular_devkit/build_angular/src/webpack/configs/server.ts b/packages/angular_devkit/build_angular/src/webpack/configs/server.ts
index 9e28d25131da..82241e555831 100644
--- a/packages/angular_devkit/build_angular/src/webpack/configs/server.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/configs/server.ts
@@ -35,7 +35,6 @@ export function getServerConfig(wco: WebpackConfigOptions): Configuration {
     resolve: {
       mainFields: ['es2015', 'main', 'module'],
     },
-    target: 'node',
     output: {
       libraryTarget: 'commonjs',
     },