Skip to content
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

Jump to bottom

fix(@ngtools/webpack): remove Webpack 5 deprecation warning in resource loader #20295

Merged
merged 2 commits into from Mar 17, 2021
Merged

fix(@ngtools/webpack): remove Webpack 5 deprecation warning in resource loader #20295

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2b9f82
fix(@ngtools/webpack): remove Webpack 5 deprecation warning in resour…
clydin Mar 16, 2021
640ec98
fixup! fix(@ngtools/webpack): remove Webpack 5 deprecation warning in…
clydin Mar 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 20 additions & 6 deletions packages/ngtools/webpack/src/resource_loader.ts
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@ import * as vm from 'vm';
import { Compiler, compilation } from 'webpack';
import { RawSource } from 'webpack-sources';
import { normalizePath } from './ivy/paths';
import { isWebpackFiveOrHigher } from './webpack-version';

const NodeTemplatePlugin = require('webpack/lib/node/NodeTemplatePlugin');
const NodeTargetPlugin = require('webpack/lib/node/NodeTargetPlugin');
Expand Down Expand Up @@ -132,13 +133,26 @@ export class WebpackResourceLoader {

let finalContent: string | undefined;
let finalMap: string | undefined;
childCompiler.hooks.afterCompile.tap('angular-compiler', (childCompilation) => {
finalContent = childCompilation.assets[filePath]?.source().toString();
finalMap = childCompilation.assets[filePath + '.map']?.source().toString();
if (isWebpackFiveOrHigher()) {
childCompiler.hooks.compilation.tap('angular-compiler', (childCompilation) => {
// tslint:disable-next-line: no-any
(childCompilation.hooks as any).processAssets.tap('angular-compiler', () => {
finalContent = childCompilation.assets[filePath]?.source().toString();
finalMap = childCompilation.assets[filePath + '.map']?.source().toString();

delete childCompilation.assets[filePath];
delete childCompilation.assets[filePath + '.map'];
});
});
} else {
childCompiler.hooks.afterCompile.tap('angular-compiler', (childCompilation) => {
finalContent = childCompilation.assets[filePath]?.source().toString();
finalMap = childCompilation.assets[filePath + '.map']?.source().toString();

delete childCompilation.assets[filePath];
delete childCompilation.assets[filePath + '.map'];
});
delete childCompilation.assets[filePath];
delete childCompilation.assets[filePath + '.map'];
});
}

return new Promise<CompilationOutput>((resolve, reject) => {
childCompiler.runAsChild((error, _, childCompilation) => {
Expand Down