Skip to content

fix(@angular-devkit/build-angular): add back raw-loader for html #15248

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

Closed
wants to merge 1 commit into from
Closed

fix(@angular-devkit/build-angular): add back raw-loader for html #15248

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
151 changes: 80 additions & 71 deletions packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,9 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
tsConfig.options.target || ScriptTarget.ES5,
);
if ((buildOptions.scriptTargetOverride || tsConfig.options.target) === ScriptTarget.ES5) {
if (buildOptions.es5BrowserSupport ||
(
buildOptions.es5BrowserSupport === undefined &&
buildBrowserFeatures.isEs5SupportNeeded()
)
if (
buildOptions.es5BrowserSupport ||
(buildOptions.es5BrowserSupport === undefined && buildBrowserFeatures.isEs5SupportNeeded())
) {
// The nomodule polyfill needs to be inject prior to any script and be
// outside of webpack compilation because otherwise webpack will cause the
Expand All @@ -91,7 +89,7 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
: [noModuleScript];
}

// For differential loading we don't need to generate a seperate polyfill file
// For differential loading we don't need to generate a seperate polyfill file
// because they will be loaded exclusivly based on module and nomodule
const polyfillsChunkName = buildBrowserFeatures.isDifferentialLoadingNeeded()
? 'polyfills'
Expand Down Expand Up @@ -120,60 +118,64 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
}

if (buildOptions.profile || process.env['NG_BUILD_PROFILING']) {
extraPlugins.push(new debug.ProfilingPlugin({
outputPath: path.resolve(root, `chrome-profiler-events${targetInFileName}.json`),
}));
extraPlugins.push(
new debug.ProfilingPlugin({
outputPath: path.resolve(root, `chrome-profiler-events${targetInFileName}.json`),
}),
);
}

// determine hashing format
const hashFormat = getOutputHashFormat(buildOptions.outputHashing || 'none');

// process global scripts
if (buildOptions.scripts.length > 0) {
const globalScriptsByBundleName = normalizeExtraEntryPoints(buildOptions.scripts, 'scripts')
.reduce((prev: { bundleName: string, paths: string[], lazy: boolean }[], curr) => {
const bundleName = curr.bundleName;
const resolvedPath = path.resolve(root, curr.input);
const existingEntry = prev.find((el) => el.bundleName === bundleName);
if (existingEntry) {
if (existingEntry.lazy && !curr.lazy) {
// All entries have to be lazy for the bundle to be lazy.
throw new Error(`The ${curr.bundleName} bundle is mixing lazy and non-lazy scripts.`);
}

existingEntry.paths.push(resolvedPath);
} else {
prev.push({
bundleName,
paths: [resolvedPath],
lazy: curr.lazy || false,
});
const globalScriptsByBundleName = normalizeExtraEntryPoints(
buildOptions.scripts,
'scripts',
).reduce((prev: { bundleName: string; paths: string[]; lazy: boolean }[], curr) => {
const bundleName = curr.bundleName;
const resolvedPath = path.resolve(root, curr.input);
const existingEntry = prev.find(el => el.bundleName === bundleName);
if (existingEntry) {
if (existingEntry.lazy && !curr.lazy) {
// All entries have to be lazy for the bundle to be lazy.
throw new Error(`The ${curr.bundleName} bundle is mixing lazy and non-lazy scripts.`);
}

return prev;
}, []);
existingEntry.paths.push(resolvedPath);
} else {
prev.push({
bundleName,
paths: [resolvedPath],
lazy: curr.lazy || false,
});
}

return prev;
}, []);

// Add a new asset for each entry.
globalScriptsByBundleName.forEach((script) => {
globalScriptsByBundleName.forEach(script => {
// Lazy scripts don't get a hash, otherwise they can't be loaded by name.
const hash = script.lazy ? '' : hashFormat.script;
const bundleName = script.bundleName;

extraPlugins.push(new ScriptsWebpackPlugin({
name: bundleName,
sourceMap: scriptsSourceMap,
filename: `${path.basename(bundleName)}${hash}.js`,
scripts: script.paths,
basePath: projectRoot,
}));
extraPlugins.push(
new ScriptsWebpackPlugin({
name: bundleName,
sourceMap: scriptsSourceMap,
filename: `${path.basename(bundleName)}${hash}.js`,
scripts: script.paths,
basePath: projectRoot,
}),
);
});
}

// process asset entries
if (buildOptions.assets) {
const copyWebpackPluginPatterns = buildOptions.assets.map((asset: AssetPatternClass) => {

// Resolve input paths relative to workspace root and add slash at the end.
asset.input = path.resolve(root, asset.input).replace(/\\/g, '/');
asset.input = asset.input.endsWith('/') ? asset.input : asset.input + '/';
Expand All @@ -198,8 +200,10 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {

const copyWebpackPluginOptions = { ignore: ['.gitkeep', '**/.DS_Store', '**/Thumbs.db'] };

const copyWebpackPluginInstance = new CopyWebpackPlugin(copyWebpackPluginPatterns,
copyWebpackPluginOptions);
const copyWebpackPluginInstance = new CopyWebpackPlugin(
copyWebpackPluginPatterns,
copyWebpackPluginOptions,
);
extraPlugins.push(copyWebpackPluginInstance);
}

Expand All @@ -208,20 +212,24 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
}

if (buildOptions.showCircularDependencies) {
extraPlugins.push(new CircularDependencyPlugin({
exclude: /([\\\/]node_modules[\\\/])|(ngfactory\.js$)/,
}));
extraPlugins.push(
new CircularDependencyPlugin({
exclude: /([\\\/]node_modules[\\\/])|(ngfactory\.js$)/,
}),
);
}

if (buildOptions.statsJson) {
extraPlugins.push(new class {
apply(compiler: Compiler) {
compiler.hooks.emit.tap('angular-cli-stats', compilation => {
const data = JSON.stringify(compilation.getStats().toJson('verbose'));
compilation.assets[`stats${targetInFileName}.json`] = new RawSource(data);
});
}
});
extraPlugins.push(
new (class {
apply(compiler: Compiler) {
compiler.hooks.emit.tap('angular-cli-stats', compilation => {
const data = JSON.stringify(compilation.getStats().toJson('verbose'));
compilation.assets[`stats${targetInFileName}.json`] = new RawSource(data);
});
}
})(),
);
}

if (buildOptions.namedChunks) {
Expand Down Expand Up @@ -266,15 +274,15 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
: 'rxjs/_esm5/path-mapping';
const rxPaths = require(require.resolve(rxjsPathMappingImport, { paths: [projectRoot] }));
alias = rxPaths(nodeModules);
} catch { }
} catch {}

const extraMinimizers = [];
if (stylesOptimization) {
extraMinimizers.push(
new CleanCssWebpackPlugin({
sourceMap: stylesSourceMap,
// component styles retain their original file name
test: (file) => /\.(?:css|scss|sass|less|styl)$/.test(file),
test: file => /\.(?:css|scss|sass|less|styl)$/.test(file),
}),
);
}
Expand Down Expand Up @@ -307,15 +315,18 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
},
// On server, we don't want to compress anything. We still set the ngDevMode = false for it
// to remove dev code, and ngI18nClosureMode to remove Closure compiler i18n code
compress: (buildOptions.platform == 'server' ? {
global_defs: angularGlobalDefinitions,
} : {
pure_getters: buildOptions.buildOptimizer,
// PURE comments work best with 3 passes.
// See https://github.com/webpack/webpack/issues/2899#issuecomment-317425926.
passes: buildOptions.buildOptimizer ? 3 : 1,
global_defs: angularGlobalDefinitions,
}),
compress:
buildOptions.platform == 'server'
? {
global_defs: angularGlobalDefinitions,
}
: {
pure_getters: buildOptions.buildOptimizer,
// PURE comments work best with 3 passes.
// See https://github.com/webpack/webpack/issues/2899#issuecomment-317425926.
passes: buildOptions.buildOptimizer ? 3 : 1,
global_defs: angularGlobalDefinitions,
},
// We also want to avoid mangling on server.
...(buildOptions.platform == 'server' ? { mangle: false } : {}),
};
Expand All @@ -330,8 +341,10 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
);
}

if (wco.tsConfig.options.target !== undefined &&
wco.tsConfig.options.target >= ScriptTarget.ES2017) {
if (
wco.tsConfig.options.target !== undefined &&
wco.tsConfig.options.target >= ScriptTarget.ES2017
) {
wco.logger.warn(tags.stripIndent`
WARNING: Zone.js does not support native async/await in ES2017.
These blocks are not intercepted by zone.js and will not triggering change detection.
Expand All @@ -340,18 +353,13 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
}

return {
mode: scriptsOptimization || stylesOptimization
? 'production'
: 'development',
mode: scriptsOptimization || stylesOptimization ? 'production' : 'development',
devtool: false,
profile: buildOptions.statsJson,
resolve: {
extensions: ['.ts', '.tsx', '.mjs', '.js'],
symlinks: !buildOptions.preserveSymlinks,
modules: [
wco.tsConfig.options.baseUrl || projectRoot,
'node_modules',
],
modules: [wco.tsConfig.options.baseUrl || projectRoot, 'node_modules'],
alias,
},
resolveLoader: {
Expand All @@ -377,6 +385,7 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
// Show an error for missing exports instead of a warning.
strictExportPresence: true,
rules: [
{ test: /\.html$/, loader: 'raw-loader' },
{
test: /\.(eot|svg|cur|jpg|png|webp|gif|otf|ttf|woff|woff2|ani)$/,
loader: 'file-loader',
Expand Down