Skip to content

fix(@angular-devkit/build-angular): never split polyfill chunks #14334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 7, 2019
Merged

fix(@angular-devkit/build-angular): never split polyfill chunks #14334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d5b905
fix(@angular-devkit/build-angular): never split polyfill chunks
filipesilva May 3, 2019
0efc724
fix(@angular-devkit/build-angular): load polyfills-es5 on test
filipesilva May 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import * as webpack from 'webpack';
import { IndexHtmlWebpackPlugin } from '../../plugins/index-html-webpack-plugin';
import { generateEntryPoints } from '../../utilities/package-chunk-sort';
import { WebpackConfigOptions } from '../build-options';
import { getSourceMapDevTool, normalizeExtraEntryPoints } from './utils';
import { getSourceMapDevTool, isPolyfillsEntry, normalizeExtraEntryPoints } from './utils';

const SubresourceIntegrityPlugin = require('webpack-subresource-integrity');

Expand Down Expand Up @@ -114,7 +114,7 @@ export function getBrowserConfig(wco: WebpackConfigOptions): webpack.Configurati
const moduleName = module.nameForCondition ? module.nameForCondition() : '';

return /[\\/]node_modules[\\/]/.test(moduleName)
&& !chunks.some(({ name }) => name === 'polyfills' || name === 'polyfills-es5'
&& !chunks.some(({ name }) => isPolyfillsEntry(name)
|| globalStylesBundleNames.includes(name));
},
},
Expand Down
6 changes: 3 additions & 3 deletions packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import * as glob from 'glob';
import * as path from 'path';
import * as webpack from 'webpack';
import { WebpackConfigOptions, WebpackTestOptions } from '../build-options';
import { getSourceMapDevTool } from './utils';
import { getSourceMapDevTool, isPolyfillsEntry } from './utils';


/**
Expand Down Expand Up @@ -85,7 +85,7 @@ export function getTestConfig(
plugins: extraPlugins,
optimization: {
splitChunks: {
chunks: ((chunk: { name: string }) => chunk.name !== 'polyfills'),
chunks: ((chunk: { name: string }) => !isPolyfillsEntry(chunk.name)),
cacheGroups: {
vendors: false,
vendor: {
Expand All @@ -95,7 +95,7 @@ export function getTestConfig(
const moduleName = module.nameForCondition ? module.nameForCondition() : '';

return /[\\/]node_modules[\\/]/.test(moduleName)
&& !chunks.some(({ name }) => name === 'polyfills');
&& !chunks.some(({ name }) => isPolyfillsEntry(name));
},
},
},
Expand Down
4 changes: 4 additions & 0 deletions packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,3 +101,7 @@ export function getEsVersionForFileName(
return scriptTargetOverride && esVersionInFileName ?
'-' + ts.ScriptTarget[scriptTargetOverride].toLowerCase() : '';
}

export function isPolyfillsEntry(name: string) {
return name === 'polyfills' || name === 'polyfills-es5';
}
1 change: 1 addition & 0 deletions packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-context.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
</script>
<script src="_karma_webpack_/runtime.js" crossorigin="anonymous"></script>
<script src="_karma_webpack_/polyfills.js" crossorigin="anonymous"></script>
<script src="_karma_webpack_/polyfills-es5.js" crossorigin="anonymous" nomodule></script>
<!-- Dynamically replaced with <script> tags -->
%SCRIPTS%
<script src="_karma_webpack_/styles.js" crossorigin="anonymous"></script>
Expand Down
1 change: 1 addition & 0 deletions packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-debug.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
</script>
<script src="_karma_webpack_/runtime.js" crossorigin="anonymous"></script>
<script src="_karma_webpack_/polyfills.js" crossorigin="anonymous"></script>
<script src="_karma_webpack_/polyfills-es5.js" crossorigin="anonymous" nomodule></script>
<!-- Dynamically replaced with <script> tags -->
%SCRIPTS%
<script src="_karma_webpack_/styles.js" crossorigin="anonymous"></script>
Expand Down
1 change: 1 addition & 0 deletions packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ const init: any = (config: any, emitter: any, customFileHandlers: any) => {
const alwaysServe = [
'/_karma_webpack_/runtime.js',
'/_karma_webpack_/polyfills.js',
'/_karma_webpack_/polyfills-es5.js',
'/_karma_webpack_/scripts.js',
'/_karma_webpack_/styles.js',
'/_karma_webpack_/vendor.js',
Expand Down