fix: fix invalid path to node with sh execution

elibosley · elibosley · commit 7cf2bab96113 · 2025-02-28T10:37:19.000-05:00
diff --git a/api/src/cli.ts b/api/src/cli.ts
@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
 import '@app/dotenv.js';
 
 import { execa } from 'execa';
diff --git a/api/src/environment.ts b/api/src/environment.ts
@@ -1,16 +1,31 @@
 import { readFileSync } from 'node:fs';
 import { homedir } from 'node:os';
-import { dirname, join } from 'node:path';
+import { join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
 const getPackageJsonVersion = () => {
     try {
-        // Use import.meta.resolve to get the URL of package.json
-        const packageJsonUrl = import.meta.resolve('../package.json');
-        const packageJsonPath = fileURLToPath(packageJsonUrl);
-        const packageJson = readFileSync(packageJsonPath, 'utf-8');
-        const packageJsonObject = JSON.parse(packageJson);
-        return packageJsonObject.version;
+        // Try different possible locations for package.json
+        const possibleLocations = ['../package.json', '../../package.json'];
+        
+        for (const location of possibleLocations) {
+            try {
+                const packageJsonUrl = import.meta.resolve(location);
+                const packageJsonPath = fileURLToPath(packageJsonUrl);
+                const packageJson = readFileSync(packageJsonPath, 'utf-8');
+                const packageJsonObject = JSON.parse(packageJson);
+                if (packageJsonObject.version) {
+                    return packageJsonObject.version;
+                }
+            } catch (error) {
+                // Continue to next location if this one fails
+                continue;
+            }
+        }
+        
+        // If we get here, we couldn't find a valid package.json in any location
+        console.error('Could not find package.json in any of the expected locations');
+        return undefined;
     } catch (error) {
         console.error('Failed to load package.json:', error);
         return undefined;
diff --git a/api/vite.config.ts b/api/vite.config.ts
@@ -90,6 +90,12 @@ export default defineConfig(({ mode }): ViteUserConfig => {
                     entryFileNames: '[name].js',
                     format: 'es',
                     interop: 'auto',
+                    banner: (chunk) => {
+                        if (chunk.fileName === 'main.js' || chunk.fileName === 'cli.js') {
+                            return '#!/bin/sh\n":" //# comment; exec /opt/homebrew/bin/node "$0" "$@" 2>/dev/null || exec /usr/local/node/bin/node "$0" "$@" 2>/dev/null || exec /usr/bin/env node "$0" "$@"\n';
+                        }
+                        return '';
+                    },
                 },
                 preserveEntrySignatures: 'strict',
                 external: [

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-#!/usr/bin/env node`
`2`		`-`
`3`	`1`	`import '@app/dotenv.js';`
`4`	`2`
`5`	`3`	`import { execa } from 'execa';`