css-loader 4.2.0 → 5.0.0

package/dist/utils.js

@@ -28,8 +28,6 @@ var _path = _interopRequireDefault(require("path"));
 
 var _loaderUtils = require("loader-utils");
 
-var _normalizePath = _interopRequireDefault(require("normalize-path"));
-
 var _cssesc = _interopRequireDefault(require("cssesc"));
 
 var _postcssModulesValues = _interopRequireDefault(require("postcss-modules-values"));
@@ -66,6 +64,10 @@ function unescape(str) {
     String.fromCharCode(high >> 10 | 0xd800, high & 0x3ff | 0xdc00);
     /* eslint-enable line-comment-position */
   });
+}
+
+function normalizePath(file) {
+  return _path.default.sep === '\\' ? file.replace(/\\/g, '/') : file;
 } // eslint-disable-next-line no-control-regex
 
 
@@ -73,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,
@@ -81,22 +90,17 @@ function defaultGetLocalIdent(loaderContext, localIdentName, localName, options)
   const {
     resourcePath
   } = loaderContext;
-  const request = (0, _normalizePath.default)(_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
+  const request = normalizePath(_path.default.relative(context, resourcePath)); // eslint-disable-next-line no-param-reassign
 
-  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)) {
@@ -124,17 +128,31 @@ 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') {
     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) {
@@ -142,7 +160,7 @@ function getModulesOptions(rawOptions, loaderContext) {
   }
 
   let modulesOptions = {
-    compileType: rawOptions.icss ? 'icss' : 'module',
+    compileType: isIcss ? 'icss' : 'module',
     auto: true,
     mode: 'local',
     exportGlobals: false,
@@ -151,7 +169,8 @@ function getModulesOptions(rawOptions, loaderContext) {
     localIdentHashPrefix: '',
     // eslint-disable-next-line no-undefined
     localIdentRegExp: undefined,
-    getLocalIdent: defaultGetLocalIdent,
+    // eslint-disable-next-line no-undefined
+    getLocalIdent: undefined,
     namedExport: false,
     exportLocalsConvention: 'asIs',
     exportOnlyLocals: false
@@ -200,28 +219,26 @@ 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,
     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,
+    importLoaders: typeof rawOptions.importLoaders === 'string' ? parseInt(rawOptions.importLoaders, 10) : rawOptions.importLoaders,
     esModule: typeof rawOptions.esModule === 'undefined' ? true : rawOptions.esModule
   };
 }
@@ -274,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
@@ -290,26 +324,57 @@ function getModulesPlugins(options, loaderContext) {
   return plugins;
 }
 
-function normalizeSourceMap(map) {
+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';
+    }
+
+    return 'path-absolute';
+  }
+
+  if (IS_NATIVE_WIN32_PATH.test(source)) {
+    return 'path-absolute';
+  }
+
+  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') {
     newMap = JSON.parse(newMap);
-  } // Source maps should use forward slash because it is URLs (https://github.com/mozilla/source-map/issues/91)
-  // We should normalize path because previous loaders like `sass-loader` using backslash when generate source map
-
-
-  if (newMap.file) {
-    newMap.file = (0, _normalizePath.default)(newMap.file);
   }
 
-  if (newMap.sourceRoot) {
-    newMap.sourceRoot = (0, _normalizePath.default)(newMap.sourceRoot);
-  }
+  delete newMap.file;
+  const {
+    sourceRoot
+  } = newMap;
+  delete newMap.sourceRoot;
 
   if (newMap.sources) {
-    newMap.sources = newMap.sources.map(source => (0, _normalizePath.default)(source));
+    // Source maps should use forward slash because it is URLs (https://github.com/mozilla/source-map/issues/91)
+    // 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) {
+        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);
+        return _path.default.relative(_path.default.dirname(resourcePath), absoluteSource);
+      }
+
+      return source;
+    });
   }
 
   return newMap;
@@ -345,24 +410,59 @@ function getImportCode(imports, options) {
       url,
       icss
     } = item;
-    code += options.esModule ? icss && options.modules.namedExport ? `import ${importName}, * as ${importName}_NAMED___ from ${url};\n` : `import ${importName} from ${url};\n` : `var ${importName} = require(${url});\n`;
+
+    if (options.esModule) {
+      if (icss && options.modules.namedExport) {
+        code += `import ${options.modules.exportOnlyLocals ? '' : `${importName}, `}* as ${importName}_NAMED___ from ${url};\n`;
+      } else {
+        code += `import ${importName} from ${url};\n`;
+      }
+    } else {
+      code += `var ${importName} = require(${url});\n`;
+    }
   }
 
   return code ? `// Imports\n${code}` : '';
 }
 
-function getModuleCode(result, api, replacements, options) {
+function normalizeSourceMapForRuntime(map, loaderContext) {
+  const resultMap = map ? map.toJSON() : null;
+
+  if (resultMap) {
+    delete resultMap.file;
+    resultMap.sourceRoot = '';
+    resultMap.sources = resultMap.sources.map(source => {
+      // Non-standard syntax from `postcss`
+      if (source.indexOf('<') === 0) {
+        return source;
+      }
+
+      const sourceType = getURLType(source);
+
+      if (sourceType !== 'path-relative') {
+        return source;
+      }
+
+      const resourceDirname = _path.default.dirname(loaderContext.resourcePath);
+
+      const absoluteSource = _path.default.resolve(resourceDirname, source);
+
+      const contextifyPath = normalizePath(_path.default.relative(loaderContext.rootContext, absoluteSource));
+      return `webpack://${contextifyPath}`;
+    });
+  }
+
+  return JSON.stringify(resultMap);
+}
+
+function getModuleCode(result, api, replacements, options, loaderContext) {
   if (options.modules.exportOnlyLocals === true) {
-    return 'var ___CSS_LOADER_EXPORT___ = {};\n';
+    return '';
   }
 
-  const {
-    css,
-    map
-  } = result;
-  const sourceMapValue = options.sourceMap && map ? `,${map}` : '';
-  let code = JSON.stringify(css);
-  let beforeCode = `var ___CSS_LOADER_EXPORT___ = ___CSS_LOADER_API_IMPORT___(${options.sourceMap});\n`;
+  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 ? '___CSS_LOADER_API_SOURCEMAP_IMPORT___' : 'function(i){return i[1]}'});\n`;
 
   for (const item of api) {
     const {
@@ -381,7 +481,7 @@ function getModuleCode(result, api, replacements, options) {
     } = 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,
@@ -402,12 +502,12 @@ function dashesCamelCase(str) {
 }
 
 function getExportCode(exports, replacements, options) {
-  let code = '';
+  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`;
@@ -475,18 +575,31 @@ function getExportCode(exports, replacements, options) {
       const {
         importName
       } = item;
-      localsCode = localsCode.replace(new RegExp(replacementName, 'g'), () => options.modules.namedExport ? `" + ${importName}_NAMED___[${JSON.stringify((0, _camelcase.default)(localName))}] + "` : `" + ${importName}.locals[${JSON.stringify(localName)}] + "`);
+      localsCode = localsCode.replace(new RegExp(replacementName, 'g'), () => {
+        if (options.modules.namedExport) {
+          return `" + ${importName}_NAMED___[${JSON.stringify(getValidLocalName(localName, options.modules.exportLocalsConvention))}] + "`;
+        } else if (options.modules.exportOnlyLocals) {
+          return `" + ${importName}[${JSON.stringify(localName)}] + "`;
+        }
+
+        return `" + ${importName}.locals[${JSON.stringify(localName)}] + "`;
+      });
     } else {
       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`;
+    return code;
+  }
+
   if (localsCode) {
-    code += options.modules.namedExport ? `${localsCode}` : `___CSS_LOADER_EXPORT___.locals = {\n${localsCode}\n};\n`;
+    code += options.modules.namedExport ? localsCode : `___CSS_LOADER_EXPORT___.locals = {\n${localsCode}\n};\n`;
   }
 
   code += `${options.esModule ? 'export default' : 'module.exports ='} ___CSS_LOADER_EXPORT___;\n`;
-  return `// Exports\n${code}`;
+  return code;
 }
 
 async function resolveRequests(resolve, context, possibleRequests) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "css-loader",
-  "version": "4.2.0",
+  "version": "5.0.0",
   "description": "css loader module for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/css-loader",
@@ -43,53 +43,56 @@
     "webpack": "^4.27.0 || ^5.0.0"
   },
   "dependencies": {
-    "camelcase": "^6.0.0",
+    "camelcase": "^6.1.0",
     "cssesc": "^3.0.0",
-    "icss-utils": "^4.1.1",
+    "icss-utils": "^5.0.0",
     "loader-utils": "^2.0.0",
-    "normalize-path": "^3.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.1.1",
+    "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",
+    "schema-utils": "^3.0.0",
     "semver": "^7.3.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.10.5",
-    "@babel/core": "^7.10.5",
-    "@babel/preset-env": "^7.10.4",
-    "@commitlint/cli": "^9.1.2",
-    "@commitlint/config-conventional": "^9.1.1",
+    "@babel/cli": "^7.11.6",
+    "@babel/core": "^7.11.6",
+    "@babel/preset-env": "^7.11.5",
+    "@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",
+    "babel-jest": "^26.5.2",
     "cross-env": "^7.0.2",
-    "del": "^5.1.0",
+    "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",
-    "lint-staged": "^10.2.11",
+    "es-check": "^5.1.1",
+    "eslint": "^7.11.0",
+    "eslint-config-prettier": "^6.12.0",
+    "eslint-plugin-import": "^2.22.1",
+    "file-loader": "^6.1.1",
+    "husky": "^4.3.0",
+    "jest": "^26.5.3",
+    "less": "^3.12.2",
+    "less-loader": "^7.0.2",
+    "lint-staged": "^10.4.0",
     "memfs": "^3.2.0",
-    "mini-css-extract-plugin": "^0.9.0",
+    "mini-css-extract-plugin": "^1.0.0",
     "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",
-    "standard-version": "^8.0.2",
+    "prettier": "^2.1.2",
+    "sass": "^1.27.0",
+    "sass-loader": "^10.0.3",
+    "standard-version": "^9.0.0",
     "strip-ansi": "^6.0.0",
-    "style-loader": "^1.2.1",
-    "url-loader": "^4.1.0",
-    "webpack": "^4.44.0"
+    "style-loader": "^2.0.0",
+    "stylus": "^0.54.8",
+    "stylus-loader": "^4.1.1",
+    "url-loader": "^4.1.1",
+    "webpack": "^5.0.0"
   },
   "keywords": [
     "webpack",