css-loader 4.2.2 → 5.0.2

package/dist/utils.js

@@ -46,8 +46,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
   MIT License http://www.opensource.org/licenses/mit-license.php
   Author Tobias Koppers @sokra
 */
-const whitespace = '[\\x20\\t\\r\\n\\f]';
-const unescapeRegExp = new RegExp(`\\\\([\\da-f]{1,6}${whitespace}?|(${whitespace})|.)`, 'ig');
+const whitespace = "[\\x20\\t\\r\\n\\f]";
+const unescapeRegExp = new RegExp(`\\\\([\\da-f]{1,6}${whitespace}?|(${whitespace})|.)`, "ig");
 const matchNativeWin32Path = /^[A-Z]:[/\\]|^\\\\/i;
 
 function unescape(str) {
@@ -67,7 +67,7 @@ function unescape(str) {
 }
 
 function normalizePath(file) {
-  return _path.default.sep === '\\' ? file.replace(/\\/g, '/') : file;
+  return _path.default.sep === "\\" ? file.replace(/\\/g, "/") : file;
 } // eslint-disable-next-line no-control-regex
 
 
@@ -75,6 +75,13 @@ const filenameReservedRegex = /[<>:"/\\|?*]/g; // eslint-disable-next-line no-co
 
 const reControlChars = /[\u0000-\u001f\u0080-\u009f]/g;
 
+function escapeLocalIdent(localident) {
+  return (0, _cssesc.default)(localident // For `[hash]` placeholder
+  .replace(/^((-?[0-9])|--)/, "_$1").replace(filenameReservedRegex, "-").replace(reControlChars, "-").replace(/\./g, "-"), {
+    isIdentifier: true
+  });
+}
+
 function defaultGetLocalIdent(loaderContext, localIdentName, localName, options) {
   const {
     context,
@@ -85,27 +92,22 @@ function defaultGetLocalIdent(loaderContext, localIdentName, localName, options)
   } = loaderContext;
   const request = normalizePath(_path.default.relative(context, resourcePath)); // eslint-disable-next-line no-param-reassign
 
-  options.content = `${hashPrefix + request}\x00${unescape(localName)}`; // Using `[path]` placeholder outputs `/` we need escape their
-  // Also directories can contains invalid characters for css we need escape their too
-
-  return (0, _cssesc.default)((0, _loaderUtils.interpolateName)(loaderContext, localIdentName, options) // For `[hash]` placeholder
-  .replace(/^((-?[0-9])|--)/, '_$1').replace(filenameReservedRegex, '-').replace(reControlChars, '-').replace(/\./g, '-'), {
-    isIdentifier: true
-  }).replace(/\\\[local\\]/gi, localName);
+  options.content = `${hashPrefix + request}\x00${localName}`;
+  return (0, _loaderUtils.interpolateName)(loaderContext, localIdentName, options);
 }
 
 function normalizeUrl(url, isStringValue) {
   let normalizedUrl = url;
 
-  if (isStringValue && /\\[\n]/.test(normalizedUrl)) {
-    normalizedUrl = normalizedUrl.replace(/\\[\n]/g, '');
+  if (isStringValue && /\\(\n|\r\n|\r|\f)/.test(normalizedUrl)) {
+    normalizedUrl = normalizedUrl.replace(/\\(\n|\r\n|\r|\f)/g, "");
   }
 
   if (matchNativeWin32Path.test(url)) {
-    return decodeURIComponent(normalizedUrl);
+    return decodeURI(normalizedUrl);
   }
 
-  return decodeURIComponent(unescape(normalizedUrl));
+  return decodeURI(unescape(normalizedUrl));
 }
 
 function requestify(url, rootContext) {
@@ -113,12 +115,12 @@ function requestify(url, rootContext) {
     return (0, _url.fileURLToPath)(url);
   }
 
-  return url.charAt(0) === '/' ? (0, _loaderUtils.urlToRequest)(url, rootContext) : (0, _loaderUtils.urlToRequest)(url);
+  return url.charAt(0) === "/" ? (0, _loaderUtils.urlToRequest)(url, rootContext) : (0, _loaderUtils.urlToRequest)(url);
 }
 
 function getFilter(filter, resourcePath) {
   return (...args) => {
-    if (typeof filter === 'function') {
+    if (typeof filter === "function") {
       return filter(...args, resourcePath);
     }
 
@@ -126,44 +128,59 @@ function getFilter(filter, resourcePath) {
   };
 }
 
-const moduleRegExp = /\.module\.\w+$/i;
+function getValidLocalName(localName, exportLocalsConvention) {
+  if (exportLocalsConvention === "dashesOnly") {
+    return dashesCamelCase(localName);
+  }
+
+  return (0, _camelcase.default)(localName);
+}
+
+const moduleRegExp = /\.module(s)?\.\w+$/i;
+const icssRegExp = /\.icss\.\w+$/i;
 
 function getModulesOptions(rawOptions, loaderContext) {
   const {
     resourcePath
   } = loaderContext;
+  let isIcss;
 
-  if (typeof rawOptions.modules === 'undefined') {
+  if (typeof rawOptions.modules === "undefined") {
     const isModules = moduleRegExp.test(resourcePath);
 
     if (!isModules) {
+      isIcss = icssRegExp.test(resourcePath);
+    }
+
+    if (!isModules && !isIcss) {
       return false;
     }
-  } else if (typeof rawOptions.modules === 'boolean' && rawOptions.modules === false) {
+  } else if (typeof rawOptions.modules === "boolean" && rawOptions.modules === false) {
     return false;
   }
 
   let modulesOptions = {
-    compileType: rawOptions.icss ? 'icss' : 'module',
+    compileType: isIcss ? "icss" : "module",
     auto: true,
-    mode: 'local',
+    mode: "local",
     exportGlobals: false,
-    localIdentName: '[hash:base64]',
+    localIdentName: "[hash:base64]",
     localIdentContext: loaderContext.rootContext,
-    localIdentHashPrefix: '',
+    localIdentHashPrefix: "",
     // eslint-disable-next-line no-undefined
     localIdentRegExp: undefined,
-    getLocalIdent: defaultGetLocalIdent,
+    // eslint-disable-next-line no-undefined
+    getLocalIdent: undefined,
     namedExport: false,
-    exportLocalsConvention: 'asIs',
+    exportLocalsConvention: "asIs",
     exportOnlyLocals: false
   };
 
-  if (typeof rawOptions.modules === 'boolean' || typeof rawOptions.modules === 'string') {
-    modulesOptions.mode = typeof rawOptions.modules === 'string' ? rawOptions.modules : 'local';
+  if (typeof rawOptions.modules === "boolean" || typeof rawOptions.modules === "string") {
+    modulesOptions.mode = typeof rawOptions.modules === "string" ? rawOptions.modules : "local";
   } else {
     if (rawOptions.modules) {
-      if (typeof rawOptions.modules.auto === 'boolean') {
+      if (typeof rawOptions.modules.auto === "boolean") {
         const isModules = rawOptions.modules.auto && moduleRegExp.test(resourcePath);
 
         if (!isModules) {
@@ -175,7 +192,7 @@ function getModulesOptions(rawOptions, loaderContext) {
         if (!isModules) {
           return false;
         }
-      } else if (typeof rawOptions.modules.auto === 'function') {
+      } else if (typeof rawOptions.modules.auto === "function") {
         const isModule = rawOptions.modules.auto(resourcePath);
 
         if (!isModule) {
@@ -183,8 +200,8 @@ function getModulesOptions(rawOptions, loaderContext) {
         }
       }
 
-      if (rawOptions.modules.namedExport === true && typeof rawOptions.modules.exportLocalsConvention === 'undefined') {
-        modulesOptions.exportLocalsConvention = 'camelCaseOnly';
+      if (rawOptions.modules.namedExport === true && typeof rawOptions.modules.exportLocalsConvention === "undefined") {
+        modulesOptions.exportLocalsConvention = "camelCaseOnly";
       }
     }
 
@@ -193,7 +210,7 @@ function getModulesOptions(rawOptions, loaderContext) {
     };
   }
 
-  if (typeof modulesOptions.mode === 'function') {
+  if (typeof modulesOptions.mode === "function") {
     modulesOptions.mode = modulesOptions.mode(loaderContext.resourcePath);
   }
 
@@ -202,29 +219,27 @@ function getModulesOptions(rawOptions, loaderContext) {
       throw new Error('The "modules.namedExport" option requires the "esModules" option to be enabled');
     }
 
-    if (modulesOptions.exportLocalsConvention !== 'camelCaseOnly') {
-      throw new Error('The "modules.namedExport" option requires the "modules.exportLocalsConvention" option to be "camelCaseOnly"');
+    if (modulesOptions.exportLocalsConvention !== "camelCaseOnly" && modulesOptions.exportLocalsConvention !== "dashesOnly") {
+      throw new Error('The "modules.namedExport" option requires the "modules.exportLocalsConvention" option to be "camelCaseOnly" or "dashesOnly"');
     }
   }
 
+  if (/\[emoji(?::(\d+))?\]/i.test(modulesOptions.localIdentName)) {
+    loaderContext.emitWarning("Emoji is deprecated and will be removed in next major release.");
+  }
+
   return modulesOptions;
 }
 
 function normalizeOptions(rawOptions, loaderContext) {
-  if (rawOptions.icss) {
-    loaderContext.emitWarning(new Error('The "icss" option is deprecated, use "modules.compileType: "icss"" instead'));
-  }
-
   const modulesOptions = getModulesOptions(rawOptions, loaderContext);
   return {
-    url: typeof rawOptions.url === 'undefined' ? true : rawOptions.url,
-    import: typeof rawOptions.import === 'undefined' ? true : rawOptions.import,
+    url: typeof rawOptions.url === "undefined" ? true : rawOptions.url,
+    import: typeof rawOptions.import === "undefined" ? true : rawOptions.import,
     modules: modulesOptions,
-    // TODO remove in the next major release
-    icss: typeof rawOptions.icss === 'undefined' ? false : rawOptions.icss,
-    sourceMap: typeof rawOptions.sourceMap === 'boolean' ? rawOptions.sourceMap : loaderContext.sourceMap,
-    importLoaders: rawOptions.importLoaders,
-    esModule: typeof rawOptions.esModule === 'undefined' ? true : rawOptions.esModule
+    sourceMap: typeof rawOptions.sourceMap === "boolean" ? rawOptions.sourceMap : loaderContext.sourceMap,
+    importLoaders: typeof rawOptions.importLoaders === "string" ? parseInt(rawOptions.importLoaders, 10) : rawOptions.importLoaders,
+    esModule: typeof rawOptions.esModule === "undefined" ? true : rawOptions.esModule
   };
 }
 
@@ -233,7 +248,7 @@ function shouldUseImportPlugin(options) {
     return false;
   }
 
-  if (typeof options.import === 'boolean') {
+  if (typeof options.import === "boolean") {
     return options.import;
   }
 
@@ -245,7 +260,7 @@ function shouldUseURLPlugin(options) {
     return false;
   }
 
-  if (typeof options.url === 'boolean') {
+  if (typeof options.url === "boolean") {
     return options.url;
   }
 
@@ -253,7 +268,7 @@ function shouldUseURLPlugin(options) {
 }
 
 function shouldUseModulesPlugins(options) {
-  return options.modules.compileType === 'module';
+  return options.modules.compileType === "module";
 }
 
 function shouldUseIcssPlugin(options) {
@@ -276,11 +291,28 @@ function getModulesPlugins(options, loaderContext) {
       mode
     }), (0, _postcssModulesExtractImports.default)(), (0, _postcssModulesScope.default)({
       generateScopedName(exportName) {
-        return getLocalIdent(loaderContext, localIdentName, exportName, {
-          context: localIdentContext,
-          hashPrefix: localIdentHashPrefix,
-          regExp: localIdentRegExp
-        });
+        let localIdent;
+
+        if (typeof getLocalIdent !== "undefined") {
+          localIdent = getLocalIdent(loaderContext, localIdentName, unescape(exportName), {
+            context: localIdentContext,
+            hashPrefix: localIdentHashPrefix,
+            regExp: localIdentRegExp
+          });
+        } // A null/undefined value signals that we should invoke the default
+        // getLocalIdent method.
+
+
+        if (typeof localIdent === "undefined" || localIdent === null) {
+          localIdent = defaultGetLocalIdent(loaderContext, localIdentName, unescape(exportName), {
+            context: localIdentContext,
+            hashPrefix: localIdentHashPrefix,
+            regExp: localIdentRegExp
+          });
+          return escapeLocalIdent(localIdent).replace(/\\\[local\\]/gi, exportName);
+        }
+
+        return escapeLocalIdent(localIdent);
       },
 
       exportGlobals: options.modules.exportGlobals
@@ -296,26 +328,26 @@ const IS_NATIVE_WIN32_PATH = /^[a-z]:[/\\]|^\\\\/i;
 const ABSOLUTE_SCHEME = /^[a-z0-9+\-.]+:/i;
 
 function getURLType(source) {
-  if (source[0] === '/') {
-    if (source[1] === '/') {
-      return 'scheme-relative';
+  if (source[0] === "/") {
+    if (source[1] === "/") {
+      return "scheme-relative";
     }
 
-    return 'path-absolute';
+    return "path-absolute";
   }
 
   if (IS_NATIVE_WIN32_PATH.test(source)) {
-    return 'path-absolute';
+    return "path-absolute";
   }
 
-  return ABSOLUTE_SCHEME.test(source) ? 'absolute' : 'path-relative';
+  return ABSOLUTE_SCHEME.test(source) ? "absolute" : "path-relative";
 }
 
 function normalizeSourceMap(map, resourcePath) {
   let newMap = map; // Some loader emit source map as string
   // Strip any JSON XSSI avoidance prefix from the string (as documented in the source maps specification), and then parse the string as JSON.
 
-  if (typeof newMap === 'string') {
+  if (typeof newMap === "string") {
     newMap = JSON.parse(newMap);
   }
 
@@ -330,14 +362,14 @@ function normalizeSourceMap(map, resourcePath) {
     // We should normalize path because previous loaders like `sass-loader` using backslash when generate source map
     newMap.sources = newMap.sources.map(source => {
       // Non-standard syntax from `postcss`
-      if (source.indexOf('<') === 0) {
+      if (source.indexOf("<") === 0) {
         return source;
       }
 
       const sourceType = getURLType(source); // Do no touch `scheme-relative` and `absolute` URLs
 
-      if (sourceType === 'path-relative' || sourceType === 'path-absolute') {
-        const absoluteSource = sourceType === 'path-relative' && sourceRoot ? _path.default.resolve(sourceRoot, normalizePath(source)) : normalizePath(source);
+      if (sourceType === "path-relative" || sourceType === "path-absolute") {
+        const absoluteSource = sourceType === "path-relative" && sourceRoot ? _path.default.resolve(sourceRoot, normalizePath(source)) : normalizePath(source);
         return _path.default.relative(_path.default.dirname(resourcePath), absoluteSource);
       }
 
@@ -359,9 +391,9 @@ function getPreRequester({
     }
 
     if (number === false) {
-      cache[number] = '';
+      cache[number] = "";
     } else {
-      const loadersRequest = loaders.slice(loaderIndex, loaderIndex + 1 + (typeof number !== 'number' ? 0 : number)).map(x => x.request).join('!');
+      const loadersRequest = loaders.slice(loaderIndex, loaderIndex + 1 + (typeof number !== "number" ? 0 : number)).map(x => x.request).join("!");
       cache[number] = `-!${loadersRequest}!`;
     }
 
@@ -370,7 +402,7 @@ function getPreRequester({
 }
 
 function getImportCode(imports, options) {
-  let code = '';
+  let code = "";
 
   for (const item of imports) {
     const {
@@ -381,7 +413,7 @@ function getImportCode(imports, options) {
 
     if (options.esModule) {
       if (icss && options.modules.namedExport) {
-        code += `import ${options.modules.exportOnlyLocals ? '' : `${importName}, `}* as ${importName}_NAMED___ from ${url};\n`;
+        code += `import ${options.modules.exportOnlyLocals ? "" : `${importName}, `}* as ${importName}_NAMED___ from ${url};\n`;
       } else {
         code += `import ${importName} from ${url};\n`;
       }
@@ -390,7 +422,7 @@ function getImportCode(imports, options) {
     }
   }
 
-  return code ? `// Imports\n${code}` : '';
+  return code ? `// Imports\n${code}` : "";
 }
 
 function normalizeSourceMapForRuntime(map, loaderContext) {
@@ -398,16 +430,16 @@ function normalizeSourceMapForRuntime(map, loaderContext) {
 
   if (resultMap) {
     delete resultMap.file;
-    resultMap.sourceRoot = '';
+    resultMap.sourceRoot = "";
     resultMap.sources = resultMap.sources.map(source => {
       // Non-standard syntax from `postcss`
-      if (source.indexOf('<') === 0) {
+      if (source.indexOf("<") === 0) {
         return source;
       }
 
       const sourceType = getURLType(source);
 
-      if (sourceType !== 'path-relative') {
+      if (sourceType !== "path-relative") {
         return source;
       }
 
@@ -416,7 +448,7 @@ function normalizeSourceMapForRuntime(map, loaderContext) {
       const absoluteSource = _path.default.resolve(resourceDirname, source);
 
       const contextifyPath = normalizePath(_path.default.relative(loaderContext.rootContext, absoluteSource));
-      return `webpack://${contextifyPath}`;
+      return `webpack://./${contextifyPath}`;
     });
   }
 
@@ -425,12 +457,12 @@ function normalizeSourceMapForRuntime(map, loaderContext) {
 
 function getModuleCode(result, api, replacements, options, loaderContext) {
   if (options.modules.exportOnlyLocals === true) {
-    return '';
+    return "";
   }
 
-  const sourceMapValue = options.sourceMap ? `,${normalizeSourceMapForRuntime(result.map, loaderContext)}` : '';
+  const sourceMapValue = options.sourceMap ? `,${normalizeSourceMapForRuntime(result.map, loaderContext)}` : "";
   let code = JSON.stringify(result.css);
-  let beforeCode = `var ___CSS_LOADER_EXPORT___ = ___CSS_LOADER_API_IMPORT___(${options.sourceMap});\n`;
+  let beforeCode = `var ___CSS_LOADER_EXPORT___ = ___CSS_LOADER_API_IMPORT___(${options.sourceMap ? "___CSS_LOADER_API_SOURCEMAP_IMPORT___" : "function(i){return i[1]}"});\n`;
 
   for (const item of api) {
     const {
@@ -438,7 +470,7 @@ function getModuleCode(result, api, replacements, options, loaderContext) {
       media,
       dedupe
     } = item;
-    beforeCode += url ? `___CSS_LOADER_EXPORT___.push([module.id, ${JSON.stringify(`@import url(${url});`)}${media ? `, ${JSON.stringify(media)}` : ''}]);\n` : `___CSS_LOADER_EXPORT___.i(${item.importName}${media ? `, ${JSON.stringify(media)}` : dedupe ? ', ""' : ''}${dedupe ? ', true' : ''});\n`;
+    beforeCode += url ? `___CSS_LOADER_EXPORT___.push([module.id, ${JSON.stringify(`@import url(${url});`)}${media ? `, ${JSON.stringify(media)}` : ""}]);\n` : `___CSS_LOADER_EXPORT___.i(${item.importName}${media ? `, ${JSON.stringify(media)}` : dedupe ? ', ""' : ""}${dedupe ? ", true" : ""});\n`;
   }
 
   for (const item of replacements) {
@@ -449,16 +481,16 @@ function getModuleCode(result, api, replacements, options, loaderContext) {
     } = item;
 
     if (localName) {
-      code = code.replace(new RegExp(replacementName, 'g'), () => options.modules.namedExport ? `" + ${importName}_NAMED___[${JSON.stringify((0, _camelcase.default)(localName))}] + "` : `" + ${importName}.locals[${JSON.stringify(localName)}] + "`);
+      code = code.replace(new RegExp(replacementName, "g"), () => options.modules.namedExport ? `" + ${importName}_NAMED___[${JSON.stringify(getValidLocalName(localName, options.modules.exportLocalsConvention))}] + "` : `" + ${importName}.locals[${JSON.stringify(localName)}] + "`);
     } else {
       const {
         hash,
         needQuotes
       } = item;
-      const getUrlOptions = [].concat(hash ? [`hash: ${JSON.stringify(hash)}`] : []).concat(needQuotes ? 'needQuotes: true' : []);
-      const preparedOptions = getUrlOptions.length > 0 ? `, { ${getUrlOptions.join(', ')} }` : '';
+      const getUrlOptions = [].concat(hash ? [`hash: ${JSON.stringify(hash)}`] : []).concat(needQuotes ? "needQuotes: true" : []);
+      const preparedOptions = getUrlOptions.length > 0 ? `, { ${getUrlOptions.join(", ")} }` : "";
       beforeCode += `var ${replacementName} = ___CSS_LOADER_GET_URL_IMPORT___(${importName}${preparedOptions});\n`;
-      code = code.replace(new RegExp(replacementName, 'g'), () => `" + ${replacementName} + "`);
+      code = code.replace(new RegExp(replacementName, "g"), () => `" + ${replacementName} + "`);
     }
   }
 
@@ -470,12 +502,12 @@ function dashesCamelCase(str) {
 }
 
 function getExportCode(exports, replacements, options) {
-  let code = '// Exports\n';
-  let localsCode = '';
+  let code = "// Exports\n";
+  let localsCode = "";
 
   const addExportToLocalsCode = (name, value) => {
     if (options.modules.namedExport) {
-      localsCode += `export const ${(0, _camelcase.default)(name)} = ${JSON.stringify(value)};\n`;
+      localsCode += `export const ${name} = ${JSON.stringify(value)};\n`;
     } else {
       if (localsCode) {
         localsCode += `,\n`;
@@ -490,7 +522,7 @@ function getExportCode(exports, replacements, options) {
     value
   } of exports) {
     switch (options.modules.exportLocalsConvention) {
-      case 'camelCase':
+      case "camelCase":
         {
           addExportToLocalsCode(name, value);
           const modifiedName = (0, _camelcase.default)(name);
@@ -502,13 +534,13 @@ function getExportCode(exports, replacements, options) {
           break;
         }
 
-      case 'camelCaseOnly':
+      case "camelCaseOnly":
         {
           addExportToLocalsCode((0, _camelcase.default)(name), value);
           break;
         }
 
-      case 'dashes':
+      case "dashes":
         {
           addExportToLocalsCode(name, value);
           const modifiedName = dashesCamelCase(name);
@@ -520,13 +552,13 @@ function getExportCode(exports, replacements, options) {
           break;
         }
 
-      case 'dashesOnly':
+      case "dashesOnly":
         {
           addExportToLocalsCode(dashesCamelCase(name), value);
           break;
         }
 
-      case 'asIs':
+      case "asIs":
       default:
         addExportToLocalsCode(name, value);
         break;
@@ -543,9 +575,9 @@ function getExportCode(exports, replacements, options) {
       const {
         importName
       } = item;
-      localsCode = localsCode.replace(new RegExp(replacementName, 'g'), () => {
+      localsCode = localsCode.replace(new RegExp(replacementName, "g"), () => {
         if (options.modules.namedExport) {
-          return `" + ${importName}_NAMED___[${JSON.stringify((0, _camelcase.default)(localName))}] + "`;
+          return `" + ${importName}_NAMED___[${JSON.stringify(getValidLocalName(localName, options.modules.exportLocalsConvention))}] + "`;
         } else if (options.modules.exportOnlyLocals) {
           return `" + ${importName}[${JSON.stringify(localName)}] + "`;
         }
@@ -553,12 +585,12 @@ function getExportCode(exports, replacements, options) {
         return `" + ${importName}.locals[${JSON.stringify(localName)}] + "`;
       });
     } else {
-      localsCode = localsCode.replace(new RegExp(replacementName, 'g'), () => `" + ${replacementName} + "`);
+      localsCode = localsCode.replace(new RegExp(replacementName, "g"), () => `" + ${replacementName} + "`);
     }
   }
 
   if (options.modules.exportOnlyLocals) {
-    code += options.modules.namedExport ? localsCode : `${options.esModule ? 'export default' : 'module.exports ='} {\n${localsCode}\n};\n`;
+    code += options.modules.namedExport ? localsCode : `${options.esModule ? "export default" : "module.exports ="} {\n${localsCode}\n};\n`;
     return code;
   }
 
@@ -566,14 +598,12 @@ function getExportCode(exports, replacements, options) {
     code += options.modules.namedExport ? localsCode : `___CSS_LOADER_EXPORT___.locals = {\n${localsCode}\n};\n`;
   }
 
-  code += `${options.esModule ? 'export default' : 'module.exports ='} ___CSS_LOADER_EXPORT___;\n`;
+  code += `${options.esModule ? "export default" : "module.exports ="} ___CSS_LOADER_EXPORT___;\n`;
   return code;
 }
 
 async function resolveRequests(resolve, context, possibleRequests) {
-  return resolve(context, possibleRequests[0]).then(result => {
-    return result;
-  }).catch(error => {
+  return resolve(context, possibleRequests[0]).then(result => result).catch(error => {
     const [, ...tailPossibleRequests] = possibleRequests;
 
     if (tailPossibleRequests.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "css-loader",
-  "version": "4.2.2",
+  "version": "5.0.2",
   "description": "css loader module for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/css-loader",
@@ -43,55 +43,56 @@
     "webpack": "^4.27.0 || ^5.0.0"
   },
   "dependencies": {
-    "camelcase": "^6.0.0",
+    "camelcase": "^6.2.0",
     "cssesc": "^3.0.0",
-    "icss-utils": "^4.1.1",
+    "icss-utils": "^5.1.0",
     "loader-utils": "^2.0.0",
-    "postcss": "^7.0.32",
-    "postcss-modules-extract-imports": "^2.0.0",
-    "postcss-modules-local-by-default": "^3.0.3",
-    "postcss-modules-scope": "^2.2.0",
-    "postcss-modules-values": "^3.0.0",
+    "postcss": "^8.2.4",
+    "postcss-modules-extract-imports": "^3.0.0",
+    "postcss-modules-local-by-default": "^4.0.0",
+    "postcss-modules-scope": "^3.0.0",
+    "postcss-modules-values": "^4.0.0",
     "postcss-value-parser": "^4.1.0",
-    "schema-utils": "^2.7.0",
-    "semver": "^7.3.2"
+    "schema-utils": "^3.0.0",
+    "semver": "^7.3.4"
   },
   "devDependencies": {
-    "@babel/cli": "^7.10.5",
-    "@babel/core": "^7.11.4",
-    "@babel/preset-env": "^7.10.4",
-    "@commitlint/cli": "^10.0.0",
-    "@commitlint/config-conventional": "^10.0.0",
+    "@babel/cli": "^7.12.13",
+    "@babel/core": "^7.12.13",
+    "@babel/preset-env": "^7.12.13",
+    "@commitlint/cli": "^11.0.0",
+    "@commitlint/config-conventional": "^11.0.0",
     "@webpack-contrib/defaults": "^6.3.0",
     "@webpack-contrib/eslint-config-webpack": "^3.0.0",
-    "babel-jest": "^26.1.0",
-    "cross-env": "^7.0.2",
-    "del": "^5.1.0",
+    "babel-jest": "^26.6.3",
+    "cross-env": "^7.0.3",
+    "del": "^6.0.0",
     "del-cli": "^3.0.1",
-    "es-check": "^5.1.0",
-    "eslint": "^7.5.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-import": "^2.22.0",
-    "file-loader": "^6.0.0",
-    "husky": "^4.2.5",
-    "jest": "^26.1.0",
-    "less-loader": "^6.2.0",
-    "lint-staged": "^10.2.11",
+    "es-check": "^5.2.0",
+    "eslint": "^7.19.0",
+    "eslint-config-prettier": "^7.2.0",
+    "eslint-plugin-import": "^2.22.1",
+    "file-loader": "^6.2.0",
+    "husky": "^4.3.8",
+    "jest": "^26.6.3",
+    "less": "^4.1.1",
+    "less-loader": "^7.1.0",
+    "lint-staged": "^10.5.3",
     "memfs": "^3.2.0",
-    "mini-css-extract-plugin": "^0.10.0",
+    "mini-css-extract-plugin": "^1.3.5",
     "npm-run-all": "^4.1.5",
-    "postcss-loader": "^3.0.0",
+    "postcss-loader": "^4.0.4",
     "postcss-preset-env": "^6.7.0",
-    "prettier": "^2.0.5",
-    "sass": "^1.26.10",
-    "sass-loader": "^9.0.2",
+    "prettier": "^2.1.2",
+    "sass": "^1.32.6",
+    "sass-loader": "^10.1.0",
     "standard-version": "^9.0.0",
     "strip-ansi": "^6.0.0",
-    "style-loader": "^1.2.1",
+    "style-loader": "^2.0.0",
     "stylus": "^0.54.8",
-    "stylus-loader": "^3.0.2",
-    "url-loader": "^4.1.0",
-    "webpack": "^4.44.1"
+    "stylus-loader": "^4.3.0",
+    "url-loader": "^4.1.1",
+    "webpack": "^5.20.1"
   },
   "keywords": [
     "webpack",