fix: respect content option for minification

plumelo · May 31, 2020 · 59b3c07 · 59b3c07
1 parent a6ad67d
commit 59b3c07
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 40 deletions.
diff --git a/package.json b/package.json
@@ -110,7 +110,7 @@
     "node-sass": "^4.14.1",
     "postcss-custom-properties": "^9.1.1",
     "prettier": "^2.0.5",
-    "rollup": "^2.11.2",
+    "rollup": "^2.12.0",
     "rollup-plugin-dts": "^1.4.7",
     "rollup-plugin-lit-css": "^2.0.3",
     "rollup-plugin-node-externals": "^2.2.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/index.ts b/src/index.ts
@@ -262,10 +262,10 @@ export default (options: Options = {}): Plugin => {
 
           cssNanoOpts.from = res.name;
           cssNanoOpts.to = res.name;
-          cssNanoOpts.map = {
+          cssNanoOpts.map = sourceMap && {
             inline: false,
             annotation: false,
-            sourcesContent: true,
+            sourcesContent: sourceMap.content,
             prev: res.map,
           };
 

diff --git a/src/loaders/postcss/index.ts b/src/loaders/postcss/index.ts
@@ -80,7 +80,7 @@ const loader: Loader<PostCSSLoaderOptions> = {
       map: {
         inline: false,
         annotation: false,
-        sourcesContent: true,
+        sourcesContent: this.sourceMap ? this.sourceMap.content : true,
         prev: mm(map).relative(path.dirname(this.id)).toObject(),
       },
     };
@@ -128,9 +128,6 @@ const loader: Loader<PostCSSLoaderOptions> = {
     for (const asset of assets) this.assets.set(asset.to, asset.source);
 
     map = mm((res.map?.toJSON() as unknown) as RawSourceMap)
-      .modify(m => {
-        if (this.sourceMap && !this.sourceMap.content) delete m.sourcesContent;
-      })
       .resolve(path.dirname(postcssOpts.to))
       .toString();