Commit 18a41388eb694a8590c2239424bf8ddec55c1c72 | the-knife

author	Patricio Gómez Meneses <107218376+Prgm-code@users.noreply.github.com> 2026-07-08 23:55:33-04:00
committer	GitHub <noreply@github.com> 2026-07-09 03:55:33+00:00
log	18a41388eb694a8590c2239424bf8ddec55c1c72
tree	fee8719334fd0aec0c197ec2735a96ca5d3bb572
parent	0c665658544c9d60b29b59699631d7f496e914e6
signature	Signed by PGP key B5690EEEBB952194

Fix desktop native optional dependency packaging (#3816)

2 files changed, 45 insertions(+), 11 deletions(-)

scripts
- build-desktop-artifact.test.ts
- build-desktop-artifact.ts

scripts/build-desktop-artifact.test.ts+15

 @@ -33,6 +33,7 @@ import {
   resolveGitHubPublishConfig,
   resolveMockUpdateServerPort,
   resolveMockUpdateServerUrl,
+  resolvePackageManagerUserAgent,
   stageLinuxIconSize,
   STAGE_INSTALL_ARGS,
 } from "./build-desktop-artifact.ts";
 @@ -208,6 +209,13 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => {
         cpu: ["x64"],
       },
     });
+    assert.deepStrictEqual(createStageWorkspaceConfig({ platform: "linux", arch: "x64" }), {
+      supportedArchitectures: {
+        os: ["linux"],
+        cpu: ["x64"],
+        libc: ["glibc"],
+      },
+    });
     // Windows artifacts also bundle the same-architecture WSL (Linux, glibc) backend, so the
     // staged install must fetch its native optional deps (e.g. ffi-rs) too.
     assert.deepStrictEqual(createStageWorkspaceConfig({ platform: "win", arch: "x64" }), {
 @@ -253,6 +261,7 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => {
         supportedArchitectures: {
           os: ["linux"],
           cpu: ["x64"],
+          libc: ["glibc"],
         },
         allowBuilds: {
           electron: true,
 @@ -529,6 +538,12 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => {
     assert.equal(resolveMockUpdateServerUrl(4123), "http://localhost:4123");
   });
+  it("derives the electron-builder package manager user agent from packageManager", () => {
+    assert.equal(resolvePackageManagerUserAgent("pnpm@11.10.0"), "pnpm/11.10.0");
+    assert.equal(resolvePackageManagerUserAgent(" yarn@4.9.2 "), "yarn/4.9.2");
+    assert.equal(resolvePackageManagerUserAgent("pnpm"), "pnpm");
+  });
   it.effect("normalizes mock update server ports from env-style strings", () =>
     Effect.gen(function* () {
       assert.equal(yield* resolveMockUpdateServerPort(undefined), undefined);

scripts/build-desktop-artifact.ts+30-11

 @@ -890,22 +890,27 @@ export function createStageWorkspaceConfig(input: {
   const { platform, arch, allowBuilds, patchedDependencies, overrides } = input;
   const hostOs = platform === "mac" ? "darwin" : platform === "win" ? "win32" : "linux";
   const hostCpu = arch === "universal" ? ["arm64", "x64"] : [arch];
-  // Windows artifacts also bundle the same-architecture WSL Linux backend, which loads
+  // Linux AppImages and Windows WSL backends both execute a Linux/glibc Node
-  // Linux-native optional deps at runtime (e.g. @yuuang/ffi-rs-linux-x64-gnu).
+  // process that loads Linux-native optional deps at runtime (e.g.
-  // Pull the Linux (glibc) variants in addition to the host platform's so
+  // @yuuang/ffi-rs-linux-x64-gnu). Keep libc explicit so pnpm includes those
-  // they ship in the asar; without them the WSL backend crash-loops on require
+  // optional packages in the staged production install.
-  // ("Cannot find module '@yuuang/ffi-rs-linux-x64-gnu'").
   const supportedArchitectures =
-    platform === "win"
+    platform === "linux"
       ? {
-          os: Array.from(new Set([hostOs, "linux"])),
+          os: [hostOs],
           cpu: hostCpu,
           libc: ["glibc"],
         }
-      : {
+      : platform === "win"
-          os: [hostOs],
+        ? {
-          cpu: hostCpu,
+            os: Array.from(new Set([hostOs, "linux"])),
-        };
+            cpu: hostCpu,
+            libc: ["glibc"],
+          }
+        : {
+            os: [hostOs],
+            cpu: hostCpu,
+          };
   return {
     supportedArchitectures,
 @@ -1339,6 +1344,19 @@ export function resolveMockUpdateServerUrl(mockUpdateServerPort: number | undefi
   return `http://localhost:${mockUpdateServerPort ?? 3000}`;
 }
+// Electron Builder detects pnpm from npm_config_user_agent, whose value uses
+// user-agent syntax (pnpm/11.10.0) rather than packageManager syntax
+// (pnpm@11.10.0).
+export function resolvePackageManagerUserAgent(packageManager: string): string {
+  const trimmed = packageManager.trim();
+  const versionSeparator = trimmed.lastIndexOf("@");
+  if (versionSeparator <= 0 || versionSeparator === trimmed.length - 1) {
+    return trimmed;
+  }
+  return `${trimmed.slice(0, versionSeparator)}/${trimmed.slice(versionSeparator + 1)}`;
+}
 export function resolveDesktopProductName(version: string): string {
   return resolveDesktopUpdateChannel(version) === "nightly"
     ? "T3 Code (Nightly)"
 @@ -1799,6 +1817,7 @@ const buildDesktopArtifact = Effect.fn("buildDesktopArtifact")(function* (
   const buildEnv: NodeJS.ProcessEnv = {
     ...process.env,
   };
+  buildEnv.npm_config_user_agent = resolvePackageManagerUserAgent(rootPackageJson.packageManager);
   for (const [key, value] of Object.entries(buildEnv)) {
     if (value === "") {
       delete buildEnv[key];