Skip to content

Commit 2039d62

Browse files
committed
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 070a133)
1 parent dd60228 commit 2039d62

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

packages/angular_devkit/build_angular/src/webpack/configs/browser.ts

-4
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,6 @@ export function getBrowserConfig(wco: WebpackConfigOptions): webpack.Configurati
8181
resolve: {
8282
mainFields: ['es2015', 'browser', 'module', 'main'],
8383
},
84-
target:
85-
wco.tsConfig.options.target === ScriptTarget.ES5 || buildBrowserFeatures.isEs5SupportNeeded()
86-
? ['web', 'es5']
87-
: 'web',
8884
output: {
8985
crossOriginLoading,
9086
trustedTypes: 'angular#bundler',

packages/angular_devkit/build_angular/src/webpack/configs/common.ts

+8-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ import {
4040
maxWorkers,
4141
persistentBuildCacheEnabled,
4242
profilingEnabled,
43-
shouldBeautify,
4443
} from '../../utils/environment-options';
4544
import { findAllNodeModules } from '../../utils/find-up';
4645
import { Spinner } from '../../utils/spinner';
@@ -395,12 +394,19 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
395394
return {
396395
mode: scriptsOptimization || stylesOptimization.minify ? 'production' : 'development',
397396
devtool: false,
397+
target: [
398+
platform === 'server' ? 'node' : 'web',
399+
tsConfig.options.target === ScriptTarget.ES5 ||
400+
(platform !== 'server' && buildBrowserFeatures.isEs5SupportNeeded())
401+
? 'es5'
402+
: 'es2015',
403+
],
398404
profile: buildOptions.statsJson,
399405
resolve: {
400406
roots: [projectRoot],
401407
extensions: ['.ts', '.tsx', '.mjs', '.js'],
402408
symlinks: !buildOptions.preserveSymlinks,
403-
modules: [wco.tsConfig.options.baseUrl || projectRoot, 'node_modules'],
409+
modules: [tsConfig.options.baseUrl || projectRoot, 'node_modules'],
404410
},
405411
resolveLoader: {
406412
symlinks: !buildOptions.preserveSymlinks,

packages/angular_devkit/build_angular/src/webpack/configs/server.ts

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ export function getServerConfig(wco: WebpackConfigOptions): Configuration {
3535
resolve: {
3636
mainFields: ['es2015', 'main', 'module'],
3737
},
38-
target: 'node',
3938
output: {
4039
libraryTarget: 'commonjs',
4140
},

0 commit comments

Comments
 (0)