@gtkx/cli 2.0.0-beta.1 → 2.0.0-beta.10

package/src/deploy/settings/paths.ts

@@ -1,9 +1,11 @@
 import type { Config } from "@gtkx/config";
 import { isPathInside } from "@gtkx/utils";
-import { statSync } from "node:fs";
-import { join, resolve } from "node:path";
-import type { DeployConfig, DeployPaths } from "../types.js";
+import { lstatSync, readdirSync, statSync, writeFileSync } from "node:fs";
+import { join, relative, resolve, sep } from "node:path";
+import type { DeployArchName, DeployConfig, DeployPaths } from "../types.js";
+import { DEFAULT_DEPLOY_OUT_DIR } from "../../internal/deploy-out-dir.js";
 import { resolveApplicationIcon } from "../../internal/icon-path.js";
+import { prepareOutputDirectory, readRegularFile } from "../../internal/output-directory.js";
 
 type PathsRequest = {
     root: string;
@@ -11,23 +13,87 @@ type PathsRequest = {
     applicationIcon: Config["applicationIcon"];
     applicationId: Config["applicationId"];
     outDirOverride: string | undefined;
+    arch: DeployArchName;
 };
 
-const DEFAULT_OUT_DIR = "build";
 const DIST_DIR = "dist";
+const DEPLOY_MARKER_FILENAME = ".gtkx-deploy.json";
+const DEPLOY_MARKER = `${JSON.stringify({ generator: "gtkx-deploy", formatVersion: 1 })}\n`;
 const LICENSE_CANDIDATES = ["LICENSE", "LICENSE.md", "LICENSE.txt", "COPYING", "COPYING.md"];
 
+const hasSymlinkComponent = (root: string, target: string): boolean => {
+    let current = root;
+
+    for (const segment of relative(root, target).split(sep)) {
+        current = join(current, segment);
+
+        if (lstatSync(current, { throwIfNoEntry: false })?.isSymbolicLink() === true) {
+            return true;
+        }
+    }
+
+    return false;
+};
+
+const isDeployMarker = (path: string): boolean => {
+    return readRegularFile(path) === DEPLOY_MARKER;
+};
+
+const isReusableDeployDirectory = (path: string): boolean => {
+    const entry = lstatSync(path, { throwIfNoEntry: false });
+
+    if (entry === undefined) {
+        return true;
+    }
+
+    return entry.isDirectory() &&
+        (readdirSync(path).length === 0 || isDeployMarker(join(path, DEPLOY_MARKER_FILENAME)));
+};
+
+const deployOutputError = (root: string, configured: string): Error =>
+    new Error(
+        `Cannot use "${configured}" as the deploy output directory: choose an empty directory or an ` +
+        `earlier GTKX deploy directory below ${root}`,
+    );
+
+const assertSafeDeployOutDir = (root: string, outDir: string, configured: string): void => {
+    const dist = join(root, DIST_DIR);
+
+    if (
+        outDir === dist ||
+        !isPathInside(root, outDir) ||
+        isPathInside(dist, outDir) ||
+        hasSymlinkComponent(root, outDir)
+    ) {
+        throw deployOutputError(root, configured);
+    }
+};
+
 const resolveOutDir = ({ root, deploy, outDirOverride }: PathsRequest): string => {
-    const configured = outDirOverride ?? deploy.outDir ?? DEFAULT_OUT_DIR;
+    const configured = outDirOverride ?? deploy.outDir ?? DEFAULT_DEPLOY_OUT_DIR;
     const outDir = resolve(root, configured);
+    assertSafeDeployOutDir(root, outDir, configured);
 
-    if (!isPathInside(root, outDir)) {
-        throw new Error(`Cannot use "${configured}" as the deploy output directory: it is outside ${root}`);
+    if (!isReusableDeployDirectory(outDir)) {
+        throw deployOutputError(root, configured);
     }
 
     return outDir;
 };
 
+const prepareDeployOutDir = (root: string, outDir: string): void => {
+    assertSafeDeployOutDir(root, outDir, outDir);
+    const prepared = prepareOutputDirectory(root, outDir, isReusableDeployDirectory);
+
+    if (prepared.status === "unsafe") {
+        throw deployOutputError(root, outDir);
+    }
+
+    using transaction = prepared.transaction;
+    transaction.commit();
+    writeFileSync(join(outDir, DEPLOY_MARKER_FILENAME), DEPLOY_MARKER, { flag: "wx" });
+};
+
 const existingFile = (path: string): string | null =>
     statSync(path, { throwIfNoEntry: false })?.isFile() === true ? path : null;
 
@@ -48,16 +114,17 @@ const resolveLicenseFile = (root: string, configured: string | undefined): strin
 const resolvePaths = (request: PathsRequest): DeployPaths => {
     const { root, deploy } = request;
     const outDir = resolveOutDir(request);
+    const archDir = join(outDir, request.arch);
 
     return {
         root,
         dist: join(root, DIST_DIR),
         outDir,
-        metadata: join(outDir, "metadata"),
-        runtime: join(outDir, "runtime"),
-        stage: join(outDir, "stage"),
-        overlay: join(outDir, "overlay"),
-        targets: join(outDir, "targets"),
+        metadata: join(archDir, "metadata"),
+        runtime: join(archDir, "runtime"),
+        stage: join(archDir, "stage"),
+        overlay: join(archDir, "overlay"),
+        targets: join(archDir, "targets"),
         output: join(outDir, "out"),
         applicationIcon: resolveApplicationIcon(root, request.applicationId, request.applicationIcon),
         licenseFile: resolveLicenseFile(root, deploy.licenseFile),
@@ -65,4 +132,4 @@ const resolvePaths = (request: PathsRequest): DeployPaths => {
     };
 };
 
-export { resolvePaths };
+export { prepareDeployOutDir, resolvePaths };

package/src/deploy/targets/appimage.ts

@@ -29,6 +29,7 @@ const EXTRACT_AND_RUN = "APPIMAGE_EXTRACT_AND_RUN";
 const appimageTarget: DeployTarget = {
     name: "appimage",
     prefix: PREFIX,
+    isHostOnly: true,
     tools: [FILE_TOOL],
     render: (payload) => renderManifests(payload),
     pack: (payload) => packAppImage(payload),

package/src/deploy/targets/flatpak-pnpm.ts

@@ -9,12 +9,12 @@ type PnpmPin = {
     sha512: string;
 };
 
-const PNPM_VERSION = "11.25.0";
+const PNPM_VERSION = "11.26.0";
 const PNPM_MAJOR = 11;
-const PNPM_MINOR = 25;
+const PNPM_MINOR = 26;
 
-const PNPM_SHA512 = "5cde925b4f075f725eb71fbae18a42ffe784524789f19b61c731cb8721ec28aaee160e01a" +
-    "8d5af4fedb2a42cdbf300efe23db356b0d4a17b4d63e11f8ab7c956";
+const PNPM_SHA512 = "fc0e2bf890b9f983611f1ab68c0637bce914390653699f83c1a78b005ed25f2c81e77920c8" +
+    "fd8eee2ecf0b58b28cdcb00a84d97f69bcf7c56b2f344710238664";
 
 const PNPM_DIR = "flatpak-pnpm";
 const PNPM_COMMAND = "pnpm";

package/src/deploy/targets/flatpak-source.ts

@@ -3,6 +3,7 @@ import { existsSync, readFileSync, realpathSync } from "node:fs";
 import { posix, relative, resolve } from "node:path";
 import type { DeployPayload, DeploySettings } from "../types.js";
 import { LOCALE_DIRNAME } from "../../i18n/catalogs.js";
+import { FONTS_DIR } from "../../internal/font-path.js";
 import { listFilesRecursive } from "../../internal/list-files.js";
 import { BUNDLE_FILENAME } from "../../vite-plugins/esm-extension.js";
 import { renderDbusService } from "../freedesktop/dbus-service.js";
@@ -68,6 +69,7 @@ const runtimeInstallCommands = (settings: DeploySettings, nodeExtensionPath: str
         "test ! -f dist/gschemas.compiled || " +
         installCommand("dist/gschemas.compiled", `${lib}/gschemas.compiled`, "m644"),
         `test ! -d dist/assets || cp -a dist/assets ${lib}/assets`,
+        `test ! -d dist/${FONTS_DIR} || cp -a dist/${FONTS_DIR} ${lib}/${FONTS_DIR}`,
         `test ! -d dist/${LOCALE_DIRNAME} || { mkdir -p ${locale} && cp -a dist/${LOCALE_DIRNAME}/. ${locale}/; }`,
         installCommand(LAUNCHER_FILENAME, `${DESTINATION}/bin/${settings.binaryName}`, "m755"),
     ];
@@ -244,6 +246,17 @@ const appendPathFor = (settings: DeploySettings, pin: PnpmPin | null, nodeExtens
         ? `${nodeExtensionPath}/bin`
         : `${pnpmPathFor(moduleDirFor(settings))}:${nodeExtensionPath}/bin`;
 
+const sourceBuildCommand = (settings: DeploySettings): string => {
+    const configFile = projectRelative(settings, settings.configFile);
+    assertInsideProject(settings, {
+        destination: "the Flatpak build configuration",
+        source: configFile,
+        resolved: settings.configFile,
+    });
+
+    return `npx gtkx build --config ${pathArgument(configFile)}`;
+};
+
 const flatpakSourceModule = (payload: DeployPayload): FlatpakModule => {
     const settings = payload.settings;
     const manager = detectPackageManager(settings);
@@ -271,14 +284,14 @@ const flatpakSourceModule = (payload: DeployPayload): FlatpakModule => {
         ],
         "build-commands": [
             installCommandFor(settings, manager),
-            "npx gtkx build",
+            sourceBuildCommand(settings),
             ...runtimeInstallCommands(settings, nodeExtensionPath),
+            ...extraFileInstallCommands(settings),
             ...metadataInstallCommands(settings),
             ...schemaInstallCommands(settings),
             ...iconInstallCommands(settings),
             ...licenseInstallCommands(settings),
             ...noticesInstallCommands(settings),
-            ...extraFileInstallCommands(settings),
             ...(settings.deploy.flatpak?.buildCommands ?? []),
             ...validationCommands(settings),
         ],

package/src/deploy/targets/flatpak.ts

@@ -21,6 +21,7 @@ const BUILDER_REF = "org.flatpak.Builder";
 const flatpakTarget: DeployTarget = {
     name: "flatpak",
     prefix: PREFIX,
+    isHostOnly: true,
     tools: [FLATPAK, FLATPAK_BUILDER, DESKTOP_FILE_VALIDATE, APPSTREAMCLI],
     render: (payload) => renderManifests(payload),
     pack: (payload) => Promise.try(() => packFlatpak(payload)),

package/src/deploy/targets/nfpm-target.ts

@@ -1,7 +1,8 @@
+import { info } from "@gtkx/utils";
 import { join } from "node:path";
 import { stringify } from "yaml";
 import type { DeployArtifact, DeployManifest, DeployPayload, DeployTarget } from "../types.js";
-import { type NfpmPackager, renderNfpmConfig } from "../nfpm/config.js";
+import { glibcMinimumForPackage, type NfpmPackager, renderNfpmConfig } from "../nfpm/config.js";
 import { packWithNfpm } from "../nfpm/pack.js";
 import { TAR } from "../tools.js";
 
@@ -11,12 +12,18 @@ const PREFIX = "/usr";
 const manifestPathFor = (payload: DeployPayload, packager: NfpmPackager): string =>
     join(payload.settings.paths.targets, packager, MANIFEST_FILENAME);
 
-const renderManifests = (payload: DeployPayload, packager: NfpmPackager): DeployManifest[] => [
-    {
+const renderManifests = (payload: DeployPayload, packager: NfpmPackager): DeployManifest[] => {
+    const glibcMinimum = glibcMinimumForPackage(payload, packager);
+
+    if (glibcMinimum !== null) {
+        info(`${packager} package requires glibc >= ${glibcMinimum}`);
+    }
+
+    return [{
         path: manifestPathFor(payload, packager),
-        contents: stringify(renderNfpmConfig(payload, packager), { lineWidth: 0 }),
-    },
-];
+        contents: stringify(renderNfpmConfig(payload, packager, glibcMinimum), { lineWidth: 0 }),
+    }];
+};
 
 const packPackage = async (payload: DeployPayload, packager: NfpmPackager): Promise<DeployArtifact[]> => [
     await packWithNfpm(payload, packager, manifestPathFor(payload, packager)),
@@ -25,6 +32,7 @@ const packPackage = async (payload: DeployPayload, packager: NfpmPackager): Prom
 const nfpmTarget = (packager: NfpmPackager): DeployTarget => ({
     name: packager,
     prefix: PREFIX,
+    isHostOnly: false,
     tools: [TAR],
     render: (payload) => renderManifests(payload, packager),
     pack: (payload) => packPackage(payload, packager),

package/src/deploy/types.ts

@@ -2,6 +2,7 @@ import type { Config } from "@gtkx/config";
 import type { ResolvedApplicationIcon } from "../internal/icon-path.js";
 
 type DeployConfig = NonNullable<Config["deploy"]>;
+type DeployArchName = NonNullable<DeployConfig["architectures"]>[number];
 type DeployTargetName = NonNullable<DeployConfig["targets"]>[number];
 type PackageFamily = "arch" | "debian" | "fedora" | "suse" | "unknown";
 
@@ -94,7 +95,7 @@ type DeployArch = {
     rpm: string;
     flatpak: string;
     appimage: string;
-    node: string;
+    node: DeployArchName;
 };
 
 type DeployPaths = {
@@ -114,6 +115,7 @@ type DeployPaths = {
 
 type DeploySettings = {
     applicationId: string;
+    configFile: string;
     binaryName: string;
     name: string;
     genericName: string | null;
@@ -169,6 +171,7 @@ type DeployArtifact = {
 type DeployTarget = {
     name: DeployTargetName;
     prefix: string;
+    isHostOnly: boolean;
     tools: DeployTool[];
     render: (payload: DeployPayload) => DeployManifest[];
     pack: (payload: DeployPayload, manifests: DeployManifest[]) => Promise<DeployArtifact[]>;
@@ -176,6 +179,7 @@ type DeployTarget = {
 
 export type {
     DeployArch,
+    DeployArchName,
     DeployArtifact,
     DeployConfig,
     DeployDesktopAction,

package/src/deploy/vendored/appimagetool.ts

@@ -39,7 +39,7 @@ const resolveAppimageTooling = async (arch: string): Promise<AppimageTooling> =>
         url: `${APPIMAGETOOL_URL}/appimagetool-${arch}.AppImage`,
         dest: join(dir, `appimagetool-${arch}`),
         label: `appimagetool ${APPIMAGETOOL_VERSION}`,
-        sha256: digestFor(APPIMAGETOOL_DIGESTS, arch, "appimagetool"),
+        digest: digestFor(APPIMAGETOOL_DIGESTS, arch, "appimagetool"),
         mode: EXECUTABLE_MODE,
     });
 
@@ -47,7 +47,7 @@ const resolveAppimageTooling = async (arch: string): Promise<AppimageTooling> =>
         url: `${RUNTIME_URL}/runtime-${arch}`,
         dest: join(dir, `runtime-${arch}`),
         label: `the AppImage runtime ${RUNTIME_VERSION}`,
-        sha256: digestFor(RUNTIME_DIGESTS, arch, "the AppImage runtime"),
+        digest: digestFor(RUNTIME_DIGESTS, arch, "the AppImage runtime"),
         mode: EXECUTABLE_MODE,
     });
 

package/src/deploy/vendored/nfpm.ts

@@ -56,7 +56,7 @@ const downloadNfpm = async (dir: string, binary: string): Promise<string> => {
         url: `${NFPM_BASE_URL}/${assetName}`,
         dest: join(dir, assetName),
         label: `nfpm ${NFPM_VERSION}`,
-        sha256: digestFor(process.arch),
+        digest: digestFor(process.arch),
     });
 
     extractNfpm(archive, binary);

package/src/dev/catalog-writes.ts

@@ -0,0 +1,35 @@
+import { readFileSync } from "node:fs";
+import { resolve } from "node:path";
+import type { WrittenCatalog } from "../i18n/catalogs.js";
+
+type CatalogWrites = {
+    record: (catalogs: WrittenCatalog[]) => void;
+    hasWritten: (path: string) => boolean;
+};
+
+const hasContent = (path: string, content: Buffer): boolean => {
+    try {
+        return readFileSync(path).equals(content);
+    } catch {
+        return false;
+    }
+};
+
+const createCatalogWrites = (): CatalogWrites => {
+    const contents: Map<string, Buffer> = new Map();
+
+    return {
+        record: (catalogs) => {
+            for (const catalog of catalogs) {
+                contents.set(resolve(catalog.path), catalog.content);
+            }
+        },
+        hasWritten: (path) => {
+            const content = contents.get(resolve(path));
+
+            return content !== undefined && hasContent(path, content);
+        },
+    };
+};
+
+export { type CatalogWrites, createCatalogWrites };

package/src/dev/entry-env.ts

@@ -1,3 +1,4 @@
 const DEV_ENTRY_ENV = "GTKX_DEV_ENTRY";
+const DEV_CONFIG_ENV = "GTKX_DEV_CONFIG";
 
-export { DEV_ENTRY_ENV };
+export { DEV_CONFIG_ENV, DEV_ENTRY_ENV };

package/src/dev/font-dir.ts

@@ -0,0 +1,11 @@
+import { stageProjectFonts } from "../internal/font-staging.js";
+import { prependXdgDataDir } from "../internal/xdg-data-dirs.js";
+
+const prepareDevFontDir = (root: string): string => {
+    const shareDir = stageProjectFonts(root);
+    process.env.XDG_DATA_DIRS = prependXdgDataDir(shareDir, process.env.XDG_DATA_DIRS);
+
+    return shareDir;
+};
+
+export { prepareDevFontDir };

package/src/dev/headless.ts

@@ -0,0 +1,40 @@
+import { MCP_SOCKET_PATH_ENV, resolveMcpSocketPath } from "@gtkx/mcp/internal";
+import { resolveHeadlessOptions, startHeadlessDisplay } from "@gtkx/vitest/headless";
+
+const restoreEnvironment = (name: string, value: string | undefined): void => {
+    if (value === undefined) {
+        Reflect.deleteProperty(process.env, name);
+    } else {
+        process.env[name] = value;
+    }
+};
+
+const startHeadlessDevDisplay = async (size?: string): Promise<() => void> => {
+    const previousSocketPath = process.env[MCP_SOCKET_PATH_ENV];
+    process.env[MCP_SOCKET_PATH_ENV] = resolveMcpSocketPath();
+
+    try {
+        const stopDisplay = await startHeadlessDisplay(resolveHeadlessOptions({ ...(size !== undefined && { size }) }));
+        let isStopped = false;
+
+        const stop = (): void => {
+            if (isStopped) {
+                return;
+            }
+
+            isStopped = true;
+            process.removeListener("exit", stop);
+            stopDisplay();
+            restoreEnvironment(MCP_SOCKET_PATH_ENV, previousSocketPath);
+        };
+
+        process.once("exit", stop);
+
+        return stop;
+    } catch (error) {
+        restoreEnvironment(MCP_SOCKET_PATH_ENV, previousSocketPath);
+        throw error;
+    }
+};
+
+export { startHeadlessDevDisplay };

package/src/dev/runner-deps.ts

@@ -17,6 +17,7 @@ import { isRefreshBoundary, performRefresh, staleExportName } from "../refresh-r
 import { gtkxFastRefresh } from "../vite-plugins/fast-refresh/swc-refresh.js";
 import { gtkxVitePlugins } from "../vite-plugins/index.js";
 import { gtkxReactDomPrebundle } from "../vite-plugins/react-dom-prebundle.js";
+import { type CatalogWrites, createCatalogWrites } from "./catalog-writes.js";
 
 const DEV_MODE = "development";
 const APPLICATION_POLL_INTERVAL_MS = 50;
@@ -43,11 +44,22 @@ const waitForApplicationId = async (timeoutMs: number, shouldKeepWaiting: () =>
 
 const readFileRevision = (path: string): Promise<string> => readFile(path, "utf8");
 
-const defaultDevRunnerDeps = (): DevRunnerDeps => ({
+const devPlugins = (configFile: string, catalogWrites: CatalogWrites): DevRunnerDeps["plugins"] =>
+    (entryPath) => [
+        ...gtkxVitePlugins({ mode: DEV_MODE, entryPath, configFile, onCatalogsWritten: catalogWrites.record }),
+        ...gtkxFastRefresh(),
+        gtkxReactDomPrebundle(),
+    ];
+
+const createDevRunnerDeps = (
+    configFile: string,
+    deployOutDir: string | undefined,
+    catalogWrites: CatalogWrites,
+): DevRunnerDeps => ({
     createServer,
     waitForApplicationId,
     getConfiguredApplicationId: async (root: string) => {
-        const loaded = await loadConfig(root, { mode: DEV_MODE });
+        const loaded = await loadConfig(root, { mode: DEV_MODE, configFile });
 
         return loaded.config.applicationId;
     },
@@ -86,13 +98,14 @@ const defaultDevRunnerDeps = (): DevRunnerDeps => ({
     isRefreshBoundary,
     staleExportName,
     readFileRevision,
-    plugins: (entryPath) => [
-        ...gtkxVitePlugins(DEV_MODE, entryPath),
-        ...gtkxFastRefresh(),
-        gtkxReactDomPrebundle(),
-    ],
+    hasWrittenCatalog: catalogWrites.hasWritten,
+    deployOutDir,
+    plugins: devPlugins(configFile, catalogWrites),
     log: info,
     exit: (code: number): never => process.exit(code),
 });
 
+const defaultDevRunnerDeps = (configFile: string, deployOutDir: string | undefined): DevRunnerDeps =>
+    createDevRunnerDeps(configFile, deployOutDir, createCatalogWrites());
+
 export { defaultDevRunnerDeps };

package/src/dev/runner-main.ts

@@ -1,7 +1,8 @@
 import { loadConfig } from "@gtkx/config";
 import { error } from "@gtkx/utils";
 import { resolve } from "node:path";
-import { DEV_ENTRY_ENV } from "./entry-env.js";
+import { DEV_CONFIG_ENV, DEV_ENTRY_ENV } from "./entry-env.js";
+import { prepareDevFontDir } from "./font-dir.js";
 import { prepareDevIconDir } from "./icon-dir.js";
 import { prepareDevLocaleDir } from "./locale-dir.js";
 import { createDevRunner } from "./runner.js";
@@ -22,13 +23,21 @@ const main = async (): Promise<void> => {
         process.exit(1);
     }
 
-    const { config, root } = await loadConfig(cwd, { mode: "development" });
+    const configFile = process.env[DEV_CONFIG_ENV];
+
+    if (!configFile) {
+        error(`Missing ${DEV_CONFIG_ENV}`);
+        process.exit(1);
+    }
+
+    const { config, root } = await loadConfig(cwd, { mode: "development", configFile });
     prepareDevLocaleDir(root, config.applicationId);
     prepareDevSchemaDir(root);
     prepareDevIconDir(root, config.applicationId, config.applicationIcon);
+    prepareDevFontDir(root);
     const entryPath = resolve(cwd, entryArg);
     const { defaultDevRunnerDeps } = await import("./runner-deps.js");
-    const runner = createDevRunner(defaultDevRunnerDeps());
+    const runner = createDevRunner(defaultDevRunnerDeps(configFile, config.deploy?.outDir));
     await runner.run(entryPath);
 };
 

package/src/dev/runner.ts

@@ -2,6 +2,7 @@ import type { ApplicationInstance } from "@gtkx/runtime/internal";
 import type { InlineConfig, Plugin } from "vite";
 import { error, warn } from "@gtkx/utils";
 import { isCatalogSource } from "../i18n/catalogs.js";
+import { hasUnstagedFontImport } from "../internal/font-staging.js";
 import { loadModuleExclusively, withExclusiveLoad } from "../internal/module-loads.js";
 import { createChangeQueue, type WatchedChange } from "./change-queue.js";
 import { createFailureTracker, type FailureTracker } from "./failure-tracker.js";
@@ -33,6 +34,8 @@ type DevRunnerDeps = {
     isRefreshBoundary(module: Record<string, unknown>): boolean;
     staleExportName(previous: Record<string, unknown>, current: Record<string, unknown>): string | null;
     readFileRevision(path: string): Promise<string>;
+    hasWrittenCatalog(path: string): boolean;
+    deployOutDir: string | undefined;
     plugins(entryPath: string): Plugin[];
     log(message: string): void;
     exit(code: number): never;
@@ -370,21 +373,46 @@ const restartForServerConfig = async (session: DevSession, changedPath: string):
     await requestRestart(session);
 };
 
-const applyChange = async (session: DevSession, change: WatchedChange): Promise<void> => {
-    if (session.controller.isShuttingDown()) {
+const restartForFont = async (session: DevSession, changedPath: string): Promise<void> => {
+    session.deps.log(`Font import added: ${changedPath}`);
+    await requestRestart(session);
+};
+
+const restartForCatalog = async (session: DevSession, changedPath: string): Promise<void> => {
+    if (session.deps.hasWrittenCatalog(changedPath)) {
         return;
     }
 
-    if (isCatalogSource(session.server.config.root, change.path)) {
-        session.deps.log(`Translation catalog changed: ${change.path}`);
-        await requestRestart(session);
+    session.deps.log(`Translation catalog changed: ${changedPath}`);
+    await requestRestart(session);
+};
 
-        return;
+const didRestartForChange = async (session: DevSession, change: WatchedChange): Promise<boolean> => {
+    const { root } = session.server.config;
+
+    if (isCatalogSource(root, change.path)) {
+        await restartForCatalog(session, change.path);
+
+        return true;
     }
 
     if (isServerConfigFile(session.server.config, change.path)) {
         await restartForServerConfig(session, change.path);
 
+        return true;
+    }
+
+    if (change.event !== "unlink" && hasUnstagedFontImport(root, change.path)) {
+        await restartForFont(session, change.path);
+
+        return true;
+    }
+
+    return false;
+};
+
+const applyChange = async (session: DevSession, change: WatchedChange): Promise<void> => {
+    if (session.controller.isShuttingDown() || await didRestartForChange(session, change)) {
         return;
     }
 
@@ -610,7 +638,9 @@ const createSession = (server: DevServer, deps: DevRunnerDeps): DevSession => {
 
 const createDevRunner = (deps: DevRunnerDeps): DevRunner => ({
     async run(entryPath: string): Promise<void> {
-        const server = await deps.createServer(createDevServerConfig(process.cwd(), deps.plugins(entryPath)));
+        const server = await deps.createServer(
+            createDevServerConfig(process.cwd(), deps.deployOutDir, deps.plugins(entryPath)),
+        );
         const session = createSession(server, deps);
         deps.installShutdownHandlers(onShutdownSignal(session));