Skip to content

feat(@angular-devkit/build-angular): use evergreen version of zone.js with ES2015 #14273

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
alexeagle merged 1 commit into from
Apr 25, 2019
Merged

feat(@angular-devkit/build-angular): use evergreen version of zone.js with ES2015 #14273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,17 @@ export async function generateWebpackConfig(
wco.buildOptions.progress = defaultProgress(wco.buildOptions.progress);

const partials = webpackPartialGenerator(wco);
const webpackConfig = webpackMerge(partials);
const webpackConfig = webpackMerge(partials) as webpack.Configuration;

if (supportES2015) {
if (!webpackConfig.resolve) {
webpackConfig.resolve = {};
}
if (!webpackConfig.resolve.alias) {
webpackConfig.resolve.alias = {};
}
webpackConfig.resolve.alias['zone.js/dist/zone'] = 'zone.js/dist/zone-evergreen';
}

if (options.profile || process.env['NG_BUILD_PROFILING']) {
const esVersionInFileName = getEsVersionForFileName(
Expand Down
9 changes: 9 additions & 0 deletions packages/angular_devkit/build_angular/test/browser/differential_loading_spec_large.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,4 +98,13 @@ describe('Browser Builder with differential loading', () => {
expect(await files['main-es5.js']).not.toContain('class');
expect(await files['main-es2015.js']).toContain('class');
});

it('uses the right zone.js variant', async () => {
const { files } = await browserBuild(architect, host, target, { optimization: false });
expect(await files['polyfills-es5.js']).toContain('zone.js/dist/zone');
expect(await files['polyfills-es5.js']).not.toContain('zone.js/dist/zone-evergreen');
expect(await files['polyfills-es5.js']).toContain('registerElementPatch');
expect(await files['polyfills-es2015.js']).toContain('zone.js/dist/zone-evergreen');
expect(await files['polyfills-es2015.js']).not.toContain('registerElementPatch');
});
});