sass-loader
Advanced tools
Comparing version 13.3.2 to 13.3.3
@@ -99,3 +99,2 @@ "use strict"; | ||
} | ||
var _default = loader; | ||
exports.default = _default; | ||
var _default = exports.default = loader; |
@@ -116,3 +116,3 @@ "use strict"; | ||
const logger = loaderContext.getLogger("sass-loader"); | ||
const formatSpan = span => `${span.url || "-"}:${span.start.line}:${span.start.column}: `; | ||
const formatSpan = span => `Warning on line ${span.start.line}, column ${span.start.column} of ${span.url || "-"}:${span.start.line}:${span.start.column}:\n`; | ||
const formatDebugSpan = span => `[debug:${span.start.line}:${span.start.column}] `; | ||
@@ -133,7 +133,10 @@ sassOptions.logger = { | ||
} | ||
if (loggerOptions.span && !loggerOptions.stack) { | ||
builtMessage = formatSpan(loggerOptions.span); | ||
if (loggerOptions.span) { | ||
builtMessage += formatSpan(loggerOptions.span); | ||
} | ||
builtMessage += message; | ||
if (loggerOptions.stack) { | ||
if (loggerOptions.span && loggerOptions.span.context) { | ||
builtMessage += `\n\n${loggerOptions.span.start.line} | ${loggerOptions.span.context}`; | ||
} | ||
if (loggerOptions.stack && loggerOptions.stack !== "null") { | ||
builtMessage += `\n\n${loggerOptions.stack}`; | ||
@@ -232,2 +235,7 @@ } | ||
sassOptions.importer = sassOptions.importer ? proxyCustomImporters(Array.isArray(sassOptions.importer) ? sassOptions.importer.slice() : [sassOptions.importer], loaderContext) : []; | ||
// Regression on the `sass-embedded` side | ||
if (loaderOptions.webpackImporter === false && sassOptions.importer.length === 0) { | ||
sassOptions.importer = undefined; | ||
} | ||
sassOptions.includePaths = [].concat(process.cwd()).concat( | ||
@@ -234,0 +242,0 @@ // We use `includePaths` in context for resolver, so it should be always absolute |
{ | ||
"name": "sass-loader", | ||
"version": "13.3.2", | ||
"version": "13.3.3", | ||
"description": "Sass loader for webpack", | ||
@@ -69,9 +69,9 @@ "license": "MIT", | ||
"devDependencies": { | ||
"@babel/cli": "^7.21.5", | ||
"@babel/core": "^7.21.5", | ||
"@babel/preset-env": "^7.21.5", | ||
"@commitlint/cli": "^17.6.1", | ||
"@commitlint/config-conventional": "^17.6.1", | ||
"@babel/cli": "^7.22.9", | ||
"@babel/core": "^7.22.9", | ||
"@babel/preset-env": "^7.22.9", | ||
"@commitlint/cli": "^17.6.7", | ||
"@commitlint/config-conventional": "^17.6.7", | ||
"@webpack-contrib/eslint-config-webpack": "^3.0.0", | ||
"babel-jest": "^29.5.0", | ||
"babel-jest": "^29.6.2", | ||
"bootstrap-sass": "^3.4.1", | ||
@@ -81,17 +81,16 @@ "bootstrap-v4": "npm:bootstrap@^4.5.3", | ||
"cross-env": "^7.0.3", | ||
"cspell": "^6.31.1", | ||
"css-loader": "^6.7.3", | ||
"cspell": "^6.31.2", | ||
"css-loader": "^6.8.1", | ||
"del": "^6.1.1", | ||
"del-cli": "^4.0.1", | ||
"enhanced-resolve": "^5.13.0", | ||
"eslint": "^8.39.0", | ||
"eslint-config-prettier": "^8.8.0", | ||
"eslint-plugin-import": "^2.27.5", | ||
"fibers": "^5.0.3", | ||
"enhanced-resolve": "^5.15.0", | ||
"eslint": "^8.46.0", | ||
"eslint-config-prettier": "^8.9.0", | ||
"eslint-plugin-import": "^2.28.0", | ||
"file-loader": "^6.2.0", | ||
"foundation-sites": "^6.7.5", | ||
"husky": "^8.0.3", | ||
"jest": "^29.5.0", | ||
"jest-environment-node-single-context": "^29.0.0", | ||
"lint-staged": "^13.2.2", | ||
"jest": "^29.6.2", | ||
"jest-environment-node-single-context": "^29.1.0", | ||
"lint-staged": "^13.2.3", | ||
"material-components-web": "^9.0.0", | ||
@@ -103,8 +102,8 @@ "memfs": "^3.5.1", | ||
"prettier": "^2.8.8", | ||
"sass": "^1.62.1", | ||
"sass-embedded": "^1.62.0", | ||
"semver": "^7.5.0", | ||
"sass": "^1.64.2", | ||
"sass-embedded": "^1.64.2", | ||
"semver": "^7.5.4", | ||
"standard-version": "^9.3.1", | ||
"style-loader": "^3.3.2", | ||
"webpack": "^5.81.0" | ||
"style-loader": "^3.3.3", | ||
"webpack": "^5.88.2" | ||
}, | ||
@@ -111,0 +110,0 @@ "keywords": [ |
@@ -421,3 +421,3 @@ <div align="center"> | ||
options: { | ||
sassOptions: (loaderContext) => { | ||
sassOptions: (content, loaderContext) => { | ||
// More information about available properties https://webpack.js.org/api/loaders/ | ||
@@ -681,10 +681,6 @@ const { resourcePath, rootContext } = loaderContext; | ||
Default: `false` | ||
Default: `true` | ||
Treats the `@warn` rule as a webpack warning. | ||
> **Note** | ||
> | ||
> It will be `true` by default in the next major release. | ||
**style.scss** | ||
@@ -691,0 +687,0 @@ |
59046
37
776
959