YeonGyu-Kim
3ddc757b15
Root cause: bun build --target bun inlines top-level
var { spawn } = globalThis.Bun;
for every file that contains 'import { spawn } from "bun"'. On Node/Electron
where globalThis.Bun is undefined, this crashes with
Cannot destructure property 'spawn' of 'globalThis.Bun' as it is undefined.
26 source files had this import; the bundled output had 25 top-level destructures.
Fix:
- Add src/shared/bun-spawn-shim.ts: a thin wrapper that
- delegates to Bun.spawn/spawnSync when globalThis.Bun is present (real Bun)
- falls back to static ESM imports of node:child_process otherwise
- uses static 'import { spawn } from "node:child_process"' so Bun bundler
does NOT emit any globalThis.Bun destructures for this module
- Replace all 26 'from "bun"' spawn/spawnSync imports with relative paths to shim
- Replace 4 direct Bun.spawn() call sites with shim's spawn()
- Remove src/electron-compat.ts and script/prepend-electron-shim.ts (no longer needed)
- Update src/electron-compat.test.ts to assert 0 top-level globalThis.Bun destructures
Verification: grep -c '} = globalThis.Bun;' dist/index.js → 0 (was 25)
All 5921 tests pass (1 pre-existing timeout failure unrelated to this change).
Fixes #3797
73 lines
1.8 KiB
TypeScript
73 lines
1.8 KiB
TypeScript
import { spawn, spawnSync } from "../bun-spawn-shim"
|
|
|
|
import type { ArchiveEntry } from "../archive-entry-validator"
|
|
import { readZipSymlinkTarget } from "./read-zip-symlink-target"
|
|
|
|
export function parseZipInfoListedEntry(line: string): ArchiveEntry | null {
|
|
const match = line.match(
|
|
/^([-dl?])\S*\s+\S+\s+\S+\s+\d+\s+\S+\s+\d+\s+\S+\s+\S+\s+\S+\s+(.*)$/
|
|
)
|
|
if (!match) {
|
|
return null
|
|
}
|
|
|
|
const [, rawType, rawEntryPath] = match
|
|
return {
|
|
path: rawEntryPath,
|
|
type: rawType === "d" ? "directory" : rawType === "l" ? "symlink" : "file",
|
|
}
|
|
}
|
|
|
|
export function isZipInfoZipListingAvailable(): boolean {
|
|
const proc = spawnSync(["which", "zipinfo"], {
|
|
stdout: "ignore",
|
|
stderr: "ignore",
|
|
})
|
|
|
|
return proc.exitCode === 0
|
|
}
|
|
|
|
function splitZipInfoOutputLines(stdout: string): string[] {
|
|
return stdout.split(/\r?\n/).filter(line => line.length > 0)
|
|
}
|
|
|
|
export async function listZipEntriesWithZipInfo(
|
|
archivePath: string
|
|
): Promise<ArchiveEntry[]> {
|
|
if (!isZipInfoZipListingAvailable()) {
|
|
throw new Error("zip entry listing requires zipinfo, but zipinfo is not installed")
|
|
}
|
|
|
|
const proc = spawn(["zipinfo", "-l", archivePath], {
|
|
stdout: "pipe",
|
|
stderr: "pipe",
|
|
})
|
|
|
|
const [exitCode, stdout, stderr] = await Promise.all([
|
|
proc.exited,
|
|
new Response(proc.stdout).text(),
|
|
new Response(proc.stderr).text(),
|
|
])
|
|
|
|
if (exitCode !== 0) {
|
|
throw new Error(`zip entry listing failed (exit ${exitCode}): ${stderr}`)
|
|
}
|
|
|
|
const parsedEntries = splitZipInfoOutputLines(stdout)
|
|
.map(line => parseZipInfoListedEntry(line))
|
|
.filter((entry): entry is ArchiveEntry => entry !== null)
|
|
|
|
return Promise.all(
|
|
parsedEntries.map(async entry => {
|
|
if (entry.type !== "symlink") {
|
|
return entry
|
|
}
|
|
|
|
return {
|
|
...entry,
|
|
linkPath: await readZipSymlinkTarget(archivePath, entry.path),
|
|
}
|
|
})
|
|
)
|
|
}
|