Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-21 05:52:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(@angular-devkit/build-angular): recover from CSS optimization errors

Browse Source
This commit is contained in:
Alan Agius 2021-04-20 15:14:28 +02:00 committed by Filipe Silva
parent bc0f3293c0
commit 7d56d480c1
1 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
packages/angular_devkit/build_angular/src/webpack/plugins/optimize-css-webpack-plugin.ts
View File

@ -8,7 +8,7 @@
import * as cssNano from 'cssnano';
import { ProcessOptions, Result } from 'postcss';
import { Compilation, Compiler, sources } from 'webpack';
import { addWarning } from '../../utils/webpack-diagnostics';
import { addError, addWarning } from '../../utils/webpack-diagnostics';
export interface OptimizeCssWebpackPluginOptions {
sourceMap: boolean;
@ -86,33 +86,39 @@ export class OptimizeCssWebpackPlugin {
map: map && { annotation: false, prev: map },
};
const output = await new Promise<Result>((resolve, reject) => {
// @types/cssnano are not up to date with version 5.
// tslint:disable-next-line: no-any
(cssNano as any)(cssNanoOptions).process(content, postCssOptions)
.then(resolve)
.catch((err: Error) => reject(new Error(`${file} ${err.message}`)));
});
for (const { text } of output.warnings()) {
addWarning(compilation, text);
}
let newSource;
if (output.map) {
newSource = new sources.SourceMapSource(
output.css,
file,
try {
const output = await new Promise<Result>((resolve, reject) => {
// @types/cssnano are not up to date with version 5.
// tslint:disable-next-line: no-any
output.map.toString() as any,
content,
map,
);
} else {
newSource = new sources.RawSource(output.css);
}
(cssNano as any)(cssNanoOptions).process(content, postCssOptions)
.then(resolve)
.catch((err: Error) => reject(err));
});
compilation.assets[file] = newSource;
for (const { text } of output.warnings()) {
addWarning(compilation, text);
}
let newSource;
if (output.map) {
newSource = new sources.SourceMapSource(
output.css,
file,
output.map.toString(),
content,
map,
);
} else {
newSource = new sources.RawSource(output.css);
}
compilation.assets[file] = newSource;
} catch (error) {
addError(compilation, error.message);
return;
}
});
return Promise.all(actions).then(() => {});