css-loader 7.1.1 → 7.1.2

package/dist/index.js

@@ -148,20 +148,7 @@ async function loader(content, map, meta) {
       });
     }
   }
-  let isTemplateLiteralSupported = false;
-  if (
-  // eslint-disable-next-line no-underscore-dangle
-  this._compilation &&
-  // eslint-disable-next-line no-underscore-dangle
-  this._compilation.options &&
-  // eslint-disable-next-line no-underscore-dangle
-  this._compilation.options.output &&
-  // eslint-disable-next-line no-underscore-dangle
-  this._compilation.options.output.environment &&
-  // eslint-disable-next-line no-underscore-dangle
-  this._compilation.options.output.environment.templateLiteral) {
-    isTemplateLiteralSupported = true;
-  }
+  const isTemplateLiteralSupported = (0, _utils.supportTemplateLiteral)(this);
   const importCode = (0, _utils.getImportCode)(imports, options);
   let moduleCode;
   try {

package/dist/plugins/postcss-import-parser.js

@@ -7,25 +7,32 @@ exports.default = void 0;
 var _postcssValueParser = _interopRequireDefault(require("postcss-value-parser"));
 var _utils = require("../utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function parseNode(atRule, key, options) {
-  // Convert only top-level @import
-  if (atRule.parent.type !== "root") {
-    return;
-  }
+function isIgnoredAfterName(atRule) {
   if (atRule.raws && atRule.raws.afterName && atRule.raws.afterName.trim().length > 0) {
     const lastCommentIndex = atRule.raws.afterName.lastIndexOf("/*");
     const matched = atRule.raws.afterName.slice(lastCommentIndex).match(_utils.WEBPACK_IGNORE_COMMENT_REGEXP);
     if (matched && matched[2] === "true") {
-      return;
+      return true;
     }
   }
+  return false;
+}
+function isIgnoredPrevNode(atRule) {
   const prevNode = atRule.prev();
   if (prevNode && prevNode.type === "comment") {
     const matched = prevNode.text.match(_utils.WEBPACK_IGNORE_COMMENT_REGEXP);
     if (matched && matched[2] === "true") {
-      return;
+      return true;
     }
   }
+  return false;
+}
+function parseNode(atRule, key, options) {
+  // Convert only top-level @import
+  if (atRule.parent.type !== "root") {
+    return;
+  }
+  const isIgnored = isIgnoredAfterName(atRule) || isIgnoredPrevNode(atRule);
 
   // Nodes do not exists - `@import url('http://') :root {}`
   if (atRule.nodes) {
@@ -61,10 +68,14 @@ function parseNode(atRule, key, options) {
     url = isStringValue ? paramsNodes[0].nodes[0].value : _postcssValueParser.default.stringify(paramsNodes[0].nodes);
   }
   url = (0, _utils.normalizeUrl)(url, isStringValue);
-  const {
-    requestable,
-    needResolve
-  } = (0, _utils.isURLRequestable)(url, options);
+  let requestable = false;
+  let needResolve = false;
+  if (!isIgnored) {
+    ({
+      requestable,
+      needResolve
+    } = (0, _utils.isURLRequestable)(url, options));
+  }
   let prefix;
   if (requestable && needResolve) {
     const queryParts = url.split("!");

package/dist/utils.js

@@ -27,6 +27,7 @@ exports.shouldUseModulesPlugins = shouldUseModulesPlugins;
 exports.shouldUseURLPlugin = shouldUseURLPlugin;
 exports.sort = sort;
 exports.stringifyRequest = stringifyRequest;
+exports.supportTemplateLiteral = supportTemplateLiteral;
 exports.syntaxErrorFactory = syntaxErrorFactory;
 exports.warningFactory = warningFactory;
 var _url = require("url");
@@ -1033,4 +1034,25 @@ function syntaxErrorFactory(error) {
   });
   obj.stack = null;
   return obj;
+}
+function supportTemplateLiteral(loaderContext) {
+  if (loaderContext.environment && loaderContext.environment.templateLiteral) {
+    return true;
+  }
+
+  // TODO remove in the next major release
+  if (
+  // eslint-disable-next-line no-underscore-dangle
+  loaderContext._compilation &&
+  // eslint-disable-next-line no-underscore-dangle
+  loaderContext._compilation.options &&
+  // eslint-disable-next-line no-underscore-dangle
+  loaderContext._compilation.options.output &&
+  // eslint-disable-next-line no-underscore-dangle
+  loaderContext._compilation.options.output.environment &&
+  // eslint-disable-next-line no-underscore-dangle
+  loaderContext._compilation.options.output.environment.templateLiteral) {
+    return true;
+  }
+  return false;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "css-loader",
-  "version": "7.1.1",
+  "version": "7.1.2",
   "description": "css loader module for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/css-loader",
@@ -65,15 +65,15 @@
     "semver": "^7.5.4"
   },
   "devDependencies": {
-    "@babel/cli": "^7.23.4",
-    "@babel/core": "^7.23.7",
-    "@babel/preset-env": "^7.23.7",
-    "@commitlint/cli": "^19.2.1",
-    "@commitlint/config-conventional": "^19.1.0",
+    "@babel/cli": "^7.24.5",
+    "@babel/core": "^7.24.5",
+    "@babel/preset-env": "^7.24.5",
+    "@commitlint/cli": "^19.3.0",
+    "@commitlint/config-conventional": "^19.2.2",
     "@webpack-contrib/eslint-config-webpack": "^3.0.0",
     "babel-jest": "^29.7.0",
     "cross-env": "^7.0.3",
-    "cspell": "^8.6.1",
+    "cspell": "^8.7.0",
     "del-cli": "^5.1.0",
     "es-check": "^7.1.0",
     "eslint": "^8.54.0",
@@ -86,14 +86,14 @@
     "less": "^4.2.0",
     "less-loader": "^12.2.0",
     "lint-staged": "^15.2.2",
-    "memfs": "^4.8.1",
-    "mini-css-extract-plugin": "^2.7.5",
+    "memfs": "^4.9.2",
+    "mini-css-extract-plugin": "^2.9.0",
     "npm-run-all": "^4.1.5",
     "postcss-loader": "^8.1.1",
-    "postcss-preset-env": "^9.5.4",
+    "postcss-preset-env": "^9.5.9",
     "prettier": "^3.2.5",
-    "sass": "^1.69.7",
-    "sass-loader": "^14.1.1",
+    "sass": "^1.76.0",
+    "sass-loader": "^14.2.1",
     "standard-version": "^9.5.0",
     "strip-ansi": "^6.0.0",
     "style-loader": "^3.3.4",