Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.
fix(release): stage pnpm 11 allowBuilds for desktop installs (#3781)
Julius Marminge03ac1f0cd9b5
diff --git a/scripts/build-desktop-artifact.test.ts b/scripts/build-desktop-artifact.test.tsindex c7e33f6fc..e62baf39d 100644--- a/scripts/build-desktop-artifact.test.ts+++ b/scripts/build-desktop-artifact.test.ts@@ -11,7 +11,7 @@ import { ChildProcessSpawner } from "effect/unstable/process";import {BuildCommandFailedError,createStageWorkspaceConfig,- createStagePnpmConfig,+ createStagePatchedDependencies,createBuildConfig,DESKTOP_ASAR_UNPACK,InvalidMacPasskeyRpDomainError,@@ -168,7 +168,7 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => {it("carries only staged dependency patch metadata into staged desktop installs", () => {assert.deepStrictEqual(- createStagePnpmConfig(+ createStagePatchedDependencies({"@expo/[email protected]": "patches/@expo%[email protected]","@ff-labs/[email protected]": "patches/@[email protected]",@@ -183,28 +183,26 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => {},),{- patchedDependencies: {- "@ff-labs/[email protected]": "patches/@[email protected]",- "@pierre/[email protected]": "patches/@pierre%[email protected]",- "[email protected]": "patches/[email protected]",- },+ "@ff-labs/[email protected]": "patches/@[email protected]",+ "@pierre/[email protected]": "patches/@pierre%[email protected]",+ "[email protected]": "patches/[email protected]",},);- assert.equal(- createStagePnpmConfig(+ assert.deepStrictEqual(+ createStagePatchedDependencies({"@expo/[email protected]": "patches/@expo%[email protected]",},{ effect: "4.0.0-beta.73" },),- undefined,+ {},);});it("installs optional native dependencies for the target desktop architecture", () => {assert.deepStrictEqual(STAGE_INSTALL_ARGS, ["install", "--prod"]);- assert.deepStrictEqual(createStageWorkspaceConfig("mac", "x64"), {+ assert.deepStrictEqual(createStageWorkspaceConfig({ platform: "mac", arch: "x64" }), {supportedArchitectures: {os: ["darwin"],cpu: ["x64"],@@ -212,21 +210,21 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => {});// 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("win", "x64"), {+ assert.deepStrictEqual(createStageWorkspaceConfig({ platform: "win", arch: "x64" }), {supportedArchitectures: {os: ["win32", "linux"],cpu: ["x64"],libc: ["glibc"],},});- assert.deepStrictEqual(createStageWorkspaceConfig("win", "arm64"), {+ assert.deepStrictEqual(createStageWorkspaceConfig({ platform: "win", arch: "arm64" }), {supportedArchitectures: {os: ["win32", "linux"],cpu: ["arm64"],libc: ["glibc"],},});- assert.deepStrictEqual(createStageWorkspaceConfig("mac", "universal"), {+ assert.deepStrictEqual(createStageWorkspaceConfig({ platform: "mac", arch: "universal" }), {supportedArchitectures: {os: ["darwin"],cpu: ["arm64", "x64"],@@ -234,6 +232,62 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => {});});+ it("stages pnpm 11 allowBuilds and patchedDependencies in the workspace yaml", () => {+ assert.deepStrictEqual(+ createStageWorkspaceConfig({+ platform: "linux",+ arch: "x64",+ allowBuilds: {+ electron: true,+ "node-pty": true,+ "browser-tabs-lock": false,+ },+ patchedDependencies: {+ "[email protected]": "patches/[email protected]",+ },+ overrides: {+ effect: "4.0.0-beta.73",+ },+ }),+ {+ supportedArchitectures: {+ os: ["linux"],+ cpu: ["x64"],+ },+ allowBuilds: {+ electron: true,+ "node-pty": true,+ "browser-tabs-lock": false,+ },+ patchedDependencies: {+ "[email protected]": "patches/[email protected]",+ },+ overrides: {+ effect: "4.0.0-beta.73",+ },+ },+ );++ // Empty maps must not be written — pnpm would still require reviewed+ // packages if allowBuilds is present but incomplete, and omitting empty+ // patchedDependencies keeps the stage yaml minimal.+ assert.deepStrictEqual(+ createStageWorkspaceConfig({+ platform: "mac",+ arch: "arm64",+ allowBuilds: {},+ patchedDependencies: {},+ overrides: {},+ }),+ {+ supportedArchitectures: {+ os: ["darwin"],+ cpu: ["arm64"],+ },+ },+ );+ });+it("unpacks the fff shared library for filesystem and FFI access", () => {assert.deepStrictEqual(DESKTOP_ASAR_UNPACK, ["node_modules/@ff-labs/fff-bin-*/**/*"]);});diff --git a/scripts/build-desktop-artifact.ts b/scripts/build-desktop-artifact.tsindex 58153efe8..a75e48480 100644--- a/scripts/build-desktop-artifact.ts+++ b/scripts/build-desktop-artifact.ts@@ -40,6 +40,7 @@ const WorkspaceConfig = Schema.Struct({catalog: Schema.optional(Schema.Record(Schema.String, Schema.String)),overrides: Schema.optional(Schema.Record(Schema.String, Schema.String)),patchedDependencies: Schema.optional(Schema.Record(Schema.String, Schema.String)),+ allowBuilds: Schema.optional(Schema.Record(Schema.String, Schema.Boolean)),});type WorkspaceConfig = typeof WorkspaceConfig.Type;@@ -49,7 +50,14 @@ const StageWorkspaceConfig = Schema.Struct({cpu: Schema.Array(Schema.String),libc: Schema.optional(Schema.Array(Schema.String)),}),+ // pnpm 11 only reads these from pnpm-workspace.yaml (not package.json#pnpm).+ // Without allowBuilds the staged `vp install --prod` fails with+ // ERR_PNPM_IGNORED_BUILDS for packages that have lifecycle scripts.+ allowBuilds: Schema.optional(Schema.Record(Schema.String, Schema.Boolean)),+ patchedDependencies: Schema.optional(Schema.Record(Schema.String, Schema.String)),+ overrides: Schema.optional(Schema.Record(Schema.String, Schema.String)),});+type StageWorkspaceConfig = typeof StageWorkspaceConfig.Type;const RepoRoot = Effect.service(Path.Path).pipe(Effect.flatMap((path) => path.fromFileUrl(new URL("..", import.meta.url))),@@ -563,10 +571,6 @@ interface StagePackageJson {readonly devDependencies: {readonly electron: string;};- readonly overrides: Record<string, unknown>;- readonly pnpm?: {- readonly patchedDependencies?: Record<string, string>;- };}export const STAGE_INSTALL_ARGS = ["install", "--prod"] as const;@@ -876,10 +880,14 @@ const stageClerkPasskeyNativeBinaries = Effect.fn("stageClerkPasskeyNativeBinari}});-export function createStageWorkspaceConfig(- platform: typeof BuildPlatform.Type,- arch: typeof BuildArch.Type,-): typeof StageWorkspaceConfig.Type {+export function createStageWorkspaceConfig(input: {+ readonly platform: typeof BuildPlatform.Type;+ readonly arch: typeof BuildArch.Type;+ readonly allowBuilds?: Record<string, boolean>;+ readonly patchedDependencies?: Record<string, string>;+ readonly overrides?: Record<string, string>;+}): StageWorkspaceConfig {+ 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@@ -887,36 +895,37 @@ export function createStageWorkspaceConfig(// Pull the Linux (glibc) variants in addition to the host platform's so// they ship in the asar; without them the WSL backend crash-loops on require// ("Cannot find module '@yuuang/ffi-rs-linux-x64-gnu'").- if (platform === "win") {- return {- supportedArchitectures: {- os: Array.from(new Set([hostOs, "linux"])),- cpu: hostCpu,- libc: ["glibc"],- },- };- }+ const supportedArchitectures =+ platform === "win"+ ? {+ os: Array.from(new Set([hostOs, "linux"])),+ cpu: hostCpu,+ libc: ["glibc"],+ }+ : {+ os: [hostOs],+ cpu: hostCpu,+ };+return {- supportedArchitectures: {- os: [hostOs],- cpu: hostCpu,- },+ supportedArchitectures,+ ...(allowBuilds && Object.keys(allowBuilds).length > 0 ? { allowBuilds } : {}),+ ...(patchedDependencies && Object.keys(patchedDependencies).length > 0+ ? { patchedDependencies }+ : {}),+ ...(overrides && Object.keys(overrides).length > 0 ? { overrides } : {}),};}-export function createStagePnpmConfig(+export function createStagePatchedDependencies(patchedDependencies: Record<string, string>,dependencies: Record<string, unknown>,-): StagePackageJson["pnpm"] | undefined {- const stagePatchedDependencies = Object.fromEntries(+): Record<string, string> {+ return Object.fromEntries(Object.entries(patchedDependencies).filter(([patchKey]) =>Object.hasOwn(dependencies, getPatchedDependencyPackageName(patchKey)),),);-- return Object.keys(stagePatchedDependencies).length > 0- ? { patchedDependencies: stagePatchedDependencies }- : undefined;}function getPatchedDependencyPackageName(patchKey: string): string {@@ -1540,6 +1549,7 @@ const buildDesktopArtifact = Effect.fn("buildDesktopArtifact")(function* (const workspaceCatalog = workspaceConfig.catalog ?? {};const workspaceOverrides = workspaceConfig.overrides ?? {};const workspacePatchedDependencies = workspaceConfig.patchedDependencies ?? {};+ const workspaceAllowBuilds = workspaceConfig.allowBuilds ?? {};const platformConfig = PLATFORM_CONFIG[options.platform];if (!platformConfig) {@@ -1709,7 +1719,10 @@ const buildDesktopArtifact = Effect.fn("buildDesktopArtifact")(function* (): {}),};- const stagePnpmConfig = createStagePnpmConfig(workspacePatchedDependencies, stageDependencies);+ const stagePatchedDependencies = createStagePatchedDependencies(+ workspacePatchedDependencies,+ stageDependencies,+ );const stagePackageJson: StagePackageJson = {name: "t3code",version: appVersion,@@ -1738,20 +1751,24 @@ const buildDesktopArtifact = Effect.fn("buildDesktopArtifact")(function* (devDependencies: {electron: electronVersion,},- overrides: resolvedOverrides,- ...(stagePnpmConfig ? { pnpm: stagePnpmConfig } : {}),};const stagePackageJsonString = yield* encodeJsonString(stagePackageJson);yield* fs.writeFileString(path.join(stageAppDir, "package.json"), `${stagePackageJsonString}\n`);- const stageWorkspaceConfig = createStageWorkspaceConfig(options.platform, options.arch);+ const stageWorkspaceConfig = createStageWorkspaceConfig({+ platform: options.platform,+ arch: options.arch,+ allowBuilds: workspaceAllowBuilds,+ patchedDependencies: stagePatchedDependencies,+ overrides: resolvedOverrides,+ });const stageWorkspaceConfigString = yield* encodeStageWorkspaceConfig(stageWorkspaceConfig);yield* fs.writeFileString(path.join(stageAppDir, "pnpm-workspace.yaml"),stageWorkspaceConfigString,);- if (Object.keys(workspacePatchedDependencies).length > 0) {+ if (Object.keys(stagePatchedDependencies).length > 0) {yield* fs.copy(path.join(repoRoot, "patches"), path.join(stageAppDir, "patches"));}