Skip to content

Commit 2f4602d

Browse files
clydinhansl
authored andcommitted
feat(@angular-devkit/build-angular): change es5BrowserSupport output filename to polyfills.es5.js
Closes #13808
1 parent b80a281 commit 2f4602d

File tree

9 files changed

+17
-17
lines changed

9 files changed

+17
-17
lines changed

packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export function getBrowserConfig(wco: WebpackConfigOptions) {
4444
entrypoints: generateEntryPoints(buildOptions),
4545
deployUrl: buildOptions.deployUrl,
4646
sri: buildOptions.subresourceIntegrity,
47-
noModuleEntrypoints: ['es2015-polyfills'],
47+
noModuleEntrypoints: ['polyfills.es5'],
4848
}));
4949
}
5050

@@ -113,7 +113,7 @@ export function getBrowserConfig(wco: WebpackConfigOptions) {
113113
const moduleName = module.nameForCondition ? module.nameForCondition() : '';
114114

115115
return /[\\/]node_modules[\\/]/.test(moduleName)
116-
&& !chunks.some(({ name }) => name === 'polyfills' || name === 'es2015-polyfills'
116+
&& !chunks.some(({ name }) => name === 'polyfills' || name === 'polyfills.es5'
117117
|| globalStylesBundleNames.includes(name));
118118
},
119119
},

packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
5454
}
5555

5656
if (buildOptions.es5BrowserSupport) {
57-
entryPoints['es2015-polyfills'] = [path.join(__dirname, '..', 'es2015-polyfills.js')];
57+
entryPoints['polyfills.es5'] = [path.join(__dirname, '..', 'es2015-polyfills.js')];
5858
}
5959

6060
if (buildOptions.polyfills) {
@@ -68,8 +68,8 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
6868
];
6969

7070
if (buildOptions.es5BrowserSupport) {
71-
entryPoints['es2015-polyfills'] = [
72-
...entryPoints['es2015-polyfills'],
71+
entryPoints['polyfills.es5'] = [
72+
...entryPoints['polyfills.es5'],
7373
path.join(__dirname, '..', 'es2015-jit-polyfills.js'),
7474
];
7575
}

packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export function generateEntryPoints(
2626
};
2727

2828
const entryPoints = [
29-
'es2015-polyfills',
29+
'polyfills.es5',
3030
'polyfills',
3131
'sw-register',
3232
...extraEntryPoints(appConfig.styles, 'styles'),

tests/legacy-cli/e2e/tests/basic/scripts-array.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export default function () {
5454
// index.html lists the right bundles
5555
.then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
5656
<script src="runtime.js"></script>
57-
<script src="es2015-polyfills.js" nomodule></script>
57+
<script src="polyfills.es5.js" nomodule></script>
5858
<script src="polyfills.js"></script>
5959
<script src="scripts.js"></script>
6060
<script src="renamed-script.js"></script>

tests/legacy-cli/e2e/tests/basic/styles-array.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export default function () {
4343
`))
4444
.then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
4545
<script src="runtime.js"></script>
46-
<script src="es2015-polyfills.js" nomodule></script>
46+
<script src="polyfills.es5.js" nomodule></script>
4747
<script src="polyfills.js"></script>
4848
<script src="vendor.js"></script>
4949
<script src="main.js"></script>

tests/legacy-cli/e2e/tests/build/polyfills.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export default async function () {
1515
await expectFileToMatch('dist/test-project/polyfills.js', 'zone.js');
1616
expectFileToMatch('dist/test-project/index.html', oneLineTrim`
1717
<script src="runtime.js"></script>
18-
<script src="es2015-polyfills.js" nomodule></script>
18+
<script src="polyfills.es5.js" nomodule></script>
1919
<script src="polyfills.js"></script>
2020
`);
2121
const jitPolyfillSize = await getFileSize('dist/test-project/polyfills.js');
@@ -28,7 +28,7 @@ export default async function () {
2828
await expectFileToMatch('dist/test-project/polyfills.js', 'zone.js');
2929
expectFileToMatch('dist/test-project/index.html', oneLineTrim`
3030
<script src="runtime.js"></script>
31-
<script src="es2015-polyfills.js" nomodule></script>
31+
<script src="polyfills.es5.js" nomodule></script>
3232
<script src="polyfills.js"></script>
3333
`);
3434
}

tests/legacy-cli/e2e/tests/build/styles/extract-css.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export default function () {
4848
`)))
4949
.then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
5050
<script src="runtime.js"></script>
51-
<script src="es2015-polyfills.js" nomodule></script>
51+
<script src="polyfills.es5.js" nomodule></script>
5252
<script src="polyfills.js"></script>
5353
<script src="vendor.js"></script>
5454
<script src="main.js"></script>
@@ -64,7 +64,7 @@ export default function () {
6464
// index.html lists the right bundles
6565
.then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
6666
<script src="runtime.js"></script>
67-
<script src="es2015-polyfills.js" nomodule></script>
67+
<script src="polyfills.es5.js" nomodule></script>
6868
<script src="polyfills.js"></script>
6969
<script src="styles.js"></script>
7070
<script src="renamed-style.js"></script>

tests/legacy-cli/e2e/tests/misc/support-ie.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export default async function () {
1010
});
1111

1212
await ng('build');
13-
await expectFileNotToExist('dist/test-project/es2015-polyfills.js');
13+
await expectFileNotToExist('dist/test-project/polyfills.es5.js');
1414
await expectFileToMatch('dist/test-project/index.html', oneLineTrim`
1515
<script src="runtime.js"></script>
1616
<script src="polyfills.js"></script>
@@ -20,10 +20,10 @@ export default async function () {
2020
`);
2121

2222
await ng('build', `--es5BrowserSupport`);
23-
await expectFileToMatch('dist/test-project/es2015-polyfills.js', 'core-js');
23+
await expectFileToMatch('dist/test-project/polyfills.es5.js', 'core-js');
2424
await expectFileToMatch('dist/test-project/index.html', oneLineTrim`
2525
<script src="runtime.js"></script>
26-
<script src="es2015-polyfills.js" nomodule></script>
26+
<script src="polyfills.es5.js" nomodule></script>
2727
<script src="polyfills.js"></script>
2828
<script src="styles.js"></script>
2929
<script src="vendor.js"></script>

tests/legacy-cli/e2e/tests/third-party/bootstrap.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export default function() {
2323
.then(() => expectFileToMatch('dist/test-project/styles.css', '* Bootstrap'))
2424
.then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
2525
<script src="runtime.js"></script>
26-
<script src="es2015-polyfills.js" nomodule></script>
26+
<script src="polyfills.es5.js" nomodule></script>
2727
<script src="polyfills.js"></script>
2828
<script src="scripts.js"></script>
2929
<script src="vendor.js"></script>
@@ -40,7 +40,7 @@ export default function() {
4040
.then(() => expectFileToMatch('dist/test-project/styles.css', '* Bootstrap'))
4141
.then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
4242
<script src="runtime.js"></script>
43-
<script src="es2015-polyfills.js" nomodule></script>
43+
<script src="polyfills.es5.js" nomodule></script>
4444
<script src="polyfills.js"></script>
4545
<script src="scripts.js"></script>
4646
<script src="main.js"></script>

0 commit comments

Comments
 (0)