Skip to content

3: Patch sass-loader #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: 2-nested-imports
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 77 additions & 0 deletions .yarn/patches/sass-loader-npm-16.0.2-eafa07389f.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
diff --git a/dist/index.js b/dist/index.js
index 7a3ca0ffb49a51f1f306fbaecae816c7e9f9923f..4ea2088bfba90acd138d731d86ee5edb5e14a466 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -38,9 +38,12 @@ async function loader(content) {
} = sassOptions;
sassOptions.importer.push((0, _utils.getWebpackImporter)(this, implementation, includePaths));
} else {
+ const {
+ loadPaths,
+ } = sassOptions;
sassOptions.importers.push(
// No need to pass `loadPaths`, because modern API handle them itself
- (0, _utils.getModernWebpackImporter)(this, implementation, []));
+ (0, _utils.getModernWebpackImporter)(this, implementation, loadPaths));
}
}
let compile;
diff --git a/dist/utils.js b/dist/utils.js
index 34f6c14c0373818f0cf7e372be1dc22a2d3696f9..fdbec457fe8d6c5399f23fad91e2a4cf22f4038f 100644
--- a/dist/utils.js
+++ b/dist/utils.js
@@ -382,7 +382,7 @@ function getWebpackResolver(resolverFactory, implementation, includePaths = [])
mainFields: [],
mainFiles: ["_index.import", "_index", "index.import", "index"],
modules: [],
- restrictions: [/\.((sa|sc|c)ss)$/i],
+ restrictions: [/\.(((sa|sc|c)ss)|json)$/i],
preferRelative: true
}));
const webpackModuleResolve = promiseResolve(resolverFactory({
@@ -471,6 +471,7 @@ function getWebpackResolver(resolverFactory, implementation, includePaths = [])
return startResolving(resolutionMap);
};
}
+const nodeJsonImporter = require('node-sass-json-importer');
const MATCH_CSS = /\.css$/i;
function getModernWebpackImporter(loaderContext, implementation, loadPaths) {
const resolve = getWebpackResolver(loaderContext.getResolve, implementation, loadPaths);
@@ -492,6 +493,7 @@ function getModernWebpackImporter(loaderContext, implementation, loadPaths) {
},
async load(canonicalUrl) {
const ext = _path.default.extname(canonicalUrl.pathname);
+ let contents;
let syntax;
if (ext && ext.toLowerCase() === ".scss") {
syntax = "scss";
@@ -499,13 +501,19 @@ function getModernWebpackImporter(loaderContext, implementation, loadPaths) {
syntax = "indented";
} else if (ext && ext.toLowerCase() === ".css") {
syntax = "css";
+ } else if (ext && ext.toLowerCase() === ".json") {
+ contents = nodeJsonImporter().bind({ options: {} })(
+ canonicalUrl.pathname.split('/').at(-1),
+ canonicalUrl.pathname,
+ ).contents;
+ syntax = "scss";
} else {
// Fallback to default value
syntax = "scss";
}
try {
// eslint-disable-next-line no-shadow
- const contents = await new Promise((resolve, reject) => {
+ contents = contents || (await new Promise((resolve, reject) => {
// Old version of `enhanced-resolve` supports only path as a string
// TODO simplify in the next major release and pass URL
const canonicalPath = _url.default.fileURLToPath(canonicalUrl);
@@ -516,7 +524,7 @@ function getModernWebpackImporter(loaderContext, implementation, loadPaths) {
}
resolve(content);
});
- });
+ }));
return {
contents,
syntax,
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"css-loader": "^7.1.2",
"node-sass-json-importer": "^4.3.0",
"sass-embedded": "^1.79.4",
"sass-loader": "^16.0.2",
"sass-loader": "patch:sass-loader@npm%3A16.0.2#~/.yarn/patches/sass-loader-npm-16.0.2-eafa07389f.patch",
"style-loader": "^4.0.0",
"webpack": "^5.95.0",
"webpack-cli": "^5.1.4"
Expand Down
30 changes: 28 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1252,14 +1252,14 @@ __metadata:
css-loader: "npm:^7.1.2"
node-sass-json-importer: "npm:^4.3.0"
sass-embedded: "npm:^1.79.4"
sass-loader: "npm:^16.0.2"
sass-loader: "patch:sass-loader@npm%3A16.0.2#~/.yarn/patches/sass-loader-npm-16.0.2-eafa07389f.patch"
style-loader: "npm:^4.0.0"
webpack: "npm:^5.95.0"
webpack-cli: "npm:^5.1.4"
languageName: unknown
linkType: soft

"sass-loader@npm:^16.0.2":
"sass-loader@npm:16.0.2":
version: 16.0.2
resolution: "sass-loader@npm:16.0.2"
dependencies:
Expand All @@ -1285,6 +1285,32 @@ __metadata:
languageName: node
linkType: hard

"sass-loader@patch:sass-loader@npm%3A16.0.2#~/.yarn/patches/sass-loader-npm-16.0.2-eafa07389f.patch":
version: 16.0.2
resolution: "sass-loader@patch:sass-loader@npm%3A16.0.2#~/.yarn/patches/sass-loader-npm-16.0.2-eafa07389f.patch::version=16.0.2&hash=b50e66"
dependencies:
neo-async: "npm:^2.6.2"
peerDependencies:
"@rspack/core": 0.x || 1.x
node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0
sass: ^1.3.0
sass-embedded: "*"
webpack: ^5.0.0
peerDependenciesMeta:
"@rspack/core":
optional: true
node-sass:
optional: true
sass:
optional: true
sass-embedded:
optional: true
webpack:
optional: true
checksum: 10c0/9aecbac119d044f04d0fe37aa3bcd78f3b067ba0858a69e9b1377d0713ed9918a7afe74c261574f6f82538bdea0b0e20b6c7cc87efc7b9ecc15abe54aa82236f
languageName: node
linkType: hard

"schema-utils@npm:^3.1.1, schema-utils@npm:^3.2.0":
version: 3.3.0
resolution: "schema-utils@npm:3.3.0"
Expand Down