| author |  Julius Marminge <julius0216@outlook.com> 2026-04-09 14:20:05-07:00 |
| committer |  GitHub <noreply@github.com> 2026-04-09 21:20:05+00:00 |
| log | 9847e9b6211df61bd6d3d1142538ec4df77e0013 |
| tree | e1a4bd76c23f76b61b43fafa064704520d9a7bc3 |
| parent | b547fee77e77b3e813ce81284aea25781fec28b3 |
| signature | Signed by PGP key B5690EEEBB952194 |
fix build (#1859)
3 files changed, 20 insertions(+), 0 deletions(-)
bun.lock+2
| ... | @@ -185,6 +185,7 @@ | ... | @@ -185,6 +185,7 @@ |
| 185 | "node-pty", | 185 | "node-pty", |
| 186 | ], | 186 | ], |
| 187 | "overrides": { | 187 | "overrides": { |
| 188 | "@effect/platform-node-shared": "catalog:", | ||
| 188 | "vite": "^8.0.0", | 189 | "vite": "^8.0.0", |
| 189 | }, | 190 | }, |
| 190 | "catalog": { | 191 | "catalog": { |
| ... | @@ -192,6 +193,7 @@ | ... | @@ -192,6 +193,7 @@ |
| 192 | "@effect/language-service": "0.84.2", | 193 | "@effect/language-service": "0.84.2", |
| 193 | "@effect/platform-bun": "4.0.0-beta.43", | 194 | "@effect/platform-bun": "4.0.0-beta.43", |
| 194 | "@effect/platform-node": "4.0.0-beta.43", | 195 | "@effect/platform-node": "4.0.0-beta.43", |
| 196 | "@effect/platform-node-shared": "4.0.0-beta.43", | ||
| 195 | "@effect/sql-sqlite-bun": "4.0.0-beta.43", | 197 | "@effect/sql-sqlite-bun": "4.0.0-beta.43", |
| 196 | "@effect/vitest": "4.0.0-beta.43", | 198 | "@effect/vitest": "4.0.0-beta.43", |
| 197 | "@types/bun": "^1.3.9", | 199 | "@types/bun": "^1.3.9", |
package.json+2
| ... | @@ -12,6 +12,7 @@ | ... | @@ -12,6 +12,7 @@ |
| 12 | "@effect/atom-react": "4.0.0-beta.43", | 12 | "@effect/atom-react": "4.0.0-beta.43", |
| 13 | "@effect/platform-bun": "4.0.0-beta.43", | 13 | "@effect/platform-bun": "4.0.0-beta.43", |
| 14 | "@effect/platform-node": "4.0.0-beta.43", | 14 | "@effect/platform-node": "4.0.0-beta.43", |
| 15 | "@effect/platform-node-shared": "4.0.0-beta.43", | ||
| 15 | "@effect/sql-sqlite-bun": "4.0.0-beta.43", | 16 | "@effect/sql-sqlite-bun": "4.0.0-beta.43", |
| 16 | "@effect/vitest": "4.0.0-beta.43", | 17 | "@effect/vitest": "4.0.0-beta.43", |
| 17 | "@effect/language-service": "0.84.2", | 18 | "@effect/language-service": "0.84.2", |
| ... | @@ -61,6 +62,7 @@ | ... | @@ -61,6 +62,7 @@ |
| 61 | "vitest": "catalog:" | 62 | "vitest": "catalog:" |
| 62 | }, | 63 | }, |
| 63 | "overrides": { | 64 | "overrides": { |
| 65 | "@effect/platform-node-shared": "catalog:", | ||
| 64 | "vite": "^8.0.0" | 66 | "vite": "^8.0.0" |
| 65 | }, | 67 | }, |
| 66 | "engines": { | 68 | "engines": { |
scripts/build-desktop-artifact.ts+16
| ... | @@ -182,6 +182,7 @@ interface StagePackageJson { | ... | @@ -182,6 +182,7 @@ interface StagePackageJson { |
| 182 | readonly devDependencies: { | 182 | readonly devDependencies: { |
| 183 | readonly electron: string; | 183 | readonly electron: string; |
| 184 | }; | 184 | }; |
| 185 | readonly overrides: Record<string, unknown>; | ||
| 185 | } | 186 | } |
| 186 | 187 | ||
| 187 | const AzureTrustedSigningOptionsConfig = Config.all({ | 188 | const AzureTrustedSigningOptionsConfig = Config.all({ |
| ... | @@ -570,6 +571,20 @@ const buildDesktopArtifact = Effect.fn("buildDesktopArtifact")(function* ( | ... | @@ -570,6 +571,20 @@ const buildDesktopArtifact = Effect.fn("buildDesktopArtifact")(function* ( |
| 570 | }); | 571 | }); |
| 571 | } | 572 | } |
| 572 | 573 | ||
| 574 | const resolvedOverrides = yield* Effect.try({ | ||
| 575 | try: () => | ||
| 576 | resolveCatalogDependencies( | ||
| 577 | rootPackageJson.overrides, | ||
| 578 | rootPackageJson.workspaces.catalog, | ||
| 579 | "apps/desktop", | ||
| 580 | ), | ||
| 581 | catch: (cause) => | ||
| 582 | new BuildScriptError({ | ||
| 583 | message: "Could not resolve overrides from package.json.", | ||
| 584 | cause, | ||
| 585 | }), | ||
| 586 | }); | ||
| 587 | |||
| 573 | const resolvedServerDependencies = yield* Effect.try({ | 588 | const resolvedServerDependencies = yield* Effect.try({ |
| 574 | try: () => | 589 | try: () => |
| 575 | resolveCatalogDependencies( | 590 | resolveCatalogDependencies( |
| ... | @@ -677,6 +692,7 @@ const buildDesktopArtifact = Effect.fn("buildDesktopArtifact")(function* ( | ... | @@ -677,6 +692,7 @@ const buildDesktopArtifact = Effect.fn("buildDesktopArtifact")(function* ( |
| 677 | devDependencies: { | 692 | devDependencies: { |
| 678 | electron: electronVersion, | 693 | electron: electronVersion, |
| 679 | }, | 694 | }, |
| 695 | overrides: resolvedOverrides, | ||
| 680 | }; | 696 | }; |
| 681 | 697 | ||
| 682 | const stagePackageJsonString = yield* encodeJsonString(stagePackageJson); | 698 | const stagePackageJsonString = yield* encodeJsonString(stagePackageJson); |