From 4cecfe8e799c683037ef0a312a4d134e5542631f Mon Sep 17 00:00:00 2001 From: Luke Parker <10430890+Hona@users.noreply.github.com> Date: Fri, 28 Aug 2026 10:18:53 +1000 Subject: [PATCH] chore(desktop): remove stale native packaging (#45786) --- bun.lock | 8 -------- .../desktop/electron-builder.config.test.ts | 18 ++++++++---------- packages/desktop/electron-builder.config.ts | 12 +++--------- packages/desktop/electron.vite.config.test.ts | 17 +++++++++++++++++ packages/desktop/package.json | 11 +---------- 5 files changed, 29 insertions(+), 37 deletions(-) diff --git a/bun.lock b/bun.lock index e2b8abdfafc..f0417ad6936 100644 --- a/bun.lock +++ b/bun.lock @@ -458,14 +458,6 @@ "@lydell/node-pty-linux-x64": "1.2.0-beta.12", "@lydell/node-pty-win32-arm64": "1.2.0-beta.12", "@lydell/node-pty-win32-x64": "1.2.0-beta.12", - "@parcel/watcher-darwin-arm64": "2.5.1", - "@parcel/watcher-darwin-x64": "2.5.1", - "@parcel/watcher-linux-arm64-glibc": "2.5.1", - "@parcel/watcher-linux-arm64-musl": "2.5.1", - "@parcel/watcher-linux-x64-glibc": "2.5.1", - "@parcel/watcher-linux-x64-musl": "2.5.1", - "@parcel/watcher-win32-arm64": "2.5.1", - "@parcel/watcher-win32-x64": "2.5.1", "msgpackr-extract": "3.0.4", }, }, diff --git a/packages/desktop/electron-builder.config.test.ts b/packages/desktop/electron-builder.config.test.ts index d143117f045..48ee150a9f6 100644 --- a/packages/desktop/electron-builder.config.test.ts +++ b/packages/desktop/electron-builder.config.test.ts @@ -67,11 +67,13 @@ for (const channel of ["dev", "beta"] as const) { else process.env.OPENCODE_CHANNEL = previous expect(config.files).toContain("!resources/opencode-cli*") - expect(config.extraResources).toContainEqual({ - from: "resources/", - to: "", - filter: ["opencode-cli*"], - }) + expect(config.extraResources).toEqual([ + { + from: "resources/", + to: "", + filter: ["opencode-cli*"], + }, + ]) }) } @@ -83,9 +85,5 @@ test("does not bundle the CLI in prod builds", async () => { if (previous === undefined) delete process.env.OPENCODE_CHANNEL else process.env.OPENCODE_CHANNEL = previous - expect(config.extraResources).not.toContainEqual({ - from: "resources/", - to: "", - filter: ["opencode-cli*"], - }) + expect(config.extraResources).toEqual([]) }) diff --git a/packages/desktop/electron-builder.config.ts b/packages/desktop/electron-builder.config.ts index e4cf6f423ca..de59c2910e0 100644 --- a/packages/desktop/electron-builder.config.ts +++ b/packages/desktop/electron-builder.config.ts @@ -56,8 +56,8 @@ const getBase = (appId: string): Configuration => ({ desktopName: `${appId}.desktop`, }, files: ["out/**/*", "resources/**/*", "!resources/opencode-cli*"], - extraResources: [ - ...(channel !== "prod" + extraResources: + channel !== "prod" ? [ { from: "resources/", @@ -65,13 +65,7 @@ const getBase = (appId: string): Configuration => ({ filter: ["opencode-cli*"], }, ] - : []), - { - from: "native/", - to: "native/", - filter: ["index.js", "index.d.ts", "build/Release/mac_window.node", "swift-build/**"], - }, - ], + : [], mac: { category: "public.app-category.developer-tools", icon: `resources/icons/icon.icns`, diff --git a/packages/desktop/electron.vite.config.test.ts b/packages/desktop/electron.vite.config.test.ts index 8415b075f55..ca154b79c57 100644 --- a/packages/desktop/electron.vite.config.test.ts +++ b/packages/desktop/electron.vite.config.test.ts @@ -26,6 +26,23 @@ test("does not package external copies of bundled dependencies", () => { expect(pkg.optionalDependencies["msgpackr-extract"]).toBe("3.0.4") }) +test("keeps PTY binaries without stale native packaging", () => { + expect(Object.keys(pkg.scripts)).not.toContain("native:build") + expect( + Object.keys({ ...pkg.dependencies, ...pkg.devDependencies, ...pkg.optionalDependencies }).filter((name) => + name.startsWith("@parcel/watcher"), + ), + ).toEqual([]) + expect(Object.keys(pkg.optionalDependencies).filter((name) => name.startsWith("@lydell/node-pty-"))).toEqual([ + "@lydell/node-pty-darwin-arm64", + "@lydell/node-pty-darwin-x64", + "@lydell/node-pty-linux-arm64", + "@lydell/node-pty-linux-x64", + "@lydell/node-pty-win32-arm64", + "@lydell/node-pty-win32-x64", + ]) +}) + test("bundles one Effect runtime and Drizzle while keeping native dependencies external", async () => { const result = await loadConfigFromFile( { command: "build", mode: "production" }, diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 5c5bb6deb04..2b48121bff8 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -18,8 +18,7 @@ "package": "electron-builder --config electron-builder.config.ts", "package:mac": "electron-builder --mac --config electron-builder.config.ts", "package:win": "electron-builder --win --config electron-builder.config.ts", - "package:linux": "electron-builder --linux --config electron-builder.config.ts", - "native:build": "bun install --cwd native" + "package:linux": "electron-builder --linux --config electron-builder.config.ts" }, "main": "./out/main/index.js", "dependencies": { @@ -65,14 +64,6 @@ "@lydell/node-pty-linux-x64": "1.2.0-beta.12", "@lydell/node-pty-win32-arm64": "1.2.0-beta.12", "@lydell/node-pty-win32-x64": "1.2.0-beta.12", - "@parcel/watcher-darwin-arm64": "2.5.1", - "@parcel/watcher-darwin-x64": "2.5.1", - "@parcel/watcher-linux-arm64-glibc": "2.5.1", - "@parcel/watcher-linux-arm64-musl": "2.5.1", - "@parcel/watcher-linux-x64-glibc": "2.5.1", - "@parcel/watcher-linux-x64-musl": "2.5.1", - "@parcel/watcher-win32-arm64": "2.5.1", - "@parcel/watcher-win32-x64": "2.5.1", "msgpackr-extract": "3.0.4" } }