Merge pull request #205 from mkusaka/fix-error

Resolved an error that occurs when using with sass 1.60.x
mizdra · Jun 12, 2023 · 616b1cf · 616b1cf
2 parents 0fb9ecd + daa7f95
commit 616b1cf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -63,7 +63,7 @@
     "postcss-scss": "^4.0.6",
     "postcss-simple-vars": "^7.0.1",
     "prettier": "~2.7.1",
-    "sass": "^1.54.3",
+    "sass": "^1.63.3",
     "stylelint": "^15.4.0",
     "tsc-watch": "^5.0.3",
     "typescript": "^5.0.3"

diff --git a/packages/happy-css-modules/src/transformer/scss-transformer.ts b/packages/happy-css-modules/src/transformer/scss-transformer.ts
@@ -22,7 +22,8 @@ function promisifySassRender(sass: typeof import('sass')) {
 export const createScssTransformer: () => Transformer = () => {
   let sass: typeof import('sass');
   return async (source, options) => {
-    sass ??= (await import('sass').catch(handleImportError('sass'))).default;
+    const sassModule = await import('sass').catch(handleImportError('sass'));
+    sass ??= sassModule.default ?? sassModule;
     const render = promisifySassRender(sass);
     const result = await render({
       data: source,