Skip to content

Commit b5c5eb3

Browse files
author
Zayd
committed
fix(build): preserve directory desktop artifacts and framework symlinks
1 parent bb7783e commit b5c5eb3

2 files changed

Lines changed: 60 additions & 13 deletions

File tree

‎scripts/build-desktop-artifact.test.ts‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import { ChildProcess, ChildProcessSpawner } from "effect/process";
2222

2323
import {
2424
buildDesktopBundles,
25+
copyDesktopBuildArtifacts,
2526
DesktopBuildManifestRestoreError,
2627
BundleNotSelfContainedError,
2728
BuildCommandFailedError,
@@ -1671,3 +1672,26 @@ it.effect.skipIf(!symlinksSupported)("rebases packaged links into the isolated t
16711672
);
16721673
}).pipe(Effect.provide(NodeServices.layer)),
16731674
);
1675+
1676+
it.effect("preserves packaged app directories from the dir target", () =>
1677+
Effect.gen(function* () {
1678+
const fs = yield* FileSystem.FileSystem;
1679+
const path = yield* Path.Path;
1680+
const root = yield* fs.makeTempDirectoryScoped({ prefix: "t3-dir-artifact-" });
1681+
const stage = path.join(root, "stage");
1682+
const output = path.join(root, "output");
1683+
const app = path.join("mac-arm64", "T3 Code.app", "Contents");
1684+
yield* fs.makeDirectory(path.join(stage, app), { recursive: true });
1685+
yield* fs.writeFileString(path.join(stage, app, "Info.plist"), "built-app");
1686+
yield* fs.writeFileString(path.join(stage, "builder-debug.yml"), "debug");
1687+
yield* fs.symlink("Info.plist", path.join(stage, app, "Current"));
1688+
const copied = yield* copyDesktopBuildArtifacts(stage, output, true);
1689+
assert.include(copied, path.join(output, "mac-arm64"));
1690+
assert.equal(yield* fs.readFileString(path.join(output, app, "Info.plist")), "built-app");
1691+
assert.equal(yield* fs.readLink(path.join(output, app, "Current")), "Info.plist");
1692+
assert.equal(yield* fs.readFileString(path.join(stage, app, "Info.plist")), "built-app");
1693+
const filesOnly = yield* copyDesktopBuildArtifacts(stage, path.join(root, "files-only"));
1694+
assert.deepEqual(filesOnly, [path.join(root, "files-only", "builder-debug.yml")]);
1695+
assert.isFalse(yield* fs.exists(path.join(root, "files-only", "mac-arm64")));
1696+
}).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
1697+
);

‎scripts/build-desktop-artifact.ts‎

Lines changed: 36 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4107,19 +4107,11 @@ const buildDesktopArtifactUnlocked = Effect.fn("buildDesktopArtifactUnlocked")(f
41074107
});
41084108
}
41094109

4110-
const stageEntries = yield* fs.readDirectory(stageDistDir);
4111-
yield* fs.makeDirectory(options.outputDir, { recursive: true });
4112-
4113-
const copiedArtifacts: string[] = [];
4114-
for (const entry of stageEntries) {
4115-
const from = path.join(stageDistDir, entry);
4116-
const stat = yield* fs.stat(from).pipe(Effect.orElseSucceed(() => null));
4117-
if (!stat || stat.type !== "File") continue;
4118-
4119-
const to = path.join(options.outputDir, entry);
4120-
yield* fs.copyFile(from, to);
4121-
copiedArtifacts.push(to);
4122-
}
4110+
const copiedArtifacts = yield* copyDesktopBuildArtifacts(
4111+
stageDistDir,
4112+
options.outputDir,
4113+
options.target === "dir",
4114+
);
41234115

41244116
if (copiedArtifacts.length === 0) {
41254117
return yield* new DesktopBuildNoArtifactsProducedError({
@@ -4141,6 +4133,37 @@ const buildDesktopArtifact = Effect.fn("buildDesktopArtifact")(function* (
41414133
return yield* withDesktopBuildLock(repoRoot, buildDesktopArtifactUnlocked(options));
41424134
});
41434135

4136+
export const copyDesktopBuildArtifacts = Effect.fn("copyDesktopBuildArtifacts")(function* (
4137+
stageDistDir: string,
4138+
outputDir: string,
4139+
includeDirectories = false,
4140+
) {
4141+
const fs = yield* FileSystem.FileSystem;
4142+
const path = yield* Path.Path;
4143+
const stageEntries = yield* fs.readDirectory(stageDistDir);
4144+
yield* fs.makeDirectory(outputDir, { recursive: true });
4145+
4146+
const copiedArtifacts: string[] = [];
4147+
for (const entry of stageEntries) {
4148+
const from = path.join(stageDistDir, entry);
4149+
const stat = yield* fs.stat(from).pipe(Effect.orElseSucceed(() => null));
4150+
if (!stat || (stat.type !== "File" && !(includeDirectories && stat.type === "Directory")))
4151+
continue;
4152+
4153+
const to = path.join(outputDir, entry);
4154+
yield* Effect.tryPromise(() =>
4155+
NodeFSP.cp(from, to, {
4156+
recursive: true,
4157+
force: true,
4158+
verbatimSymlinks: true,
4159+
}),
4160+
);
4161+
copiedArtifacts.push(to);
4162+
}
4163+
4164+
return copiedArtifacts;
4165+
});
4166+
41444167
const buildDesktopArtifactCli = Command.make("build-desktop-artifact", {
41454168
platform: Flag.Literals("platform", BuildPlatform.literals).pipe(
41464169
Flag.withDescription("Build platform (env: T3CODE_DESKTOP_PLATFORM)."),

0 commit comments

Comments
 (0)