sass-loader 10.0.0-rc.0 → 10.0.3

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [10.0.3](https://github.com/webpack-contrib/sass-loader/compare/v10.0.2...v10.0.3) (2020-10-09)
+
+### Chore
+
+* update `schema-utils`
+
+### [10.0.2](https://github.com/webpack-contrib/sass-loader/compare/v10.0.1...v10.0.2) (2020-09-03)
+
+
+### Bug Fixes
+
+* source maps generation ([#886](https://github.com/webpack-contrib/sass-loader/issues/886)) ([8327d55](https://github.com/webpack-contrib/sass-loader/commit/8327d55df9e8fc6e24d2759d7bd50174ed1ff1e4))
+
+### [10.0.1](https://github.com/webpack-contrib/sass-loader/compare/v10.0.0...v10.0.1) (2020-08-25)
+
+### Chore
+
+* update deps
+
+## [10.0.0](https://github.com/webpack-contrib/sass-loader/compare/v10.0.0-rc.0...v10.0.0) (2020-08-24)
+
+### Bug Fixes
+
+* handle absolute windows path in source maps
+
 ## [10.0.0-rc.0](https://github.com/webpack-contrib/sass-loader/compare/v9.0.3...v10.0.0-rc.0) (2020-08-24)
 
 

package/dist/index.js

@@ -7,7 +7,7 @@ exports.default = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
-var _schemaUtils = _interopRequireDefault(require("schema-utils"));
+var _schemaUtils = require("schema-utils");
 
 var _loaderUtils = require("loader-utils");
 
@@ -27,7 +27,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  */
 function loader(content) {
   const options = (0, _loaderUtils.getOptions)(this);
-  (0, _schemaUtils.default)(_options.default, options, {
+  (0, _schemaUtils.validate)(_options.default, options, {
     name: 'Sass Loader',
     baseDataPath: 'options'
   });
@@ -55,29 +55,18 @@ function loader(content) {
 
       callback(new _SassError.default(error));
       return;
-    } // Modify source paths only for webpack, otherwise we do nothing
-
-
-    if (result.map && useSourceMap) {
-      // eslint-disable-next-line no-param-reassign
-      result.map = JSON.parse(result.map); // result.map.file is an optional property that provides the output filename.
-      // Since we don't know the final filename in the webpack build chain yet, it makes no sense to have it.
-      // eslint-disable-next-line no-param-reassign
-
-      delete result.map.file; // eslint-disable-next-line no-param-reassign
+    }
 
-      result.sourceRoot = ''; // node-sass returns POSIX paths, that's why we need to transform them back to native paths.
-      // This fixes an error on windows where the source-map module cannot resolve the source maps.
-      // @see https://github.com/webpack-contrib/sass-loader/issues/366#issuecomment-279460722
-      // eslint-disable-next-line no-param-reassign
+    let map = result.map ? JSON.parse(result.map) : null; // Modify source paths only for webpack, otherwise we do nothing
 
-      result.map.sources = result.map.sources.map(source => (0, _utils.absolutifySourceMapSource)(this.rootContext, source));
+    if (map && useSourceMap) {
+      map = (0, _utils.normalizeSourceMap)(map, this.rootContext);
     }
 
     result.stats.includedFiles.forEach(includedFile => {
       this.addDependency(_path.default.normalize(includedFile));
     });
-    callback(null, result.css.toString(), result.map);
+    callback(null, result.css.toString(), map);
   });
 }
 

package/dist/utils.js

@@ -8,7 +8,7 @@ exports.getSassOptions = getSassOptions;
 exports.getWebpackResolver = getWebpackResolver;
 exports.getWebpackImporter = getWebpackImporter;
 exports.getRenderFunctionFromSassImplementation = getRenderFunctionFromSassImplementation;
-exports.absolutifySourceMapSource = absolutifySourceMapSource;
+exports.normalizeSourceMap = normalizeSourceMap;
 
 var _url = _interopRequireDefault(require("url"));
 
@@ -16,7 +16,7 @@ var _path = _interopRequireDefault(require("path"));
 
 var _semver = _interopRequireDefault(require("semver"));
 
-var _klona = _interopRequireDefault(require("klona"));
+var _full = require("klona/full");
 
 var _loaderUtils = require("loader-utils");
 
@@ -115,7 +115,7 @@ function proxyCustomImporters(importers, loaderContext) {
 
 
 function getSassOptions(loaderContext, loaderOptions, content, implementation, useSourceMap) {
-  const options = (0, _klona.default)(loaderOptions.sassOptions ? typeof loaderOptions.sassOptions === 'function' ? loaderOptions.sassOptions(loaderContext) || {} : loaderOptions.sassOptions : {});
+  const options = (0, _full.klona)(loaderOptions.sassOptions ? typeof loaderOptions.sassOptions === 'function' ? loaderOptions.sassOptions(loaderContext) || {} : loaderOptions.sassOptions : {});
   const isDartSass = implementation.info.includes('dart-sass');
 
   if (isDartSass) {
@@ -157,10 +157,10 @@ function getSassOptions(loaderContext, loaderOptions, content, implementation, u
     // all paths in sourceMap.sources will be relative to that path.
     // Pretty complicated... :(
     options.sourceMap = true;
-    options.outFile = _path.default.join(loaderContext.rootContext, 'style.css.map'); // options.sourceMapRoot = process.cwd();
-
+    options.outFile = _path.default.join(loaderContext.rootContext, 'style.css.map');
     options.sourceMapContents = true;
-    options.omitSourceMapUrl = true; // options.sourceMapEmbed = false;
+    options.omitSourceMapUrl = true;
+    options.sourceMapEmbed = false;
   }
 
   const {
@@ -239,15 +239,19 @@ url, forWebpackResolver = false, rootContext = false) {
 
 function promiseResolve(callbackResolve) {
   return (context, request) => new Promise((resolve, reject) => {
-    callbackResolve(context, request, (err, result) => {
-      if (err) reject(err);else resolve(result);
+    callbackResolve(context, request, (error, result) => {
+      if (error) {
+        reject(error);
+      } else {
+        resolve(result);
+      }
     });
   });
 }
 
-const isSpecialModuleImport = /^~[^/]+$/; // `[drive_letter]:\` + `\\[server]\[sharename]\`
+const IS_SPECIAL_MODULE_IMPORT = /^~[^/]+$/; // `[drive_letter]:\` + `\\[server]\[sharename]\`
 
-const isNativeWin32Path = /^[a-zA-Z]:[/\\]|^\\\\/i;
+const IS_NATIVE_WIN32_PATH = /^[a-z]:[/\\]|^\\\\/i;
 /**
  * @public
  * Create the resolve function used in the custom Sass importer.
@@ -331,11 +335,11 @@ function getWebpackResolver(resolverFactory, implementation, includePaths = [],
 
     let resolutionMap = [];
     const needEmulateSassResolver = // `sass` doesn't support module import
-    !isSpecialModuleImport.test(request) && // We need improve absolute paths handling.
+    !IS_SPECIAL_MODULE_IMPORT.test(request) && // We need improve absolute paths handling.
     // Absolute paths should be resolved:
     // - Server-relative URLs - `<context>/path/to/file.ext` (where `<context>` is root context)
     // - Absolute path - `/full/path/to/file.ext` or `C:\\full\path\to\file.ext`
-    !isFileScheme && !originalRequest.startsWith('/') && !isNativeWin32Path.test(originalRequest);
+    !isFileScheme && !originalRequest.startsWith('/') && !IS_NATIVE_WIN32_PATH.test(originalRequest);
 
     if (includePaths.length > 0 && needEmulateSassResolver) {
       // The order of import precedence is as follows:
@@ -435,15 +439,33 @@ function getURLType(source) {
     return 'path-absolute';
   }
 
+  if (IS_NATIVE_WIN32_PATH.test(source)) {
+    return 'path-absolute';
+  }
+
   return ABSOLUTE_SCHEME.test(source) ? 'absolute' : 'path-relative';
 }
 
-function absolutifySourceMapSource(sourceRoot, source) {
-  const sourceType = getURLType(source); // Do no touch `scheme-relative`, `path-absolute` and `absolute` types
+function normalizeSourceMap(map, rootContext) {
+  const newMap = map; // result.map.file is an optional property that provides the output filename.
+  // Since we don't know the final filename in the webpack build chain yet, it makes no sense to have it.
+  // eslint-disable-next-line no-param-reassign
 
-  if (sourceType === 'path-relative') {
-    return _path.default.resolve(sourceRoot, _path.default.normalize(source));
-  }
+  delete newMap.file; // eslint-disable-next-line no-param-reassign
 
-  return source;
+  newMap.sourceRoot = ''; // node-sass returns POSIX paths, that's why we need to transform them back to native paths.
+  // This fixes an error on windows where the source-map module cannot resolve the source maps.
+  // @see https://github.com/webpack-contrib/sass-loader/issues/366#issuecomment-279460722
+  // eslint-disable-next-line no-param-reassign
+
+  newMap.sources = newMap.sources.map(source => {
+    const sourceType = getURLType(source); // Do no touch `scheme-relative`, `path-absolute` and `absolute` types
+
+    if (sourceType === 'path-relative') {
+      return _path.default.resolve(rootContext, _path.default.normalize(source));
+    }
+
+    return source;
+  });
+  return newMap;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sass-loader",
-  "version": "10.0.0-rc.0",
+  "version": "10.0.3",
   "description": "Sass loader for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/sass-loader",
@@ -56,46 +56,46 @@
     }
   },
   "dependencies": {
-    "klona": "^1.1.2",
+    "klona": "^2.0.4",
     "loader-utils": "^2.0.0",
     "neo-async": "^2.6.2",
-    "schema-utils": "^2.7.0",
+    "schema-utils": "^3.0.0",
     "semver": "^7.3.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.10.5",
-    "@babel/core": "^7.11.0",
-    "@babel/preset-env": "^7.11.0",
-    "@commitlint/cli": "^9.1.1",
-    "@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.2.2",
-    "bootstrap": "^4.5.1",
+    "babel-jest": "^26.5.2",
+    "bootstrap": "^4.5.2",
     "bootstrap-sass": "^3.4.1",
     "cross-env": "^7.0.2",
-    "css-loader": "^4.2.0",
-    "del": "^5.1.0",
+    "css-loader": "^4.3.0",
+    "del": "^6.0.0",
     "del-cli": "^3.0.1",
-    "enhanced-resolve": "^4.3.0",
-    "eslint": "^7.6.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-import": "^2.21.2",
+    "enhanced-resolve": "^5.2.0",
+    "eslint": "^7.10.0",
+    "eslint-config-prettier": "^6.12.0",
+    "eslint-plugin-import": "^2.22.1",
     "fibers": "^5.0.0",
-    "file-loader": "^6.0.0",
+    "file-loader": "^6.1.0",
     "foundation-sites": "^6.6.3",
-    "husky": "^4.2.5",
-    "jest": "^26.2.2",
-    "lint-staged": "^10.2.11",
+    "husky": "^4.3.0",
+    "jest": "^26.5.2",
+    "lint-staged": "^10.4.0",
     "material-components-web": "^7.0.0",
     "memfs": "^3.2.0",
     "node-sass": "^4.14.1",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.0.5",
-    "sass": "^1.26.10",
-    "standard-version": "^8.0.2",
-    "style-loader": "^1.2.1",
-    "webpack": "^4.44.1"
+    "prettier": "^2.1.2",
+    "sass": "^1.27.0",
+    "standard-version": "^9.0.0",
+    "style-loader": "^2.0.0",
+    "webpack": "^4.44.2"
   },
   "keywords": [
     "sass",