Showing the changes to scripts (1 of 3 files). Show all
Unified · Split
| @@ -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 | ||
| 187 | const AzureTrustedSigningOptionsConfig = Config.all({ | 188 | const 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); |