fix: use pathToFileURL when loading config

uhyo · Dec 28, 2024 · 2b1976b · 2b1976b
1 parent bfb0f89
commit 2b1976b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/crates/config-file/src/node.rs b/crates/config-file/src/node.rs
@@ -116,8 +116,8 @@ pub async fn run_node(code: &str) -> io::Result<String> {
 pub async fn load_default_from_js_file(path: &Path) -> io::Result<String> {
     run_node(&format!(
         r#"
-import config from "{}";
-import {{ stdout }} from "process";
+import {{ pathToFileURL }} from "url";
+const config = (await import(pathToFileURL("{}").toString())).default;
 export default config?.default ?? config;
 "#,
         path.to_string_lossy().escape_default()

diff --git a/packages/core/src/config.ts b/packages/core/src/config.ts
@@ -2,8 +2,9 @@
  * @file `nitrogql_helper/config` namespace.
  */
 
+import { pathToFileURL } from "node:url";
 import { execFileSync } from "node:child_process";
-import { getMemory, readString, utf8Len, writeString } from "./memory.js";
+import { readString, utf8Len, writeString } from "./memory.js";
 import { getCommandClient } from "./command/commandClient.js";
 
 /**
@@ -55,8 +56,10 @@ export function executeNodeSync(code: string): string {
  */
 export function executeConfigFileSync(configFilePath: string): string {
   return executeNodeSync(`
-import config from ${JSON.stringify(configFilePath)};
 import { stdout } from "process";
+const config = (await import(${JSON.stringify(
+    pathToFileURL(configFilePath).toString()
+  )})).default;
 stdout.write(JSON.stringify(config.default ?? config));
 `);
 }