fix: 🐛 config changes are not reflecting due to cached config

shufo · Sep 19, 2022 · 16318ab · 16318ab
1 parent 9861ed2
commit 16318ab
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/src/extension.ts b/src/extension.ts
@@ -11,7 +11,7 @@ import { findConfigFile, readRuntimeConfig } from './runtimeConfig';
 import { ExtensionConstants } from "./constants";
 import { messages } from "./messages";
 import { formatFromCommand } from "./commands";
-import { getCoreNodeModule } from "./util";
+import { getCoreNodeModule, requireUncached } from "./util";
 import { resolveTailwindConfig } from "./tailwind";
 
 const { Range, Position } = vscode;
@@ -73,8 +73,12 @@ export function activate(context: ExtensionContext) {
 
                 const runtimeConfig = readRuntimeConfig(document.uri.fsPath);
 
-                if (runtimeConfig?.tailwindcssConfigPath) {
-                    runtimeConfig.tailwindcssConfigPath = resolveTailwindConfig(document.uri.fsPath, runtimeConfig?.tailwindcssConfigPath ?? '');
+                let tailwindConfig, tailwindConfigPath;
+
+                if (runtimeConfig?.sortTailwindcssClasses) {
+                    tailwindConfigPath = resolveTailwindConfig(document.uri.fsPath, runtimeConfig?.tailwindcssConfigPath ?? '');
+                    tailwindConfig = requireUncached(tailwindConfigPath);
+                    runtimeConfig.tailwindcssConfigPath = '';
                 }
 
                 const options = {
@@ -85,6 +89,7 @@ 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/util.ts b/src/util.ts
@@ -18,3 +18,16 @@ export function getCoreNodeModule(moduleName: string) {
 
     return null;
 }
+
+/**
+ * require module without cache
+ */
+export function requireUncached(moduleName: string) {
+    try {
+        // @ts-ignore
+        delete __non_webpack_require__.cache[__non_webpack_require__.resolve(moduleName)];
+        // @ts-ignore
+        return __non_webpack_require__(moduleName);
+    } catch (err: any) {
+    }
+}