Skip to content

Commit f10f910

Browse files
alan-agius4filipesilva
authored andcommitted
refactor(@angular-devkit/build-angular): remove esVersionInFileName build option
This option can be determined via `wco.differentialLoadingMode`
1 parent 33f5b60 commit f10f910

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

packages/angular_devkit/build_angular/src/utils/build-options.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ export interface BuildOptions {
7676
/** @deprecated use only for compatibility in 8.x; will be removed in 9.0 */
7777
rebaseRootRelativeCssUrls?: boolean;
7878

79-
/* Append script target version to filename. */
80-
esVersionInFileName?: boolean;
8179
experimentalRollupPass?: boolean;
8280
allowedCommonJsDependencies?: string[];
8381
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
7070

7171
const targetInFileName = getEsVersionForFileName(
7272
tsConfig.options.target,
73-
buildOptions.esVersionInFileName,
73+
wco.differentialLoadingMode,
7474
);
7575

7676
if (buildOptions.main) {
@@ -126,7 +126,6 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
126126
if (differentialLoadingMode || tsConfig.options.target === ScriptTarget.ES5) {
127127
const buildBrowserFeatures = new BuildBrowserFeatures(
128128
projectRoot,
129-
tsConfig.options.target || ScriptTarget.ES5,
130129
);
131130

132131
if (buildBrowserFeatures.isEs5SupportNeeded()) {

packages/angular_devkit/build_angular/src/webpack/utils/helpers.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,20 +101,20 @@ export function getSourceMapDevTool(
101101
* Returns an ES version file suffix to differentiate between various builds.
102102
*/
103103
export function getEsVersionForFileName(
104-
scriptTargetOverride: ScriptTarget | undefined,
104+
scriptTarget: ScriptTarget | undefined,
105105
esVersionInFileName = false,
106106
): string {
107-
if (!esVersionInFileName || scriptTargetOverride === undefined) {
107+
if (!esVersionInFileName || scriptTarget === undefined) {
108108
return '';
109109
}
110110

111-
if (scriptTargetOverride === ScriptTarget.ESNext) {
111+
if (scriptTarget === ScriptTarget.ESNext) {
112112
return '-esnext';
113113
}
114114

115-
return '-' + ScriptTarget[scriptTargetOverride].toLowerCase();
115+
return '-' + ScriptTarget[scriptTarget].toLowerCase();
116116
}
117117

118-
export function isPolyfillsEntry(name: string) {
118+
export function isPolyfillsEntry(name: string): boolean {
119119
return name === 'polyfills' || name === 'polyfills-es5';
120120
}

0 commit comments

Comments
 (0)