From ea126546801d72b1ee094e611b1e204fe2a93e8c Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Thu, 9 Apr 2026 14:12:43 -0700 Subject: [PATCH] fix build --- bun.lock | 2 ++ package.json | 2 ++ scripts/build-desktop-artifact.ts | 16 ++++++++++++++++ 3 files changed, 20 insertions(+) diff --git a/bun.lock b/bun.lock index 74c5badbe6..f5e71fbed3 100644 --- a/bun.lock +++ b/bun.lock @@ -185,6 +185,7 @@ "node-pty", ], "overrides": { + "@effect/platform-node-shared": "catalog:", "vite": "^8.0.0", }, "catalog": { @@ -192,6 +193,7 @@ "@effect/language-service": "0.84.2", "@effect/platform-bun": "4.0.0-beta.43", "@effect/platform-node": "4.0.0-beta.43", + "@effect/platform-node-shared": "4.0.0-beta.43", "@effect/sql-sqlite-bun": "4.0.0-beta.43", "@effect/vitest": "4.0.0-beta.43", "@types/bun": "^1.3.9", diff --git a/package.json b/package.json index a26a359c03..f0a158a621 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "@effect/atom-react": "4.0.0-beta.43", "@effect/platform-bun": "4.0.0-beta.43", "@effect/platform-node": "4.0.0-beta.43", + "@effect/platform-node-shared": "4.0.0-beta.43", "@effect/sql-sqlite-bun": "4.0.0-beta.43", "@effect/vitest": "4.0.0-beta.43", "@effect/language-service": "0.84.2", @@ -61,6 +62,7 @@ "vitest": "catalog:" }, "overrides": { + "@effect/platform-node-shared": "catalog:", "vite": "^8.0.0" }, "engines": { diff --git a/scripts/build-desktop-artifact.ts b/scripts/build-desktop-artifact.ts index c0327ab4ca..feb50a6662 100644 --- a/scripts/build-desktop-artifact.ts +++ b/scripts/build-desktop-artifact.ts @@ -182,6 +182,7 @@ interface StagePackageJson { readonly devDependencies: { readonly electron: string; }; + readonly overrides: Record; } const AzureTrustedSigningOptionsConfig = Config.all({ @@ -570,6 +571,20 @@ const buildDesktopArtifact = Effect.fn("buildDesktopArtifact")(function* ( }); } + const resolvedOverrides = yield* Effect.try({ + try: () => + resolveCatalogDependencies( + rootPackageJson.overrides, + rootPackageJson.workspaces.catalog, + "apps/desktop", + ), + catch: (cause) => + new BuildScriptError({ + message: "Could not resolve overrides from package.json.", + cause, + }), + }); + const resolvedServerDependencies = yield* Effect.try({ try: () => resolveCatalogDependencies( @@ -677,6 +692,7 @@ const buildDesktopArtifact = Effect.fn("buildDesktopArtifact")(function* ( devDependencies: { electron: electronVersion, }, + overrides: resolvedOverrides, }; const stagePackageJsonString = yield* encodeJsonString(stagePackageJson);