Skip to content
This repository was archived by the owner on Apr 1, 2022. It is now read-only.

Commit e5f4754

Browse files
committed
Backport source map fix to v3
The fix was in this PR: NMFR#61 Fixes NMFR#53 For those of us stuck on Webpack 3
1 parent 52c0699 commit e5f4754

File tree

1 file changed

+17
-14
lines changed

1 file changed

+17
-14
lines changed

Diff for: index.js

+17-14
Original file line numberDiff line numberDiff line change
@@ -35,32 +35,35 @@ function OptimizeCssAssetsPlugin(options) {
3535
};
3636

3737
OptimizeCssAssetsPlugin.prototype.processCss = function(assetName, asset, assets) {
38-
var css = asset.source();
38+
var css = asset.sourceAndMap ? asset.sourceAndMap() : { source: asset.source() };
3939
var processOptions = Object.assign(
4040
{ from: assetName, to: assetName },
41-
this.options.cssProcessorOptions || {}
41+
this.options.cssProcessorOptions
4242
);
4343
if (processOptions.map && !processOptions.map.prev) {
4444
try {
45-
var mapJson = assets.getAsset(assetName + '.map');
46-
if (mapJson) {
47-
var map = JSON.parse(mapJson);
48-
if (
49-
map &&
50-
(
51-
(map.sources && map.sources.length > 0) ||
52-
(map.mappings && map.mappings.length > 0)
53-
)
54-
) {
55-
processOptions.map = Object.assign({ prev: mapJson }, processOptions.map);
45+
let map = css.map;
46+
if (!map) {
47+
const mapJson = assets.getAsset(assetName + '.map');
48+
if (mapJson) {
49+
map = JSON.parse(mapJson);
5650
}
5751
}
52+
if (
53+
map &&
54+
(
55+
(map.sources && map.sources.length > 0) ||
56+
(map.mappings && map.mappings.length > 0)
57+
)
58+
) {
59+
processOptions.map = Object.assign({ prev: map }, processOptions.map);
60+
}
5861
} catch (err) {
5962
console.warn('OptimizeCssAssetsPlugin.processCss() Error getting previous source map', err);
6063
}
6164
}
6265
return this.options
63-
.cssProcessor.process(css, processOptions)
66+
.cssProcessor.process(css.source, processOptions)
6467
.then(r => {
6568
if (processOptions.map && r.map && r.map.toString) {
6669
assets.setAsset(assetName + '.map', r.map.toString());

0 commit comments

Comments
 (0)