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
228228 "node-pty",
229229 ],
230230 "overrides": {
231+ "@effect/platform-node-shared": "catalog:",
231232 "vite": "^8.0.0",
232233 },
233234 "catalog": {
@@ -235,6 +236,7 @@ · 1 unmodified line
235236 "@effect/language-service": "0.84.2",
236237 "@effect/platform-bun": "4.0.0-beta.43",
237238 "@effect/platform-node": "4.0.0-beta.43",
239+ "@effect/platform-node-shared": "4.0.0-beta.43",
238240 "@effect/sql-sqlite-bun": "4.0.0-beta.43",
239241 "@effect/vitest": "4.0.0-beta.43",
240242 "@types/bun": "^1.3.9",
package.json+2−0
@@ -12,6 +12,7 @@ · 11 unmodified lines
1212 "@effect/atom-react": "4.0.0-beta.43",
1313 "@effect/platform-bun": "4.0.0-beta.43",
1414 "@effect/platform-node": "4.0.0-beta.43",
15+ "@effect/platform-node-shared": "4.0.0-beta.43",
1516 "@effect/sql-sqlite-bun": "4.0.0-beta.43",
1617 "@effect/vitest": "4.0.0-beta.43",
1718 "@effect/language-service": "0.84.2",
@@ -61,6 +62,7 @@ · 43 unmodified lines
6162 "vitest": "catalog:"
6263 },
6364 "overrides": {
65+ "@effect/platform-node-shared": "catalog:",
6466 "vite": "^8.0.0"
6567 },
6668 "engines": {
scripts/build-desktop-artifact.ts+16−0
@@ -182,6 +182,7 @@ interface StagePackageJson { · 181 unmodified lines
182182 readonly devDependencies: {
183183 readonly electron: string;
184184 };
185+ readonly overrides: Record<string, unknown>;
185186 }
186187
187188 const AzureTrustedSigningOptionsConfig = Config.all({
@@ -570,6 +571,20 @@ const buildDesktopArtifact = Effect.fn("buildDesktopArtifact")(function* ( · 382 unmodified lines
570571 });
571572 }
572573
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+
573588 const resolvedServerDependencies = yield* Effect.try({
574589 try: () =>
575590 resolveCatalogDependencies(
@@ -677,6 +692,7 @@ const buildDesktopArtifact = Effect.fn("buildDesktopArtifact")(function* ( · 101 unmodified lines
677692 devDependencies: {
678693 electron: electronVersion,
679694 },
695+ overrides: resolvedOverrides,
680696 };
681697
682698 const stagePackageJsonString = yield* encodeJsonString(stagePackageJson);