Remove usage of __dirname

trappar · Jan 31, 2024 · e049089 · e049089
1 parent a111a1c
commit e049089
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/dist/start/index.js b/dist/start/index.js
@@ -6134,7 +6134,7 @@ async function main() {
     (0,core.exportVariable)("TURBO_TOKEN", token);
     (0,core.exportVariable)("TURBO_TEAM", teamId);
     (0,core.debug)(`Starting Turbo Cache Server...`);
-    const subprocess = (0,external_child_process_namespaceObject.spawn)("node", [(0,external_path_.resolve)(__dirname, "../start_and_log")], {
+    const subprocess = (0,external_child_process_namespaceObject.spawn)("node", [(0,external_path_.resolve)(process.cwd(), "../start_and_log")], {
         detached: true,
         stdio: "ignore",
         env: {

diff --git a/dist/start_and_log/index.js b/dist/start_and_log/index.js
@@ -58,7 +58,7 @@ const logDir = (0,external_path_namespaceObject.resolve)(external_os_default().t
 
 
 
-const subprocess = (0,external_child_process_namespaceObject.spawn)("node", [(0,external_path_namespaceObject.resolve)(__dirname, "../server")]);
+const subprocess = (0,external_child_process_namespaceObject.spawn)("node", [(0,external_path_namespaceObject.resolve)(process.cwd(), "../server")]);
 subprocess.stdout.pipe((0,external_fs_namespaceObject.createWriteStream)((0,external_path_namespaceObject.resolve)(logDir, "out.log")));
 subprocess.stderr.pipe((0,external_fs_namespaceObject.createWriteStream)((0,external_path_namespaceObject.resolve)(logDir, "err.log")));
 
diff --git a/src/start.ts b/src/start.ts
@@ -27,17 +27,21 @@ async function main() {
   exportVariable("TURBO_TEAM", teamId);
 
   debug(`Starting Turbo Cache Server...`);
-  const subprocess = spawn("node", [resolve(__dirname, "../start_and_log")], {
-    detached: true,
-    stdio: "ignore",
-    env: {
-      ...process.env,
-      PORT: port.toString(),
-      TURBO_TOKEN: token,
-      STORAGE_PROVIDER: storageProvider,
-      STORAGE_PATH: storagePath,
+  const subprocess = spawn(
+    "node",
+    [resolve(process.cwd(), "../start_and_log")],
+    {
+      detached: true,
+      stdio: "ignore",
+      env: {
+        ...process.env,
+        PORT: port.toString(),
+        TURBO_TOKEN: token,
+        STORAGE_PROVIDER: storageProvider,
+        STORAGE_PATH: storagePath,
+      },
     },
-  });
+  );
 
   const pid = subprocess.pid?.toString();
   subprocess.unref();

diff --git a/src/start_and_log.ts b/src/start_and_log.ts
@@ -3,7 +3,7 @@ import { createWriteStream } from "fs";
 import { resolve } from "path";
 import { logDir } from "./constants.js";
 
-const subprocess = spawn("node", [resolve(__dirname, "../server")]);
+const subprocess = spawn("node", [resolve(process.cwd(), "../server")]);
 
 subprocess.stdout.pipe(createWriteStream(resolve(logDir, "out.log")));
 subprocess.stderr.pipe(createWriteStream(resolve(logDir, "err.log")));