| ... | @@ -12,7 +12,8 @@ import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"; | ... | @@ -12,7 +12,8 @@ import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"; |
| 12 | | 12 | |
| 13 | import { | 13 | import { |
| 14 | DEVELOPMENT_ICON_OVERRIDES, | 14 | DEVELOPMENT_ICON_OVERRIDES, |
| 15 | PUBLISH_ICON_OVERRIDES, | 15 | resolveWebAssetBrandForPackageVersion, |
| | 16 | resolveWebIconOverrides, |
| 16 | } from "../../../scripts/lib/brand-assets.ts"; | 17 | } from "../../../scripts/lib/brand-assets.ts"; |
| 17 | import { resolveCatalogDependencies } from "../../../scripts/lib/resolve-catalog.ts"; | 18 | import { resolveCatalogDependencies } from "../../../scripts/lib/resolve-catalog.ts"; |
| 18 | import { fromJsonStringPretty } from "@t3tools/shared/schemaJson"; | 19 | import { fromJsonStringPretty } from "@t3tools/shared/schemaJson"; |
| ... | @@ -81,50 +82,34 @@ const runCommand = Effect.fn("runCommand")(function* (command: ChildProcess.Stan | ... | @@ -81,50 +82,34 @@ const runCommand = Effect.fn("runCommand")(function* (command: ChildProcess.Stan |
| 81 | } | 82 | } |
| 82 | }); | 83 | }); |
| 83 | | 84 | |
| 84 | interface PublishIconBackup { | 85 | const preparePublishIcons = Effect.fn("preparePublishIcons")(function* ( |
| 85 | readonly targetPath: string; | | |
| 86 | readonly backupPath: string; | | |
| 87 | } | | |
| 88 | | | |
| 89 | const applyPublishIconOverrides = Effect.fn("applyPublishIconOverrides")(function* ( | | |
| 90 | repoRoot: string, | 86 | repoRoot: string, |
| 91 | serverDir: string, | 87 | serverDir: string, |
| | 88 | version: string, |
| 92 | ) { | 89 | ) { |
| 93 | const path = yield* Path.Path; | 90 | const path = yield* Path.Path; |
| 94 | const fs = yield* FileSystem.FileSystem; | 91 | const fs = yield* FileSystem.FileSystem; |
| 95 | const backups: PublishIconBackup[] = []; | 92 | const brand = resolveWebAssetBrandForPackageVersion(version); |
| 96 | | 93 | const icons = resolveWebIconOverrides(brand, "dist/client").map((override) => ({ |
| 97 | for (const override of PUBLISH_ICON_OVERRIDES) { | 94 | sourcePath: path.join(repoRoot, override.sourceRelativePath), |
| 98 | const sourcePath = path.join(repoRoot, override.sourceRelativePath); | 95 | targetPath: path.join(serverDir, override.targetRelativePath), |
| 99 | const targetPath = path.join(serverDir, override.targetRelativePath); | 96 | })); |
| 100 | const backupPath = `${targetPath}.publish-bak`; | 97 | |
| 101 | | 98 | for (const icon of icons) { |
| 102 | if (!(yield* fs.exists(sourcePath))) { | 99 | if (!(yield* fs.exists(icon.sourcePath))) { |
| 103 | return yield* new ServerCliPublishIconSourceMissingError({ sourcePath }); | 100 | return yield* new ServerCliPublishIconSourceMissingError({ sourcePath: icon.sourcePath }); |
| 104 | } | 101 | } |
| 105 | if (!(yield* fs.exists(targetPath))) { | 102 | if (!(yield* fs.exists(icon.targetPath))) { |
| 106 | return yield* new ServerCliPublishIconTargetMissingError({ targetPath }); | 103 | return yield* new ServerCliPublishIconTargetMissingError({ targetPath: icon.targetPath }); |
| 107 | } | 104 | } |
| 108 | | | |
| 109 | yield* fs.copyFile(targetPath, backupPath); | | |
| 110 | yield* fs.copyFile(sourcePath, targetPath); | | |
| 111 | backups.push({ targetPath, backupPath }); | | |
| 112 | } | 105 | } |
| 113 | | 106 | |
| 114 | yield* Effect.log("[cli] Applied publish icon overrides to dist/client"); | 107 | return yield* Effect.forEach(icons, (icon) => |
| 115 | return backups as ReadonlyArray<PublishIconBackup>; | 108 | Effect.all({ |
| 116 | }); | 109 | original: fs.readFile(icon.targetPath), |
| 117 | | 110 | publish: fs.readFile(icon.sourcePath), |
| 118 | const restorePublishIconOverrides = Effect.fn("restorePublishIconOverrides")(function* ( | 111 | }).pipe(Effect.map((contents) => ({ ...icon, ...contents }))), |
| 119 | backups: ReadonlyArray<PublishIconBackup>, | 112 | ); |
| 120 | ) { | | |
| 121 | const fs = yield* FileSystem.FileSystem; | | |
| 122 | for (const backup of backups) { | | |
| 123 | if (!(yield* fs.exists(backup.backupPath))) { | | |
| 124 | continue; | | |
| 125 | } | | |
| 126 | yield* fs.rename(backup.backupPath, backup.targetPath); | | |
| 127 | } | | |
| 128 | }); | 113 | }); |
| 129 | | 114 | |
| 130 | const applyDevelopmentIconOverrides = Effect.fn("applyDevelopmentIconOverrides")(function* ( | 115 | const applyDevelopmentIconOverrides = Effect.fn("applyDevelopmentIconOverrides")(function* ( |
| ... | @@ -236,7 +221,6 @@ const publishCmd = Command.make( | ... | @@ -236,7 +221,6 @@ const publishCmd = Command.make( |
| 236 | const repoRoot = yield* RepoRoot; | 221 | const repoRoot = yield* RepoRoot; |
| 237 | const serverDir = path.join(repoRoot, "apps/server"); | 222 | const serverDir = path.join(repoRoot, "apps/server"); |
| 238 | const packageJsonPath = path.join(serverDir, "package.json"); | 223 | const packageJsonPath = path.join(serverDir, "package.json"); |
| 239 | const backupPath = `${packageJsonPath}.bak`; | | |
| 240 | | 224 | |
| 241 | // Assert build assets exist | 225 | // Assert build assets exist |
| 242 | for (const relPath of ["dist/bin.mjs", "dist/client/index.html"]) { | 226 | for (const relPath of ["dist/bin.mjs", "dist/client/index.html"]) { |
| ... | @@ -247,7 +231,7 @@ const publishCmd = Command.make( | ... | @@ -247,7 +231,7 @@ const publishCmd = Command.make( |
| 247 | } | 231 | } |
| 248 | | 232 | |
| 249 | yield* Effect.acquireUseRelease( | 233 | yield* Effect.acquireUseRelease( |
| 250 | // Acquire: backup package.json, resolve catalog dependencies, and strip devDependencies/scripts | 234 | // Acquire: resolve publish metadata and read every original before mutation. |
| 251 | Effect.gen(function* () { | 235 | Effect.gen(function* () { |
| 252 | const version = Option.getOrElse(config.appVersion, () => serverPackageJson.version); | 236 | const version = Option.getOrElse(config.appVersion, () => serverPackageJson.version); |
| 253 | const workspaceConfig = yield* readWorkspaceConfig(); | 237 | const workspaceConfig = yield* readWorkspaceConfig(); |
| ... | @@ -273,19 +257,22 @@ const publishCmd = Command.make( | ... | @@ -273,19 +257,22 @@ const publishCmd = Command.make( |
| 273 | ), | 257 | ), |
| 274 | }; | 258 | }; |
| 275 | | 259 | |
| 276 | const original = yield* fs.readFileString(packageJsonPath); | 260 | return { |
| 277 | const packageJsonString = yield* encodePackageJson(pkg); | 261 | packageJsonString: yield* encodePackageJson(pkg), |
| 278 | yield* fs.writeFileString(backupPath, original); | 262 | originalPackageJson: yield* fs.readFile(packageJsonPath), |
| 279 | yield* fs.writeFileString(packageJsonPath, `${packageJsonString}\n`); | 263 | icons: yield* preparePublishIcons(repoRoot, serverDir, version), |
| 280 | yield* Effect.log("[cli] Prepared package.json for publish"); | 264 | }; |
| 281 | | | |
| 282 | const iconBackups = yield* applyPublishIconOverrides(repoRoot, serverDir); | | |
| 283 | return { iconBackups }; | | |
| 284 | }), | 265 | }), |
| 285 | // Use: pnpm publish from the workspace root so pnpm-only workspace | 266 | // Use: pnpm publish from the workspace root so pnpm-only workspace |
| 286 | // config, including override selectors, is interpreted correctly. | 267 | // config, including override selectors, is interpreted correctly. |
| 287 | () => | 268 | (resource) => |
| 288 | Effect.gen(function* () { | 269 | Effect.gen(function* () { |
| | 270 | yield* fs.writeFileString(packageJsonPath, `${resource.packageJsonString}\n`); |
| | 271 | for (const icon of resource.icons) { |
| | 272 | yield* fs.writeFile(icon.targetPath, icon.publish); |
| | 273 | } |
| | 274 | yield* Effect.log("[cli] Applied package metadata and publish icon overrides"); |
| | 275 | |
| 289 | const args = createVpPmPublishArgs(config); | 276 | const args = createVpPmPublishArgs(config); |
| 290 | const spawnCommand = yield* resolveSpawnCommand("vp", ["pm", ...args]); | 277 | const spawnCommand = yield* resolveSpawnCommand("vp", ["pm", ...args]); |
| 291 | | 278 | |
| ... | @@ -299,16 +286,14 @@ const publishCmd = Command.make( | ... | @@ -299,16 +286,14 @@ const publishCmd = Command.make( |
| 299 | }), | 286 | }), |
| 300 | ); | 287 | ); |
| 301 | }), | 288 | }), |
| 302 | // Release: restore | 289 | // Release: restore every file even if applying overrides or publishing fails. |
| 303 | (resource: { readonly iconBackups: ReadonlyArray<PublishIconBackup> }) => | 290 | (resource) => |
| 304 | Effect.gen(function* () { | 291 | Effect.gen(function* () { |
| 305 | yield* restorePublishIconOverrides(resource.iconBackups).pipe( | 292 | yield* fs.writeFile(packageJsonPath, resource.originalPackageJson); |
| 306 | Effect.catch((error) => | 293 | for (const icon of resource.icons) { |
| 307 | Effect.logError(`[cli] Failed to restore publish icon overrides: ${String(error)}`), | 294 | yield* fs.writeFile(icon.targetPath, icon.original); |
| 308 | ), | 295 | } |
| 309 | ); | 296 | if (config.verbose) yield* Effect.log("[cli] Restored original publish assets"); |
| 310 | yield* fs.rename(backupPath, packageJsonPath); | | |
| 311 | if (config.verbose) yield* Effect.log("[cli] Restored original package.json"); | | |
| 312 | }), | 297 | }), |
| 313 | ); | 298 | ); |
| 314 | }), | 299 | }), |
maria <maria@kuuro.net> 2026-07-23 17:36:02-04:00
GitHub <noreply@github.com> 2026-07-23 23:36:02+02:00