Skip to content
This repository was archived by the owner on Mar 24, 2025. It is now read-only.

Commit 271cc26

Browse files
Merge remote-tracking branch 'origin/feature/fix-esb-v16' into develop
2 parents 7bbdf8a + bfbcfce commit 271cc26

3 files changed

Lines changed: 211 additions & 190 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"homepage": "https://github.com/Squirrel-Network/esbuild-sass-modules-plugin#readme",
2929
"devDependencies": {
30-
"esbuild": "^0.14.39",
30+
"esbuild": "^0.16",
3131
"jest": "^28.1.0"
3232
},
3333
"dependencies": {

src/esbuild-sass-modules-plugin.class.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ export default class ESBuildSASSModulesPlugin {
4444

4545
switch(resolver) {
4646
case ImportResolver.BUNDLE: {
47-
const resolved = await esbconfig.resolve(path, { resolveDir });
47+
const resolved =
48+
await esbconfig.resolve(path, { resolveDir, kind });
4849

4950
if(!resolved.path) {
5051
return { errors: resolved.errors, warnings: resolved.warnings };
@@ -59,7 +60,7 @@ export default class ESBuildSASSModulesPlugin {
5960
const actualPath = path.substring('inline:'.length);
6061

6162
const resolved =
62-
await esbconfig.resolve(actualPath, { resolveDir });
63+
await esbconfig.resolve(actualPath, { resolveDir, kind });
6364

6465
if(!resolved.path) {
6566
return { errors: resolved.errors, warnings: resolved.warnings };
@@ -74,7 +75,7 @@ export default class ESBuildSASSModulesPlugin {
7475
const actualPath = path.substring('file:'.length);
7576

7677
const resolved =
77-
await esbconfig.resolve(actualPath, { resolveDir });
78+
await esbconfig.resolve(actualPath, { resolveDir, kind });
7879

7980
if(!resolved.path) {
8081
return { errors: resolved.errors, warnings: resolved.warnings };

0 commit comments

Comments
 (0)