css-loader 4.2.2 → 5.0.2

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

@@ -11,7 +11,7 @@ var _postcss = _interopRequireDefault(require("postcss"));
 
 var _package = _interopRequireDefault(require("postcss/package.json"));
 
-var _schemaUtils = _interopRequireDefault(require("schema-utils"));
+var _schemaUtils = require("schema-utils");
 
 var _semver = require("semver");
 
@@ -33,9 +33,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 */
 async function loader(content, map, meta) {
   const rawOptions = (0, _loaderUtils.getOptions)(this);
-  (0, _schemaUtils.default)(_options.default, rawOptions, {
-    name: 'CSS Loader',
-    baseDataPath: 'options'
+  (0, _schemaUtils.validate)(_options.default, rawOptions, {
+    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;
     }
@@ -138,6 +138,7 @@ async function loader(content, map, meta) {
 
   try {
     result = await (0, _postcss.default)(plugins).process(content, {
+      hideNothingWarning: true,
       from: resourcePath,
       to: resourcePath,
       map: options.sourceMap ? {
@@ -151,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;
   }
 
@@ -164,9 +165,16 @@ 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"))
+      });
+    }
   }
 
   const importCode = (0, _utils.getImportCode)(imports, options);

package/dist/options.json

@@ -122,10 +122,6 @@
         }
       ]
     },
-    "icss": {
-      "description": "Enables/Disables handling the CSS module interoperable import/export format ((https://github.com/webpack-contrib/css-loader#icss)",
-      "type": "boolean"
-    },
     "sourceMap": {
       "description": "Enables/Disables generation of source maps (https://github.com/webpack-contrib/css-loader#sourcemap).",
       "type": "boolean"
@@ -136,6 +132,9 @@
         {
           "type": "boolean"
         },
+        {
+          "type": "string"
+        },
         {
           "type": "integer"
         }

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

@@ -5,109 +5,114 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _postcss = _interopRequireDefault(require("postcss"));
-
 var _icssUtils = require("icss-utils");
 
 var _utils = require("../utils");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var _default = _postcss.default.plugin('postcss-icss-parser', options => async css => {
-  const importReplacements = Object.create(null);
-  const {
-    icssImports,
-    icssExports
-  } = (0, _icssUtils.extractICSS)(css);
-  const imports = new Map();
-  const tasks = []; // eslint-disable-next-line guard-for-in
-
-  for (const url in icssImports) {
-    const tokens = icssImports[url];
-
-    if (Object.keys(tokens).length === 0) {
-      // eslint-disable-next-line no-continue
-      continue;
-    }
-
-    let normalizedUrl = url;
-    let prefix = '';
-    const queryParts = normalizedUrl.split('!');
+const plugin = (options = {}) => {
+  return {
+    postcssPlugin: "postcss-icss-parser",
 
-    if (queryParts.length > 1) {
-      normalizedUrl = queryParts.pop();
-      prefix = queryParts.join('!');
-    }
-
-    const request = (0, _utils.requestify)((0, _utils.normalizeUrl)(normalizedUrl, true), options.rootContext);
-
-    const doResolve = async () => {
+    async OnceExit(root) {
+      const importReplacements = Object.create(null);
       const {
-        resolver,
-        context
-      } = options;
-      const resolvedUrl = await (0, _utils.resolveRequests)(resolver, context, [...new Set([normalizedUrl, request])]);
-      return {
-        url: resolvedUrl,
-        prefix,
-        tokens
-      };
-    };
-
-    tasks.push(doResolve());
-  }
-
-  const results = await Promise.all(tasks);
-
-  for (let index = 0; index <= results.length - 1; index++) {
-    const {
-      url,
-      prefix,
-      tokens
-    } = results[index];
-    const newUrl = prefix ? `${prefix}!${url}` : url;
-    const importKey = newUrl;
-    let importName = imports.get(importKey);
-
-    if (!importName) {
-      importName = `___CSS_LOADER_ICSS_IMPORT_${imports.size}___`;
-      imports.set(importKey, importName);
-      options.imports.push({
-        importName,
-        url: options.urlHandler(newUrl),
-        icss: true,
-        index
-      });
-      options.api.push({
-        importName,
-        dedupe: true,
-        index
-      });
+        icssImports,
+        icssExports
+      } = (0, _icssUtils.extractICSS)(root);
+      const imports = new Map();
+      const tasks = []; // eslint-disable-next-line guard-for-in
+
+      for (const url in icssImports) {
+        const tokens = icssImports[url];
+
+        if (Object.keys(tokens).length === 0) {
+          // eslint-disable-next-line no-continue
+          continue;
+        }
+
+        let normalizedUrl = url;
+        let prefix = "";
+        const queryParts = normalizedUrl.split("!");
+
+        if (queryParts.length > 1) {
+          normalizedUrl = queryParts.pop();
+          prefix = queryParts.join("!");
+        }
+
+        const request = (0, _utils.requestify)((0, _utils.normalizeUrl)(normalizedUrl, true), options.rootContext);
+
+        const doResolve = async () => {
+          const {
+            resolver,
+            context
+          } = options;
+          const resolvedUrl = await (0, _utils.resolveRequests)(resolver, context, [...new Set([normalizedUrl, request])]);
+          return {
+            url: resolvedUrl,
+            prefix,
+            tokens
+          };
+        };
+
+        tasks.push(doResolve());
+      }
+
+      const results = await Promise.all(tasks);
+
+      for (let index = 0; index <= results.length - 1; index++) {
+        const {
+          url,
+          prefix,
+          tokens
+        } = results[index];
+        const newUrl = prefix ? `${prefix}!${url}` : url;
+        const importKey = newUrl;
+        let importName = imports.get(importKey);
+
+        if (!importName) {
+          importName = `___CSS_LOADER_ICSS_IMPORT_${imports.size}___`;
+          imports.set(importKey, importName);
+          options.imports.push({
+            importName,
+            url: options.urlHandler(newUrl),
+            icss: true,
+            index
+          });
+          options.api.push({
+            importName,
+            dedupe: true,
+            index
+          });
+        }
+
+        for (const [replacementIndex, token] of Object.keys(tokens).entries()) {
+          const replacementName = `___CSS_LOADER_ICSS_IMPORT_${index}_REPLACEMENT_${replacementIndex}___`;
+          const localName = tokens[token];
+          importReplacements[token] = replacementName;
+          options.replacements.push({
+            replacementName,
+            importName,
+            localName
+          });
+        }
+      }
+
+      if (Object.keys(importReplacements).length > 0) {
+        (0, _icssUtils.replaceSymbols)(root, importReplacements);
+      }
+
+      for (const name of Object.keys(icssExports)) {
+        const value = (0, _icssUtils.replaceValueSymbols)(icssExports[name], importReplacements);
+        options.exports.push({
+          name,
+          value
+        });
+      }
     }
 
-    for (const [replacementIndex, token] of Object.keys(tokens).entries()) {
-      const replacementName = `___CSS_LOADER_ICSS_IMPORT_${index}_REPLACEMENT_${replacementIndex}___`;
-      const localName = tokens[token];
-      importReplacements[token] = replacementName;
-      options.replacements.push({
-        replacementName,
-        importName,
-        localName
-      });
-    }
-  }
-
-  if (Object.keys(importReplacements).length > 0) {
-    (0, _icssUtils.replaceSymbols)(css, importReplacements);
-  }
-
-  for (const name of Object.keys(icssExports)) {
-    const value = (0, _icssUtils.replaceValueSymbols)(icssExports[name], importReplacements);
-    options.exports.push({
-      name,
-      value
-    });
-  }
-});
+  };
+};
 
+plugin.postcss = true;
+var _default = plugin;
 exports.default = _default;