History

fix build (#1859)

Julius Marminge committed 7 months ago

Commit 8a2f1431 parent 86ab8743 files · +20 −0Browse files

Unified · Split

3 files
  1. bun.lock +2 −0
  2. package.json +2 −0
  3. scripts/build-desktop-artifact.ts +16 −0
bun.lock+2−0
@@ -228,6 +228,7 @@ · 227 unmodified lines
228 "node-pty",228 "node-pty",
229 ],229 ],
230 "overrides": {230 "overrides": {
231 "@effect/platform-node-shared": "catalog:",
231 "vite": "^8.0.0",232 "vite": "^8.0.0",
232 },233 },
233 "catalog": {234 "catalog": {
@@ -235,6 +236,7 @@ · 1 unmodified line
235 "@effect/language-service": "0.84.2",236 "@effect/language-service": "0.84.2",
236 "@effect/platform-bun": "4.0.0-beta.43",237 "@effect/platform-bun": "4.0.0-beta.43",
237 "@effect/platform-node": "4.0.0-beta.43",238 "@effect/platform-node": "4.0.0-beta.43",
239 "@effect/platform-node-shared": "4.0.0-beta.43",
238 "@effect/sql-sqlite-bun": "4.0.0-beta.43",240 "@effect/sql-sqlite-bun": "4.0.0-beta.43",
239 "@effect/vitest": "4.0.0-beta.43",241 "@effect/vitest": "4.0.0-beta.43",
240 "@types/bun": "^1.3.9",242 "@types/bun": "^1.3.9",
package.json+2−0
@@ -12,6 +12,7 @@ · 11 unmodified lines
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 @@ · 43 unmodified lines
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−0
@@ -182,6 +182,7 @@ interface StagePackageJson { · 181 unmodified lines
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
187const AzureTrustedSigningOptionsConfig = Config.all({188const AzureTrustedSigningOptionsConfig = Config.all({
@@ -570,6 +571,20 @@ const buildDesktopArtifact = Effect.fn("buildDesktopArtifact")(function* ( · 382 unmodified lines
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* ( · 101 unmodified lines
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);