css-loader 6.7.1 → 6.7.2

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

@@ -4,60 +4,49 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 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;
   }
-
   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;
     }
   }
-
   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;
     }
-  } // Nodes do not exists - `@import url('http://') :root {}`
-
+  }
 
+  // Nodes do not exists - `@import url('http://') :root {}`
   if (atRule.nodes) {
     const error = new Error("It looks like you didn't end your @import statement correctly. Child nodes are attached to it.");
     error.node = atRule;
     throw error;
   }
-
   const rawParams = atRule.raws && atRule.raws[key] && typeof atRule.raws[key].raw !== "undefined" ? atRule.raws[key].raw : atRule[key];
   const {
     nodes: paramsNodes
-  } = (0, _postcssValueParser.default)(rawParams); // No nodes - `@import ;`
-  // Invalid type - `@import foo-bar;`
+  } = (0, _postcssValueParser.default)(rawParams);
 
+  // No nodes - `@import ;`
+  // Invalid type - `@import foo-bar;`
   if (paramsNodes.length === 0 || paramsNodes[0].type !== "string" && paramsNodes[0].type !== "function") {
     const error = new Error(`Unable to find uri in "${atRule.toString()}"`);
     error.node = atRule;
     throw error;
   }
-
   let isStringValue;
   let url;
-
   if (paramsNodes[0].type === "string") {
     isStringValue = true;
     url = paramsNodes[0].value;
@@ -68,47 +57,39 @@ function parseNode(atRule, key, options) {
       error.node = atRule;
       throw error;
     }
-
     isStringValue = paramsNodes[0].nodes.length !== 0 && paramsNodes[0].nodes[0].type === "string";
     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 prefix;
-
   if (requestable && needResolve) {
     const queryParts = url.split("!");
-
     if (queryParts.length > 1) {
       url = queryParts.pop();
       prefix = queryParts.join("!");
     }
-  } // Empty url - `@import "";` or `@import url();`
-
+  }
 
+  // Empty url - `@import "";` or `@import url();`
   if (url.trim().length === 0) {
     const error = new Error(`Unable to find uri in "${atRule.toString()}"`);
     error.node = atRule;
     throw error;
   }
-
   const additionalNodes = paramsNodes.slice(1);
   let supports;
   let layer;
   let media;
-
   if (additionalNodes.length > 0) {
     let nodes = [];
-
     for (const node of additionalNodes) {
       nodes.push(node);
       const isLayerFunction = node.type === "function" && node.value.toLowerCase() === "layer";
       const isLayerWord = node.type === "word" && node.value.toLowerCase() === "layer";
-
       if (isLayerFunction || isLayerWord) {
         if (isLayerFunction) {
           nodes.splice(nodes.length - 1, 1, ...node.nodes);
@@ -119,7 +100,6 @@ function parseNode(atRule, key, options) {
             unclosed: false
           });
         }
-
         layer = _postcssValueParser.default.stringify(nodes).trim().toLowerCase();
         nodes = [];
       } else if (node.type === "function" && node.value.toLowerCase() === "supports") {
@@ -128,13 +108,12 @@ function parseNode(atRule, key, options) {
         nodes = [];
       }
     }
-
     if (nodes.length > 0) {
       media = _postcssValueParser.default.stringify(nodes).trim().toLowerCase();
     }
-  } // eslint-disable-next-line consistent-return
-
+  }
 
+  // eslint-disable-next-line consistent-return
   return {
     atRule,
     prefix,
@@ -146,11 +125,9 @@ function parseNode(atRule, key, options) {
     needResolve
   };
 }
-
 const plugin = (options = {}) => {
   return {
     postcssPlugin: "postcss-import-parser",
-
     prepare(result) {
       const parsedAtRules = [];
       return {
@@ -160,13 +137,11 @@ const plugin = (options = {}) => {
               options.loaderContext.emitError(new Error(atRule.error("'@import' rules are not allowed here and will not be processed").message));
               return;
             }
-
             const {
               isSupportDataURL,
               isSupportAbsoluteURL
             } = options;
             let parsedAtRule;
-
             try {
               parsedAtRule = parseNode(atRule, "params", {
                 isSupportAbsoluteURL,
@@ -177,21 +152,16 @@ const plugin = (options = {}) => {
                 node: error.node
               });
             }
-
             if (!parsedAtRule) {
               return;
             }
-
             parsedAtRules.push(parsedAtRule);
           }
-
         },
-
         async OnceExit() {
           if (parsedAtRules.length === 0) {
             return;
           }
-
           const {
             loaderContext
           } = options;
@@ -214,30 +184,25 @@ const plugin = (options = {}) => {
               supports,
               media
             } = parsedAtRule;
-
             if (options.filter) {
               const needKeep = await options.filter(url, media, loaderContext.resourcePath, supports, layer);
-
               if (!needKeep) {
                 return;
               }
             }
-
             if (needResolve) {
               const request = (0, _utils.requestify)(url, loaderContext.rootContext);
               const resolvedUrl = await (0, _utils.resolveRequests)(resolver, loaderContext.context, [...new Set([request, url])]);
-
               if (!resolvedUrl) {
                 return;
               }
-
               if (resolvedUrl === loaderContext.resourcePath) {
                 atRule.remove();
                 return;
               }
+              atRule.remove();
 
-              atRule.remove(); // eslint-disable-next-line consistent-return
-
+              // eslint-disable-next-line consistent-return
               return {
                 url: resolvedUrl,
                 layer,
@@ -247,9 +212,9 @@ const plugin = (options = {}) => {
                 requestable
               };
             }
+            atRule.remove();
 
-            atRule.remove(); // eslint-disable-next-line consistent-return
-
+            // eslint-disable-next-line consistent-return
             return {
               url,
               layer,
@@ -260,15 +225,12 @@ const plugin = (options = {}) => {
             };
           }));
           const urlToNameMap = new Map();
-
           for (let index = 0; index <= resolvedAtRules.length - 1; index++) {
             const resolvedAtRule = resolvedAtRules[index];
-
             if (!resolvedAtRule) {
               // eslint-disable-next-line no-continue
               continue;
             }
-
             const {
               url,
               requestable,
@@ -276,7 +238,6 @@ const plugin = (options = {}) => {
               supports,
               media
             } = resolvedAtRule;
-
             if (!requestable) {
               options.api.push({
                 url,
@@ -284,17 +245,16 @@ const plugin = (options = {}) => {
                 supports,
                 media,
                 index
-              }); // eslint-disable-next-line no-continue
+              });
 
+              // eslint-disable-next-line no-continue
               continue;
             }
-
             const {
               prefix
             } = resolvedAtRule;
             const newUrl = prefix ? `${prefix}!${url}` : url;
             let importName = urlToNameMap.get(newUrl);
-
             if (!importName) {
               importName = `___CSS_LOADER_AT_RULE_IMPORT_${urlToNameMap.size}___`;
               urlToNameMap.set(newUrl, importName);
@@ -305,7 +265,6 @@ const plugin = (options = {}) => {
                 index
               });
             }
-
             options.api.push({
               importName,
               layer,
@@ -315,13 +274,10 @@ const plugin = (options = {}) => {
             });
           }
         }
-
       };
     }
-
   };
 };
-
 plugin.postcss = true;
 var _default = plugin;
 exports.default = _default;

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

@@ -4,51 +4,38 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 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 }; }
-
 const isUrlFunc = /url/i;
 const isImageSetFunc = /^(?:-webkit-)?image-set$/i;
 const needParseDeclaration = /(?:url|(?:-webkit-)?image-set)\(/i;
-
 function getNodeFromUrlFunc(node) {
   return node.nodes && node.nodes[0];
 }
-
 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.WEBPACK_IGNORE_COMMENT_REGEXP);
   return matched && matched[2] === "true";
 }
-
 function shouldHandleURL(url, declaration, result, options) {
   if (url.length === 0) {
     result.warn(`Unable to find uri in '${declaration.toString()}'`, {
@@ -59,57 +46,44 @@ function shouldHandleURL(url, declaration, result, options) {
       needResolve: false
     };
   }
-
   return (0, _utils.isURLRequestable)(url, options);
 }
-
 function parseDeclaration(declaration, key, result, options) {
   if (!needParseDeclaration.test(declaration[key])) {
     return;
   }
-
   const parsed = (0, _postcssValueParser.default)(declaration.raws && declaration.raws.value && declaration.raws.value.raw ? declaration.raws.value.raw : declaration[key]);
   let inBetween;
-
   if (declaration.raws && declaration.raws.between) {
     const lastCommentIndex = declaration.raws.between.lastIndexOf("/*");
     const matched = declaration.raws.between.slice(lastCommentIndex).match(_utils.WEBPACK_IGNORE_COMMENT_REGEXP);
-
     if (matched) {
       inBetween = matched[2] === "true";
     }
   }
-
   let isIgnoreOnDeclaration = false;
   const prevNode = declaration.prev();
-
   if (prevNode && prevNode.type === "comment") {
     const matched = prevNode.text.match(_utils.WEBPACK_IGNORE_COMMENT_REGEXP);
-
     if (matched) {
       isIgnoreOnDeclaration = matched[2] === "true";
     }
   }
-
   let needIgnore;
   const parsedURLs = [];
   parsed.walk((valueNode, index, valueNodes) => {
     if (valueNode.type !== "function") {
       return;
     }
-
     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;
       }
-
       const {
         nodes
       } = valueNode;
@@ -119,21 +93,19 @@ function parseDeclaration(declaration, key, result, options) {
       const {
         requestable,
         needResolve
-      } = shouldHandleURL(url, declaration, result, options); // Do not traverse inside `url`
+      } = shouldHandleURL(url, declaration, result, options);
 
+      // Do not traverse inside `url`
       if (!requestable) {
         // eslint-disable-next-line consistent-return
         return false;
       }
-
       const queryParts = url.split("!");
       let prefix;
-
       if (queryParts.length > 1) {
         url = queryParts.pop();
         prefix = queryParts.join("!");
       }
-
       parsedURLs.push({
         declaration,
         parsed,
@@ -142,8 +114,9 @@ function parseDeclaration(declaration, key, result, options) {
         url,
         needQuotes: false,
         needResolve
-      }); // eslint-disable-next-line consistent-return
+      });
 
+      // eslint-disable-next-line consistent-return
       return false;
     } else if (isImageSetFunc.test(valueNode.value)) {
       for (const [innerIndex, nNode] of valueNode.nodes.entries()) {
@@ -151,20 +124,17 @@ function parseDeclaration(declaration, key, result, options) {
           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
-
+            }
 
+            // eslint-disable-next-line no-continue
             continue;
           }
-
           const {
             nodes
           } = nNode;
@@ -174,21 +144,19 @@ function parseDeclaration(declaration, key, result, options) {
           const {
             requestable,
             needResolve
-          } = shouldHandleURL(url, declaration, result, options); // Do not traverse inside `url`
+          } = shouldHandleURL(url, declaration, result, options);
 
+          // Do not traverse inside `url`
           if (!requestable) {
             // eslint-disable-next-line consistent-return
             return false;
           }
-
           const queryParts = url.split("!");
           let prefix;
-
           if (queryParts.length > 1) {
             url = queryParts.pop();
             prefix = queryParts.join("!");
           }
-
           parsedURLs.push({
             declaration,
             parsed,
@@ -200,36 +168,32 @@ function parseDeclaration(declaration, key, result, options) {
           });
         } else if (type === "string") {
           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
-
+            }
 
+            // eslint-disable-next-line no-continue
             continue;
           }
-
           let url = (0, _utils.normalizeUrl)(value, true);
           const {
             requestable,
             needResolve
-          } = shouldHandleURL(url, declaration, result, options); // Do not traverse inside `url`
+          } = shouldHandleURL(url, declaration, result, options);
 
+          // Do not traverse inside `url`
           if (!requestable) {
             // eslint-disable-next-line consistent-return
             return false;
           }
-
           const queryParts = url.split("!");
           let prefix;
-
           if (queryParts.length > 1) {
             url = queryParts.pop();
             prefix = queryParts.join("!");
           }
-
           parsedURLs.push({
             declaration,
             parsed,
@@ -240,21 +204,20 @@ function parseDeclaration(declaration, key, result, options) {
             needResolve
           });
         }
-      } // Do not traverse inside `image-set`
-      // eslint-disable-next-line consistent-return
-
+      }
 
+      // Do not traverse inside `image-set`
+      // eslint-disable-next-line consistent-return
       return false;
     }
-  }); // eslint-disable-next-line consistent-return
+  });
 
+  // eslint-disable-next-line consistent-return
   return parsedURLs;
 }
-
 const plugin = (options = {}) => {
   return {
     postcssPlugin: "postcss-url-parser",
-
     prepare(result) {
       const parsedDeclarations = [];
       return {
@@ -267,39 +230,31 @@ const plugin = (options = {}) => {
             isSupportDataURL,
             isSupportAbsoluteURL
           });
-
           if (!parsedURL) {
             return;
           }
-
           parsedDeclarations.push(...parsedURL);
         },
-
         async OnceExit() {
           if (parsedDeclarations.length === 0) {
             return;
           }
-
           const resolvedDeclarations = await Promise.all(parsedDeclarations.map(async parsedDeclaration => {
             const {
               url,
               needResolve
             } = parsedDeclaration;
-
             if (options.filter) {
               const needKeep = await options.filter(url);
-
               if (!needKeep) {
                 // eslint-disable-next-line consistent-return
                 return;
               }
             }
-
             if (!needResolve) {
               // eslint-disable-next-line consistent-return
               return parsedDeclaration;
             }
-
             const splittedUrl = url.split(/(\?)?#/);
             const [pathname, query, hashOrQuery] = splittedUrl;
             let hash = query ? "?" : "";
@@ -309,24 +264,23 @@ const plugin = (options = {}) => {
               rootContext
             } = options;
             const request = (0, _utils.requestify)(pathname, rootContext, Boolean(resolver));
-
             if (!resolver) {
               // eslint-disable-next-line consistent-return
-              return { ...parsedDeclaration,
+              return {
+                ...parsedDeclaration,
                 url: request,
                 hash
               };
             }
-
             const resolvedURL = await (0, _utils.resolveRequests)(resolver, options.context, [...new Set([request, url])]);
-
             if (!resolvedURL) {
               // eslint-disable-next-line consistent-return
               return;
-            } // eslint-disable-next-line consistent-return
-
+            }
 
-            return { ...parsedDeclaration,
+            // eslint-disable-next-line consistent-return
+            return {
+              ...parsedDeclaration,
               url: resolvedURL,
               hash
             };
@@ -334,15 +288,12 @@ const plugin = (options = {}) => {
           const urlToNameMap = new Map();
           const urlToReplacementMap = new Map();
           let hasUrlImportHelper = false;
-
           for (let index = 0; index <= resolvedDeclarations.length - 1; index++) {
             const item = resolvedDeclarations[index];
-
             if (!item) {
               // eslint-disable-next-line no-continue
               continue;
             }
-
             if (!hasUrlImportHelper) {
               options.imports.push({
                 type: "get_url_import",
@@ -352,14 +303,12 @@ const plugin = (options = {}) => {
               });
               hasUrlImportHelper = true;
             }
-
             const {
               url,
               prefix
             } = item;
             const newUrl = prefix ? `${prefix}!${url}` : url;
             let importName = urlToNameMap.get(newUrl);
-
             if (!importName) {
               importName = `___CSS_LOADER_URL_IMPORT_${urlToNameMap.size}___`;
               urlToNameMap.set(newUrl, importName);
@@ -370,7 +319,6 @@ const plugin = (options = {}) => {
                 index
               });
             }
-
             const {
               hash,
               needQuotes
@@ -381,7 +329,6 @@ const plugin = (options = {}) => {
               needQuotes
             });
             let replacementName = urlToReplacementMap.get(replacementKey);
-
             if (!replacementName) {
               replacementName = `___CSS_LOADER_URL_REPLACEMENT_${urlToReplacementMap.size}___`;
               urlToReplacementMap.set(replacementKey, replacementName);
@@ -391,23 +338,20 @@ const plugin = (options = {}) => {
                 hash,
                 needQuotes
               });
-            } // eslint-disable-next-line no-param-reassign
-
-
-            item.node.type = "word"; // eslint-disable-next-line no-param-reassign
-
-            item.node.value = replacementName; // eslint-disable-next-line no-param-reassign
+            }
 
+            // eslint-disable-next-line no-param-reassign
+            item.node.type = "word";
+            // eslint-disable-next-line no-param-reassign
+            item.node.value = replacementName;
+            // eslint-disable-next-line no-param-reassign
             item.declaration.value = item.parsed.toString();
           }
         }
-
       };
     }
-
   };
 };
-
 plugin.postcss = true;
 var _default = plugin;
 exports.default = _default;