css-loader 5.2.7 → 6.3.0

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

@@ -49,7 +49,7 @@ function getWebpackIgnoreCommentValue(index, nodes, inBetween) {
   return matched && matched[2] === "true";
 }
 
-function shouldHandleURL(url, declaration, result) {
+function shouldHandleURL(url, declaration, result, isSupportDataURLInNewURL) {
   if (url.length === 0) {
     result.warn(`Unable to find uri in '${declaration.toString()}'`, {
       node: declaration
@@ -57,6 +57,16 @@ function shouldHandleURL(url, declaration, result) {
     return false;
   }
 
+  if ((0, _utils.isDataUrl)(url) && isSupportDataURLInNewURL) {
+    try {
+      decodeURIComponent(url);
+    } catch (ignoreError) {
+      return false;
+    }
+
+    return true;
+  }
+
   if (!(0, _utils.isUrlRequestable)(url)) {
     return false;
   }
@@ -64,7 +74,7 @@ function shouldHandleURL(url, declaration, result) {
   return true;
 }
 
-function parseDeclaration(declaration, key, result) {
+function parseDeclaration(declaration, key, result, isSupportDataURLInNewURL) {
   if (!needParseDeclaration.test(declaration[key])) {
     return;
   }
@@ -118,7 +128,7 @@ function parseDeclaration(declaration, key, result) {
       let url = isStringValue ? nodes[0].value : _postcssValueParser.default.stringify(nodes);
       url = (0, _utils.normalizeUrl)(url, isStringValue); // Do not traverse inside `url`
 
-      if (!shouldHandleURL(url, declaration, result)) {
+      if (!shouldHandleURL(url, declaration, result, isSupportDataURLInNewURL)) {
         // eslint-disable-next-line consistent-return
         return false;
       }
@@ -168,7 +178,7 @@ function parseDeclaration(declaration, key, result) {
           let url = isStringValue ? nodes[0].value : _postcssValueParser.default.stringify(nodes);
           url = (0, _utils.normalizeUrl)(url, isStringValue); // Do not traverse inside `url`
 
-          if (!shouldHandleURL(url, declaration, result)) {
+          if (!shouldHandleURL(url, declaration, result, isSupportDataURLInNewURL)) {
             // eslint-disable-next-line consistent-return
             return false;
           }
@@ -204,7 +214,7 @@ function parseDeclaration(declaration, key, result) {
 
           let url = (0, _utils.normalizeUrl)(value, true); // Do not traverse inside `url`
 
-          if (!shouldHandleURL(url, declaration, result)) {
+          if (!shouldHandleURL(url, declaration, result, isSupportDataURLInNewURL)) {
             // eslint-disable-next-line consistent-return
             return false;
           }
@@ -245,7 +255,10 @@ const plugin = (options = {}) => {
       const parsedDeclarations = [];
       return {
         Declaration(declaration) {
-          const parsedURL = parseDeclaration(declaration, "value", result);
+          const {
+            isSupportDataURLInNewURL
+          } = options;
+          const parsedURL = parseDeclaration(declaration, "value", result, isSupportDataURLInNewURL);
 
           if (!parsedURL) {
             return;
@@ -268,15 +281,34 @@ const plugin = (options = {}) => {
               const needKeep = await options.filter(url);
 
               if (!needKeep) {
+                // eslint-disable-next-line consistent-return
                 return;
               }
             }
 
+            if ((0, _utils.isDataUrl)(url)) {
+              // eslint-disable-next-line consistent-return
+              return parsedDeclaration;
+            }
+
             const splittedUrl = url.split(/(\?)?#/);
             const [pathname, query, hashOrQuery] = splittedUrl;
             let hash = query ? "?" : "";
             hash += hashOrQuery ? `#${hashOrQuery}` : "";
-            const request = (0, _utils.requestify)(pathname, options.rootContext);
+            const {
+              needToResolveURL,
+              rootContext
+            } = options;
+            const request = (0, _utils.requestify)(pathname, rootContext, needToResolveURL);
+
+            if (!needToResolveURL) {
+              // eslint-disable-next-line consistent-return
+              return { ...parsedDeclaration,
+                url: request,
+                hash
+              };
+            }
+
             const {
               resolver,
               context
@@ -284,6 +316,7 @@ const plugin = (options = {}) => {
             const resolvedUrl = await (0, _utils.resolveRequests)(resolver, context, [...new Set([request, url])]);
 
             if (!resolvedUrl) {
+              // eslint-disable-next-line consistent-return
               return;
             } // eslint-disable-next-line consistent-return
 
@@ -307,6 +340,7 @@ const plugin = (options = {}) => {
 
             if (!hasUrlImportHelper) {
               options.imports.push({
+                type: "get_url_import",
                 importName: "___CSS_LOADER_GET_URL_IMPORT___",
                 url: options.urlHandler(require.resolve("../runtime/getUrl.js")),
                 index: -1
@@ -325,8 +359,9 @@ const plugin = (options = {}) => {
               importName = `___CSS_LOADER_URL_IMPORT_${urlToNameMap.size}___`;
               urlToNameMap.set(newUrl, importName);
               options.imports.push({
+                type: "url",
                 importName,
-                url: options.urlHandler(newUrl),
+                url: options.needToResolveURL ? options.urlHandler(newUrl) : JSON.stringify(newUrl),
                 index
               });
             }

package/dist/runtime/api.js

@@ -4,37 +4,55 @@
   MIT License http://www.opensource.org/licenses/mit-license.php
   Author Tobias Koppers @sokra
 */
-// css base code, injected by the css-loader
-// eslint-disable-next-line func-names
 module.exports = function (cssWithMappingToString) {
   var list = []; // return the list of modules as css string
 
   list.toString = function toString() {
     return this.map(function (item) {
-      var content = cssWithMappingToString(item);
+      var content = "";
+      var needLayer = typeof item[5] !== "undefined";
+
+      if (item[4]) {
+        content += "@supports (".concat(item[4], ") {");
+      }
+
+      if (item[2]) {
+        content += "@media ".concat(item[2], " {");
+      }
+
+      if (needLayer) {
+        content += "@layer".concat(item[5].length > 0 ? " ".concat(item[5]) : "", " {");
+      }
+
+      content += cssWithMappingToString(item);
+
+      if (needLayer) {
+        content += "}";
+      }
 
       if (item[2]) {
-        return "@media ".concat(item[2], " {").concat(content, "}");
+        content += "}";
+      }
+
+      if (item[4]) {
+        content += "}";
       }
 
       return content;
     }).join("");
   }; // import a list of modules into the list
-  // eslint-disable-next-line func-names
 
 
-  list.i = function (modules, mediaQuery, dedupe) {
+  list.i = function i(modules, media, dedupe, supports, layer) {
     if (typeof modules === "string") {
-      // eslint-disable-next-line no-param-reassign
-      modules = [[null, modules, ""]];
+      modules = [[null, modules, undefined]];
     }
 
     var alreadyImportedModules = {};
 
     if (dedupe) {
-      for (var i = 0; i < this.length; i++) {
-        // eslint-disable-next-line prefer-destructuring
-        var id = this[i][0];
+      for (var _i = 0; _i < this.length; _i++) {
+        var id = this[_i][0];
 
         if (id != null) {
           alreadyImportedModules[id] = true;
@@ -42,19 +60,37 @@ module.exports = function (cssWithMappingToString) {
       }
     }
 
-    for (var _i = 0; _i < modules.length; _i++) {
-      var item = [].concat(modules[_i]);
+    for (var _i2 = 0; _i2 < modules.length; _i2++) {
+      var item = [].concat(modules[_i2]);
 
       if (dedupe && alreadyImportedModules[item[0]]) {
-        // eslint-disable-next-line no-continue
         continue;
       }
 
-      if (mediaQuery) {
+      if (typeof layer !== "undefined") {
+        if (typeof item[5] === "undefined") {
+          item[5] = layer;
+        } else {
+          item[1] = "@layer".concat(item[5].length > 0 ? " ".concat(item[5]) : "", " {").concat(item[1], "}");
+          item[5] = layer;
+        }
+      }
+
+      if (media) {
         if (!item[2]) {
-          item[2] = mediaQuery;
+          item[2] = media;
+        } else {
+          item[1] = "@media ".concat(item[2], " {").concat(item[1], "}");
+          item[2] = media;
+        }
+      }
+
+      if (supports) {
+        if (!item[4]) {
+          item[4] = "".concat(supports);
         } else {
-          item[2] = "".concat(mediaQuery, " and ").concat(item[2]);
+          item[1] = "@supports (".concat(item[4], ") {").concat(item[1], "}");
+          item[4] = supports;
         }
       }
 

package/dist/runtime/getUrl.js

@@ -2,31 +2,26 @@
 
 module.exports = function (url, options) {
   if (!options) {
-    // eslint-disable-next-line no-param-reassign
     options = {};
-  } // eslint-disable-next-line no-underscore-dangle, no-param-reassign
-
-
-  url = url && url.__esModule ? url.default : url;
+  }
 
-  if (typeof url !== "string") {
+  if (!url) {
     return url;
-  } // If url is already wrapped in quotes, remove them
+  }
 
+  url = String(url.__esModule ? url.default : url); // If url is already wrapped in quotes, remove them
 
   if (/^['"].*['"]$/.test(url)) {
-    // eslint-disable-next-line no-param-reassign
     url = url.slice(1, -1);
   }
 
   if (options.hash) {
-    // eslint-disable-next-line no-param-reassign
     url += options.hash;
   } // Should url be wrapped?
   // See https://drafts.csswg.org/css-values-3/#urls
 
 
-  if (/["'() \t\n]/.test(url) || options.needQuotes) {
+  if (/["'() \t\n]|(%20)/.test(url) || options.needQuotes) {
     return "\"".concat(url.replace(/"/g, '\\"').replace(/\n/g, "\\n"), "\"");
   }
 

package/dist/runtime/noSourceMaps.js

@@ -0,0 +1,5 @@
+"use strict";
+
+module.exports = function (i) {
+  return i[1];
+};

package/dist/runtime/sourceMaps.js

@@ -0,0 +1,22 @@
+"use strict";
+
+module.exports = function (item) {
+  var content = item[1];
+  var cssMapping = item[3];
+
+  if (!cssMapping) {
+    return content;
+  }
+
+  if (typeof btoa === "function") {
+    var base64 = btoa(unescape(encodeURIComponent(JSON.stringify(cssMapping))));
+    var data = "sourceMappingURL=data:application/json;charset=utf-8;base64,".concat(base64);
+    var sourceMapping = "/*# ".concat(data, " */");
+    var sourceURLs = cssMapping.sources.map(function (source) {
+      return "/*# sourceURL=".concat(cssMapping.sourceRoot || "").concat(source, " */");
+    });
+    return [content].concat(sourceURLs).concat([sourceMapping]).join("\n");
+  }
+
+  return [content].join("\n");
+};