fallback when bun blocks postinstall

Rhys Sullivan committed 7 months agov1.4.0-beta.3

Commit a09601c1 parent efc1e6b5 files · +41 −20Browse files

Unified · Split

5 files

.changeset/kind-cycles-hang.md +5 −0
.changeset/pre.json +1 −1
apps/cli/package.json +1 −1
apps/cli/src/build.ts +33 −17
bun.lock +1 −1

@@ -0,0 +1,5 @@
	1	---
	2	"executor": patch
	3	---
	4
	5	Fallback to downloading the platform binary on first run when package-manager postinstall scripts are blocked, including Bun global installs.

.changeset/pre.json+1−1

@@ -26,7 +26,7 @@ · 25 unmodified lines
26	"@executor/ui": "1.4.0-beta.0"	26	"@executor/ui": "1.4.0-beta.0"
27	},	27	},
28	"changesets": [	28	"changesets": [
29	"funny-buses-count",	29	"kind-cycles-hang",
30	"ripe-yaks-sniff"	30	"ripe-yaks-sniff"
31	]	31	]
32	}	32	}

apps/cli/package.json+1−1

@@ -1,6 +1,6 @@
1	{	1	{
2	"name": "executor",	2	"name": "executor",
3	"version": "1.4.0-beta.2",	3	"version": "1.4.0-beta.3",
4	"private": true,	4	"private": true,
5	"type": "module",	5	"type": "module",
6	"bin": {	6	"bin": {

apps/cli/src/build.ts+33−17

 if (process.env.EXECUTOR_BIN_PATH) run(process.env.EXECUTOR_BIN_PATH);
 const scriptDir = path.dirname(fs.realpathSync(__filename));
-const cached = path.join(scriptDir, process.platform === "win32" ? ".executor.exe" : ".executor");
+const binary = process.platform === "win32" ? "executor.exe" : "executor";
+const runtimeBinary = path.join(scriptDir, "runtime", binary);
+const legacyCached = path.join(scriptDir, process.platform === "win32" ? ".executor.exe" : ".executor");
+const resolveInstalledBinary = () => {
+  if (fs.existsSync(runtimeBinary)) {
+    return runtimeBinary;
+  }
+  if (fs.existsSync(legacyCached)) {
+    return legacyCached;
+  }
+  return null;
+};
 const installIfNeeded = () => {
-  if (fs.existsSync(cached)) {
+  const existing = resolveInstalledBinary();
-    return true;
+  if (existing) {
+    return existing;
   }
   const installer = path.resolve(scriptDir, "..", "postinstall.cjs");
   if (!fs.existsSync(installer)) {
-    return false;
+    return null;
   }
   console.error("executor binary is missing; downloading release asset...");
     process.exit(result.status);
   }
-  return fs.existsSync(cached);
+  return resolveInstalledBinary();
 };
-if (!installIfNeeded()) {
+const installedBinary = installIfNeeded();
+if (!installedBinary) {
   console.error("executor binary is missing. Reinstall the package or run 'npm rebuild executor'.");
   process.exit(1);
 }
-run(cached);
+run(installedBinary);
 `;
 // ---------------------------------------------------------------------------
 const packageDir = path.dirname(fs.realpathSync(__filename));
 const binDir = path.join(packageDir, "bin");
+const runtimeDir = path.join(binDir, "runtime");
 const packageJson = JSON.parse(fs.readFileSync(path.join(packageDir, "package.json"), "utf8"));
 const repositoryUrl = typeof packageJson.repository === "string"
 const platform = platformMap[os.platform()] || os.platform();
 const arch = os.arch() === "arm64" ? "arm64" : "x64";
 const binary = platform === "windows" ? "executor.exe" : "executor";
-const cachedBinary = path.join(binDir, platform === "win32" ? ".executor.exe" : ".executor");
+const cachedBinary = path.join(runtimeDir, binary);
+const legacyCachedBinary = path.join(binDir, platform === "win32" ? ".executor.exe" : ".executor");
 const isMusl = (() => {
   if (platform !== "linux") return false;
 const extract = () => {
   fs.mkdirSync(binDir, { recursive: true });
+  fs.rmSync(runtimeDir, { recursive: true, force: true });
+  fs.mkdirSync(runtimeDir, { recursive: true });
   if (platform === "linux") {
-    run("tar", ["-xzf", archivePath, "-C", binDir]);
+    run("tar", ["-xzf", archivePath, "-C", runtimeDir]);
     return;
   }
   if (platform === "darwin") {
-    run("unzip", ["-o", archivePath, "-d", binDir]);
+    run("unzip", ["-o", archivePath, "-d", runtimeDir]);
     return;
   }
   const command = [
     "$ErrorActionPreference = 'Stop'",
-    "Expand-Archive -LiteralPath '" + archivePath.replace(/'/g, "''") + "' -DestinationPath '" + binDir.replace(/'/g, "''") + "' -Force",
+    "Expand-Archive -LiteralPath '" + archivePath.replace(/'/g, "''") + "' -DestinationPath '" + runtimeDir.replace(/'/g, "''") + "' -Force",
   ].join("; ");
   run("powershell.exe", ["-NoLogo", "-NoProfile", "-Command", command]);
 };
     await download();
     extract();
-    const extractedBinary = path.join(binDir, binary);
+    if (!fs.existsSync(cachedBinary)) {
-    if (!fs.existsSync(extractedBinary)) {
+      throw new Error("Expected extracted binary at " + cachedBinary);
-      throw new Error("Expected extracted binary at " + extractedBinary);
     }
-    if (fs.existsSync(cachedBinary)) {
+    if (fs.existsSync(legacyCachedBinary)) {
-      fs.unlinkSync(cachedBinary);
+      fs.unlinkSync(legacyCachedBinary);
     }
-    fs.renameSync(extractedBinary, cachedBinary);
     fs.chmodSync(cachedBinary, 0o755);
     fs.rmSync(archivePath, { force: true });
     console.log("executor: installed " + assetBase + " from GitHub Releases");

bun.lock+1−1

@@ -18,7 +18,7 @@ · 17 unmodified lines
18	},	18	},
19	"apps/cli": {	19	"apps/cli": {
20	"name": "executor",	20	"name": "executor",
21	"version": "1.4.0-beta.2",	21	"version": "1.4.0-beta.3",
22	"bin": {	22	"bin": {
23	"executor": "./bin/executor.ts",	23	"executor": "./bin/executor.ts",
24	},	24	},

fallback when bun blocks postinstall

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code