css-loader 5.0.0 → 5.1.1

package/dist/CssSyntaxError.js

@@ -14,16 +14,16 @@ class CssSyntaxError extends Error {
       column,
       file
     } = error;
-    this.name = 'CssSyntaxError'; // Based on https://github.com/postcss/postcss/blob/master/lib/css-syntax-error.es6#L132
+    this.name = "CssSyntaxError"; // Based on https://github.com/postcss/postcss/blob/master/lib/css-syntax-error.es6#L132
     // We don't need `plugin` and `file` properties.
 
     this.message = `${this.name}\n\n`;
 
-    if (typeof line !== 'undefined') {
+    if (typeof line !== "undefined") {
       this.message += `(${line}:${column}) `;
     }
 
-    this.message += file ? `${file} ` : '<css input> ';
+    this.message += file ? `${file} ` : "<css input> ";
     this.message += `${reason}`;
     const code = error.showSourceCode();
 

package/dist/Warning.js

@@ -13,12 +13,12 @@ class Warning extends Error {
       line,
       column
     } = warning;
-    this.name = 'Warning'; // Based on https://github.com/postcss/postcss/blob/master/lib/warning.es6#L74
+    this.name = "Warning"; // Based on https://github.com/postcss/postcss/blob/master/lib/warning.es6#L74
     // We don't need `plugin` properties.
 
     this.message = `${this.name}\n\n`;
 
-    if (typeof line !== 'undefined') {
+    if (typeof line !== "undefined") {
       this.message += `(${line}:${column}) `;
     }
 

package/dist/cjs.js

@@ -1,5 +1,5 @@
 "use strict";
 
-const loader = require('./index');
+const loader = require("./index");
 
 module.exports = loader.default;

package/dist/index.js

@@ -34,8 +34,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 async function loader(content, map, meta) {
   const rawOptions = (0, _loaderUtils.getOptions)(this);
   (0, _schemaUtils.validate)(_options.default, rawOptions, {
-    name: 'CSS Loader',
-    baseDataPath: 'options'
+    name: "CSS Loader",
+    baseDataPath: "options"
   });
   const plugins = [];
   const callback = this.async();
@@ -60,10 +60,10 @@ async function loader(content, map, meta) {
 
   if ((0, _utils.shouldUseImportPlugin)(options)) {
     const resolver = this.getResolve({
-      conditionNames: ['style'],
-      extensions: ['.css'],
-      mainFields: ['css', 'style', 'main', '...'],
-      mainFiles: ['index', '...'],
+      conditionNames: ["style"],
+      extensions: [".css"],
+      mainFields: ["css", "style", "main", "..."],
+      mainFiles: ["index", "..."],
       restrictions: [/\.css$/i]
     });
     plugins.push((0, _plugins.importParser)({
@@ -81,8 +81,8 @@ async function loader(content, map, meta) {
 
   if ((0, _utils.shouldUseURLPlugin)(options)) {
     const urlResolver = this.getResolve({
-      conditionNames: ['asset'],
-      mainFields: ['asset'],
+      conditionNames: ["asset"],
+      mainFields: ["asset"],
       mainFiles: [],
       extensions: []
     });
@@ -102,10 +102,10 @@ async function loader(content, map, meta) {
 
   if ((0, _utils.shouldUseIcssPlugin)(options)) {
     const icssResolver = this.getResolve({
-      conditionNames: ['style'],
+      conditionNames: ["style"],
       extensions: [],
-      mainFields: ['css', 'style', 'main', '...'],
-      mainFiles: ['index', '...']
+      mainFields: ["css", "style", "main", "..."],
+      mainFiles: ["index", "..."]
     });
     plugins.push((0, _plugins.icssParser)({
       imports: icssPluginImports,
@@ -125,7 +125,7 @@ async function loader(content, map, meta) {
       ast
     } = meta;
 
-    if (ast && ast.type === 'postcss' && (0, _semver.satisfies)(ast.version, `^${_package.default.version}`)) {
+    if (ast && ast.type === "postcss" && (0, _semver.satisfies)(ast.version, `^${_package.default.version}`)) {
       // eslint-disable-next-line no-param-reassign
       content = ast.root;
     }
@@ -152,7 +152,7 @@ async function loader(content, map, meta) {
       this.addDependency(error.file);
     }
 
-    callback(error.name === 'CssSyntaxError' ? new _CssSyntaxError.default(error) : error);
+    callback(error.name === "CssSyntaxError" ? new _CssSyntaxError.default(error) : error);
     return;
   }
 
@@ -165,14 +165,14 @@ async function loader(content, map, meta) {
 
   if (options.modules.exportOnlyLocals !== true) {
     imports.unshift({
-      importName: '___CSS_LOADER_API_IMPORT___',
-      url: (0, _loaderUtils.stringifyRequest)(this, require.resolve('./runtime/api'))
+      importName: "___CSS_LOADER_API_IMPORT___",
+      url: (0, _loaderUtils.stringifyRequest)(this, require.resolve("./runtime/api"))
     });
 
     if (options.sourceMap) {
       imports.unshift({
-        importName: '___CSS_LOADER_API_SOURCEMAP_IMPORT___',
-        url: (0, _loaderUtils.stringifyRequest)(this, require.resolve('./runtime/cssWithMappingToString'))
+        importName: "___CSS_LOADER_API_SOURCEMAP_IMPORT___",
+        url: (0, _loaderUtils.stringifyRequest)(this, require.resolve("./runtime/cssWithMappingToString"))
       });
     }
   }

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

@@ -11,7 +11,7 @@ var _utils = require("../utils");
 
 const plugin = (options = {}) => {
   return {
-    postcssPlugin: 'postcss-icss-parser',
+    postcssPlugin: "postcss-icss-parser",
 
     async OnceExit(root) {
       const importReplacements = Object.create(null);
@@ -31,12 +31,12 @@ const plugin = (options = {}) => {
         }
 
         let normalizedUrl = url;
-        let prefix = '';
-        const queryParts = normalizedUrl.split('!');
+        let prefix = "";
+        const queryParts = normalizedUrl.split("!");
 
         if (queryParts.length > 1) {
           normalizedUrl = queryParts.pop();
-          prefix = queryParts.join('!');
+          prefix = queryParts.join("!");
         }
 
         const request = (0, _utils.requestify)((0, _utils.normalizeUrl)(normalizedUrl, true), options.rootContext);

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

@@ -13,8 +13,27 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 function visitor(result, parsedResults, node, key) {
   // Convert only top-level @import
-  if (node.parent.type !== 'root') {
+  if (node.parent.type !== "root") {
     return;
+  }
+
+  if (node.raws && node.raws.afterName && node.raws.afterName.trim().length > 0) {
+    const lastCommentIndex = node.raws.afterName.lastIndexOf("/*");
+    const matched = node.raws.afterName.slice(lastCommentIndex).match(_utils.webpackIgnoreCommentRegexp);
+
+    if (matched && matched[2] === "true") {
+      return;
+    }
+  }
+
+  const prevNode = node.prev();
+
+  if (prevNode && prevNode.type === "comment") {
+    const matched = prevNode.text.match(_utils.webpackIgnoreCommentRegexp);
+
+    if (matched && matched[2] === "true") {
+      return;
+    }
   } // Nodes do not exists - `@import url('http://') :root {}`
 
 
@@ -30,7 +49,7 @@ function visitor(result, parsedResults, node, key) {
   } = (0, _postcssValueParser.default)(node[key]); // No nodes - `@import ;`
   // Invalid type - `@import foo-bar;`
 
-  if (paramsNodes.length === 0 || paramsNodes[0].type !== 'string' && paramsNodes[0].type !== 'function') {
+  if (paramsNodes.length === 0 || paramsNodes[0].type !== "string" && paramsNodes[0].type !== "function") {
     result.warn(`Unable to find uri in "${node.toString()}"`, {
       node
     });
@@ -40,19 +59,19 @@ function visitor(result, parsedResults, node, key) {
   let isStringValue;
   let url;
 
-  if (paramsNodes[0].type === 'string') {
+  if (paramsNodes[0].type === "string") {
     isStringValue = true;
     url = paramsNodes[0].value;
   } else {
     // Invalid function - `@import nourl(test.css);`
-    if (paramsNodes[0].value.toLowerCase() !== 'url') {
+    if (paramsNodes[0].value.toLowerCase() !== "url") {
       result.warn(`Unable to find uri in "${node.toString()}"`, {
         node
       });
       return;
     }
 
-    isStringValue = paramsNodes[0].nodes.length !== 0 && paramsNodes[0].nodes[0].type === 'string';
+    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);
   } // Empty url - `@import "";` or `@import url();`
 
@@ -74,14 +93,14 @@ function visitor(result, parsedResults, node, key) {
 
 const plugin = (options = {}) => {
   return {
-    postcssPlugin: 'postcss-import-parser',
+    postcssPlugin: "postcss-import-parser",
 
     prepare(result) {
       const parsedResults = [];
       return {
         AtRule: {
           import(atRule) {
-            visitor(result, parsedResults, atRule, 'params');
+            visitor(result, parsedResults, atRule, "params");
           }
 
         },
@@ -102,15 +121,15 @@ const plugin = (options = {}) => {
               mediaNodes
             } = parsedResult;
             let normalizedUrl = url;
-            let prefix = '';
+            let prefix = "";
             const isRequestable = (0, _utils.isUrlRequestable)(normalizedUrl);
 
             if (isRequestable) {
-              const queryParts = normalizedUrl.split('!');
+              const queryParts = normalizedUrl.split("!");
 
               if (queryParts.length > 1) {
                 normalizedUrl = queryParts.pop();
-                prefix = queryParts.join('!');
+                prefix = queryParts.join("!");
               }
 
               normalizedUrl = (0, _utils.normalizeUrl)(normalizedUrl, isStringValue); // Empty url after normalize - `@import '\

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

@@ -21,7 +21,7 @@ function getNodeFromUrlFunc(node) {
 
 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) {
+  if (rule.url.replace(/^[\s]+|[\s]+$/g, "").length === 0) {
     result.warn(`Unable to find uri in '${node.toString()}'`, {
       node
     });
@@ -35,22 +35,86 @@ function shouldHandleRule(rule, node, result) {
   return true;
 }
 
+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)(node[key]);
-  parsed.walk(valueNode => {
-    if (valueNode.type !== 'function') {
+  const parsed = (0, _postcssValueParser.default)(node.raws && node.raws.value && node.raws.value.raw ? node.raws.value.raw : node[key]);
+  let inBetween;
+
+  if (node.raws && node.raws.between) {
+    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;
     }
 
     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;
-      const isStringValue = nodes.length !== 0 && nodes[0].type === 'string';
+      const isStringValue = nodes.length !== 0 && nodes[0].type === "string";
       const url = isStringValue ? nodes[0].value : _postcssValueParser.default.stringify(nodes);
       const rule = {
         node: getNodeFromUrlFunc(valueNode),
@@ -71,17 +135,29 @@ function visitor(result, parsedResults, node, key) {
 
       return false;
     } else if (isImageSetFunc.test(valueNode.value)) {
-      for (const nNode of valueNode.nodes) {
+      for (const [innerIndex, nNode] of valueNode.nodes.entries()) {
         const {
           type,
           value
         } = nNode;
 
-        if (type === 'function' && isUrlFunc.test(value)) {
+        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 {
             nodes
           } = nNode;
-          const isStringValue = nodes.length !== 0 && nodes[0].type === 'string';
+          const isStringValue = nodes.length !== 0 && nodes[0].type === "string";
           const url = isStringValue ? nodes[0].value : _postcssValueParser.default.stringify(nodes);
           const rule = {
             node: getNodeFromUrlFunc(nNode),
@@ -97,7 +173,19 @@ function visitor(result, parsedResults, node, key) {
               parsed
             });
           }
-        } else if (type === 'string') {
+        } 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
+
+
+            continue;
+          }
+
           const rule = {
             node: nNode,
             url: value,
@@ -124,13 +212,13 @@ function visitor(result, parsedResults, node, key) {
 
 const plugin = (options = {}) => {
   return {
-    postcssPlugin: 'postcss-url-parser',
+    postcssPlugin: "postcss-url-parser",
 
     prepare(result) {
       const parsedResults = [];
       return {
         Declaration(declaration) {
-          visitor(result, parsedResults, declaration, 'value');
+          visitor(result, parsedResults, declaration, "value");
         },
 
         async OnceExit() {
@@ -149,12 +237,12 @@ const plugin = (options = {}) => {
               isStringValue
             } = parsedResult.rule;
             let normalizedUrl = url;
-            let prefix = '';
-            const queryParts = normalizedUrl.split('!');
+            let prefix = "";
+            const queryParts = normalizedUrl.split("!");
 
             if (queryParts.length > 1) {
               normalizedUrl = queryParts.pop();
-              prefix = queryParts.join('!');
+              prefix = queryParts.join("!");
             }
 
             normalizedUrl = (0, _utils.normalizeUrl)(normalizedUrl, isStringValue);
@@ -166,8 +254,8 @@ const plugin = (options = {}) => {
 
             if (!hasUrlImportHelper) {
               options.imports.push({
-                importName: '___CSS_LOADER_GET_URL_IMPORT___',
-                url: options.urlHandler(require.resolve('../runtime/getUrl.js')),
+                importName: "___CSS_LOADER_GET_URL_IMPORT___",
+                url: options.urlHandler(require.resolve("../runtime/getUrl.js")),
                 index: -1
               });
               hasUrlImportHelper = true;
@@ -175,8 +263,8 @@ const plugin = (options = {}) => {
 
             const splittedUrl = normalizedUrl.split(/(\?)?#/);
             const [pathname, query, hashOrQuery] = splittedUrl;
-            let hash = query ? '?' : '';
-            hash += hashOrQuery ? `#${hashOrQuery}` : '';
+            let hash = query ? "?" : "";
+            hash += hashOrQuery ? `#${hashOrQuery}` : "";
             const request = (0, _utils.requestify)(pathname, options.rootContext);
             tasks.push((async () => {
               const {
@@ -242,7 +330,7 @@ const plugin = (options = {}) => {
             } // eslint-disable-next-line no-param-reassign
 
 
-            rule.node.type = 'word'; // 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
 

package/dist/runtime/api.js

@@ -18,15 +18,15 @@ module.exports = function (cssWithMappingToString) {
       }
 
       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 = {};

package/dist/runtime/cssWithMappingToString.js

@@ -17,16 +17,16 @@ module.exports = function cssWithMappingToString(item) {
       content = _item[1],
       cssMapping = _item[3];
 
-  if (typeof btoa === 'function') {
+  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 "/*# sourceURL=".concat(cssMapping.sourceRoot || "").concat(source, " */");
     });
-    return [content].concat(sourceURLs).concat([sourceMapping]).join('\n');
+    return [content].concat(sourceURLs).concat([sourceMapping]).join("\n");
   }
 
-  return [content].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;