@zackees/soldr 0.8.0 → 0.8.1

package/README.md

@@ -128,8 +128,8 @@ soldr cargo build --target aarch64-pc-windows-msvc
 
 The canonical multi-platform GitHub Actions tutorial lives in [`zackees/setup-soldr#90`](https://github.com/zackees/setup-soldr/issues/90).
 
-For Linux → Windows cross-compilation (GNU via `cargo-zigbuild`, MSVC via
-`cargo-xwin`) and explicit Windows x64 GNU builds via managed MinGW-w64 GCC,
+For Windows x64 → Windows GNU builds via managed MinGW-w64 GCC, and Linux →
+Windows MSVC cross-compilation via `cargo-xwin`,
 see [docs/CROSS_COMPILE.md](./docs/CROSS_COMPILE.md).
 
 ### CI cache lineage

package/contracts/zccache-runtime.v1.json

@@ -10,8 +10,6 @@
     "required_binaries": [
       "soldr",
       "soldr-daemon",
-      "soldr-shim",
-      "soldr-clang-shim",
       "crgx",
       "cargo-chef"
     ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zackees/soldr",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "Instant Rust tools and builds from one command.",
   "license": "BSD-3-Clause",
   "homepage": "https://github.com/zackees/soldr",

package/scripts/install.js

@@ -14,7 +14,7 @@ const PACKAGE_ROOT = path.resolve(__dirname, "..");
 const PACKAGE_JSON = require(path.join(PACKAGE_ROOT, "package.json"));
 
 // Every release ships a single .tar.zst per target that bundles soldr
-// alongside soldr-owned sidecars, same-target crgx, and same-target
+// alongside soldr-daemon, same-target crgx, and same-target
 // cargo-chef. One fetch installs everything, and `bin/soldr.js` wires
 // SOLDR_CRGX_LOCAL_DIR and SOLDR_CARGO_CHEF_LOCAL_DIR to the install dir
 // so soldr's runtime resolver finds those bundled tools without going
@@ -26,12 +26,16 @@ const TARGETS = {
   "linux-x64-musl": { triple: "x86_64-unknown-linux-musl", binary: "soldr" },
   "linux-arm64-gnu": { triple: "aarch64-unknown-linux-gnu", binary: "soldr" },
   "linux-arm64-musl": { triple: "aarch64-unknown-linux-musl", binary: "soldr" },
-  "darwin-x64": { triple: "x86_64-apple-darwin", binary: "soldr" },
   "darwin-arm64": { triple: "aarch64-apple-darwin", binary: "soldr" },
   "win32-x64": { triple: "x86_64-pc-windows-msvc", binary: "soldr.exe" },
   "win32-arm64": { triple: "aarch64-pc-windows-msvc", binary: "soldr.exe" },
 };
 
+const UNSUPPORTED_TARGETS = {
+  "darwin-x64":
+    "x86_64-apple-darwin release archives are intentionally not published; install from PyPI sdist or build from source",
+};
+
 // Files we expect to find at the root of every extracted release
 // archive. Names line up with what `release-auto.yml`'s
 // `Stage soldr release binaries`, `Build crgx from pinned source`, and
@@ -86,7 +90,8 @@ function platformTarget(platform = process.platform, arch = process.arch, libc =
       : `${platform}-${arch}`;
   const target = TARGETS[key];
   if (!target) {
-    throw new Error(`unsupported platform for soldr npm package: ${key}`);
+    const detail = UNSUPPORTED_TARGETS[key] ? `: ${UNSUPPORTED_TARGETS[key]}` : "";
+    throw new Error(`unsupported platform for soldr npm package: ${key}${detail}`);
   }
   return target;
 }
@@ -248,7 +253,7 @@ async function install() {
     fs.rmSync(nativeDir, { recursive: true, force: true });
     fs.mkdirSync(nativeDir, { recursive: true });
 
-    // Copy every bundled binary so soldr has its sidecars and can find
+    // Copy every bundled binary so soldr has its daemon and can find
     // crgx via SOLDR_CRGX_LOCAL_DIR and cargo-chef via
     // SOLDR_CARGO_CHEF_LOCAL_DIR.
     // `bin/soldr.js` wires these env vars before exec. The archive
@@ -296,7 +301,7 @@ async function install() {
     fs.copyFileSync(manifestSrc, path.join(nativeDir, zccacheContract.MANIFEST_NAME));
 
     console.log(
-      `soldr: installed ${target.triple} (soldr + sidecars + crgx + cargo-chef) into ${nativeDir}`,
+      `soldr: installed ${target.triple} (soldr + daemon + crgx + cargo-chef) into ${nativeDir}`,
     );
   } finally {
     fs.rmSync(tmp, { recursive: true, force: true });

package/scripts/test-npm-package.js

@@ -100,7 +100,10 @@ assert.strictEqual(
 // Default (no libc arg) falls back to detectLibc; on most CI hosts that's
 // gnu. We don't assert the triple here — just that the call resolves.
 assert.ok(install.platformTarget("linux", "x64").triple.startsWith("x86_64-unknown-linux-"));
-assert.strictEqual(install.platformTarget("darwin", "x64").triple, "x86_64-apple-darwin");
+assert.throws(
+  () => install.platformTarget("darwin", "x64"),
+  /x86_64-apple-darwin release archives are intentionally not published/,
+);
 assert.strictEqual(install.platformTarget("darwin", "arm64").triple, "aarch64-apple-darwin");
 assert.strictEqual(install.platformTarget("win32", "x64").triple, "x86_64-pc-windows-msvc");
 assert.strictEqual(install.platformTarget("win32", "arm64").triple, "aarch64-pc-windows-msvc");
@@ -165,7 +168,7 @@ for (const [key, target] of Object.entries(install.TARGETS || {})) {
   );
 }
 
-// BUNDLED_BINARIES must include soldr, soldr-owned sidecars, crgx, and
+// BUNDLED_BINARIES must include soldr, soldr-daemon, crgx, and
 // cargo-chef. It must not require standalone zccache binaries.
 assert.ok(
   Array.isArray(install.BUNDLED_BINARIES),
@@ -174,8 +177,6 @@ assert.ok(
 for (const required of [
   "soldr",
   "soldr-daemon",
-  "soldr-shim",
-  "soldr-clang-shim",
   "crgx",
   "cargo-chef",
 ]) {