@gtkx/cli 1.3.0 → 1.4.0

package/env.d.ts

@@ -1,204 +1,23 @@
 /// <reference types="vite/client" />
 /// <reference types="@gtkx/react/env" />
 
-declare module "#data/*.aac" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
+declare module "*?resource" {
+    /** GResource path of the bundled asset. */
+    const path: string;
+    export { path };
+    export default path;
 }
 
-declare module "#data/*.avif" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.data" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.eot" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.flac" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.gif" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.gpa" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.ico" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.jpeg" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.jpg" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.mp3" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.mp4" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.ogg" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.otf" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.png" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.svg" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.ttf" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.wav" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.webm" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.webp" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.woff" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.woff2" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "*.data" {
-    /**
-     * URL of the emitted asset: a dev server URL under `gtkx dev`, an absolute filesystem path once built.
-     * Import it under `#data/` instead for a GResource path and a `resource://` URI.
-     */
-    const assetUrl: string;
-    export default assetUrl;
-}
-
-declare module "*.gpa" {
-    /**
-     * URL of the emitted asset: a dev server URL under `gtkx dev`, an absolute filesystem path once built.
-     * Import it under `#data/` instead for a GResource path and a `resource://` URI.
-     */
-    const assetUrl: string;
-    export default assetUrl;
+declare module "*?icon" {
+    /** Icon-theme name of the bundled asset. */
+    const iconName: string;
+    export default iconName;
 }
 
 declare module "*.css?url" {
     /**
-     * URL of the emitted stylesheet, imported without installing it on the default display: a dev server URL
-     * under `gtkx dev`, an absolute filesystem path once built.
+     * Absolute filesystem path of the source stylesheet under `gtkx dev` or the emitted stylesheet once built,
+     * imported without installing it on the default display.
      */
     const styleSheetUrl: string;
     export default styleSheetUrl;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gtkx/cli",
-  "version": "1.3.0",
-  "description": "Command-line tool and Vite plugin stack that scaffolds, develops, builds, and documents GTKX applications",
+  "version": "1.4.0",
+  "description": "GTK app toolchain for React: scaffold, dev server, build, docs.",
   "keywords": [
     "gtkx",
     "gtk",
@@ -73,19 +73,19 @@
     "react-refresh": "^0.18.0",
     "vite": "^8.2.2",
     "yaml": "^2.9.0",
-    "@gtkx/config": "1.3.0",
-    "@gtkx/codegen": "1.3.0",
-    "@gtkx/runtime": "1.3.0",
-    "@gtkx/mcp": "1.3.0",
-    "@gtkx/utils": "1.3.0",
-    "@gtkx/vitest": "1.3.0",
-    "create-gtkx": "1.3.0"
+    "@gtkx/codegen": "1.4.0",
+    "@gtkx/config": "1.4.0",
+    "@gtkx/mcp": "1.4.0",
+    "@gtkx/utils": "1.4.0",
+    "@gtkx/runtime": "1.4.0",
+    "@gtkx/vitest": "1.4.0",
+    "create-gtkx": "1.4.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
     "@types/react-refresh": "^0.14.7",
     "vitest": "^4.1.11",
-    "@gtkx/testing": "1.3.0"
+    "@gtkx/testing": "1.4.0"
   },
   "peerDependencies": {
     "react": "^19"

package/src/builder.ts

@@ -1,7 +1,7 @@
 import { join, posix } from "node:path";
 import { type InlineConfig, mergeConfig, build as viteBuild } from "vite";
-import { gtkxBuiltUrl } from "./vite-plugins/built-url.js";
-import { gtkxBundledPackages } from "./vite-plugins/bundled-packages.js";
+import { createBuildManifestCollector } from "./internal/build-manifest.js";
+import { gtkxBuildManifest } from "./vite-plugins/build-manifest.js";
 import { BUNDLE_FILENAME, ESM_EXTENSION } from "./vite-plugins/esm-extension.js";
 import { gtkxVitePlugins } from "./vite-plugins/index.js";
 import { gtkxNative } from "./vite-plugins/native.js";
@@ -10,7 +10,6 @@ import { gtkxWorker } from "./vite-plugins/worker.js";
 
 type BuildOptions = {
     entry: string;
-    assetBase?: string | undefined;
     vite?: InlineConfig | undefined;
 };
 
@@ -33,17 +32,17 @@ const buildDefaults: InlineConfig = {
 };
 
 const build = async (options: BuildOptions): Promise<string> => {
-    const { entry, assetBase, vite: viteConfig } = options;
+    const { entry, vite: viteConfig } = options;
     const root = viteConfig?.root ?? process.cwd();
     const assetsDir = viteConfig?.build?.assetsDir ?? DEFAULT_ASSETS_DIR;
+    const buildManifest = createBuildManifestCollector();
 
     const forced: InlineConfig = {
         plugins: [
-            ...gtkxVitePlugins(BUILD_MODE),
+            ...gtkxVitePlugins(BUILD_MODE, undefined, buildManifest),
             gtkxWorker(),
-            gtkxBuiltUrl(assetBase),
             gtkxNative(root),
-            gtkxBundledPackages(root),
+            gtkxBuildManifest(root, buildManifest),
             gtkxSelfContained(),
         ],
         build: {

package/src/codegen/run-codegen.ts

@@ -156,6 +156,7 @@ const prepareCodegen = (options: RunCodegenOptions, cwd: string, config: Config)
 const runCodegen = async (options: RunCodegenOptions = {}): Promise<RunCodegenResult> => {
     const cwd = options.cwd ?? process.cwd();
     const { config, configFile } = await resolveLoadedConfig(options, cwd);
+    syncSchemaEnv(cwd, config.future?.v2ResourceImports === true);
 
     if (config.codegen === false) {
         removeShadowingStores(cwd);
@@ -208,8 +209,9 @@ const isCodegenDisabled = async (cwd: string, mode?: string): Promise<boolean> =
     }
 };
 
-const syncSchemaEnv = (cwd: string): void => {
-    emitSchemaEnv(cwd, resolveDataDir(cwd));
+const syncSchemaEnv = (cwd: string, isV2ResourceImports = false): void => {
+    const dataDir = isV2ResourceImports ? null : resolveDataDir(cwd);
+    emitSchemaEnv(cwd, dataDir, isV2ResourceImports);
 };
 
 const resolveInputsOrNull = (cwd: string, config: Config): CodegenInputs | null => {
@@ -243,12 +245,14 @@ const isPreflightSkipped = (options: EnsureGeneratedOptions): boolean =>
 
 /* eslint-disable-next-line unicorn/consistent-boolean-name -- the boolean reports whether codegen ran */
 const generate = async (context: CodegenContext, options: EnsureGeneratedOptions): Promise<boolean> => {
-    syncSchemaEnv(context.root);
-
     if (context.config.codegen === false) {
-        removeShadowingStores(context.root);
+        const result = await runCodegen({
+            cwd: context.root,
+            mode: options.mode,
+            resolved: { config: context.config, configFile: context.configFile },
+        });
 
-        return false;
+        return result.isRegenerated;
     }
 
     const inputs = resolveInputsOrNull(context.root, context.config);
@@ -286,7 +290,6 @@ const resolveConfigWatch = async (
 export {
     runCodegen,
     isCodegenDisabled,
-    syncSchemaEnv,
     ensureGenerated,
     ensureGeneratedIn,
     resolveConfigWatch,

package/src/commands/build.ts

@@ -13,10 +13,6 @@ const build = defineCommand({
     },
     args: {
         ...entryArg,
-        "asset-base": {
-            type: "string",
-            description: "Asset base path relative to executable directory (e.g., ../share/my-app)",
-        },
     },
     async run({ args }) {
         const { cwd, entry } = await prepareProject(args, BUILD_MODE);
@@ -24,7 +20,6 @@ const build = defineCommand({
 
         const bundlePath = await buildApp({
             entry,
-            assetBase: args["asset-base"],
             vite: {
                 root: cwd,
             },

package/src/commands/codegen.ts

@@ -1,7 +1,7 @@
 import { info } from "@gtkx/utils";
 import { defineCommand } from "citty";
 import { formatCodegenResult } from "../codegen/report.js";
-import { ensureGenerated, isCodegenDisabled, runCodegen, syncSchemaEnv } from "../codegen/run-codegen.js";
+import { ensureGenerated, isCodegenDisabled, runCodegen } from "../codegen/run-codegen.js";
 import { cwdArg, resolveCwd } from "../internal/entry-arg.js";
 
 const FORCED_WHILE_DISABLED_MESSAGE =
@@ -29,7 +29,6 @@ const codegen = defineCommand({
 
         if (isDisabled) {
             await runCodegen({ cwd });
-            syncSchemaEnv(cwd);
             info("codegen: disabled for this project; reusing an installed binding store");
 
             return;
@@ -44,7 +43,6 @@ const codegen = defineCommand({
 
         const startedAt = Date.now();
         const result = await runCodegen({ cwd, isForced: true });
-        syncSchemaEnv(cwd);
         const lines = formatCodegenResult(result, Date.now() - startedAt);
 
         for (const line of lines) {

package/src/deploy/depends.ts

@@ -1,41 +1,70 @@
-import type { DeployConfig } from "./types.js";
+import type { DeploySettings } from "./types.js";
 
 type Relations = {
     deb: string[];
     rpm: string[];
 };
 
-const GLES_SONAME = "libGLESv2.so.2()(64bit)";
+type LibraryPackages = {
+    deb: string;
+    rpm: string;
+    extra: Relations;
+};
+
+const SONAME_SUFFIX = "()(64bit)";
+const GLES_SONAME = `libGLESv2.so.2${SONAME_SUFFIX}`;
+const NO_EXTRA: Relations = { deb: [], rpm: [] };
 
 const BASE_DEPENDS: Relations = {
     deb: ["hicolor-icon-theme", "adwaita-icon-theme", "gsettings-desktop-schemas"],
     rpm: ["hicolor-icon-theme", "adwaita-icon-theme", "gsettings-desktop-schemas"],
 };
 
-const DEPENDS_BY_LIBRARY: Record<string, Relations> = {
-    "Adw-1": { deb: ["libadwaita-1-0"], rpm: ["libadwaita"] },
-    "Gtk-4.0": { deb: ["libgtk-4-1"], rpm: ["gtk4", GLES_SONAME] },
-    "GtkSource-5": { deb: ["libgtksourceview-5-0"], rpm: ["gtksourceview5"] },
-    "WebKit-6.0": { deb: ["libwebkitgtk-6.0-4"], rpm: ["webkitgtk6.0"] },
+const DEPENDS_BY_LIBRARY: Record<string, LibraryPackages> = {
+    "Adw-1": { deb: "libadwaita-1-0", rpm: "libadwaita", extra: NO_EXTRA },
+    "Gtk-4.0": { deb: "libgtk-4-1", rpm: "gtk4", extra: { deb: [], rpm: [GLES_SONAME] } },
 };
 
-const libraryDepends = (libraries: string[]): Relations => ({
-    deb: libraries.flatMap((library) => DEPENDS_BY_LIBRARY[library]?.deb ?? []),
-    rpm: libraries.flatMap((library) => DEPENDS_BY_LIBRARY[library]?.rpm ?? []),
-});
+const debRelation = (name: string, minimum: string | undefined): string =>
+    minimum === undefined ? name : `${name} (>= ${minimum})`;
+
+const rpmRelation = (name: string, minimum: string | undefined): string =>
+    minimum === undefined ? name : `${name} >= ${minimum}`;
+
+const libraryDepends = (settings: DeploySettings): Relations => {
+    const deb: string[] = [];
+    const rpm: string[] = [];
+
+    for (const library of settings.libraries) {
+        const packages = DEPENDS_BY_LIBRARY[library];
+
+        if (packages === undefined) {
+            continue;
+        }
+
+        const minimum = settings.minimumLibraryVersions[library];
+        deb.push(debRelation(packages.deb, minimum), ...packages.extra.deb);
+        rpm.push(rpmRelation(packages.rpm, minimum), ...packages.extra.rpm);
+    }
+
+    return { deb, rpm };
+};
 
-const glibcDepends = (glibcFloor: string | null): Relations =>
-    glibcFloor === null ? { deb: [], rpm: [] } : { deb: [`libc6 (>= ${glibcFloor})`], rpm: [`glibc >= ${glibcFloor}`] };
+const glibcDepends = (glibcMinimum: string | null): Relations =>
+    glibcMinimum === null
+        ? { deb: [], rpm: [] }
+        : { deb: [debRelation("libc6", glibcMinimum)], rpm: [rpmRelation("glibc", glibcMinimum)] };
 
 const dedupe = (entries: string[]): string[] => [...new Set(entries)];
 
-const resolveDepends = (deploy: DeployConfig, libraries: string[], glibcFloor: string | null): Relations => {
-    const fromLibraries = libraryDepends(libraries);
-    const fromGlibc = glibcDepends(glibcFloor);
+const resolveDepends = (settings: DeploySettings, glibcMinimum: string | null): Relations => {
+    const fromLibraries = libraryDepends(settings);
+    const fromGlibc = glibcDepends(glibcMinimum);
+    const extra = settings.deploy.depends ?? {};
 
     return {
-        deb: dedupe([...fromLibraries.deb, ...BASE_DEPENDS.deb, ...fromGlibc.deb, ...(deploy.depends?.deb ?? [])]),
-        rpm: dedupe([...fromLibraries.rpm, ...BASE_DEPENDS.rpm, ...fromGlibc.rpm, ...(deploy.depends?.rpm ?? [])]),
+        deb: dedupe([...fromLibraries.deb, ...BASE_DEPENDS.deb, ...fromGlibc.deb, ...(extra.deb ?? [])]),
+        rpm: dedupe([...fromLibraries.rpm, ...BASE_DEPENDS.rpm, ...fromGlibc.rpm, ...(extra.rpm ?? [])]),
     };
 };
 

package/src/deploy/nfpm/config.ts

@@ -125,7 +125,7 @@ const descriptionFor = (settings: DeploySettings, packager: NfpmPackager): strin
 const renderNfpmConfig = (payload: DeployPayload, packager: NfpmPackager): NfpmConfig => {
     const settings = payload.settings;
     const isRpm = packager === "rpm";
-    const depends = resolveDepends(settings.deploy, settings.libraries, payload.node?.glibcFloor ?? null);
+    const depends = resolveDepends(settings, payload.node?.glibcMinimum ?? null);
 
     return {
         name: packageNameFor(settings, packager),

package/src/deploy/node-runtime/elf.ts

@@ -8,7 +8,7 @@ type ElfSection = {
 
 type ElfInfo = {
     needed: string[];
-    glibcFloor: string | null;
+    glibcMinimum: string | null;
 };
 
 type DynamicEntry = {
@@ -117,7 +117,7 @@ const highestVersion = (versions: number[][]): number[] | null => {
 const formatVersion = (version: number[] | null): string | null =>
     version === null ? null : `${String(version[0] ?? 0)}.${String(version[1] ?? 0)}`;
 
-const readGlibcFloor = (strings: Buffer): string | null => {
+const readGlibcMinimum = (strings: Buffer): string | null => {
     const found = strings
         .toString("latin1")
         .matchAll(GLIBC_VERSION)
@@ -138,7 +138,7 @@ const readElfInfo = (path: string): ElfInfo => {
 
     return {
         needed: readNeeded(buffer, sectionFor(sections, ".dynamic"), strings),
-        glibcFloor: readGlibcFloor(strings),
+        glibcMinimum: readGlibcMinimum(strings),
     };
 };
 

package/src/deploy/node-runtime/index.ts

@@ -78,9 +78,9 @@ const resolveNodeRuntime = async (settings: DeploySettings): Promise<NodeRuntime
     const staged = await stageFromSource(settings, version, source);
     const isStripped = node.shouldStrip === false ? false : didStripBinary(staged.path);
     const elf = readElfInfo(staged.path);
-    info(`Bundled Node.js v${version} (${megabytes(staged.path)} MiB, glibc >= ${elf.glibcFloor ?? "unknown"})`);
+    info(`Bundled Node.js v${version} (${megabytes(staged.path)} MiB, glibc >= ${elf.glibcMinimum ?? "unknown"})`);
 
-    return { ...staged, version, glibcFloor: elf.glibcFloor, isStripped };
+    return { ...staged, version, glibcMinimum: elf.glibcMinimum, isStripped };
 };
 
 export { resolveNodeRuntime, sourcePathFor };

package/src/deploy/notices/collect.ts

@@ -1,3 +1,4 @@
+import type { RecordedPackage } from "../../internal/build-manifest.js";
 import type { DeploySettings, NodeRuntime, NoticeSection } from "../types.js";
 import { dependencyNotices } from "./dependencies.js";
 import { gtkxNotices } from "./gtkx.js";
@@ -8,10 +9,11 @@ import { bundledPackages } from "./packages.js";
 type NoticeRequest = {
     settings: DeploySettings;
     node: NodeRuntime | null;
+    packages: RecordedPackage[];
 };
 
-const collectNotices = ({ settings, node }: NoticeRequest): NoticeSection[] => {
-    const packages = bundledPackages(settings);
+const collectNotices = ({ settings, node, packages: recordedPackages }: NoticeRequest): NoticeSection[] => {
+    const packages = bundledPackages(settings, recordedPackages);
 
     const sections = [
         nodeNotices(settings, node),

package/src/deploy/notices/packages.ts

@@ -1,17 +1,11 @@
-import { isRecord, sortStringsBy, warn } from "@gtkx/utils";
-import { existsSync, readFileSync, realpathSync } from "node:fs";
+import { sortStringsBy, warn } from "@gtkx/utils";
+import { existsSync, realpathSync } from "node:fs";
 import { join, resolve } from "node:path";
+import type { RecordedPackage } from "../../internal/build-manifest.js";
 import type { DeploySettings } from "../types.js";
-import { BUNDLED_PACKAGES_FILENAME } from "../../vite-plugins/bundled-packages.js";
 import { type PackageManifest, readPackageManifest } from "../settings/package-manifest.js";
 import { copyrightLines, licenseTextIn } from "./text.js";
 
-type RecordedPackage = {
-    name: string;
-    version: string | null;
-    dir: string;
-};
-
 type BundledPackage = {
     name: string;
     version: string | null;
@@ -36,38 +30,6 @@ const realPath = (path: string): string => {
     }
 };
 
-const optionalString = (value: unknown): string | null => (typeof value === "string" ? value : null);
-
-const recordedPackage = (entry: unknown): RecordedPackage | null => {
-    if (!isRecord(entry) || typeof entry.name !== "string" || typeof entry.dir !== "string") {
-        return null;
-    }
-
-    return { name: entry.name, version: optionalString(entry.version), dir: entry.dir };
-};
-
-const recordedList = (value: unknown): RecordedPackage[] => {
-    if (!Array.isArray(value)) {
-        return [];
-    }
-
-    const entries: unknown[] = value;
-
-    return entries.map((entry) => recordedPackage(entry)).filter((entry) => entry !== null);
-};
-
-const readRecordedPackages = (settings: DeploySettings): RecordedPackage[] => {
-    const path = join(settings.paths.dist, BUNDLED_PACKAGES_FILENAME);
-
-    if (!existsSync(path)) {
-        throw new Error(`Cannot deploy: ${path} is missing. Run \`gtkx build\` first.`);
-    }
-
-    const parsed: unknown = JSON.parse(readFileSync(path, "utf8"));
-
-    return recordedList(isRecord(parsed) ? parsed.packages : null);
-};
-
 const authorLine = (manifest: PackageManifest): string[] => {
     const { name, email } = manifest.author;
 
@@ -151,10 +113,10 @@ const warnMissing = (entries: BundledPackage[]): void => {
     );
 };
 
-const bundledPackages = (settings: DeploySettings): BundledPackage[] => {
+const bundledPackages = (settings: DeploySettings, recorded: RecordedPackage[]): BundledPackage[] => {
     const root = realPath(settings.paths.root);
 
-    const entries = readRecordedPackages(settings)
+    const entries = recorded
         .map((entry) => ({ entry, dir: resolve(settings.paths.dist, entry.dir) }))
         .filter(({ dir }) => realPath(dir) !== root)
         .map(({ entry, dir }) => packageIn(entry, dir));