electrobun 2.0.4 → 2.0.5-beta.2

package/bin/resolve-hutch.cjs

@@ -2,7 +2,7 @@
 
 // Resolve the exact Hutch release paired with this electrobun npm version.
 // The single npm package stays platform-neutral: each Electrobun GitHub
-// Release carries the five Hutch archives, and this shim verifies and caches
+// Release carries the six Hutch archives, and this shim verifies and caches
 // the host archive on first use. A compatible machine-wide launcher remains
 // a fallback, but Hutch before 0.22 cannot honor the paired default variables.
 
@@ -27,7 +27,7 @@ const { homedir, tmpdir } = require("node:os");
 const path = require("node:path");
 
 // Stamped by push-version.js from package/hutch.config.ts.
-const PAIRED_HUTCH_VERSION = "0.28.1";
+const PAIRED_HUTCH_VERSION = "0.28.2-canary.3";
 const ELECTROBUN_VERSION = require("../package.json").version;
 
 const MINIMUM_DEFAULTS_HUTCH_VERSION = "0.22.0";
@@ -64,6 +64,7 @@ const strictSemver =
 
 const releasedPlatforms = {
 	"darwin-arm64": "macos-arm64",
+	"darwin-x64": "macos-x64",
 	"linux-arm64": "linux-arm64",
 	"linux-x64": "linux-x64",
 	"win32-x64": "windows-x64",
@@ -76,12 +77,14 @@ function normalizeHutchChannel(value) {
 	return null;
 }
 
-function hutchChannel(environment) {
+function hutchChannel(environment, pairedVersion = PAIRED_HUTCH_VERSION) {
 	for (const key of ["ELECTROBUN_HUTCH_CHANNEL", "HUTCH_ACTIVE_CHANNEL"]) {
 		const selected = normalizeHutchChannel(environment[key]);
 		if (selected) return selected;
 	}
-	return "production";
+	const paired = parseVersion(pairedVersion);
+	if (!paired) throw new Error("paired Hutch version must be an exact SemVer");
+	return paired.prerelease === null ? "production" : "canary";
 }
 
 function environmentFlagEnabled(environment, name) {
@@ -245,19 +248,22 @@ function checkedSpawn(command, args, options) {
 	}
 }
 
-async function installHutch({ channel, environment, platform }) {
+async function installHutch(
+	{ channel, environment, platform },
+	{ downloadInstaller = download, execute = checkedSpawn } = {},
+) {
 	const temporary = mkdtempSync(path.join(tmpdir(), "electrobun-hutch-installer-"));
 	try {
 		if (platform === "win32") {
 			const installer = path.join(temporary, "install.ps1");
 			writeFileSync(
 				installer,
-				await download(`${defaultInstallerBaseUrl}/install.ps1`, {
+				await downloadInstaller(`${defaultInstallerBaseUrl}/install.ps1`, {
 					label: "Hutch installer",
 					maxBytes: maxInstallerBytes,
 				}),
 			);
-			checkedSpawn(
+			execute(
 				"powershell.exe",
 				[
 					"-NoProfile",
@@ -268,6 +274,8 @@ async function installHutch({ channel, environment, platform }) {
 					installer,
 					"-Channel",
 					channel,
+					"-Version",
+					PAIRED_HUTCH_VERSION,
 				],
 				{ env: environment, stdio: "inherit" },
 			);
@@ -275,13 +283,13 @@ async function installHutch({ channel, environment, platform }) {
 			const installer = path.join(temporary, "install.sh");
 			writeFileSync(
 				installer,
-				await download(`${defaultInstallerBaseUrl}/install.sh`, {
+				await downloadInstaller(`${defaultInstallerBaseUrl}/install.sh`, {
 					label: "Hutch installer",
 					maxBytes: maxInstallerBytes,
 				}),
 				{ mode: 0o700 },
 			);
-			checkedSpawn("sh", [installer, "--channel", channel], {
+			execute("sh", [installer, "--channel", channel, "--version", PAIRED_HUTCH_VERSION], {
 				env: environment,
 				stdio: "inherit",
 			});
@@ -1242,7 +1250,7 @@ async function ensureCompatibleGlobal(options) {
 		);
 	}
 	console.error(
-		`Electrobun projects use Hutch; installing the latest ${channel} release...`,
+		`Electrobun projects use Hutch; installing paired Hutch ${PAIRED_HUTCH_VERSION} (${channel})...`,
 	);
 	await options.install({
 		channel,
@@ -1390,6 +1398,7 @@ module.exports = {
 	hutchChannel,
 	hutchBinaryVersion,
 	hutchPlatformKey,
+	installHutch,
 	installDownloadedArchive,
 	resolveHutchBinary,
 	runHutch,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "electrobun",
-	"version": "2.0.4",
+	"version": "2.0.5-beta.2",
 	"description": "The lightweight npm bootstrap for Electrobun and Hutch.",
 	"license": "MIT",
 	"author": "Blackboard Technologies Inc.",