fix: 🐛 fallback to default config if tailwind config has error

shufo · Sep 20, 2022 · 830e124 · 830e124
1 parent 78bcf37
commit 830e124
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/src/extension.ts b/src/extension.ts
@@ -73,12 +73,17 @@ export function activate(context: ExtensionContext) {
 
                 const runtimeConfig = readRuntimeConfig(document.uri.fsPath);
 
-                let tailwindConfig, tailwindConfigPath;
-
                 if (runtimeConfig?.sortTailwindcssClasses) {
-                    tailwindConfigPath = resolveTailwindConfig(document.uri.fsPath, runtimeConfig?.tailwindcssConfigPath ?? '');
-                    tailwindConfig = requireUncached(tailwindConfigPath);
-                    runtimeConfig.tailwindcssConfigPath = '';
+                    const tailwindConfigPath = resolveTailwindConfig(document.uri.fsPath, runtimeConfig?.tailwindcssConfigPath ?? '');
+                    runtimeConfig.tailwindcssConfigPath = tailwindConfigPath;
+
+                    try {
+                        requireUncached(tailwindConfigPath);
+                    } catch (error) {
+                        // @ts-ignore
+                        // fallback to default config
+                        runtimeConfig.tailwindcssConfigPath = __non_webpack_require__.resolve('tailwindcss/lib/public/default-config');
+                    }
                 }
 
                 const options = {
@@ -89,7 +94,6 @@ export function activate(context: ExtensionContext) {
                     wrapAttributes: extConfig.wrapAttributes,
                     useTabs: extConfig.useTabs,
                     sortTailwindcssClasses: extConfig.sortTailwindcssClasses,
-                    tailwindcssConfig: tailwindConfig,
                     sortHtmlAttributes: extConfig.sortHtmlAttributes ?? 'none',
                     noMultipleEmptyLines: extConfig.noMultipleEmptyLines,
                     ...runtimeConfig, // override all settings by runtime config

diff --git a/src/index.d.ts b/src/index.d.ts
@@ -1 +1,3 @@
 declare module 'blade-formatter';
+declare module 'tailwindcss/lib/public/default-config';
+
diff --git a/src/tailwind.ts b/src/tailwind.ts
@@ -1,6 +1,7 @@
 import findConfig from 'find-config';
 import path from 'path';
 import { findConfigFile } from './runtimeConfig';
+import { requireUncached } from './util';
 
 const __config__ = 'tailwind.config.js';
 

diff --git a/src/util.ts b/src/util.ts
@@ -29,5 +29,6 @@ export function requireUncached(moduleName: string) {
         // @ts-ignore
         return __non_webpack_require__(moduleName);
     } catch (err: any) {
+        throw err;
     }
 }