fix: unexpected failing on CSS syntax error (#593)

webpack-contrib · Jul 11, 2022 · 888d72e · 888d72e
1 parent 004334a
commit 888d72e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 15 deletions.
diff --git a/src/index.js b/src/index.js
@@ -4,7 +4,6 @@ import { satisfies } from "semver";
 import postcssPackage from "postcss/package.json";
 
 import Warning from "./Warning";
-import SyntaxError from "./Error";
 import schema from "./options.json";
 import {
   loadConfig,
@@ -14,6 +13,7 @@ import {
   normalizeSourceMapAfterPostcss,
   findPackageJSONDir,
   getPostcssImplementation,
+  reportError,
 } from "./utils";
 
 let hasExplicitDependencyOnPostCSS = false;
@@ -169,15 +169,7 @@ export default async function loader(content, sourceMap, meta) {
       }
     }
 
-    if (error.file) {
-      this.addDependency(error.file);
-    }
-
-    if (error.name === "CssSyntaxError") {
-      callback(new SyntaxError(error));
-    } else {
-      callback(error);
-    }
+    reportError(this, callback, error);
 
     return;
   }
@@ -223,11 +215,19 @@ export default async function loader(content, sourceMap, meta) {
     map = normalizeSourceMapAfterPostcss(map, this.context);
   }
 
-  const ast = {
-    type: "postcss",
-    version: result.processor.version,
-    root: result.root,
-  };
+  let ast;
+
+  try {
+    ast = {
+      type: "postcss",
+      version: result.processor.version,
+      root: result.root,
+    };
+  } catch (error) {
+    reportError(this, callback, error);
+
+    return;
+  }
 
   callback(null, result.css, map, { ast });
 }
diff --git a/src/utils.js b/src/utils.js
@@ -4,6 +4,8 @@ import Module from "module";
 import { klona } from "klona/full";
 import { cosmiconfig } from "cosmiconfig";
 
+import SyntaxError from "./Error";
+
 const parentModule = module;
 
 const stat = (inputFileSystem, filePath) =>
@@ -450,6 +452,18 @@ function getPostcssImplementation(loaderContext, implementation) {
   return resolvedImplementation;
 }
 
+function reportError(loaderContext, callback, error) {
+  if (error.file) {
+    loaderContext.addDependency(error.file);
+  }
+
+  if (error.name === "CssSyntaxError") {
+    callback(new SyntaxError(error));
+  } else {
+    callback(error);
+  }
+}
+
 export {
   loadConfig,
   getPostcssOptions,
@@ -458,4 +472,5 @@ export {
   normalizeSourceMapAfterPostcss,
   findPackageJSONDir,
   getPostcssImplementation,
+  reportError,
 };