From abb5940788dbdeefb0e428d142112efd9ccb5dcc Mon Sep 17 00:00:00 2001
From: Atharva Deopujari <atharva@habuild.in>
Date: Fri, 20 Mar 2026 12:39:42 +0530
Subject: [PATCH] fix: handle single-quoted paths and dangling var; edge case

Address review feedback:
- Match both double-quoted and single-quoted string literals defensively
- Clean up dangling `var ;` when __dirname is the sole declarator
- Refactor into a loop over both identifiers to reduce duplication
---
 scripts/build-hooks.js | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/scripts/build-hooks.js b/scripts/build-hooks.js
index 2c62e188..c5737851 100644
--- a/scripts/build-hooks.js
+++ b/scripts/build-hooks.js
@@ -45,17 +45,22 @@ function stripHardcodedDirname(filePath) {
   let content = fs.readFileSync(filePath, 'utf-8');
   const before = content.length;
 
-  // Remove `var __dirname = "...", rest` → `var rest`
-  content = content.replace(/\bvar __dirname\s*=\s*"[^"]*",\s*/g, 'var ');
-  // Remove standalone `var __dirname = "...";`
-  content = content.replace(/\bvar __dirname\s*=\s*"[^"]*";\s*/g, '');
-  // Remove `, __dirname = "..."` from mid/end of var declarations
-  content = content.replace(/,\s*__dirname\s*=\s*"[^"]*"/g, '');
+  // Match both double-quoted and single-quoted string literals.
+  // esbuild currently emits double quotes, but single quotes are handled
+  // defensively in case future versions change quoting style.
+  const str = `(?:"[^"]*"|'[^']*')`;
 
-  // Same for __filename
-  content = content.replace(/\bvar __filename\s*=\s*"[^"]*",\s*/g, 'var ');
-  content = content.replace(/\bvar __filename\s*=\s*"[^"]*";\s*/g, '');
-  content = content.replace(/,\s*__filename\s*=\s*"[^"]*"/g, '');
+  for (const id of ['__dirname', '__filename']) {
+    // Remove `var <id> = "...", rest` → `var rest`
+    content = content.replace(new RegExp(`\\bvar ${id}\\s*=\\s*${str},\\s*`, 'g'), 'var ');
+    // Remove standalone `var <id> = "...";`
+    content = content.replace(new RegExp(`\\bvar ${id}\\s*=\\s*${str};\\s*`, 'g'), '');
+    // Remove `, <id> = "..."` from mid/end of var declarations
+    content = content.replace(new RegExp(`,\\s*${id}\\s*=\\s*${str}`, 'g'), '');
+  }
+
+  // Clean up dangling `var ;` left when __dirname was the sole declarator
+  content = content.replace(/\bvar\s*;/g, '');
 
   const removed = before - content.length;
   if (removed > 0) {