css-loader 4.3.0 → 5.1.0

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

@@ -5,30 +5,25 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _util = require("util");
-
-var _postcss = _interopRequireDefault(require("postcss"));
-
 var _postcssValueParser = _interopRequireDefault(require("postcss-value-parser"));
 
 var _utils = require("../utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const pluginName = 'postcss-url-parser';
 const isUrlFunc = /url/i;
 const isImageSetFunc = /^(?:-webkit-)?image-set$/i;
-const needParseDecl = /(?:url|(?:-webkit-)?image-set)\(/i;
+const needParseDeclaration = /(?:url|(?:-webkit-)?image-set)\(/i;
 
 function getNodeFromUrlFunc(node) {
   return node.nodes && node.nodes[0];
 }
 
-function shouldHandleRule(rule, decl, result) {
+function shouldHandleRule(rule, node, result) {
   // https://www.w3.org/TR/css-syntax-3/#typedef-url-token
-  if (rule.url.replace(/^[\s]+|[\s]+$/g, '').length === 0) {
-    result.warn(`Unable to find uri in '${decl.toString()}'`, {
-      node: decl
+  if (rule.url.replace(/^[\s]+|[\s]+$/g, "").length === 0) {
+    result.warn(`Unable to find uri in '${node.toString()}'`, {
+      node
     });
     return false;
   }
@@ -40,218 +35,315 @@ function shouldHandleRule(rule, decl, result) {
   return true;
 }
 
-function walkCss(css, result, options, callback) {
-  const accumulator = [];
-  css.walkDecls(decl => {
-    if (!needParseDecl.test(decl.value)) {
+function getWebpackIgnoreCommentValue(index, nodes, inBetween) {
+  if (index === 0 && typeof inBetween !== "undefined") {
+    return inBetween;
+  }
+
+  let prevValueNode = nodes[index - 1];
+
+  if (!prevValueNode) {
+    // eslint-disable-next-line consistent-return
+    return;
+  }
+
+  if (prevValueNode.type === "space") {
+    if (!nodes[index - 2]) {
+      // eslint-disable-next-line consistent-return
+      return;
+    }
+
+    prevValueNode = nodes[index - 2];
+  }
+
+  if (prevValueNode.type !== "comment") {
+    // eslint-disable-next-line consistent-return
+    return;
+  }
+
+  const matched = prevValueNode.value.match(_utils.webpackIgnoreCommentRegexp);
+  return matched && matched[2] === "true";
+}
+
+function visitor(result, parsedResults, node, key) {
+  if (!needParseDeclaration.test(node[key])) {
+    return;
+  }
+
+  const parsed = (0, _postcssValueParser.default)(typeof node.raws.value === "undefined" ? node[key] : node.raws.value.raw);
+  let inBetween;
+
+  if (typeof node.raws.between !== "undefined") {
+    const lastCommentIndex = node.raws.between.lastIndexOf("/*");
+    const matched = node.raws.between.slice(lastCommentIndex).match(_utils.webpackIgnoreCommentRegexp);
+
+    if (matched) {
+      inBetween = matched[2] === "true";
+    }
+  }
+
+  let isIgnoreOnDeclaration = false;
+  const prevNode = node.prev();
+
+  if (prevNode && prevNode.type === "comment") {
+    const matched = prevNode.text.match(_utils.webpackIgnoreCommentRegexp);
+
+    if (matched) {
+      isIgnoreOnDeclaration = matched[2] === "true";
+    }
+  }
+
+  let needIgnore;
+  parsed.walk((valueNode, index, valueNodes) => {
+    if (valueNode.type !== "function") {
       return;
     }
 
-    const parsed = (0, _postcssValueParser.default)(decl.value);
-    parsed.walk(node => {
-      if (node.type !== 'function') {
+    if (isUrlFunc.test(valueNode.value)) {
+      needIgnore = getWebpackIgnoreCommentValue(index, valueNodes, inBetween);
+
+      if (isIgnoreOnDeclaration && typeof needIgnore === "undefined" || needIgnore) {
+        if (needIgnore) {
+          // eslint-disable-next-line no-undefined
+          needIgnore = undefined;
+        }
+
         return;
       }
 
-      if (isUrlFunc.test(node.value)) {
+      const {
+        nodes
+      } = valueNode;
+      const isStringValue = nodes.length !== 0 && nodes[0].type === "string";
+      const url = isStringValue ? nodes[0].value : _postcssValueParser.default.stringify(nodes);
+      const rule = {
+        node: getNodeFromUrlFunc(valueNode),
+        url,
+        needQuotes: false,
+        isStringValue
+      };
+
+      if (shouldHandleRule(rule, node, result)) {
+        parsedResults.push({
+          node,
+          rule,
+          parsed
+        });
+      } // Do not traverse inside `url`
+      // eslint-disable-next-line consistent-return
+
+
+      return false;
+    } else if (isImageSetFunc.test(valueNode.value)) {
+      for (const [innerIndex, nNode] of valueNode.nodes.entries()) {
         const {
-          nodes
-        } = node;
-        const isStringValue = nodes.length !== 0 && nodes[0].type === 'string';
-        const url = isStringValue ? nodes[0].value : _postcssValueParser.default.stringify(nodes);
-        const rule = {
-          node: getNodeFromUrlFunc(node),
-          url,
-          needQuotes: false,
-          isStringValue
-        };
-
-        if (shouldHandleRule(rule, decl, result)) {
-          accumulator.push({
-            decl,
-            rule,
-            parsed
-          });
-        } // Do not traverse inside `url`
-        // eslint-disable-next-line consistent-return
-
-
-        return false;
-      } else if (isImageSetFunc.test(node.value)) {
-        for (const nNode of node.nodes) {
+          type,
+          value
+        } = nNode;
+
+        if (type === "function" && isUrlFunc.test(value)) {
+          needIgnore = getWebpackIgnoreCommentValue(innerIndex, valueNode.nodes);
+
+          if (isIgnoreOnDeclaration && typeof needIgnore === "undefined" || needIgnore) {
+            if (needIgnore) {
+              // eslint-disable-next-line no-undefined
+              needIgnore = undefined;
+            } // eslint-disable-next-line no-continue
+
+
+            continue;
+          }
+
           const {
-            type,
-            value
+            nodes
           } = nNode;
+          const isStringValue = nodes.length !== 0 && nodes[0].type === "string";
+          const url = isStringValue ? nodes[0].value : _postcssValueParser.default.stringify(nodes);
+          const rule = {
+            node: getNodeFromUrlFunc(nNode),
+            url,
+            needQuotes: false,
+            isStringValue
+          };
+
+          if (shouldHandleRule(rule, node, result)) {
+            parsedResults.push({
+              node,
+              rule,
+              parsed
+            });
+          }
+        } else if (type === "string") {
+          needIgnore = getWebpackIgnoreCommentValue(innerIndex, valueNode.nodes);
 
-          if (type === 'function' && isUrlFunc.test(value)) {
-            const {
-              nodes
-            } = nNode;
-            const isStringValue = nodes.length !== 0 && nodes[0].type === 'string';
-            const url = isStringValue ? nodes[0].value : _postcssValueParser.default.stringify(nodes);
-            const rule = {
-              node: getNodeFromUrlFunc(nNode),
-              url,
-              needQuotes: false,
-              isStringValue
-            };
+          if (isIgnoreOnDeclaration && typeof needIgnore === "undefined" || needIgnore) {
+            if (needIgnore) {
+              // eslint-disable-next-line no-undefined
+              needIgnore = undefined;
+            } // eslint-disable-next-line no-continue
 
-            if (shouldHandleRule(rule, decl, result)) {
-              accumulator.push({
-                decl,
-                rule,
-                parsed
-              });
-            }
-          } else if (type === 'string') {
-            const rule = {
-              node: nNode,
-              url: value,
-              needQuotes: true,
-              isStringValue: true
-            };
-
-            if (shouldHandleRule(rule, decl, result)) {
-              accumulator.push({
-                decl,
-                rule,
-                parsed
-              });
-            }
+
+            continue;
           }
-        } // Do not traverse inside `image-set`
-        // eslint-disable-next-line consistent-return
 
+          const rule = {
+            node: nNode,
+            url: value,
+            needQuotes: true,
+            isStringValue: true
+          };
+
+          if (shouldHandleRule(rule, node, result)) {
+            parsedResults.push({
+              node,
+              rule,
+              parsed
+            });
+          }
+        }
+      } // Do not traverse inside `image-set`
+      // eslint-disable-next-line consistent-return
 
-        return false;
-      }
-    });
+
+      return false;
+    }
   });
-  callback(null, accumulator);
 }
 
-const asyncWalkCss = (0, _util.promisify)(walkCss);
+const plugin = (options = {}) => {
+  return {
+    postcssPlugin: "postcss-url-parser",
 
-var _default = _postcss.default.plugin(pluginName, options => async (css, result) => {
-  const parsedResults = await asyncWalkCss(css, result, options);
+    prepare(result) {
+      const parsedResults = [];
+      return {
+        Declaration(declaration) {
+          visitor(result, parsedResults, declaration, "value");
+        },
 
-  if (parsedResults.length === 0) {
-    return Promise.resolve();
-  }
+        async OnceExit() {
+          if (parsedResults.length === 0) {
+            return;
+          }
 
-  const tasks = [];
-  const imports = new Map();
-  const replacements = new Map();
-  let hasUrlImportHelper = false;
-
-  for (const parsedResult of parsedResults) {
-    const {
-      url,
-      isStringValue
-    } = parsedResult.rule;
-    let normalizedUrl = url;
-    let prefix = '';
-    const queryParts = normalizedUrl.split('!');
-
-    if (queryParts.length > 1) {
-      normalizedUrl = queryParts.pop();
-      prefix = queryParts.join('!');
-    }
+          const tasks = [];
+          const imports = new Map();
+          const replacements = new Map();
+          let hasUrlImportHelper = false;
 
-    normalizedUrl = (0, _utils.normalizeUrl)(normalizedUrl, isStringValue);
+          for (const parsedResult of parsedResults) {
+            const {
+              url,
+              isStringValue
+            } = parsedResult.rule;
+            let normalizedUrl = url;
+            let prefix = "";
+            const queryParts = normalizedUrl.split("!");
+
+            if (queryParts.length > 1) {
+              normalizedUrl = queryParts.pop();
+              prefix = queryParts.join("!");
+            }
 
-    if (!options.filter(normalizedUrl)) {
-      // eslint-disable-next-line no-continue
-      continue;
-    }
+            normalizedUrl = (0, _utils.normalizeUrl)(normalizedUrl, isStringValue);
 
-    if (!hasUrlImportHelper) {
-      options.imports.push({
-        importName: '___CSS_LOADER_GET_URL_IMPORT___',
-        url: options.urlHandler(require.resolve('../runtime/getUrl.js')),
-        index: -1
-      });
-      hasUrlImportHelper = true;
-    }
+            if (!options.filter(normalizedUrl)) {
+              // eslint-disable-next-line no-continue
+              continue;
+            }
 
-    const splittedUrl = normalizedUrl.split(/(\?)?#/);
-    const [pathname, query, hashOrQuery] = splittedUrl;
-    let hash = query ? '?' : '';
-    hash += hashOrQuery ? `#${hashOrQuery}` : '';
-    const request = (0, _utils.requestify)(pathname, options.rootContext);
-    tasks.push((async () => {
-      const {
-        resolver,
-        context
-      } = options;
-      const resolvedUrl = await (0, _utils.resolveRequests)(resolver, context, [...new Set([request, normalizedUrl])]);
-      return {
-        url: resolvedUrl,
-        prefix,
-        hash,
-        parsedResult
-      };
-    })());
-  }
+            if (!hasUrlImportHelper) {
+              options.imports.push({
+                importName: "___CSS_LOADER_GET_URL_IMPORT___",
+                url: options.urlHandler(require.resolve("../runtime/getUrl.js")),
+                index: -1
+              });
+              hasUrlImportHelper = true;
+            }
 
-  const results = await Promise.all(tasks);
-
-  for (let index = 0; index <= results.length - 1; index++) {
-    const {
-      url,
-      prefix,
-      hash,
-      parsedResult: {
-        decl,
-        rule,
-        parsed
-      }
-    } = results[index];
-    const newUrl = prefix ? `${prefix}!${url}` : url;
-    const importKey = newUrl;
-    let importName = imports.get(importKey);
-
-    if (!importName) {
-      importName = `___CSS_LOADER_URL_IMPORT_${imports.size}___`;
-      imports.set(importKey, importName);
-      options.imports.push({
-        importName,
-        url: options.urlHandler(newUrl),
-        index
-      });
-    }
+            const splittedUrl = normalizedUrl.split(/(\?)?#/);
+            const [pathname, query, hashOrQuery] = splittedUrl;
+            let hash = query ? "?" : "";
+            hash += hashOrQuery ? `#${hashOrQuery}` : "";
+            const request = (0, _utils.requestify)(pathname, options.rootContext);
+            tasks.push((async () => {
+              const {
+                resolver,
+                context
+              } = options;
+              const resolvedUrl = await (0, _utils.resolveRequests)(resolver, context, [...new Set([request, normalizedUrl])]);
+              return {
+                url: resolvedUrl,
+                prefix,
+                hash,
+                parsedResult
+              };
+            })());
+          }
 
-    const {
-      needQuotes
-    } = rule;
-    const replacementKey = JSON.stringify({
-      newUrl,
-      hash,
-      needQuotes
-    });
-    let replacementName = replacements.get(replacementKey);
+          const results = await Promise.all(tasks);
 
-    if (!replacementName) {
-      replacementName = `___CSS_LOADER_URL_REPLACEMENT_${replacements.size}___`;
-      replacements.set(replacementKey, replacementName);
-      options.replacements.push({
-        replacementName,
-        importName,
-        hash,
-        needQuotes
-      });
-    } // eslint-disable-next-line no-param-reassign
+          for (let index = 0; index <= results.length - 1; index++) {
+            const {
+              url,
+              prefix,
+              hash,
+              parsedResult: {
+                node,
+                rule,
+                parsed
+              }
+            } = results[index];
+            const newUrl = prefix ? `${prefix}!${url}` : url;
+            const importKey = newUrl;
+            let importName = imports.get(importKey);
+
+            if (!importName) {
+              importName = `___CSS_LOADER_URL_IMPORT_${imports.size}___`;
+              imports.set(importKey, importName);
+              options.imports.push({
+                importName,
+                url: options.urlHandler(newUrl),
+                index
+              });
+            }
 
+            const {
+              needQuotes
+            } = rule;
+            const replacementKey = JSON.stringify({
+              newUrl,
+              hash,
+              needQuotes
+            });
+            let replacementName = replacements.get(replacementKey);
+
+            if (!replacementName) {
+              replacementName = `___CSS_LOADER_URL_REPLACEMENT_${replacements.size}___`;
+              replacements.set(replacementKey, replacementName);
+              options.replacements.push({
+                replacementName,
+                importName,
+                hash,
+                needQuotes
+              });
+            } // eslint-disable-next-line no-param-reassign
 
-    rule.node.type = 'word'; // eslint-disable-next-line no-param-reassign
 
-    rule.node.value = replacementName; // eslint-disable-next-line no-param-reassign
+            rule.node.type = "word"; // eslint-disable-next-line no-param-reassign
 
-    decl.value = parsed.toString();
-  }
+            rule.node.value = replacementName; // eslint-disable-next-line no-param-reassign
 
-  return Promise.resolve();
-});
+            node.value = parsed.toString();
+          }
+        }
+
+      };
+    }
+
+  };
+};
 
+plugin.postcss = true;
+var _default = plugin;
 exports.default = _default;

package/dist/runtime/api.js

@@ -6,27 +6,27 @@
 */
 // css base code, injected by the css-loader
 // eslint-disable-next-line func-names
-module.exports = function (useSourceMap) {
+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, useSourceMap);
+      var content = cssWithMappingToString(item);
 
       if (item[2]) {
         return "@media ".concat(item[2], " {").concat(content, "}");
       }
 
       return content;
-    }).join('');
+    }).join("");
   }; // import a list of modules into the list
   // eslint-disable-next-line func-names
 
 
   list.i = function (modules, mediaQuery, dedupe) {
-    if (typeof modules === 'string') {
+    if (typeof modules === "string") {
       // eslint-disable-next-line no-param-reassign
-      modules = [[null, modules, '']];
+      modules = [[null, modules, ""]];
     }
 
     var alreadyImportedModules = {};
@@ -63,32 +63,4 @@ module.exports = function (useSourceMap) {
   };
 
   return list;
-};
-
-function cssWithMappingToString(item, useSourceMap) {
-  var content = item[1] || ''; // eslint-disable-next-line prefer-destructuring
-
-  var cssMapping = item[3];
-
-  if (!cssMapping) {
-    return content;
-  }
-
-  if (useSourceMap && typeof btoa === 'function') {
-    var sourceMapping = toComment(cssMapping);
-    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');
-} // Adapted from convert-source-map (MIT)
-
-
-function toComment(sourceMap) {
-  // eslint-disable-next-line no-undef
-  var base64 = btoa(unescape(encodeURIComponent(JSON.stringify(sourceMap))));
-  var data = "sourceMappingURL=data:application/json;charset=utf-8;base64,".concat(base64);
-  return "/*# ".concat(data, " */");
-}
+};

package/dist/runtime/cssWithMappingToString.js

@@ -0,0 +1,32 @@
+"use strict";
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return; var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+module.exports = function cssWithMappingToString(item) {
+  var _item = _slicedToArray(item, 4),
+      content = _item[1],
+      cssMapping = _item[3];
+
+  if (typeof btoa === "function") {
+    // eslint-disable-next-line no-undef
+    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");
+};

package/dist/runtime/getUrl.js

@@ -9,7 +9,7 @@ module.exports = function (url, options) {
 
   url = url && url.__esModule ? url.default : url;
 
-  if (typeof url !== 'string') {
+  if (typeof url !== "string") {
     return url;
   } // If url is already wrapped in quotes, remove them
 
@@ -27,7 +27,7 @@ module.exports = function (url, options) {
 
 
   if (/["'() \t\n]/.test(url) || options.needQuotes) {
-    return "\"".concat(url.replace(/"/g, '\\"').replace(/\n/g, '\\n'), "\"");
+    return "\"".concat(url.replace(/"/g, '\\"').replace(/\n/g, "\\n"), "\"");
   }
 
   return url;