fix: re-loading of config file

Author: sastan

package.json

@@ -96,11 +96,12 @@
     }
   },
   "dependencies": {
+    "clear-module": "^4.1.1",
     "cssbeautify": "^0.3.1",
     "fast-json-stable-stringify": "^2.1.0",
     "match-sorter": "^6.3.0",
     "sucrase": "^3.17.1",
-    "twind": "^0.16.9",
+    "twind": "^0.16.10",
     "typescript": "^4.1.0",
     "typescript-template-language-service-decorator": "^2.2.0",
     "vscode-languageserver-types": "^3.13.0"

src/load.ts

@@ -4,6 +4,8 @@ import * as Path from 'path'
 import Module from 'module'
 import { fileURLToPath } from 'url'
 
+import clearModule from 'clear-module'
+
 import type { Configuration } from 'twind'
 
 const TWIND_CONFIG_FILES = [
@@ -34,18 +36,23 @@ export const findConfig = (project: ts.server.Project, cwd = process.cwd()): str
 }
 
 export const loadFile = <T>(file: string, cwd = process.cwd()): T => {
+  const moduleId = Path.resolve(cwd, file)
+
   try {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
     const from = fileURLToPath(import.meta.url)
 
     const require = Module.createRequire?.(from) || Module.createRequireFromPath(from)
 
+    clearModule(moduleId)
+
     require('sucrase/register')
 
     // eslint-disable-next-line @typescript-eslint/no-var-requires
-    return require(Path.resolve(cwd, file)) as T
-  } catch {
+    return require(moduleId) as T
+  } catch (error) {
+    console.error(`Failed to load ${moduleId}: ${error.stack}`)
     return {} as T
   }
 }

src/twind.ts

@@ -252,7 +252,7 @@ export class Twind {
     )
 
     if (configFile) {
-      this.logger.log(`loaded twind config from ${configFile}`)
+      this.logger.log(`loaded twind config from ${configFile}: ${JSON.stringify(config)}`)
 
       // Reset all state on config file changes
       this._watchers.push(watch(configFile, () => this._reset(), { once: true }))

yarn.lock

@@ -250,7 +250,7 @@ braces@^3.0.1:
   dependencies:
     fill-range "^7.0.1"
 
-callsites@^3.0.0:
+callsites@^3.0.0, callsites@^3.1.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
@@ -272,6 +272,14 @@ chalk@^4.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+clear-module@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.npmjs.org/clear-module/-/clear-module-4.1.1.tgz#bf8ba3b62eb70ee1e0adec90589741425cf32db8"
+  integrity sha512-ng0E7LeODcT3QkazOckzZqbca+JByQy/Q2Z6qO24YsTp+pLxCfohGz2gJYJqZS0CWTX3LEUiHOqe5KlYeUbEMw==
+  dependencies:
+    parent-module "^2.0.0"
+    resolve-from "^5.0.0"
+
 color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
@@ -1017,6 +1025,13 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
+parent-module@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/parent-module/-/parent-module-2.0.0.tgz#fa71f88ff1a50c27e15d8ff74e0e3a9523bf8708"
+  integrity sha512-uo0Z9JJeWzv8BG+tRcapBKNJ0dro9cLyczGzulS6EfeyAdeC9sbojtW6XwvYxJkEne9En+J2XEl4zyglVeIwFg==
+  dependencies:
+    callsites "^3.1.0"
+
 path-exists@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
@@ -1325,10 +1340,10 @@ tsutils@^3.17.1:
   dependencies:
     tslib "^1.8.1"
 
-twind@^0.16.9:
-  version "0.16.9"
-  resolved "https://registry.npmjs.org/twind/-/twind-0.16.9.tgz#62d04a12d4a96f5f1e72e477af4e8634f356eaac"
-  integrity sha512-cOpijhtEMEaIhHQ4H3+K/APn1kAYkMtV3fMB/zBfXP+rmKiwjnNZSot8w8YNGnKDqLbV+uCSuFiZtPL60Jscaw==
+twind@^0.16.10:
+  version "0.16.10"
+  resolved "https://registry.npmjs.org/twind/-/twind-0.16.10.tgz#9e7ac848b48568fc4a49fc8ea2d218cbbadb9aab"
+  integrity sha512-GjTPjEbon/Z2FOVsEVkF6nCXqdpmNtlcfIC3p4zwWm+WUsLraryW2OK6pkWwjkXPVwWZEm0RTjzsWOuPs3gaHQ==
   dependencies:
     csstype "^3.0.5"
     htmlparser2 "^6.0.0"