Skip to content

Commit 93472b1

Browse files
author
Zhicheng Wang
committed
fix(build): Don't specify the extract-css option as precondition for css sourcemaps
Instead, use `convertToAbsoluteUrls: true`. See <https://github.com/webpack-contrib/style-loader#converttoabsoluteurls>.
1 parent a24e644 commit 93472b1

File tree

1 file changed

+11
-9
lines changed
  • packages/@angular/cli/models/webpack-configs

1 file changed

+11
-9
lines changed

packages/@angular/cli/models/webpack-configs/styles.ts

+11-9
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
import * as webpack from 'webpack';
21
import * as path from 'path';
3-
import {
4-
SuppressExtractedTextChunksWebpackPlugin
5-
} from '../../plugins/suppress-entry-chunks-webpack-plugin';
6-
import { extraEntryParser, getOutputHashFormat } from './utils';
7-
import { WebpackConfigOptions } from '../webpack-config';
2+
import * as webpack from 'webpack';
3+
import { SuppressExtractedTextChunksWebpackPlugin } from '../../plugins/suppress-entry-chunks-webpack-plugin';
84
import { pluginArgs, postcssArgs } from '../../tasks/eject';
5+
import { WebpackConfigOptions } from '../webpack-config';
6+
import { extraEntryParser, getOutputHashFormat } from './utils';
97

108
const cssnano = require('cssnano');
119
const postcssUrl = require('postcss-url');
@@ -39,7 +37,7 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
3937
// style-loader does not support sourcemaps without absolute publicPath, so it's
4038
// better to disable them when not extracting css
4139
// https://github.com/webpack-contrib/style-loader#recommended-configuration
42-
const cssSourceMap = buildOptions.extractCss && buildOptions.sourcemaps;
40+
const cssSourceMap = buildOptions.sourcemaps;
4341

4442
// Minify/optimize css in production.
4543
const minimizeCss = buildOptions.target === 'production';
@@ -199,8 +197,12 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
199197
const ret: any = {
200198
include: globalStylePaths,
201199
test,
202-
        use: buildOptions.extractCss ? ExtractTextPlugin.extract(extractTextPlugin)
203-
: ['style-loader', ...extractTextPlugin.use]
200+
use: buildOptions.extractCss ? ExtractTextPlugin.extract(extractTextPlugin) : [{
201+
loader: 'style-loader',
202+
options: {
203+
convertToAbsoluteUrls: cssSourceMap,
204+
},
205+
}, ...extractTextPlugin.use],
204206
};
205207
// Save the original options as arguments for eject.
206208
if (buildOptions.extractCss) {

0 commit comments

Comments
 (0)