Skip to content

Fix standalone desktop workspace dependencies #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ronak-guliani merged 1 commit into from
Jul 26, 2026
Merged

Fix standalone desktop workspace dependencies #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions scripts/build-desktop-artifact.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
resolveElectronFuses,
resolveMockUpdateServerPort,
resolveMockUpdateServerUrl,
resolveStandaloneRuntimeDependencies,
resolveWindowsNsisConfig,
} from "./build-desktop-artifact.ts";
import { BRAND_ASSET_PATHS } from "./lib/brand-assets.ts";
Expand All @@ -32,6 +33,25 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => {
assert.equal(resolveDesktopProductName("0.0.17", "dev"), "T3 Code (Dev)");
});

it("excludes bundled workspace packages from standalone runtime dependencies", () => {
assert.deepStrictEqual(
resolveStandaloneRuntimeDependencies(
{
"@t3tools/contracts": "workspace:*",
"@effect/platform-node": "catalog:",
electron: "40.6.0",
open: "^10.1.0",
},
{ "@effect/platform-node": "4.0.0-beta.78" },
"apps/desktop",
),
{
"@effect/platform-node": "4.0.0-beta.78",
open: "^10.1.0",
},
);
});

it("keeps RunAsNode enabled and hardens fuses, gating asar integrity to mac/win", () => {
assert.deepStrictEqual(resolveElectronFuses("mac"), {
runAsNode: true,
Expand Down
22 changes: 17 additions & 5 deletions scripts/build-desktop-artifact.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,19 +507,23 @@ function validateBundledClientAssets(clientDir: string) {
});
}

function resolveDesktopRuntimeDependencies(
export function resolveStandaloneRuntimeDependencies(
dependencies: Record<string, string> | undefined,
catalog: Record<string, string>,
label: string,
): Record<string, string> {
if (!dependencies || Object.keys(dependencies).length === 0) {
return {};
}

const runtimeDependencies = Object.fromEntries(
Object.entries(dependencies).filter(([dependencyName]) => dependencyName !== "electron"),
Object.entries(dependencies).filter(
([dependencyName, dependencySpec]) =>
dependencyName !== "electron" && !dependencySpec.startsWith("workspace:"),
),
);

return resolveCatalogDependencies(runtimeDependencies, catalog, "apps/desktop");
return resolveCatalogDependencies(runtimeDependencies, catalog, label);
}

function resolveGitHubPublishConfig(updateChannel: "latest" | "nightly"):
Expand Down Expand Up @@ -859,7 +863,11 @@ const buildDesktopArtifact = Effect.fn("buildDesktopArtifact")(function* (

const resolvedServerDependencies = yield* Effect.try({
try: () =>
resolveCatalogDependencies(serverDependencies, workspaceConfig.catalog, "apps/server"),
resolveStandaloneRuntimeDependencies(
serverDependencies,
workspaceConfig.catalog,
"apps/server",
),
catch: (cause) =>
new BuildScriptError({
message: "Could not resolve production dependencies from apps/server/package.json.",
Expand All @@ -868,7 +876,11 @@ const buildDesktopArtifact = Effect.fn("buildDesktopArtifact")(function* (
});
const resolvedDesktopRuntimeDependencies = yield* Effect.try({
try: () =>
resolveDesktopRuntimeDependencies(desktopPackageJson.dependencies, workspaceConfig.catalog),
resolveStandaloneRuntimeDependencies(
desktopPackageJson.dependencies,
workspaceConfig.catalog,
"apps/desktop",
),
catch: (cause) =>
new BuildScriptError({
message: "Could not resolve desktop runtime dependencies from apps/desktop/package.json.",
Expand Down
Loading