css-loader 6.0.0 → 6.4.0

package/dist/options.json

@@ -3,7 +3,8 @@
   "additionalProperties": false,
   "properties": {
     "url": {
-      "description": "Allows to enables/disables `url()`/`image-set()` functions handling (https://github.com/webpack-contrib/css-loader#url).",
+      "description": "Allows to enables/disables `url()`/`image-set()` functions handling.",
+      "link": "https://github.com/webpack-contrib/css-loader#url",
       "anyOf": [
         {
           "type": "boolean"
@@ -20,7 +21,8 @@
       ]
     },
     "import": {
-      "description": "Allows to enables/disables `@import` at-rules handling (https://github.com/webpack-contrib/css-loader#import).",
+      "description": "Allows to enables/disables `@import` at-rules handling.",
+      "link": "https://github.com/webpack-contrib/css-loader#import",
       "anyOf": [
         {
           "type": "boolean"
@@ -37,7 +39,8 @@
       ]
     },
     "modules": {
-      "description": "Allows to enable/disable CSS Modules or ICSS and setup configuration (https://github.com/webpack-contrib/css-loader#modules).",
+      "description": "Allows to enable/disable CSS Modules or ICSS and setup configuration.",
+      "link": "https://github.com/webpack-contrib/css-loader#modules",
       "anyOf": [
         {
           "type": "boolean"
@@ -50,7 +53,8 @@
           "additionalProperties": false,
           "properties": {
             "auto": {
-              "description": "Allows auto enable CSS modules based on filename (https://github.com/webpack-contrib/css-loader#auto).",
+              "description": "Allows auto enable CSS modules based on filename.",
+              "link": "https://github.com/webpack-contrib/css-loader#auto",
               "anyOf": [
                 {
                   "instanceof": "RegExp"
@@ -64,7 +68,8 @@
               ]
             },
             "mode": {
-              "description": "Setup `mode` option (https://github.com/webpack-contrib/css-loader#mode).",
+              "description": "Setup `mode` option.",
+              "link": "https://github.com/webpack-contrib/css-loader#mode",
               "anyOf": [
                 {
                   "enum": ["local", "global", "pure", "icss"]
@@ -75,36 +80,43 @@
               ]
             },
             "localIdentName": {
-              "description": "Allows to configure the generated local ident name (https://github.com/webpack-contrib/css-loader#localidentname).",
+              "description": "Allows to configure the generated local ident name.",
+              "link": "https://github.com/webpack-contrib/css-loader#localidentname",
               "type": "string",
               "minLength": 1
             },
             "localIdentContext": {
-              "description": "Allows to redefine basic loader context for local ident name (https://github.com/webpack-contrib/css-loader#localidentcontext).",
+              "description": "Allows to redefine basic loader context for local ident name.",
+              "link": "https://github.com/webpack-contrib/css-loader#localidentcontext",
               "type": "string",
               "minLength": 1
             },
             "localIdentHashSalt": {
-              "description": "Allows to add custom hash to generate more unique classes (https://github.com/webpack-contrib/css-loader#localidenthashsalt).",
+              "description": "Allows to add custom hash to generate more unique classes.",
+              "link": "https://github.com/webpack-contrib/css-loader#localidenthashsalt",
               "type": "string",
               "minLength": 1
             },
             "localIdentHashFunction": {
-              "description": "Allows to specify hash function to generate classes (https://github.com/webpack-contrib/css-loader#localidenthashfunction).",
+              "description": "Allows to specify hash function to generate classes.",
+              "link": "https://github.com/webpack-contrib/css-loader#localidenthashfunction",
               "type": "string",
               "minLength": 1
             },
             "localIdentHashDigest": {
-              "description": "Allows to specify hash digest to generate classes (https://github.com/webpack-contrib/css-loader#localidenthashdigest).",
+              "description": "Allows to specify hash digest to generate classes.",
+              "link": "https://github.com/webpack-contrib/css-loader#localidenthashdigest",
               "type": "string",
               "minLength": 1
             },
             "localIdentHashDigestLength": {
-              "description": "Allows to specify hash digest length to generate classes (https://github.com/webpack-contrib/css-loader#localidenthashdigestlength).",
+              "description": "Allows to specify hash digest length to generate classes.",
+              "link": "https://github.com/webpack-contrib/css-loader#localidenthashdigestlength",
               "type": "number"
             },
             "localIdentRegExp": {
-              "description": "Allows to specify custom RegExp for local ident name (https://github.com/webpack-contrib/css-loader#localidentregexp).",
+              "description": "Allows to specify custom RegExp for local ident name.",
+              "link": "https://github.com/webpack-contrib/css-loader#localidentregexp",
               "anyOf": [
                 {
                   "type": "string",
@@ -116,29 +128,41 @@
               ]
             },
             "getLocalIdent": {
-              "description": "Allows to specify a function to generate the classname (https://github.com/webpack-contrib/css-loader#getlocalident).",
+              "description": "Allows to specify a function to generate the classname.",
+              "link": "https://github.com/webpack-contrib/css-loader#getlocalident",
               "instanceof": "Function"
             },
             "namedExport": {
-              "description": "Enables/disables ES modules named export for locals (https://github.com/webpack-contrib/css-loader#namedexport).",
+              "description": "Enables/disables ES modules named export for locals.",
+              "link": "https://github.com/webpack-contrib/css-loader#namedexport",
               "type": "boolean"
             },
             "exportGlobals": {
-              "description": "Allows to export names from global class or id, so you can use that as local name (https://github.com/webpack-contrib/css-loader#exportglobals).",
+              "description": "Allows to export names from global class or id, so you can use that as local name.",
+              "link": "https://github.com/webpack-contrib/css-loader#exportglobals",
               "type": "boolean"
             },
             "exportLocalsConvention": {
-              "description": "Style of exported classnames (https://github.com/webpack-contrib/css-loader#localsconvention).",
-              "enum": [
-                "asIs",
-                "camelCase",
-                "camelCaseOnly",
-                "dashes",
-                "dashesOnly"
+              "description": "Style of exported classnames.",
+              "link": "https://github.com/webpack-contrib/css-loader#localsconvention",
+              "anyOf": [
+                {
+                  "enum": [
+                    "asIs",
+                    "camelCase",
+                    "camelCaseOnly",
+                    "dashes",
+                    "dashesOnly"
+                  ]
+                },
+                {
+                  "instanceof": "Function"
+                }
               ]
             },
             "exportOnlyLocals": {
-              "description": "Export only locals (https://github.com/webpack-contrib/css-loader#exportonlylocals).",
+              "description": "Export only locals.",
+              "link": "https://github.com/webpack-contrib/css-loader#exportonlylocals",
               "type": "boolean"
             }
           }
@@ -146,11 +170,13 @@
       ]
     },
     "sourceMap": {
-      "description": "Allows to enable/disable source maps (https://github.com/webpack-contrib/css-loader#sourcemap).",
+      "description": "Allows to enable/disable source maps.",
+      "link": "https://github.com/webpack-contrib/css-loader#sourcemap",
       "type": "boolean"
     },
     "importLoaders": {
-      "description": "Allows enables/disables or setups number of loaders applied before CSS loader for `@import`/CSS Modules and ICSS imports (https://github.com/webpack-contrib/css-loader#importloaders).",
+      "description": "Allows enables/disables or setups number of loaders applied before CSS loader for `@import`/CSS Modules and ICSS imports.",
+      "link": "https://github.com/webpack-contrib/css-loader#importloaders",
       "anyOf": [
         {
           "type": "boolean"
@@ -164,8 +190,14 @@
       ]
     },
     "esModule": {
-      "description": "Use the ES modules syntax (https://github.com/webpack-contrib/css-loader#esmodule).",
+      "description": "Use the ES modules syntax.",
+      "link": "https://github.com/webpack-contrib/css-loader#esmodule",
       "type": "boolean"
+    },
+    "exportType": {
+      "description": "Allows exporting styles as array with modules, string or constructable stylesheet (i.e. `CSSStyleSheet`).",
+      "link": "https://github.com/webpack-contrib/css-loader#exporttype",
+      "enum": ["array", "string", "css-style-sheet"]
     }
   },
   "type": "object"

package/dist/plugins/index.js

@@ -3,16 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "importParser", {
+Object.defineProperty(exports, "icssParser", {
   enumerable: true,
   get: function () {
-    return _postcssImportParser.default;
+    return _postcssIcssParser.default;
   }
 });
-Object.defineProperty(exports, "icssParser", {
+Object.defineProperty(exports, "importParser", {
   enumerable: true,
   get: function () {
-    return _postcssIcssParser.default;
+    return _postcssImportParser.default;
   }
 });
 Object.defineProperty(exports, "urlParser", {

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

@@ -20,7 +20,18 @@ const plugin = (options = {}) => {
         icssExports
       } = (0, _icssUtils.extractICSS)(root);
       const imports = new Map();
-      const tasks = []; // eslint-disable-next-line guard-for-in
+      const tasks = [];
+      const {
+        loaderContext
+      } = options;
+      const resolver = loaderContext.getResolve({
+        dependencyType: "icss",
+        conditionNames: ["style"],
+        extensions: ["..."],
+        mainFields: ["css", "style", "main", "..."],
+        mainFiles: ["index", "..."],
+        preferRelative: true
+      }); // eslint-disable-next-line guard-for-in
 
       for (const url in icssImports) {
         const tokens = icssImports[url];
@@ -39,14 +50,10 @@ const plugin = (options = {}) => {
           prefix = queryParts.join("!");
         }
 
-        const request = (0, _utils.requestify)((0, _utils.normalizeUrl)(normalizedUrl, true), options.rootContext);
+        const request = (0, _utils.requestify)((0, _utils.normalizeUrl)(normalizedUrl, true), loaderContext.rootContext);
 
         const doResolve = async () => {
-          const {
-            resolver,
-            context
-          } = options;
-          const resolvedUrl = await (0, _utils.resolveRequests)(resolver, context, [...new Set([normalizedUrl, request])]);
+          const resolvedUrl = await (0, _utils.resolveRequests)(resolver, loaderContext.context, [...new Set([normalizedUrl, request])]);
 
           if (!resolvedUrl) {
             return;

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

@@ -43,9 +43,10 @@ function parseNode(atRule, key) {
     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)(atRule[key]); // No nodes - `@import ;`
+  } = (0, _postcssValueParser.default)(rawParams); // No nodes - `@import ;`
   // Invalid type - `@import foo-bar;`
 
   if (paramsNodes.length === 0 || paramsNodes[0].type !== "string" && paramsNodes[0].type !== "function") {
@@ -92,11 +93,42 @@ function parseNode(atRule, key) {
     throw error;
   }
 
-  const mediaNodes = paramsNodes.slice(1);
+  const additionalNodes = paramsNodes.slice(1);
+  let supports;
+  let layer;
   let media;
 
-  if (mediaNodes.length > 0) {
-    media = _postcssValueParser.default.stringify(mediaNodes).trim().toLowerCase();
+  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);
+        } else {
+          nodes.splice(nodes.length - 1, 1, {
+            type: "string",
+            value: "",
+            unclosed: false
+          });
+        }
+
+        layer = _postcssValueParser.default.stringify(nodes).trim().toLowerCase();
+        nodes = [];
+      } else if (node.type === "function" && node.value.toLowerCase() === "supports") {
+        nodes.splice(nodes.length - 1, 1, ...node.nodes);
+        supports = _postcssValueParser.default.stringify(nodes).trim().toLowerCase();
+        nodes = [];
+      }
+    }
+
+    if (nodes.length > 0) {
+      media = _postcssValueParser.default.stringify(nodes).trim().toLowerCase();
+    }
   } // eslint-disable-next-line consistent-return
 
 
@@ -104,6 +136,8 @@ function parseNode(atRule, key) {
     atRule,
     prefix,
     url,
+    layer,
+    supports,
     media,
     isRequestable
   };
@@ -118,6 +152,11 @@ const plugin = (options = {}) => {
       return {
         AtRule: {
           import(atRule) {
+            if (options.isCSSStyleSheet) {
+              options.loaderContext.emitError(new Error(atRule.error("'@import' rules are not allowed here and will not be processed").message));
+              return;
+            }
+
             let parsedAtRule;
 
             try {
@@ -142,17 +181,30 @@ const plugin = (options = {}) => {
             return;
           }
 
+          const {
+            loaderContext
+          } = options;
+          const resolver = loaderContext.getResolve({
+            dependencyType: "css",
+            conditionNames: ["style"],
+            mainFields: ["css", "style", "main", "..."],
+            mainFiles: ["index", "..."],
+            extensions: [".css", "..."],
+            preferRelative: true
+          });
           const resolvedAtRules = await Promise.all(parsedAtRules.map(async parsedAtRule => {
             const {
               atRule,
               isRequestable,
               prefix,
               url,
+              layer,
+              supports,
               media
             } = parsedAtRule;
 
             if (options.filter) {
-              const needKeep = await options.filter(url, media);
+              const needKeep = await options.filter(url, media, loaderContext.resourcePath, supports, layer);
 
               if (!needKeep) {
                 return;
@@ -160,18 +212,14 @@ const plugin = (options = {}) => {
             }
 
             if (isRequestable) {
-              const request = (0, _utils.requestify)(url, options.rootContext);
-              const {
-                resolver,
-                context
-              } = options;
-              const resolvedUrl = await (0, _utils.resolveRequests)(resolver, context, [...new Set([request, url])]);
+              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 === options.resourcePath) {
+              if (resolvedUrl === loaderContext.resourcePath) {
                 atRule.remove();
                 return;
               }
@@ -180,6 +228,8 @@ const plugin = (options = {}) => {
 
               return {
                 url: resolvedUrl,
+                layer,
+                supports,
                 media,
                 prefix,
                 isRequestable
@@ -190,6 +240,8 @@ const plugin = (options = {}) => {
 
             return {
               url,
+              layer,
+              supports,
               media,
               prefix,
               isRequestable
@@ -208,12 +260,16 @@ const plugin = (options = {}) => {
             const {
               url,
               isRequestable,
+              layer,
+              supports,
               media
             } = resolvedAtRule;
 
             if (!isRequestable) {
               options.api.push({
                 url,
+                layer,
+                supports,
                 media,
                 index
               }); // eslint-disable-next-line no-continue
@@ -240,6 +296,8 @@ const plugin = (options = {}) => {
 
             options.api.push({
               importName,
+              layer,
+              supports,
               media,
               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,24 +2,20 @@
 
 module.exports = function (url, options) {
   if (!options) {
-    // eslint-disable-next-line no-param-reassign
     options = {};
   }
 
   if (!url) {
     return url;
-  } // eslint-disable-next-line no-underscore-dangle, no-param-reassign
-
+  }
 
   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

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");
+};