css-loader 6.4.0 → 6.5.0

package/dist/index.js

@@ -49,9 +49,18 @@ async function loader(content, map, meta) {
 
   const importPluginImports = [];
   const importPluginApi = [];
+  let isSupportAbsoluteURL = false; // TODO enable by default in the next major release
+
+  if (this._compilation && this._compilation.options && this._compilation.options.experiments && this._compilation.options.experiments.buildHttp) {
+    isSupportAbsoluteURL = true;
+  }
+
+  const isSupportDataURL = options.esModule && Boolean("fsStartTime" in this._compiler);
 
   if ((0, _utils.shouldUseImportPlugin)(options)) {
     plugins.push((0, _plugins.importParser)({
+      isSupportAbsoluteURL: false,
+      isSupportDataURL: false,
       isCSSStyleSheet: options.exportType === "css-style-sheet",
       loaderContext: this,
       imports: importPluginImports,
@@ -65,22 +74,21 @@ async function loader(content, map, meta) {
 
   if ((0, _utils.shouldUseURLPlugin)(options)) {
     const needToResolveURL = !options.esModule;
-    const isSupportDataURLInNewURL = options.esModule && Boolean("fsStartTime" in this._compiler);
     plugins.push((0, _plugins.urlParser)({
+      isSupportAbsoluteURL,
+      isSupportDataURL,
       imports: urlPluginImports,
       replacements,
       context: this.context,
       rootContext: this.rootContext,
       filter: (0, _utils.getFilter)(options.url.filter, this.resourcePath),
-      needToResolveURL,
       resolver: needToResolveURL ? this.getResolve({
         mainFiles: [],
         extensions: []
       }) : // eslint-disable-next-line no-undefined
       undefined,
-      urlHandler: url => (0, _utils.stringifyRequest)(this, url),
-      // Support data urls as input in new URL added in webpack@5.38.0
-      isSupportDataURLInNewURL
+      urlHandler: url => (0, _utils.stringifyRequest)(this, url) // Support data urls as input in new URL added in webpack@5.38.0
+
     }));
   }
 

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

@@ -11,7 +11,7 @@ var _utils = require("../utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function parseNode(atRule, key) {
+function parseNode(atRule, key, options) {
   // Convert only top-level @import
   if (atRule.parent.type !== "root") {
     return;
@@ -74,10 +74,13 @@ function parseNode(atRule, key) {
   }
 
   url = (0, _utils.normalizeUrl)(url, isStringValue);
-  const isRequestable = (0, _utils.isUrlRequestable)(url);
+  const {
+    requestable,
+    needResolve
+  } = (0, _utils.isURLRequestable)(url, options);
   let prefix;
 
-  if (isRequestable) {
+  if (requestable && needResolve) {
     const queryParts = url.split("!");
 
     if (queryParts.length > 1) {
@@ -139,7 +142,8 @@ function parseNode(atRule, key) {
     layer,
     supports,
     media,
-    isRequestable
+    requestable,
+    needResolve
   };
 }
 
@@ -157,10 +161,17 @@ const plugin = (options = {}) => {
               return;
             }
 
+            const {
+              isSupportDataURL,
+              isSupportAbsoluteURL
+            } = options;
             let parsedAtRule;
 
             try {
-              parsedAtRule = parseNode(atRule, "params", result);
+              parsedAtRule = parseNode(atRule, "params", {
+                isSupportAbsoluteURL,
+                isSupportDataURL
+              });
             } catch (error) {
               result.warn(error.message, {
                 node: error.node
@@ -195,7 +206,8 @@ const plugin = (options = {}) => {
           const resolvedAtRules = await Promise.all(parsedAtRules.map(async parsedAtRule => {
             const {
               atRule,
-              isRequestable,
+              requestable,
+              needResolve,
               prefix,
               url,
               layer,
@@ -211,7 +223,7 @@ const plugin = (options = {}) => {
               }
             }
 
-            if (isRequestable) {
+            if (needResolve) {
               const request = (0, _utils.requestify)(url, loaderContext.rootContext);
               const resolvedUrl = await (0, _utils.resolveRequests)(resolver, loaderContext.context, [...new Set([request, url])]);
 
@@ -232,7 +244,7 @@ const plugin = (options = {}) => {
                 supports,
                 media,
                 prefix,
-                isRequestable
+                requestable
               };
             }
 
@@ -244,7 +256,7 @@ const plugin = (options = {}) => {
               supports,
               media,
               prefix,
-              isRequestable
+              requestable
             };
           }));
           const urlToNameMap = new Map();
@@ -259,13 +271,13 @@ const plugin = (options = {}) => {
 
             const {
               url,
-              isRequestable,
+              requestable,
               layer,
               supports,
               media
             } = resolvedAtRule;
 
-            if (!isRequestable) {
+            if (!requestable) {
               options.api.push({
                 url,
                 layer,

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

@@ -49,32 +49,21 @@ function getWebpackIgnoreCommentValue(index, nodes, inBetween) {
   return matched && matched[2] === "true";
 }
 
-function shouldHandleURL(url, declaration, result, isSupportDataURLInNewURL) {
+function shouldHandleURL(url, declaration, result, options) {
   if (url.length === 0) {
     result.warn(`Unable to find uri in '${declaration.toString()}'`, {
       node: declaration
     });
-    return false;
+    return {
+      requestable: false,
+      needResolve: false
+    };
   }
 
-  if ((0, _utils.isDataUrl)(url) && isSupportDataURLInNewURL) {
-    try {
-      decodeURIComponent(url);
-    } catch (ignoreError) {
-      return false;
-    }
-
-    return true;
-  }
-
-  if (!(0, _utils.isUrlRequestable)(url)) {
-    return false;
-  }
-
-  return true;
+  return (0, _utils.isURLRequestable)(url, options);
 }
 
-function parseDeclaration(declaration, key, result, isSupportDataURLInNewURL) {
+function parseDeclaration(declaration, key, result, options) {
   if (!needParseDeclaration.test(declaration[key])) {
     return;
   }
@@ -126,9 +115,13 @@ function parseDeclaration(declaration, key, result, isSupportDataURLInNewURL) {
       } = valueNode;
       const isStringValue = nodes.length !== 0 && nodes[0].type === "string";
       let url = isStringValue ? nodes[0].value : _postcssValueParser.default.stringify(nodes);
-      url = (0, _utils.normalizeUrl)(url, isStringValue); // Do not traverse inside `url`
+      url = (0, _utils.normalizeUrl)(url, isStringValue);
+      const {
+        requestable,
+        needResolve
+      } = shouldHandleURL(url, declaration, result, options); // Do not traverse inside `url`
 
-      if (!shouldHandleURL(url, declaration, result, isSupportDataURLInNewURL)) {
+      if (!requestable) {
         // eslint-disable-next-line consistent-return
         return false;
       }
@@ -147,7 +140,8 @@ function parseDeclaration(declaration, key, result, isSupportDataURLInNewURL) {
         node: getNodeFromUrlFunc(valueNode),
         prefix,
         url,
-        needQuotes: false
+        needQuotes: false,
+        needResolve
       }); // eslint-disable-next-line consistent-return
 
       return false;
@@ -176,9 +170,13 @@ function parseDeclaration(declaration, key, result, isSupportDataURLInNewURL) {
           } = nNode;
           const isStringValue = nodes.length !== 0 && nodes[0].type === "string";
           let url = isStringValue ? nodes[0].value : _postcssValueParser.default.stringify(nodes);
-          url = (0, _utils.normalizeUrl)(url, isStringValue); // Do not traverse inside `url`
+          url = (0, _utils.normalizeUrl)(url, isStringValue);
+          const {
+            requestable,
+            needResolve
+          } = shouldHandleURL(url, declaration, result, options); // Do not traverse inside `url`
 
-          if (!shouldHandleURL(url, declaration, result, isSupportDataURLInNewURL)) {
+          if (!requestable) {
             // eslint-disable-next-line consistent-return
             return false;
           }
@@ -197,7 +195,8 @@ function parseDeclaration(declaration, key, result, isSupportDataURLInNewURL) {
             node: getNodeFromUrlFunc(nNode),
             prefix,
             url,
-            needQuotes: false
+            needQuotes: false,
+            needResolve
           });
         } else if (type === "string") {
           needIgnore = getWebpackIgnoreCommentValue(innerIndex, valueNode.nodes);
@@ -212,9 +211,13 @@ function parseDeclaration(declaration, key, result, isSupportDataURLInNewURL) {
             continue;
           }
 
-          let url = (0, _utils.normalizeUrl)(value, true); // Do not traverse inside `url`
+          let url = (0, _utils.normalizeUrl)(value, true);
+          const {
+            requestable,
+            needResolve
+          } = shouldHandleURL(url, declaration, result, options); // Do not traverse inside `url`
 
-          if (!shouldHandleURL(url, declaration, result, isSupportDataURLInNewURL)) {
+          if (!requestable) {
             // eslint-disable-next-line consistent-return
             return false;
           }
@@ -233,7 +236,8 @@ function parseDeclaration(declaration, key, result, isSupportDataURLInNewURL) {
             node: nNode,
             prefix,
             url,
-            needQuotes: true
+            needQuotes: true,
+            needResolve
           });
         }
       } // Do not traverse inside `image-set`
@@ -256,9 +260,13 @@ const plugin = (options = {}) => {
       return {
         Declaration(declaration) {
           const {
-            isSupportDataURLInNewURL
+            isSupportDataURL,
+            isSupportAbsoluteURL
           } = options;
-          const parsedURL = parseDeclaration(declaration, "value", result, isSupportDataURLInNewURL);
+          const parsedURL = parseDeclaration(declaration, "value", result, {
+            isSupportDataURL,
+            isSupportAbsoluteURL
+          });
 
           if (!parsedURL) {
             return;
@@ -274,7 +282,8 @@ const plugin = (options = {}) => {
 
           const resolvedDeclarations = await Promise.all(parsedDeclarations.map(async parsedDeclaration => {
             const {
-              url
+              url,
+              needResolve
             } = parsedDeclaration;
 
             if (options.filter) {
@@ -286,7 +295,7 @@ const plugin = (options = {}) => {
               }
             }
 
-            if ((0, _utils.isDataUrl)(url)) {
+            if (!needResolve) {
               // eslint-disable-next-line consistent-return
               return parsedDeclaration;
             }
@@ -296,12 +305,12 @@ const plugin = (options = {}) => {
             let hash = query ? "?" : "";
             hash += hashOrQuery ? `#${hashOrQuery}` : "";
             const {
-              needToResolveURL,
+              resolver,
               rootContext
             } = options;
-            const request = (0, _utils.requestify)(pathname, rootContext, needToResolveURL);
+            const request = (0, _utils.requestify)(pathname, rootContext, Boolean(resolver));
 
-            if (!needToResolveURL) {
+            if (!resolver) {
               // eslint-disable-next-line consistent-return
               return { ...parsedDeclaration,
                 url: request,
@@ -309,20 +318,16 @@ const plugin = (options = {}) => {
               };
             }
 
-            const {
-              resolver,
-              context
-            } = options;
-            const resolvedUrl = await (0, _utils.resolveRequests)(resolver, context, [...new Set([request, url])]);
+            const resolvedURL = await (0, _utils.resolveRequests)(resolver, options.context, [...new Set([request, url])]);
 
-            if (!resolvedUrl) {
+            if (!resolvedURL) {
               // eslint-disable-next-line consistent-return
               return;
             } // eslint-disable-next-line consistent-return
 
 
             return { ...parsedDeclaration,
-              url: resolvedUrl,
+              url: resolvedURL,
               hash
             };
           }));
@@ -361,7 +366,7 @@ const plugin = (options = {}) => {
               options.imports.push({
                 type: "url",
                 importName,
-                url: options.needToResolveURL ? options.urlHandler(newUrl) : JSON.stringify(newUrl),
+                url: options.resolver ? options.urlHandler(newUrl) : JSON.stringify(newUrl),
                 index
               });
             }

package/dist/runtime/api.js

@@ -51,8 +51,8 @@ module.exports = function (cssWithMappingToString) {
     var alreadyImportedModules = {};
 
     if (dedupe) {
-      for (var _i = 0; _i < this.length; _i++) {
-        var id = this[_i][0];
+      for (var k = 0; k < this.length; k++) {
+        var id = this[k][0];
 
         if (id != null) {
           alreadyImportedModules[id] = true;
@@ -60,8 +60,8 @@ module.exports = function (cssWithMappingToString) {
       }
     }
 
-    for (var _i2 = 0; _i2 < modules.length; _i2++) {
-      var item = [].concat(modules[_i2]);
+    for (var _k = 0; _k < modules.length; _k++) {
+      var item = [].concat(modules[_k]);
 
       if (dedupe && alreadyImportedModules[item[0]]) {
         continue;

package/dist/utils.js

@@ -14,7 +14,7 @@ exports.getModulesOptions = getModulesOptions;
 exports.getModulesPlugins = getModulesPlugins;
 exports.getPreRequester = getPreRequester;
 exports.isDataUrl = isDataUrl;
-exports.isUrlRequestable = isUrlRequestable;
+exports.isURLRequestable = isURLRequestable;
 exports.normalizeOptions = normalizeOptions;
 exports.normalizeSourceMap = normalizeSourceMap;
 exports.normalizeUrl = normalizeUrl;
@@ -55,9 +55,14 @@ function isAbsolutePath(str) {
 
 function isRelativePath(str) {
   return matchRelativePath.test(str);
-}
+} // TODO simplify for the next major release
+
 
 function stringifyRequest(loaderContext, request) {
+  if (typeof loaderContext.utils !== "undefined" && typeof loaderContext.utils.contextify === "function") {
+    return JSON.stringify(loaderContext.utils.contextify(loaderContext.context, request));
+  }
+
   const splitted = request.split("!");
   const {
     context
@@ -844,6 +849,13 @@ function normalizeSourceMapForRuntime(map, loaderContext) {
 
   if (resultMap) {
     delete resultMap.file;
+    /* eslint-disable no-underscore-dangle */
+
+    if (loaderContext._compilation && loaderContext._compilation.options && loaderContext._compilation.options.devtool && loaderContext._compilation.options.devtool.includes("nosources")) {
+      /* eslint-enable no-underscore-dangle */
+      delete resultMap.sourcesContent;
+    }
+
     resultMap.sourceRoot = "";
     resultMap.sources = resultMap.sources.map(source => {
       // Non-standard syntax from `postcss`
@@ -902,7 +914,13 @@ function getModuleCode(result, api, replacements, options, loaderContext) {
     return "";
   }
 
-  const sourceMapValue = options.sourceMap ? `,${normalizeSourceMapForRuntime(result.map, loaderContext)}` : "";
+  let sourceMapValue = "";
+
+  if (options.sourceMap) {
+    const sourceMap = result.map;
+    sourceMapValue = `,${normalizeSourceMapForRuntime(sourceMap, loaderContext)}`;
+  }
+
   let code = JSON.stringify(result.css);
   let beforeCode = `var ___CSS_LOADER_EXPORT___ = ___CSS_LOADER_API_IMPORT___(${options.sourceMap ? "___CSS_LOADER_API_SOURCEMAP_IMPORT___" : "___CSS_LOADER_API_NO_SOURCEMAP_IMPORT___"});\n`;
 
@@ -1061,28 +1079,67 @@ async function resolveRequests(resolve, context, possibleRequests) {
   });
 }
 
-function isUrlRequestable(url) {
+function isURLRequestable(url, options = {}) {
   // Protocol-relative URLs
   if (/^\/\//.test(url)) {
-    return false;
+    return {
+      requestable: false,
+      needResolve: false
+    };
+  } // `#` URLs
+
+
+  if (/^#/.test(url)) {
+    return {
+      requestable: false,
+      needResolve: false
+    };
+  } // Data URI
+
+
+  if (isDataUrl(url) && options.isSupportDataURL) {
+    try {
+      decodeURIComponent(url);
+    } catch (ignoreError) {
+      return {
+        requestable: false,
+        needResolve: false
+      };
+    }
+
+    return {
+      requestable: true,
+      needResolve: false
+    };
   } // `file:` protocol
 
 
   if (/^file:/i.test(url)) {
-    return true;
+    return {
+      requestable: true,
+      needResolve: true
+    };
   } // Absolute URLs
 
 
   if (/^[a-z][a-z0-9+.-]*:/i.test(url) && !NATIVE_WIN32_PATH.test(url)) {
-    return false;
-  } // `#` URLs
-
+    if (options.isSupportAbsoluteURL && /^https?:/i.test(url)) {
+      return {
+        requestable: true,
+        needResolve: false
+      };
+    }
 
-  if (/^#/.test(url)) {
-    return false;
+    return {
+      requestable: false,
+      needResolve: false
+    };
   }
 
-  return true;
+  return {
+    requestable: true,
+    needResolve: true
+  };
 }
 
 function sort(a, b) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "css-loader",
-  "version": "6.4.0",
+  "version": "6.5.0",
   "description": "css loader module for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/css-loader",
@@ -63,7 +63,7 @@
     "del": "^6.0.0",
     "del-cli": "^4.0.1",
     "es-check": "^6.0.0",
-    "eslint": "^7.30.0",
+    "eslint": "^8.1.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-import": "^2.23.4",
     "file-loader": "^6.2.0",