css-loader 3.4.2 → 3.5.3

package/dist/utils.js

@@ -7,13 +7,15 @@ exports.normalizeUrl = normalizeUrl;
 exports.getFilter = getFilter;
 exports.getModulesPlugins = getModulesPlugins;
 exports.normalizeSourceMap = normalizeSourceMap;
+exports.getPreRequester = getPreRequester;
 exports.getImportCode = getImportCode;
 exports.getModuleCode = getModuleCode;
 exports.getExportCode = getExportCode;
+exports.shouldUseModulesPlugins = shouldUseModulesPlugins;
 
 var _path = _interopRequireDefault(require("path"));
 
-var _loaderUtils = _interopRequireWildcard(require("loader-utils"));
+var _loaderUtils = require("loader-utils");
 
 var _normalizePath = _interopRequireDefault(require("normalize-path"));
 
@@ -29,10 +31,6 @@ var _postcssModulesScope = _interopRequireDefault(require("postcss-modules-scope
 
 var _camelcase = _interopRequireDefault(require("camelcase"));
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /*
@@ -75,7 +73,7 @@ function getLocalIdent(loaderContext, localIdentName, localName, options) {
   options.content = `${options.hashPrefix + request}+${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)(_loaderUtils.default.interpolateName(loaderContext, localIdentName, options) // For `[hash]` placeholder
+  return (0, _cssesc.default)((0, _loaderUtils.interpolateName)(loaderContext, localIdentName, options) // For `[hash]` placeholder
   .replace(/^((-?[0-9])|--)/, '_$1').replace(filenameReservedRegex, '-').replace(reControlChars, '-').replace(reRelativePath, '-').replace(/\./g, '-'), {
     isIdentifier: true
   }).replace(/\\\[local\\\]/gi, localName);
@@ -105,9 +103,34 @@ function getFilter(filter, resourcePath, defaultFilter = null) {
   };
 }
 
+function shouldUseModulesPlugins(modules, resourcePath) {
+  if (typeof modules === 'undefined') {
+    return false;
+  }
+
+  if (typeof modules === 'boolean') {
+    return modules;
+  }
+
+  if (typeof modules === 'string') {
+    return true;
+  }
+
+  if (typeof modules.auto === 'boolean') {
+    return modules.auto ? /\.module\.\w+$/i.test(resourcePath) : false;
+  }
+
+  if (modules.auto instanceof RegExp) {
+    return modules.auto.test(resourcePath);
+  }
+
+  return true;
+}
+
 function getModulesPlugins(options, loaderContext) {
   let modulesOptions = {
     mode: 'local',
+    exportGlobals: false,
     localIdentName: '[hash:base64]',
     getLocalIdent,
     hashPrefix: '',
@@ -120,27 +143,40 @@ function getModulesPlugins(options, loaderContext) {
     modulesOptions = Object.assign({}, modulesOptions, options.modules);
   }
 
-  return [_postcssModulesValues.default, (0, _postcssModulesLocalByDefault.default)({
-    mode: modulesOptions.mode
-  }), (0, _postcssModulesExtractImports.default)(), (0, _postcssModulesScope.default)({
-    generateScopedName: function generateScopedName(exportName) {
-      let localIdent = modulesOptions.getLocalIdent(loaderContext, modulesOptions.localIdentName, exportName, {
-        context: modulesOptions.context,
-        hashPrefix: modulesOptions.hashPrefix,
-        regExp: modulesOptions.localIdentRegExp
-      });
-
-      if (!localIdent) {
-        localIdent = getLocalIdent(loaderContext, modulesOptions.localIdentName, exportName, {
+  if (typeof modulesOptions.mode === 'function') {
+    modulesOptions.mode = modulesOptions.mode(loaderContext.resourcePath);
+  }
+
+  let plugins = [];
+
+  try {
+    plugins = [_postcssModulesValues.default, (0, _postcssModulesLocalByDefault.default)({
+      mode: modulesOptions.mode
+    }), (0, _postcssModulesExtractImports.default)(), (0, _postcssModulesScope.default)({
+      generateScopedName: function generateScopedName(exportName) {
+        let localIdent = modulesOptions.getLocalIdent(loaderContext, modulesOptions.localIdentName, exportName, {
           context: modulesOptions.context,
           hashPrefix: modulesOptions.hashPrefix,
           regExp: modulesOptions.localIdentRegExp
         });
-      }
 
-      return localIdent;
-    }
-  })];
+        if (!localIdent) {
+          localIdent = getLocalIdent(loaderContext, modulesOptions.localIdentName, exportName, {
+            context: modulesOptions.context,
+            hashPrefix: modulesOptions.hashPrefix,
+            regExp: modulesOptions.localIdentRegExp
+          });
+        }
+
+        return localIdent;
+      },
+      exportGlobals: modulesOptions.exportGlobals
+    })];
+  } catch (error) {
+    loaderContext.emitError(error);
+  }
+
+  return plugins;
 }
 
 function normalizeSourceMap(map) {
@@ -168,113 +204,47 @@ function normalizeSourceMap(map) {
   return newMap;
 }
 
-function getImportPrefix(loaderContext, importLoaders) {
-  if (importLoaders === false) {
-    return '';
-  }
+function getPreRequester({
+  loaders,
+  loaderIndex
+}) {
+  const cache = Object.create(null);
+  return number => {
+    if (cache[number]) {
+      return cache[number];
+    }
 
-  const numberImportedLoaders = parseInt(importLoaders, 10) || 0;
-  const loadersRequest = loaderContext.loaders.slice(loaderContext.loaderIndex, loaderContext.loaderIndex + 1 + numberImportedLoaders).map(x => x.request).join('!');
-  return `-!${loadersRequest}!`;
+    if (number === false) {
+      cache[number] = '';
+    } else {
+      const loadersRequest = loaders.slice(loaderIndex, loaderIndex + 1 + (typeof number !== 'number' ? 0 : number)).map(x => x.request).join('!');
+      cache[number] = `-!${loadersRequest}!`;
+    }
+
+    return cache[number];
+  };
 }
 
-function getImportCode(loaderContext, imports, exportType, sourceMap, importLoaders, esModule) {
-  const importItems = [];
-  const codeItems = [];
-  const atRuleImportNames = new Map();
-  const urlImportNames = new Map();
-  let importPrefix;
+function getImportCode(loaderContext, exportType, imports, esModule) {
+  let code = '';
 
   if (exportType === 'full') {
-    importItems.push(esModule ? `import ___CSS_LOADER_API_IMPORT___ from ${(0, _loaderUtils.stringifyRequest)(loaderContext, require.resolve('./runtime/api'))};` : `var ___CSS_LOADER_API_IMPORT___ = require(${(0, _loaderUtils.stringifyRequest)(loaderContext, require.resolve('./runtime/api'))});`);
-    codeItems.push(esModule ? `var exports = ___CSS_LOADER_API_IMPORT___(${sourceMap});` : `exports = ___CSS_LOADER_API_IMPORT___(${sourceMap});`);
+    const apiUrl = (0, _loaderUtils.stringifyRequest)(loaderContext, require.resolve('./runtime/api'));
+    code += esModule ? `import ___CSS_LOADER_API_IMPORT___ from ${apiUrl};\n` : `var ___CSS_LOADER_API_IMPORT___ = require(${apiUrl});\n`;
   }
 
-  imports.forEach(item => {
-    // eslint-disable-next-line default-case
-    switch (item.type) {
-      case '@import':
-        {
-          const {
-            url,
-            media
-          } = item;
-          const preparedMedia = media ? `, ${JSON.stringify(media)}` : '';
-
-          if (!(0, _loaderUtils.isUrlRequest)(url)) {
-            codeItems.push(`exports.push([module.id, ${JSON.stringify(`@import url(${url});`)}${preparedMedia}]);`);
-            return;
-          }
-
-          let importName = atRuleImportNames.get(url);
-
-          if (!importName) {
-            if (!importPrefix) {
-              importPrefix = getImportPrefix(loaderContext, importLoaders);
-            }
-
-            importName = `___CSS_LOADER_AT_RULE_IMPORT_${atRuleImportNames.size}___`;
-            importItems.push(esModule ? `import ${importName} from ${(0, _loaderUtils.stringifyRequest)(loaderContext, importPrefix + url)};` : `var ${importName} = require(${(0, _loaderUtils.stringifyRequest)(loaderContext, importPrefix + url)});`);
-            atRuleImportNames.set(url, importName);
-          }
-
-          codeItems.push(`exports.i(${importName}${preparedMedia});`);
-        }
-        break;
-
-      case 'url':
-        {
-          if (urlImportNames.size === 0) {
-            importItems.push(esModule ? `import ___CSS_LOADER_GET_URL_IMPORT___ from ${(0, _loaderUtils.stringifyRequest)(loaderContext, require.resolve('./runtime/getUrl.js'))};` : `var ___CSS_LOADER_GET_URL_IMPORT___ = require(${(0, _loaderUtils.stringifyRequest)(loaderContext, require.resolve('./runtime/getUrl.js'))});`);
-          }
-
-          const {
-            replacementName,
-            url,
-            hash,
-            needQuotes
-          } = item;
-          let importName = urlImportNames.get(url);
-
-          if (!importName) {
-            importName = `___CSS_LOADER_URL_IMPORT_${urlImportNames.size}___`;
-            importItems.push(esModule ? `import ${importName} from ${(0, _loaderUtils.stringifyRequest)(loaderContext, url)};` : `var ${importName} = require(${(0, _loaderUtils.stringifyRequest)(loaderContext, url)});`);
-            urlImportNames.set(url, importName);
-          }
-
-          const getUrlOptions = [].concat(hash ? [`hash: ${JSON.stringify(hash)}`] : []).concat(needQuotes ? 'needQuotes: true' : []);
-          const preparedOptions = getUrlOptions.length > 0 ? `, { ${getUrlOptions.join(', ')} }` : '';
-          codeItems.push(`var ${replacementName} = ___CSS_LOADER_GET_URL_IMPORT___(${importName}${preparedOptions});`);
-        }
-        break;
-
-      case 'icss-import':
-        {
-          const {
-            importName,
-            url,
-            media
-          } = item;
-          const preparedMedia = media ? `, ${JSON.stringify(media)}` : ', ""';
-
-          if (!importPrefix) {
-            importPrefix = getImportPrefix(loaderContext, importLoaders);
-          }
-
-          importItems.push(esModule ? `import ${importName} from ${(0, _loaderUtils.stringifyRequest)(loaderContext, importPrefix + url)};` : `var ${importName} = require(${(0, _loaderUtils.stringifyRequest)(loaderContext, importPrefix + url)});`);
+  for (const item of imports) {
+    const {
+      importName,
+      url
+    } = item;
+    code += esModule ? `import ${importName} from ${url};\n` : `var ${importName} = require(${url});\n`;
+  }
 
-          if (exportType === 'full') {
-            codeItems.push(`exports.i(${importName}${preparedMedia}, true);`);
-          }
-        }
-        break;
-    }
-  });
-  const items = importItems.concat(codeItems);
-  return items.length > 0 ? `// Imports\n${items.join('\n')}\n` : '';
+  return code ? `// Imports\n${code}` : '';
 }
 
-function getModuleCode(loaderContext, result, exportType, sourceMap, replacers) {
+function getModuleCode(result, exportType, sourceMap, apiImports, urlReplacements, icssReplacements, esModule) {
   if (exportType !== 'full') {
     return '';
   }
@@ -284,114 +254,126 @@ function getModuleCode(loaderContext, result, exportType, sourceMap, replacers)
     map
   } = result;
   const sourceMapValue = sourceMap && map ? `,${map}` : '';
-  let cssCode = JSON.stringify(css);
-  replacers.forEach(replacer => {
+  let code = JSON.stringify(css);
+  let beforeCode = '';
+  beforeCode += esModule ? `var exports = ___CSS_LOADER_API_IMPORT___(${sourceMap});\n` : `exports = ___CSS_LOADER_API_IMPORT___(${sourceMap});\n`;
+
+  for (const item of apiImports) {
     const {
       type,
-      replacementName
-    } = replacer;
+      media,
+      dedupe
+    } = item;
+    beforeCode += type === 'internal' ? `exports.i(${item.importName}${media ? `, ${JSON.stringify(media)}` : dedupe ? ', ""' : ''}${dedupe ? ', true' : ''});\n` : `exports.push([module.id, ${JSON.stringify(`@import url(${item.url});`)}${media ? `, ${JSON.stringify(media)}` : ''}]);\n`;
+  }
 
-    if (type === 'url') {
-      cssCode = cssCode.replace(new RegExp(replacementName, 'g'), () => `" + ${replacementName} + "`);
-    }
+  for (const item of urlReplacements) {
+    const {
+      replacementName,
+      importName,
+      hash,
+      needQuotes
+    } = item;
+    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} + "`);
+  }
 
-    if (type === 'icss-import') {
-      const {
-        importName,
-        localName
-      } = replacer;
-      cssCode = cssCode.replace(new RegExp(replacementName, 'g'), () => `" + ${importName}.locals[${JSON.stringify(localName)}] + "`);
-    }
-  });
-  return `// Module\nexports.push([module.id, ${cssCode}, ""${sourceMapValue}]);\n`;
+  for (const replacement of icssReplacements) {
+    const {
+      replacementName,
+      importName,
+      localName
+    } = replacement;
+    code = code.replace(new RegExp(replacementName, 'g'), () => `" + ${importName}.locals[${JSON.stringify(localName)}] + "`);
+  }
+
+  return `${beforeCode}// Module\nexports.push([module.id, ${code}, ""${sourceMapValue}]);\n`;
 }
 
 function dashesCamelCase(str) {
   return str.replace(/-+(\w)/g, (match, firstLetter) => firstLetter.toUpperCase());
 }
 
-function getExportCode(loaderContext, exports, exportType, replacers, localsConvention, esModule) {
-  const exportItems = [];
-  let exportLocalsCode;
-
-  if (exports.length > 0) {
-    const exportLocals = [];
+function getExportCode(exports, exportType, localsConvention, icssReplacements, esModule) {
+  let code = '';
+  let localsCode = '';
 
-    const addExportedLocal = (name, value) => {
-      exportLocals.push(`\t${JSON.stringify(name)}: ${JSON.stringify(value)}`);
-    };
-
-    exports.forEach(item => {
-      const {
-        name,
-        value
-      } = item;
+  const addExportToLocalsCode = (name, value) => {
+    if (localsCode) {
+      localsCode += `,\n`;
+    }
 
-      switch (localsConvention) {
-        case 'camelCase':
-          {
-            addExportedLocal(name, value);
-            const modifiedName = (0, _camelcase.default)(name);
+    localsCode += `\t${JSON.stringify(name)}: ${JSON.stringify(value)}`;
+  };
 
-            if (modifiedName !== name) {
-              addExportedLocal(modifiedName, value);
-            }
+  for (const {
+    name,
+    value
+  } of exports) {
+    switch (localsConvention) {
+      case 'camelCase':
+        {
+          addExportToLocalsCode(name, value);
+          const modifiedName = (0, _camelcase.default)(name);
 
-            break;
+          if (modifiedName !== name) {
+            addExportToLocalsCode(modifiedName, value);
           }
 
-        case 'camelCaseOnly':
-          {
-            addExportedLocal((0, _camelcase.default)(name), value);
-            break;
-          }
+          break;
+        }
 
-        case 'dashes':
-          {
-            addExportedLocal(name, value);
-            const modifiedName = dashesCamelCase(name);
+      case 'camelCaseOnly':
+        {
+          addExportToLocalsCode((0, _camelcase.default)(name), value);
+          break;
+        }
 
-            if (modifiedName !== name) {
-              addExportedLocal(modifiedName, value);
-            }
+      case 'dashes':
+        {
+          addExportToLocalsCode(name, value);
+          const modifiedName = dashesCamelCase(name);
 
-            break;
+          if (modifiedName !== name) {
+            addExportToLocalsCode(modifiedName, value);
           }
 
-        case 'dashesOnly':
-          {
-            addExportedLocal(dashesCamelCase(name), value);
-            break;
-          }
+          break;
+        }
 
-        case 'asIs':
-        default:
-          addExportedLocal(name, value);
+      case 'dashesOnly':
+        {
+          addExportToLocalsCode(dashesCamelCase(name), value);
           break;
-      }
-    });
-    exportLocalsCode = exportLocals.join(',\n');
-    replacers.forEach(replacer => {
-      if (replacer.type === 'icss-import') {
-        const {
-          replacementName,
-          importName,
-          localName
-        } = replacer;
-        exportLocalsCode = exportLocalsCode.replace(new RegExp(replacementName, 'g'), () => exportType === 'locals' ? `" + ${importName}[${JSON.stringify(localName)}] + "` : `" + ${importName}.locals[${JSON.stringify(localName)}] + "`);
-      }
-    });
+        }
+
+      case 'asIs':
+      default:
+        addExportToLocalsCode(name, value);
+        break;
+    }
+  }
+
+  for (const replacement of icssReplacements) {
+    const {
+      replacementName,
+      importName,
+      localName
+    } = replacement;
+    localsCode = localsCode.replace(new RegExp(replacementName, 'g'), () => exportType === 'locals' ? `" + ${importName}[${JSON.stringify(localName)}] + "` : `" + ${importName}.locals[${JSON.stringify(localName)}] + "`);
   }
 
   if (exportType === 'locals') {
-    exportItems.push(`${esModule ? 'export default' : 'module.exports ='} ${exportLocalsCode ? `{\n${exportLocalsCode}\n}` : '{}'};`);
+    code += `${esModule ? 'export default' : 'module.exports ='} ${localsCode ? `{\n${localsCode}\n}` : '{}'};\n`;
   } else {
-    if (exportLocalsCode) {
-      exportItems.push(`exports.locals = {\n${exportLocalsCode}\n};`);
+    if (localsCode) {
+      code += `exports.locals = {\n${localsCode}\n};\n`;
     }
 
-    exportItems.push(`${esModule ? 'export default' : 'module.exports ='} exports;`);
+    code += `${esModule ? 'export default' : 'module.exports ='} exports;\n`;
   }
 
-  return `// Exports\n${exportItems.join('\n')}\n`;
+  return `// Exports\n${code}`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "css-loader",
-  "version": "3.4.2",
+  "version": "3.5.3",
   "description": "css loader module for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/css-loader",
@@ -24,7 +24,7 @@
     "postbuild": "npm run validate:runtime",
     "commitlint": "commitlint --from=master",
     "security": "npm audit",
-    "lint:prettier": "prettier \"{**/*,*}.{js,json,md,yml,css,ts}\" --list-different",
+    "lint:prettier": "prettier --list-different .",
     "lint:js": "eslint --cache .",
     "lint": "npm-run-all -l -p \"lint:**\"",
     "test:only": "cross-env NODE_ENV=test jest",
@@ -48,47 +48,46 @@
     "icss-utils": "^4.1.1",
     "loader-utils": "^1.2.3",
     "normalize-path": "^3.0.0",
-    "postcss": "^7.0.23",
+    "postcss": "^7.0.27",
     "postcss-modules-extract-imports": "^2.0.0",
     "postcss-modules-local-by-default": "^3.0.2",
-    "postcss-modules-scope": "^2.1.1",
+    "postcss-modules-scope": "^2.2.0",
     "postcss-modules-values": "^3.0.0",
-    "postcss-value-parser": "^4.0.2",
-    "schema-utils": "^2.6.0"
+    "postcss-value-parser": "^4.0.3",
+    "schema-utils": "^2.6.6",
+    "semver": "^6.3.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.7.7",
-    "@babel/core": "^7.7.7",
-    "@babel/preset-env": "^7.7.7",
-    "@commitlint/cli": "^8.3.4",
+    "@babel/cli": "^7.8.4",
+    "@babel/core": "^7.9.0",
+    "@babel/preset-env": "^7.9.5",
+    "@commitlint/cli": "^8.3.5",
     "@commitlint/config-conventional": "^8.3.4",
     "@webpack-contrib/defaults": "^6.3.0",
     "@webpack-contrib/eslint-config-webpack": "^3.0.0",
-    "babel-jest": "^24.9.0",
-    "commitlint-azure-pipelines-cli": "^1.0.3",
-    "cross-env": "^6.0.3",
+    "babel-jest": "^25.4.0",
+    "cross-env": "^7.0.2",
     "del": "^5.1.0",
     "del-cli": "^3.0.0",
     "es-check": "^5.1.0",
     "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.9.0",
-    "eslint-plugin-import": "^2.19.1",
-    "file-loader": "^5.0.2",
-    "husky": "^4.0.6",
-    "jest": "^24.9.0",
-    "jest-junit": "^10.0.0",
-    "lint-staged": "^9.5.0",
-    "memfs": "^3.0.3",
+    "eslint-config-prettier": "^6.11.0",
+    "eslint-plugin-import": "^2.20.2",
+    "file-loader": "^6.0.0",
+    "husky": "^4.2.5",
+    "jest": "^25.4.0",
+    "lint-staged": "^10.1.7",
+    "memfs": "^3.1.2",
     "npm-run-all": "^4.1.5",
     "postcss-loader": "^3.0.0",
     "postcss-preset-env": "^6.7.0",
-    "prettier": "^1.19.1",
-    "sass": "^1.24.4",
-    "sass-loader": "^8.0.1",
-    "standard-version": "^7.0.1",
+    "prettier": "^2.0.5",
+    "sass": "^1.26.3",
+    "sass-loader": "^8.0.2",
+    "standard-version": "^7.1.0",
     "strip-ansi": "^6.0.0",
-    "url-loader": "^3.0.0",
-    "webpack": "^4.41.5"
+    "url-loader": "^4.1.0",
+    "webpack": "^4.43.0"
   },
   "keywords": [
     "webpack",