@gtkx/cli 1.6.0 → 2.0.0-beta.10

package/dist/deploy/settings/libraries.js.map

@@ -1 +1 @@
-{"version":3,"file":"libraries.js","sourceRoot":"","sources":["../../../src/deploy/settings/libraries.ts"],"names":[],"mappings":"AACA,OAAO,EACH,gBAAgB,IAAI,eAAe,EAEnC,sBAAsB,EACtB,cAAc,EACd,YAAY,GACf,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAOtD,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAA6B,EAAE;IACnE,IAAI,CAAC;QACD,OAAO,sBAAsB,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;IAClE,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,IAAI,CAAC;IAChB,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,MAAc,EAAE,gBAAyB,EAAmB,EAAE;IACvF,IAAI,CAAC;QACD,OAAO,eAAe,CAAC,MAAM,CAAC,SAAS,EAAE,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC,CAAC;IAC/F,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,IAAI,CAAC;IAChB,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,MAAc,EAAY,EAAE;IACjD,MAAM,EAAE,gBAAgB,EAAE,GAAG,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC1D,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;IAEnC,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,OAAO,eAAe,CAAC,SAAS,EAAE,EAAE,EAAE,gBAAgB,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO,mBAAmB,CAAC,MAAM,EAAE,gBAAgB,CAAC,IAAI,eAAe,CAAC,SAAS,EAAE,EAAE,EAAE,gBAAgB,CAAC,CAAC;AAC7G,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,MAAc,EAAqB,EAAE;IACzE,MAAM,SAAS,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,SAAS,GAAG,SAAS,EAAE,SAAS,IAAI,eAAe,CAAC,MAAM,CAAC,CAAC;IAClE,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;IAEnC,OAAO;QACH,SAAS;QACT,sBAAsB,EAAE,MAAM,CAAC,sBAAsB,IAAI,EAAE;KAC9D,CAAC;AACN,CAAC,CAAC;AAEF,OAAO,EAAE,gBAAgB,EAAE,CAAC","sourcesContent":["import type { Config } from \"@gtkx/config\";\nimport {\n    resolveLibraries as expandLibraries,\n    type GeneratedLibraries,\n    readGeneratedLibraries,\n    resolveGirPath,\n    resolveStore,\n} from \"@gtkx/codegen\";\nimport { resolveFuture } from \"@gtkx/config/internal\";\n\ntype ResolvedLibraries = {\n    libraries: string[];\n    minimumLibraryVersions: Record<string, string>;\n};\n\nconst generatedLibraries = (root: string): GeneratedLibraries | null => {\n    try {\n        return readGeneratedLibraries(resolveStore(root).gi.storeDir);\n    } catch {\n        return null;\n    }\n};\n\nconst discoveredLibraries = (config: Config, isAdwaitaDefault: boolean): string[] | null => {\n    try {\n        return expandLibraries(config.libraries, resolveGirPath(config.girPath), isAdwaitaDefault);\n    } catch {\n        return null;\n    }\n};\n\nconst configLibraries = (config: Config): string[] => {\n    const { isAdwaitaDefault } = resolveFuture(config.future);\n    const libraries = config.libraries;\n\n    if (Array.isArray(libraries)) {\n        return expandLibraries(libraries, [], isAdwaitaDefault);\n    }\n\n    return discoveredLibraries(config, isAdwaitaDefault) ?? expandLibraries(undefined, [], isAdwaitaDefault);\n};\n\nconst resolveLibraries = (root: string, config: Config): ResolvedLibraries => {\n    const generated = generatedLibraries(root);\n    const libraries = generated?.libraries ?? configLibraries(config);\n    const deploy = config.deploy ?? {};\n\n    return {\n        libraries,\n        minimumLibraryVersions: deploy.minimumLibraryVersions ?? {},\n    };\n};\n\nexport { resolveLibraries };\n"]}
+{"version":3,"file":"libraries.js","sourceRoot":"","sources":["../../../src/deploy/settings/libraries.ts"],"names":[],"mappings":"AACA,OAAO,EACH,gBAAgB,IAAI,eAAe,EAEnC,sBAAsB,EACtB,YAAY,GACf,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAO/D,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAA6B,EAAE;IACnE,IAAI,CAAC;QACD,OAAO,sBAAsB,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;IAClE,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,IAAI,CAAC;IAChB,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,MAAc,EAAqB,EAAE;IACzE,MAAM,SAAS,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,SAAS,GAAG,qBAAqB,CAAC,SAAS,EAAE,SAAS,IAAI,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;IACnG,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;IAEnC,OAAO;QACH,SAAS;QACT,sBAAsB,EAAE,MAAM,CAAC,sBAAsB,IAAI,EAAE;KAC9D,CAAC;AACN,CAAC,CAAC;AAEF,OAAO,EAAE,gBAAgB,EAAE,CAAC","sourcesContent":["import type { Config } from \"@gtkx/config\";\nimport {\n    resolveLibraries as expandLibraries,\n    type GeneratedLibraries,\n    readGeneratedLibraries,\n    resolveStore,\n} from \"@gtkx/codegen\";\nimport { resolveBoundLibraries } from \"@gtkx/codegen/internal\";\n\ntype ResolvedLibraries = {\n    libraries: string[];\n    minimumLibraryVersions: Record<string, string>;\n};\n\nconst generatedLibraries = (root: string): GeneratedLibraries | null => {\n    try {\n        return readGeneratedLibraries(resolveStore(root).gi.storeDir);\n    } catch {\n        return null;\n    }\n};\n\nconst resolveLibraries = (root: string, config: Config): ResolvedLibraries => {\n    const generated = generatedLibraries(root);\n    const libraries = resolveBoundLibraries(generated?.libraries ?? expandLibraries(config.libraries));\n    const deploy = config.deploy ?? {};\n\n    return {\n        libraries,\n        minimumLibraryVersions: deploy.minimumLibraryVersions ?? {},\n    };\n};\n\nexport { resolveLibraries };\n"]}

package/dist/deploy/settings/paths.d.ts

@@ -1,13 +1,14 @@
 import type { Config } from "@gtkx/config";
-import type { DeployConfig, DeployPaths } from "../types.js";
+import type { DeployArchName, DeployConfig, DeployPaths } from "../types.js";
 type PathsRequest = {
     root: string;
     deploy: DeployConfig;
     applicationIcon: Config["applicationIcon"];
     applicationId: Config["applicationId"];
     outDirOverride: string | undefined;
+    arch: DeployArchName;
 };
-declare const isInside: (parent: string, candidate: string) => boolean;
+declare const prepareDeployOutDir: (root: string, outDir: string) => void;
 declare const resolvePaths: (request: PathsRequest) => DeployPaths;
-export { isInside, resolvePaths };
+export { prepareDeployOutDir, resolvePaths };
 //# sourceMappingURL=paths.d.ts.map

package/dist/deploy/settings/paths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../../src/deploy/settings/paths.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAG3C,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG7D,KAAK,YAAY,GAAG;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,YAAY,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAC3C,aAAa,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC;IACvC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;CACtC,CAAC;AAMF,QAAA,MAAM,QAAQ,GAAI,QAAQ,MAAM,EAAE,WAAW,MAAM,KAAG,OAIrD,CAAC;AAmCF,QAAA,MAAM,YAAY,GAAI,SAAS,YAAY,KAAG,WAkB7C,CAAC;AAEF,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC"}
+{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../../src/deploy/settings/paths.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAI3C,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAK7E,KAAK,YAAY,GAAG;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,YAAY,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAC3C,aAAa,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC;IACvC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,IAAI,EAAE,cAAc,CAAC;CACxB,CAAC;AAmEF,QAAA,MAAM,mBAAmB,GAAI,MAAM,MAAM,EAAE,QAAQ,MAAM,KAAG,IAW3D,CAAC;AAmBF,QAAA,MAAM,YAAY,GAAI,SAAS,YAAY,KAAG,WAmB7C,CAAC;AAEF,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,CAAC"}

package/dist/deploy/settings/paths.js

@@ -1,29 +1,127 @@
-import { statSync } from "node:fs";
-import { isAbsolute, join, relative, resolve } from "node:path";
+var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
+    if (value !== null && value !== void 0) {
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
+        var dispose, inner;
+        if (async) {
+            if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+            dispose = value[Symbol.asyncDispose];
+        }
+        if (dispose === void 0) {
+            if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+            dispose = value[Symbol.dispose];
+            if (async) inner = dispose;
+        }
+        if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+        if (inner) dispose = function() { try { inner.call(this); } catch (e) { return Promise.reject(e); } };
+        env.stack.push({ value: value, dispose: dispose, async: async });
+    }
+    else if (async) {
+        env.stack.push({ async: true });
+    }
+    return value;
+};
+var __disposeResources = (this && this.__disposeResources) || (function (SuppressedError) {
+    return function (env) {
+        function fail(e) {
+            env.error = env.hasError ? new SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
+            env.hasError = true;
+        }
+        var r, s = 0;
+        function next() {
+            while (r = env.stack.pop()) {
+                try {
+                    if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next);
+                    if (r.dispose) {
+                        var result = r.dispose.call(r.value);
+                        if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
+                    }
+                    else s |= 1;
+                }
+                catch (e) {
+                    fail(e);
+                }
+            }
+            if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve();
+            if (env.hasError) throw env.error;
+        }
+        return next();
+    };
+})(typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+});
+import { isPathInside } from "@gtkx/utils";
+import { lstatSync, readdirSync, statSync, writeFileSync } from "node:fs";
+import { join, relative, resolve, sep } from "node:path";
+import { DEFAULT_DEPLOY_OUT_DIR } from "../../internal/deploy-out-dir.js";
 import { resolveApplicationIcon } from "../../internal/icon-path.js";
-const DEFAULT_OUT_DIR = "build";
+import { prepareOutputDirectory, readRegularFile } from "../../internal/output-directory.js";
 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 isInside = (parent, candidate) => {
-    const rel = relative(parent, candidate);
-    return rel.length > 0 && !rel.startsWith("..") && !isAbsolute(rel);
+const hasSymlinkComponent = (root, target) => {
+    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) => {
+    return readRegularFile(path) === DEPLOY_MARKER;
+};
+const isReusableDeployDirectory = (path) => {
+    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, configured) => 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, outDir, configured) => {
+    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 }) => {
-    const configured = outDirOverride ?? deploy.outDir ?? DEFAULT_OUT_DIR;
+    const configured = outDirOverride ?? deploy.outDir ?? DEFAULT_DEPLOY_OUT_DIR;
     const outDir = resolve(root, configured);
-    if (!isInside(root, outDir)) {
-        throw new Error(`Cannot use "${configured}" as the deploy output directory: it is outside ${root}`);
+    assertSafeDeployOutDir(root, outDir, configured);
+    if (!isReusableDeployDirectory(outDir)) {
+        throw deployOutputError(root, configured);
     }
     return outDir;
 };
-const existingFile = (path) => {
+const prepareDeployOutDir = (root, outDir) => {
+    const env_1 = { stack: [], error: void 0, hasError: false };
     try {
-        return statSync(path, { throwIfNoEntry: false })?.isFile() === true ? path : null;
+        assertSafeDeployOutDir(root, outDir, outDir);
+        const prepared = prepareOutputDirectory(root, outDir, isReusableDeployDirectory);
+        if (prepared.status === "unsafe") {
+            throw deployOutputError(root, outDir);
+        }
+        const transaction = __addDisposableResource(env_1, prepared.transaction, false);
+        transaction.commit();
+        writeFileSync(join(outDir, DEPLOY_MARKER_FILENAME), DEPLOY_MARKER, { flag: "wx" });
+    }
+    catch (e_1) {
+        env_1.error = e_1;
+        env_1.hasError = true;
     }
-    catch {
-        return null;
+    finally {
+        __disposeResources(env_1);
     }
 };
+const existingFile = (path) => statSync(path, { throwIfNoEntry: false })?.isFile() === true ? path : null;
 const resolveLicenseFile = (root, configured) => {
     if (configured !== undefined) {
         const path = resolve(root, configured);
@@ -37,20 +135,21 @@ const resolveLicenseFile = (root, configured) => {
 const resolvePaths = (request) => {
     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),
         schemaFiles: [],
     };
 };
-export { isInside, resolvePaths };
+export { prepareDeployOutDir, resolvePaths };
 //# sourceMappingURL=paths.js.map

package/dist/deploy/settings/paths.js.map

@@ -1 +1 @@
-{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../../src/deploy/settings/paths.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Config } from \"@gtkx/config\";\nimport { statSync } from \"node:fs\";\nimport { isAbsolute, join, relative, resolve } from \"node:path\";\nimport type { DeployConfig, DeployPaths } from \"../types.js\";\nimport { resolveApplicationIcon } from \"../../internal/icon-path.js\";\n\ntype PathsRequest = {\n    root: string;\n    deploy: DeployConfig;\n    applicationIcon: Config[\"applicationIcon\"];\n    applicationId: Config[\"applicationId\"];\n    outDirOverride: string | undefined;\n};\n\nconst DEFAULT_OUT_DIR = \"build\";\nconst DIST_DIR = \"dist\";\nconst LICENSE_CANDIDATES = [\"LICENSE\", \"LICENSE.md\", \"LICENSE.txt\", \"COPYING\", \"COPYING.md\"];\n\nconst isInside = (parent: string, candidate: string): boolean => {\n    const rel = relative(parent, candidate);\n\n    return rel.length > 0 && !rel.startsWith(\"..\") && !isAbsolute(rel);\n};\n\nconst resolveOutDir = ({ root, deploy, outDirOverride }: PathsRequest): string => {\n    const configured = outDirOverride ?? deploy.outDir ?? DEFAULT_OUT_DIR;\n    const outDir = resolve(root, configured);\n\n    if (!isInside(root, outDir)) {\n        throw new Error(`Cannot use \"${configured}\" as the deploy output directory: it is outside ${root}`);\n    }\n\n    return outDir;\n};\n\nconst existingFile = (path: string): string | null => {\n    try {\n        return statSync(path, { throwIfNoEntry: false })?.isFile() === true ? path : null;\n    } catch {\n        return null;\n    }\n};\n\nconst resolveLicenseFile = (root: string, configured: string | undefined): string | null => {\n    if (configured !== undefined) {\n        const path = resolve(root, configured);\n\n        if (existingFile(path) === null) {\n            throw new Error(`Cannot read the license file \"${configured}\": no such file under ${root}`);\n        }\n\n        return path;\n    }\n\n    return LICENSE_CANDIDATES.map((name) => existingFile(join(root, name))).find((path) => path !== null) ?? null;\n};\n\nconst resolvePaths = (request: PathsRequest): DeployPaths => {\n    const { root, deploy } = request;\n    const outDir = resolveOutDir(request);\n\n    return {\n        root,\n        dist: join(root, DIST_DIR),\n        outDir,\n        metadata: join(outDir, \"metadata\"),\n        runtime: join(outDir, \"runtime\"),\n        stage: join(outDir, \"stage\"),\n        overlay: join(outDir, \"overlay\"),\n        targets: join(outDir, \"targets\"),\n        output: join(outDir, \"out\"),\n        applicationIcon: resolveApplicationIcon(root, request.applicationId, request.applicationIcon),\n        licenseFile: resolveLicenseFile(root, deploy.licenseFile),\n        schemaFiles: [],\n    };\n};\n\nexport { isInside, resolvePaths };\n"]}
+{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../../src/deploy/settings/paths.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Config } from \"@gtkx/config\";\nimport { isPathInside } from \"@gtkx/utils\";\nimport { lstatSync, readdirSync, statSync, writeFileSync } from \"node:fs\";\nimport { join, relative, resolve, sep } from \"node:path\";\nimport type { DeployArchName, DeployConfig, DeployPaths } from \"../types.js\";\nimport { DEFAULT_DEPLOY_OUT_DIR } from \"../../internal/deploy-out-dir.js\";\nimport { resolveApplicationIcon } from \"../../internal/icon-path.js\";\nimport { prepareOutputDirectory, readRegularFile } from \"../../internal/output-directory.js\";\n\ntype PathsRequest = {\n    root: string;\n    deploy: DeployConfig;\n    applicationIcon: Config[\"applicationIcon\"];\n    applicationId: Config[\"applicationId\"];\n    outDirOverride: string | undefined;\n    arch: DeployArchName;\n};\n\nconst DIST_DIR = \"dist\";\nconst DEPLOY_MARKER_FILENAME = \".gtkx-deploy.json\";\nconst DEPLOY_MARKER = `${JSON.stringify({ generator: \"gtkx-deploy\", formatVersion: 1 })}\\n`;\nconst LICENSE_CANDIDATES = [\"LICENSE\", \"LICENSE.md\", \"LICENSE.txt\", \"COPYING\", \"COPYING.md\"];\n\nconst hasSymlinkComponent = (root: string, target: string): boolean => {\n    let current = root;\n\n    for (const segment of relative(root, target).split(sep)) {\n        current = join(current, segment);\n\n        if (lstatSync(current, { throwIfNoEntry: false })?.isSymbolicLink() === true) {\n            return true;\n        }\n    }\n\n    return false;\n};\n\nconst isDeployMarker = (path: string): boolean => {\n    return readRegularFile(path) === DEPLOY_MARKER;\n};\n\nconst isReusableDeployDirectory = (path: string): boolean => {\n    const entry = lstatSync(path, { throwIfNoEntry: false });\n\n    if (entry === undefined) {\n        return true;\n    }\n\n    return entry.isDirectory() &&\n        (readdirSync(path).length === 0 || isDeployMarker(join(path, DEPLOY_MARKER_FILENAME)));\n};\n\nconst deployOutputError = (root: string, configured: string): Error =>\n    new Error(\n        `Cannot use \"${configured}\" as the deploy output directory: choose an empty directory or an ` +\n        `earlier GTKX deploy directory below ${root}`,\n    );\n\nconst assertSafeDeployOutDir = (root: string, outDir: string, configured: string): void => {\n    const dist = join(root, DIST_DIR);\n\n    if (\n        outDir === dist ||\n        !isPathInside(root, outDir) ||\n        isPathInside(dist, outDir) ||\n        hasSymlinkComponent(root, outDir)\n    ) {\n        throw deployOutputError(root, configured);\n    }\n};\n\nconst resolveOutDir = ({ root, deploy, outDirOverride }: PathsRequest): string => {\n    const configured = outDirOverride ?? deploy.outDir ?? DEFAULT_DEPLOY_OUT_DIR;\n    const outDir = resolve(root, configured);\n    assertSafeDeployOutDir(root, outDir, configured);\n\n    if (!isReusableDeployDirectory(outDir)) {\n        throw deployOutputError(root, configured);\n    }\n\n    return outDir;\n};\n\nconst prepareDeployOutDir = (root: string, outDir: string): void => {\n    assertSafeDeployOutDir(root, outDir, outDir);\n    const prepared = prepareOutputDirectory(root, outDir, isReusableDeployDirectory);\n\n    if (prepared.status === \"unsafe\") {\n        throw deployOutputError(root, outDir);\n    }\n\n    using transaction = prepared.transaction;\n    transaction.commit();\n    writeFileSync(join(outDir, DEPLOY_MARKER_FILENAME), DEPLOY_MARKER, { flag: \"wx\" });\n};\n\nconst existingFile = (path: string): string | null =>\n    statSync(path, { throwIfNoEntry: false })?.isFile() === true ? path : null;\n\nconst resolveLicenseFile = (root: string, configured: string | undefined): string | null => {\n    if (configured !== undefined) {\n        const path = resolve(root, configured);\n\n        if (existingFile(path) === null) {\n            throw new Error(`Cannot read the license file \"${configured}\": no such file under ${root}`);\n        }\n\n        return path;\n    }\n\n    return LICENSE_CANDIDATES.map((name) => existingFile(join(root, name))).find((path) => path !== null) ?? null;\n};\n\nconst resolvePaths = (request: PathsRequest): DeployPaths => {\n    const { root, deploy } = request;\n    const outDir = resolveOutDir(request);\n    const archDir = join(outDir, request.arch);\n\n    return {\n        root,\n        dist: join(root, DIST_DIR),\n        outDir,\n        metadata: join(archDir, \"metadata\"),\n        runtime: join(archDir, \"runtime\"),\n        stage: join(archDir, \"stage\"),\n        overlay: join(archDir, \"overlay\"),\n        targets: join(archDir, \"targets\"),\n        output: join(outDir, \"out\"),\n        applicationIcon: resolveApplicationIcon(root, request.applicationId, request.applicationIcon),\n        licenseFile: resolveLicenseFile(root, deploy.licenseFile),\n        schemaFiles: [],\n    };\n};\n\nexport { prepareDeployOutDir, resolvePaths };\n"]}

package/dist/deploy/settings/screenshots.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"screenshots.d.ts","sourceRoot":"","sources":["../../../src/deploy/settings/screenshots.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAGlE,KAAK,iBAAiB,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,YAAY,CAAC;CACxB,CAAC;AAqGF,QAAA,MAAM,kBAAkB,GAAI,SAAS,iBAAiB,KAAG,gBAAgB,EAexE,CAAC;AAEF,OAAO,EAAE,kBAAkB,EAAE,CAAC"}
+{"version":3,"file":"screenshots.d.ts","sourceRoot":"","sources":["../../../src/deploy/settings/screenshots.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAGlE,KAAK,iBAAiB,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,YAAY,CAAC;CACxB,CAAC;AA8DF,QAAA,MAAM,kBAAkB,GAAI,SAAS,iBAAiB,KAAG,gBAAgB,EAexE,CAAC;AAEF,OAAO,EAAE,kBAAkB,EAAE,CAAC"}

package/dist/deploy/settings/screenshots.js

@@ -1,35 +1,13 @@
+import hostedGitInfo from "hosted-git-info";
 import { gitRemoteUrl, runGit } from "../git.js";
 const DEFAULT_BRANCH = "main";
-const GIT_SUFFIX = ".git";
-const PORTED_HOST = /^([^/]*):\d+(?=\/|$)/;
-const SCHEME_SEPARATOR = "://";
 const TRAILING_SLASH = "/";
-const RAW_BASE_BY_HOST = {
-    "github.com": (owner, repo, branch) => `https://raw.githubusercontent.com/${owner}/${repo}/${branch}`,
-    "gitlab.com": (owner, repo, branch) => `https://gitlab.com/${owner}/${repo}/-/raw/${branch}`,
-};
 const readRepositoryPrefix = (root) => trimTrailingSlash(runGit(root, ["rev-parse", "--show-prefix"]) ?? "");
 const trimTrailingSlash = (value) => value.endsWith(TRAILING_SLASH) ? trimTrailingSlash(value.slice(0, -1)) : value;
 const trimLeadingSlash = (value) => {
     const withoutDot = value.startsWith("./") ? value.slice(2) : value;
     return withoutDot.startsWith(TRAILING_SLASH) ? withoutDot.slice(1) : withoutDot;
 };
-const afterMarker = (value, marker) => {
-    const index = value.indexOf(marker);
-    return index === -1 ? value : value.slice(index + marker.length);
-};
-const normalizeLocation = (trimmed) => {
-    const location = afterMarker(afterMarker(trimmed, SCHEME_SEPARATOR), "@");
-    return trimmed.includes(SCHEME_SEPARATOR) ? location.replace(PORTED_HOST, "$1") : location.replace(":", "/");
-};
-const parseRemote = (remote) => {
-    const trimmed = remote.endsWith(GIT_SUFFIX) ? remote.slice(0, -GIT_SUFFIX.length) : remote;
-    const [host, owner, repo, ...extra] = normalizeLocation(trimmed).split("/");
-    if (repo === undefined || extra.length > 0) {
-        return null;
-    }
-    return { host: host ?? "", owner: owner ?? "", repo };
-};
 const readDefaultBranch = (root) => {
     const head = runGit(root, ["symbolic-ref", "--short", "refs/remotes/origin/HEAD"]);
     if (head === null || head.length === 0) {
@@ -38,22 +16,19 @@ const readDefaultBranch = (root) => {
     const separator = head.indexOf(TRAILING_SLASH);
     return separator === -1 ? head : head.slice(separator + 1);
 };
-const baseForRemote = (remote, branch) => {
-    const parts = parseRemote(remote);
-    if (parts === null) {
+const baseForRemote = (root, remote) => {
+    const repository = hostedGitInfo.fromUrl(remote);
+    if (repository === undefined || (repository.type !== "github" && repository.type !== "gitlab")) {
         return null;
     }
-    const build = RAW_BASE_BY_HOST[parts.host];
-    return build === undefined ? null : build(parts.owner, parts.repo, branch);
+    return trimTrailingSlash(repository.file(readRepositoryPrefix(root), { committish: readDefaultBranch(root) }));
 };
 const resolveScreenshotBaseUrl = ({ root, deploy }) => {
     if (deploy.screenshotBaseUrl !== undefined) {
         return trimTrailingSlash(deploy.screenshotBaseUrl);
     }
     const remote = gitRemoteUrl(root);
-    const base = remote === null ? null : baseForRemote(remote, readDefaultBranch(root));
-    const prefix = base === null ? "" : readRepositoryPrefix(root);
-    return base === null || prefix.length === 0 ? base : `${base}/${prefix}`;
+    return remote === null ? null : baseForRemote(root, remote);
 };
 const urlForScreenshot = (file, baseUrl) => {
     if (baseUrl === null) {

package/dist/deploy/settings/screenshots.js.map

@@ -1 +1 @@
-{"version":3,"file":"screenshots.js","sourceRoot":"","sources":["../../../src/deploy/settings/screenshots.ts"],"names":[],"mappings":"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","sourcesContent":["import type { DeployConfig, DeployScreenshot } from \"../types.js\";\nimport { gitRemoteUrl, runGit } from \"../git.js\";\n\ntype ScreenshotRequest = {\n    root: string;\n    deploy: DeployConfig;\n};\n\ntype RemoteParts = {\n    host: string;\n    owner: string;\n    repo: string;\n};\n\nconst DEFAULT_BRANCH = \"main\";\nconst GIT_SUFFIX = \".git\";\nconst PORTED_HOST = /^([^/]*):\\d+(?=\\/|$)/;\nconst SCHEME_SEPARATOR = \"://\";\nconst TRAILING_SLASH = \"/\";\n\nconst RAW_BASE_BY_HOST: Record<string, (owner: string, repo: string, branch: string) => string> = {\n    \"github.com\": (owner, repo, branch) => `https://raw.githubusercontent.com/${owner}/${repo}/${branch}`,\n    \"gitlab.com\": (owner, repo, branch) => `https://gitlab.com/${owner}/${repo}/-/raw/${branch}`,\n};\n\nconst readRepositoryPrefix = (root: string): string =>\n    trimTrailingSlash(runGit(root, [\"rev-parse\", \"--show-prefix\"]) ?? \"\");\n\nconst trimTrailingSlash = (value: string): string =>\n    value.endsWith(TRAILING_SLASH) ? trimTrailingSlash(value.slice(0, -1)) : value;\n\nconst trimLeadingSlash = (value: string): string => {\n    const withoutDot = value.startsWith(\"./\") ? value.slice(2) : value;\n\n    return withoutDot.startsWith(TRAILING_SLASH) ? withoutDot.slice(1) : withoutDot;\n};\n\nconst afterMarker = (value: string, marker: string): string => {\n    const index = value.indexOf(marker);\n\n    return index === -1 ? value : value.slice(index + marker.length);\n};\n\nconst normalizeLocation = (trimmed: string): string => {\n    const location = afterMarker(afterMarker(trimmed, SCHEME_SEPARATOR), \"@\");\n\n    return trimmed.includes(SCHEME_SEPARATOR) ? location.replace(PORTED_HOST, \"$1\") : location.replace(\":\", \"/\");\n};\n\nconst parseRemote = (remote: string): RemoteParts | null => {\n    const trimmed = remote.endsWith(GIT_SUFFIX) ? remote.slice(0, -GIT_SUFFIX.length) : remote;\n    const [host, owner, repo, ...extra] = normalizeLocation(trimmed).split(\"/\");\n\n    if (repo === undefined || extra.length > 0) {\n        return null;\n    }\n\n    return { host: host ?? \"\", owner: owner ?? \"\", repo };\n};\n\nconst readDefaultBranch = (root: string): string => {\n    const head = runGit(root, [\"symbolic-ref\", \"--short\", \"refs/remotes/origin/HEAD\"]);\n\n    if (head === null || head.length === 0) {\n        return DEFAULT_BRANCH;\n    }\n\n    const separator = head.indexOf(TRAILING_SLASH);\n\n    return separator === -1 ? head : head.slice(separator + 1);\n};\n\nconst baseForRemote = (remote: string, branch: string): string | null => {\n    const parts = parseRemote(remote);\n\n    if (parts === null) {\n        return null;\n    }\n\n    const build = RAW_BASE_BY_HOST[parts.host];\n\n    return build === undefined ? null : build(parts.owner, parts.repo, branch);\n};\n\nconst resolveScreenshotBaseUrl = ({ root, deploy }: ScreenshotRequest): string | null => {\n    if (deploy.screenshotBaseUrl !== undefined) {\n        return trimTrailingSlash(deploy.screenshotBaseUrl);\n    }\n\n    const remote = gitRemoteUrl(root);\n    const base = remote === null ? null : baseForRemote(remote, readDefaultBranch(root));\n    const prefix = base === null ? \"\" : readRepositoryPrefix(root);\n\n    return base === null || prefix.length === 0 ? base : `${base}/${prefix}`;\n};\n\nconst urlForScreenshot = (file: string, baseUrl: string | null): string => {\n    if (baseUrl === null) {\n        throw new Error(\n            `Cannot turn the screenshot \"${file}\" into a URL: a software center fetches screenshots over the ` +\n            \"network. Set `deploy.screenshotBaseUrl`, or give the screenshot an absolute `url`.\",\n        );\n    }\n\n    return `${baseUrl}/${trimLeadingSlash(file)}`;\n};\n\nconst resolveScreenshots = (request: ScreenshotRequest): DeployScreenshot[] => {\n    const configured = request.deploy.screenshots ?? [];\n\n    if (configured.length === 0) {\n        return [];\n    }\n\n    const baseUrl = resolveScreenshotBaseUrl(request);\n    const defaultIndex = configured.findIndex((entry) => entry.isDefault === true);\n\n    return configured.map((entry, index) => ({\n        url: entry.url ?? urlForScreenshot(entry.file ?? \"\", baseUrl),\n        caption: entry.caption ?? null,\n        isDefault: index === defaultIndex,\n    }));\n};\n\nexport { resolveScreenshots };\n"]}
+{"version":3,"file":"screenshots.js","sourceRoot":"","sources":["../../../src/deploy/settings/screenshots.ts"],"names":[],"mappings":"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","sourcesContent":["import hostedGitInfo from \"hosted-git-info\";\nimport type { DeployConfig, DeployScreenshot } from \"../types.js\";\nimport { gitRemoteUrl, runGit } from \"../git.js\";\n\ntype ScreenshotRequest = {\n    root: string;\n    deploy: DeployConfig;\n};\n\nconst DEFAULT_BRANCH = \"main\";\nconst TRAILING_SLASH = \"/\";\n\nconst readRepositoryPrefix = (root: string): string =>\n    trimTrailingSlash(runGit(root, [\"rev-parse\", \"--show-prefix\"]) ?? \"\");\n\nconst trimTrailingSlash = (value: string): string =>\n    value.endsWith(TRAILING_SLASH) ? trimTrailingSlash(value.slice(0, -1)) : value;\n\nconst trimLeadingSlash = (value: string): string => {\n    const withoutDot = value.startsWith(\"./\") ? value.slice(2) : value;\n\n    return withoutDot.startsWith(TRAILING_SLASH) ? withoutDot.slice(1) : withoutDot;\n};\n\nconst readDefaultBranch = (root: string): string => {\n    const head = runGit(root, [\"symbolic-ref\", \"--short\", \"refs/remotes/origin/HEAD\"]);\n\n    if (head === null || head.length === 0) {\n        return DEFAULT_BRANCH;\n    }\n\n    const separator = head.indexOf(TRAILING_SLASH);\n\n    return separator === -1 ? head : head.slice(separator + 1);\n};\n\nconst baseForRemote = (root: string, remote: string): string | null => {\n    const repository = hostedGitInfo.fromUrl(remote);\n\n    if (repository === undefined || (repository.type !== \"github\" && repository.type !== \"gitlab\")) {\n        return null;\n    }\n\n    return trimTrailingSlash(\n        repository.file(readRepositoryPrefix(root), { committish: readDefaultBranch(root) }),\n    );\n};\n\nconst resolveScreenshotBaseUrl = ({ root, deploy }: ScreenshotRequest): string | null => {\n    if (deploy.screenshotBaseUrl !== undefined) {\n        return trimTrailingSlash(deploy.screenshotBaseUrl);\n    }\n\n    const remote = gitRemoteUrl(root);\n\n    return remote === null ? null : baseForRemote(root, remote);\n};\n\nconst urlForScreenshot = (file: string, baseUrl: string | null): string => {\n    if (baseUrl === null) {\n        throw new Error(\n            `Cannot turn the screenshot \"${file}\" into a URL: a software center fetches screenshots over the ` +\n            \"network. Set `deploy.screenshotBaseUrl`, or give the screenshot an absolute `url`.\",\n        );\n    }\n\n    return `${baseUrl}/${trimLeadingSlash(file)}`;\n};\n\nconst resolveScreenshots = (request: ScreenshotRequest): DeployScreenshot[] => {\n    const configured = request.deploy.screenshots ?? [];\n\n    if (configured.length === 0) {\n        return [];\n    }\n\n    const baseUrl = resolveScreenshotBaseUrl(request);\n    const defaultIndex = configured.findIndex((entry) => entry.isDefault === true);\n\n    return configured.map((entry, index) => ({\n        url: entry.url ?? urlForScreenshot(entry.file ?? \"\", baseUrl),\n        caption: entry.caption ?? null,\n        isDefault: index === defaultIndex,\n    }));\n};\n\nexport { resolveScreenshots };\n"]}

package/dist/deploy/targets/appimage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"appimage.d.ts","sourceRoot":"","sources":["../../../src/deploy/targets/appimage.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAKR,YAAY,EAEf,MAAM,aAAa,CAAC;AAmBrB,QAAA,MAAM,cAAc,EAAE,YAMrB,CAAC;AA0HF,OAAO,EAAE,cAAc,EAAE,CAAC"}
+{"version":3,"file":"appimage.d.ts","sourceRoot":"","sources":["../../../src/deploy/targets/appimage.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAKR,YAAY,EAEf,MAAM,aAAa,CAAC;AAmBrB,QAAA,MAAM,cAAc,EAAE,YAOrB,CAAC;AA0HF,OAAO,EAAE,cAAc,EAAE,CAAC"}

package/dist/deploy/targets/appimage.js

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

package/dist/deploy/targets/appimage.js.map

@@ -1 +1 @@
-{"version":3,"file":"appimage.js","sourceRoot":"","sources":["../../../src/deploy/targets/appimage.ts"],"names":[],"mappings":"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","sourcesContent":["import { existsSync, mkdirSync, rmSync, statSync } from \"node:fs\";\nimport { basename, join } from \"node:path\";\nimport type {\n    DeployArtifact,\n    DeployManifest,\n    DeployPayload,\n    DeploySettings,\n    DeployTarget,\n    StagedFile,\n} from \"../types.js\";\nimport { runCliTool } from \"../../internal/run-cli-tool.js\";\nimport { copyInto, copyTree, EXECUTABLE_MODE, writeInto } from \"../payload/copy-tree.js\";\nimport { type ApplicationIconVariant, classifyApplicationIcon } from \"../payload/icons.js\";\nimport { FILE_TOOL } from \"../tools.js\";\nimport { resolveAppimageTooling } from \"../vendored/appimagetool.js\";\n\ntype RankedIcon = {\n    file: StagedFile;\n    variant: ApplicationIconVariant;\n};\n\nconst PREFIX = \"/usr\";\nconst TARGET_DIR = \"appimage\";\nconst APPRUN_FILENAME = \"AppRun\";\nconst APPDIR_NAME = \"AppDir\";\nconst USR_DIR = \"usr\";\nconst EXTRACT_AND_RUN = \"APPIMAGE_EXTRACT_AND_RUN\";\n\nconst appimageTarget: DeployTarget = {\n    name: \"appimage\",\n    prefix: PREFIX,\n    tools: [FILE_TOOL],\n    render: (payload) => renderManifests(payload),\n    pack: (payload) => packAppImage(payload),\n};\n\nconst appimageDir = (settings: DeploySettings): string => join(settings.paths.targets, TARGET_DIR);\nconst appDirFor = (settings: DeploySettings): string => join(appimageDir(settings), APPDIR_NAME);\nconst appRunPathFor = (settings: DeploySettings): string => join(appimageDir(settings), APPRUN_FILENAME);\n\nconst renderAppRun = (settings: DeploySettings): string =>\n    [\n        \"#!/bin/sh\",\n        \"set -e\",\n        'here=$(dirname \"$(readlink -f \"$0\")\")',\n        'XDG_DATA_DIRS=\"$here/usr/share:${XDG_DATA_DIRS:-/usr/local/share:/usr/share}\"',\n        \"export XDG_DATA_DIRS\",\n        `exec \"$here/usr/bin/${settings.binaryName}\" \"$@\"`,\n        \"\",\n    ].join(\"\\n\");\n\nconst renderManifests = (payload: DeployPayload): DeployManifest[] => [\n    { path: appRunPathFor(payload.settings), contents: renderAppRun(payload.settings) },\n];\n\nconst rankedIcon = (applicationId: string, file: StagedFile): RankedIcon | null => {\n    const variant = classifyApplicationIcon(applicationId, file.rel);\n\n    return variant === null ? null : { file, variant };\n};\n\nconst isLargerIcon = (candidate: RankedIcon, best: RankedIcon): boolean =>\n    candidate.variant.scalable === best.variant.scalable\n        ? candidate.variant.effectivePixels > best.variant.effectivePixels\n        : candidate.variant.scalable;\n\nconst largerIcon = (best: RankedIcon | undefined, candidate: RankedIcon): RankedIcon =>\n    best === undefined || isLargerIcon(candidate, best) ? candidate : best;\n\nconst largestIcon = (applicationId: string, files: StagedFile[]): StagedFile | undefined => {\n    let best: RankedIcon | undefined;\n\n    for (const file of files) {\n        const candidate = rankedIcon(applicationId, file);\n\n        if (candidate === null) {\n            continue;\n        }\n\n        best = largerIcon(best, candidate);\n    }\n\n    return best?.file;\n};\n\nconst rootIconFor = (payload: DeployPayload): { rel: string; abs: string } => {\n    const { applicationId } = payload.settings;\n    const icon = largestIcon(applicationId, payload.stage);\n\n    if (icon === undefined) {\n        throw new Error(`Cannot build an AppImage without a ${applicationId} icon in the staged icon tree`);\n    }\n\n    return { rel: basename(icon.rel), abs: icon.abs };\n};\n\nconst buildAppDir = (payload: DeployPayload): string => {\n    const settings = payload.settings;\n    const appDir = appDirFor(settings);\n    rmSync(appDir, { recursive: true, force: true, maxRetries: 5 });\n    copyTree(appDir, USR_DIR, settings.paths.stage);\n    copyTree(appDir, USR_DIR, join(settings.paths.overlay, TARGET_DIR));\n    writeInto(appDir, APPRUN_FILENAME, renderAppRun(settings), EXECUTABLE_MODE);\n\n    copyInto(appDir, `${settings.applicationId}.desktop`, join(appDir, USR_DIR, \"share/applications\",\n        `${settings.applicationId}.desktop`));\n\n    const icon = rootIconFor(payload);\n    copyInto(appDir, icon.rel, icon.abs);\n\n    return appDir;\n};\n\nconst artifactNameFor = (settings: DeploySettings): string =>\n    settings.deploy.appimage?.fileName ??\n    `${settings.name.replaceAll(\" \", \"_\")}-${settings.versions.packageVersion}-${settings.arch.appimage}.AppImage`;\n\nconst toolArgsFor = (settings: DeploySettings, runtime: string, appDir: string, target: string): string[] => {\n    const appimage = settings.deploy.appimage ?? {};\n    const signing = settings.deploy.signing?.appimage;\n\n    return [\n        \"--no-appstream\",\n        \"--runtime-file\",\n        appimage.runtimeFile ?? runtime,\n        ...(appimage.compression === undefined ? [] : [\"--comp\", appimage.compression]),\n        ...(appimage.updateInformation === undefined ? [] : [\"-u\", appimage.updateInformation]),\n        ...(signing === undefined ? [] : [\"-s\", \"--sign-key\", signing.gpgKeyId]),\n        appDir,\n        target,\n    ];\n};\n\nconst packAppImage = async (payload: DeployPayload): Promise<DeployArtifact[]> => {\n    const settings = payload.settings;\n    const tooling = await resolveAppimageTooling(settings.arch.appimage);\n    const appDir = buildAppDir(payload);\n    const output = settings.paths.output;\n    mkdirSync(output, { recursive: true });\n    const target = join(output, artifactNameFor(settings));\n\n    runCliTool({\n        tool: tooling.tool,\n        args: toolArgsFor(settings, tooling.runtime, appDir, target),\n        target: \"the AppImage\",\n        shouldStream: true,\n        options: { env: { ...process.env, ARCH: settings.arch.appimage, [EXTRACT_AND_RUN]: \"1\" } },\n    });\n\n    if (!existsSync(target)) {\n        throw new Error(`appimagetool reported success but wrote no AppImage at ${target}`);\n    }\n\n    return [{ path: target, size: statSync(target).size }];\n};\n\nexport { appimageTarget };\n"]}
+{"version":3,"file":"appimage.js","sourceRoot":"","sources":["../../../src/deploy/targets/appimage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAS3C,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACzF,OAAO,EAA+B,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC3F,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAOrE,MAAM,MAAM,GAAG,MAAM,CAAC;AACtB,MAAM,UAAU,GAAG,UAAU,CAAC;AAC9B,MAAM,eAAe,GAAG,QAAQ,CAAC;AACjC,MAAM,WAAW,GAAG,QAAQ,CAAC;AAC7B,MAAM,OAAO,GAAG,KAAK,CAAC;AACtB,MAAM,eAAe,GAAG,0BAA0B,CAAC;AAEnD,MAAM,cAAc,GAAiB;IACjC,IAAI,EAAE,UAAU;IAChB,MAAM,EAAE,MAAM;IACd,UAAU,EAAE,IAAI;IAChB,KAAK,EAAE,CAAC,SAAS,CAAC;IAClB,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,eAAe,CAAC,OAAO,CAAC;IAC7C,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC;CAC3C,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,QAAwB,EAAU,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;AACnG,MAAM,SAAS,GAAG,CAAC,QAAwB,EAAU,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,WAAW,CAAC,CAAC;AACjG,MAAM,aAAa,GAAG,CAAC,QAAwB,EAAU,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,eAAe,CAAC,CAAC;AAEzG,MAAM,YAAY,GAAG,CAAC,QAAwB,EAAU,EAAE,CACtD;IACI,WAAW;IACX,QAAQ;IACR,uCAAuC;IACvC,+EAA+E;IAC/E,sBAAsB;IACtB,uBAAuB,QAAQ,CAAC,UAAU,QAAQ;IAClD,EAAE;CACL,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEjB,MAAM,eAAe,GAAG,CAAC,OAAsB,EAAoB,EAAE,CAAC;IAClE,EAAE,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;CACtF,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,aAAqB,EAAE,IAAgB,EAAqB,EAAE;IAC9E,MAAM,OAAO,GAAG,uBAAuB,CAAC,aAAa,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IAEjE,OAAO,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;AACvD,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,SAAqB,EAAE,IAAgB,EAAW,EAAE,CACtE,SAAS,CAAC,OAAO,CAAC,QAAQ,KAAK,IAAI,CAAC,OAAO,CAAC,QAAQ;IAChD,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe;IAClE,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC;AAErC,MAAM,UAAU,GAAG,CAAC,IAA4B,EAAE,SAAqB,EAAc,EAAE,CACnF,IAAI,KAAK,SAAS,IAAI,YAAY,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;AAE3E,MAAM,WAAW,GAAG,CAAC,aAAqB,EAAE,KAAmB,EAA0B,EAAE;IACvF,IAAI,IAA4B,CAAC;IAEjC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACvB,MAAM,SAAS,GAAG,UAAU,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QAElD,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;YACrB,SAAS;QACb,CAAC;QAED,IAAI,GAAG,UAAU,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IACvC,CAAC;IAED,OAAO,IAAI,EAAE,IAAI,CAAC;AACtB,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,OAAsB,EAAgC,EAAE;IACzE,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC;IAC3C,MAAM,IAAI,GAAG,WAAW,CAAC,aAAa,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAEvD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sCAAsC,aAAa,+BAA+B,CAAC,CAAC;IACxG,CAAC;IAED,OAAO,EAAE,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC;AACtD,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,OAAsB,EAAU,EAAE;IACnD,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IAClC,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;IACnC,MAAM,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC;IAChE,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAChD,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC;IACpE,SAAS,CAAC,MAAM,EAAE,eAAe,EAAE,YAAY,CAAC,QAAQ,CAAC,EAAE,eAAe,CAAC,CAAC;IAE5E,QAAQ,CAAC,MAAM,EAAE,GAAG,QAAQ,CAAC,aAAa,UAAU,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,oBAAoB,EAC5F,GAAG,QAAQ,CAAC,aAAa,UAAU,CAAC,CAAC,CAAC;IAE1C,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IAErC,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,QAAwB,EAAU,EAAE,CACzD,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ;IAClC,GAAG,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,cAAc,IAAI,QAAQ,CAAC,IAAI,CAAC,QAAQ,WAAW,CAAC;AAEnH,MAAM,WAAW,GAAG,CAAC,QAAwB,EAAE,OAAe,EAAE,MAAc,EAAE,MAAc,EAAY,EAAE;IACxG,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC;IAChD,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC;IAElD,OAAO;QACH,gBAAgB;QAChB,gBAAgB;QAChB,QAAQ,CAAC,WAAW,IAAI,OAAO;QAC/B,GAAG,CAAC,QAAQ,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC/E,GAAG,CAAC,QAAQ,CAAC,iBAAiB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,iBAAiB,CAAC,CAAC;QACvF,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;QACxE,MAAM;QACN,MAAM;KACT,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,KAAK,EAAE,OAAsB,EAA6B,EAAE;IAC7E,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IAClC,MAAM,OAAO,GAAG,MAAM,sBAAsB,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrE,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IACpC,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC;IACrC,SAAS,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACvC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEvD,UAAU,CAAC;QACP,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,IAAI,EAAE,WAAW,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC;QAC5D,MAAM,EAAE,cAAc;QACtB,YAAY,EAAE,IAAI;QAClB,OAAO,EAAE,EAAE,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,eAAe,CAAC,EAAE,GAAG,EAAE,EAAE;KAC7F,CAAC,CAAC;IAEH,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,0DAA0D,MAAM,EAAE,CAAC,CAAC;IACxF,CAAC;IAED,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;AAC3D,CAAC,CAAC;AAEF,OAAO,EAAE,cAAc,EAAE,CAAC","sourcesContent":["import { existsSync, mkdirSync, rmSync, statSync } from \"node:fs\";\nimport { basename, join } from \"node:path\";\nimport type {\n    DeployArtifact,\n    DeployManifest,\n    DeployPayload,\n    DeploySettings,\n    DeployTarget,\n    StagedFile,\n} from \"../types.js\";\nimport { runCliTool } from \"../../internal/run-cli-tool.js\";\nimport { copyInto, copyTree, EXECUTABLE_MODE, writeInto } from \"../payload/copy-tree.js\";\nimport { type ApplicationIconVariant, classifyApplicationIcon } from \"../payload/icons.js\";\nimport { FILE_TOOL } from \"../tools.js\";\nimport { resolveAppimageTooling } from \"../vendored/appimagetool.js\";\n\ntype RankedIcon = {\n    file: StagedFile;\n    variant: ApplicationIconVariant;\n};\n\nconst PREFIX = \"/usr\";\nconst TARGET_DIR = \"appimage\";\nconst APPRUN_FILENAME = \"AppRun\";\nconst APPDIR_NAME = \"AppDir\";\nconst USR_DIR = \"usr\";\nconst EXTRACT_AND_RUN = \"APPIMAGE_EXTRACT_AND_RUN\";\n\nconst appimageTarget: DeployTarget = {\n    name: \"appimage\",\n    prefix: PREFIX,\n    isHostOnly: true,\n    tools: [FILE_TOOL],\n    render: (payload) => renderManifests(payload),\n    pack: (payload) => packAppImage(payload),\n};\n\nconst appimageDir = (settings: DeploySettings): string => join(settings.paths.targets, TARGET_DIR);\nconst appDirFor = (settings: DeploySettings): string => join(appimageDir(settings), APPDIR_NAME);\nconst appRunPathFor = (settings: DeploySettings): string => join(appimageDir(settings), APPRUN_FILENAME);\n\nconst renderAppRun = (settings: DeploySettings): string =>\n    [\n        \"#!/bin/sh\",\n        \"set -e\",\n        'here=$(dirname \"$(readlink -f \"$0\")\")',\n        'XDG_DATA_DIRS=\"$here/usr/share:${XDG_DATA_DIRS:-/usr/local/share:/usr/share}\"',\n        \"export XDG_DATA_DIRS\",\n        `exec \"$here/usr/bin/${settings.binaryName}\" \"$@\"`,\n        \"\",\n    ].join(\"\\n\");\n\nconst renderManifests = (payload: DeployPayload): DeployManifest[] => [\n    { path: appRunPathFor(payload.settings), contents: renderAppRun(payload.settings) },\n];\n\nconst rankedIcon = (applicationId: string, file: StagedFile): RankedIcon | null => {\n    const variant = classifyApplicationIcon(applicationId, file.rel);\n\n    return variant === null ? null : { file, variant };\n};\n\nconst isLargerIcon = (candidate: RankedIcon, best: RankedIcon): boolean =>\n    candidate.variant.scalable === best.variant.scalable\n        ? candidate.variant.effectivePixels > best.variant.effectivePixels\n        : candidate.variant.scalable;\n\nconst largerIcon = (best: RankedIcon | undefined, candidate: RankedIcon): RankedIcon =>\n    best === undefined || isLargerIcon(candidate, best) ? candidate : best;\n\nconst largestIcon = (applicationId: string, files: StagedFile[]): StagedFile | undefined => {\n    let best: RankedIcon | undefined;\n\n    for (const file of files) {\n        const candidate = rankedIcon(applicationId, file);\n\n        if (candidate === null) {\n            continue;\n        }\n\n        best = largerIcon(best, candidate);\n    }\n\n    return best?.file;\n};\n\nconst rootIconFor = (payload: DeployPayload): { rel: string; abs: string } => {\n    const { applicationId } = payload.settings;\n    const icon = largestIcon(applicationId, payload.stage);\n\n    if (icon === undefined) {\n        throw new Error(`Cannot build an AppImage without a ${applicationId} icon in the staged icon tree`);\n    }\n\n    return { rel: basename(icon.rel), abs: icon.abs };\n};\n\nconst buildAppDir = (payload: DeployPayload): string => {\n    const settings = payload.settings;\n    const appDir = appDirFor(settings);\n    rmSync(appDir, { recursive: true, force: true, maxRetries: 5 });\n    copyTree(appDir, USR_DIR, settings.paths.stage);\n    copyTree(appDir, USR_DIR, join(settings.paths.overlay, TARGET_DIR));\n    writeInto(appDir, APPRUN_FILENAME, renderAppRun(settings), EXECUTABLE_MODE);\n\n    copyInto(appDir, `${settings.applicationId}.desktop`, join(appDir, USR_DIR, \"share/applications\",\n        `${settings.applicationId}.desktop`));\n\n    const icon = rootIconFor(payload);\n    copyInto(appDir, icon.rel, icon.abs);\n\n    return appDir;\n};\n\nconst artifactNameFor = (settings: DeploySettings): string =>\n    settings.deploy.appimage?.fileName ??\n    `${settings.name.replaceAll(\" \", \"_\")}-${settings.versions.packageVersion}-${settings.arch.appimage}.AppImage`;\n\nconst toolArgsFor = (settings: DeploySettings, runtime: string, appDir: string, target: string): string[] => {\n    const appimage = settings.deploy.appimage ?? {};\n    const signing = settings.deploy.signing?.appimage;\n\n    return [\n        \"--no-appstream\",\n        \"--runtime-file\",\n        appimage.runtimeFile ?? runtime,\n        ...(appimage.compression === undefined ? [] : [\"--comp\", appimage.compression]),\n        ...(appimage.updateInformation === undefined ? [] : [\"-u\", appimage.updateInformation]),\n        ...(signing === undefined ? [] : [\"-s\", \"--sign-key\", signing.gpgKeyId]),\n        appDir,\n        target,\n    ];\n};\n\nconst packAppImage = async (payload: DeployPayload): Promise<DeployArtifact[]> => {\n    const settings = payload.settings;\n    const tooling = await resolveAppimageTooling(settings.arch.appimage);\n    const appDir = buildAppDir(payload);\n    const output = settings.paths.output;\n    mkdirSync(output, { recursive: true });\n    const target = join(output, artifactNameFor(settings));\n\n    runCliTool({\n        tool: tooling.tool,\n        args: toolArgsFor(settings, tooling.runtime, appDir, target),\n        target: \"the AppImage\",\n        shouldStream: true,\n        options: { env: { ...process.env, ARCH: settings.arch.appimage, [EXTRACT_AND_RUN]: \"1\" } },\n    });\n\n    if (!existsSync(target)) {\n        throw new Error(`appimagetool reported success but wrote no AppImage at ${target}`);\n    }\n\n    return [{ path: target, size: statSync(target).size }];\n};\n\nexport { appimageTarget };\n"]}

package/dist/deploy/targets/flatpak-pnpm.js

@@ -1,9 +1,9 @@
 import { readPackageManifest } from "../settings/package-manifest.js";
-const PNPM_VERSION = "11.22.0";
+const PNPM_VERSION = "11.26.0";
 const PNPM_MAJOR = 11;
-const PNPM_MINOR = 22;
-const PNPM_SHA512 = "1ff870c4c6133dfd88fb2afc46dd13d47f09c9794b438c6fdb47ca98caf3bc16381ee0be9" +
-    "3a091b8e3824cf01f889f46d7d9e20910fb0be1ab0fb5baa80dd621";
+const PNPM_MINOR = 26;
+const PNPM_SHA512 = "fc0e2bf890b9f983611f1ab68c0637bce914390653699f83c1a78b005ed25f2c81e77920c8" +
+    "fd8eee2ecf0b58b28cdcb00a84d97f69bcf7c56b2f344710238664";
 const PNPM_DIR = "flatpak-pnpm";
 const PNPM_COMMAND = "pnpm";
 const PNPM_PREFIX = "pnpm@";

package/dist/deploy/targets/flatpak-pnpm.js.map

@@ -1 +1 @@
-{"version":3,"file":"flatpak-pnpm.js","sourceRoot":"","sources":["../../../src/deploy/targets/flatpak-pnpm.ts"],"names":[],"mappings":"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","sourcesContent":["import type { DeploySettings } from \"../types.js\";\nimport type { FlatpakModule } from \"./flatpak-prebuilt.js\";\nimport { readPackageManifest } from \"../settings/package-manifest.js\";\n\ntype PnpmPin = {\n    version: string;\n    major: number;\n    minor: number;\n    sha512: string;\n};\n\nconst PNPM_VERSION = \"11.22.0\";\nconst PNPM_MAJOR = 11;\nconst PNPM_MINOR = 22;\n\nconst PNPM_SHA512 = \"1ff870c4c6133dfd88fb2afc46dd13d47f09c9794b438c6fdb47ca98caf3bc16381ee0be9\" +\n    \"3a091b8e3824cf01f889f46d7d9e20910fb0be1ab0fb5baa80dd621\";\n\nconst PNPM_DIR = \"flatpak-pnpm\";\nconst PNPM_COMMAND = \"pnpm\";\nconst PNPM_PREFIX = \"pnpm@\";\nconst PNPM_TARBALL_URL = \"https://registry.npmjs.org/pnpm/-/pnpm-\";\nconst PNPM_INSTALL = \"pnpm install --offline --frozen-lockfile\";\nconst TRUST_LOCKFILE = \"--trust-lockfile\";\nconst STORE_V10 = \"v10\";\nconst STORE_V11 = \"v11\";\nconst STORE_V10_MAJOR = 10;\nconst STORE_V11_MAJOR = 11;\nconst TRUST_LOCKFILE_MINOR = 3;\n\nconst DEFAULT_PIN: PnpmPin = {\n    version: PNPM_VERSION,\n    major: PNPM_MAJOR,\n    minor: PNPM_MINOR,\n    sha512: PNPM_SHA512,\n};\n\nconst PNPM_PIN_FIELD =\n    /^pnpm@(?<version>(?<major>\\d+)\\.(?<minor>\\d+)\\.\\d+)\\+sha512\\.(?<sha512>[\\da-f]{128})$/;\n\nconst pinFromGroups = (groups: Record<string, string | undefined>): PnpmPin | null => {\n    const { major, minor, sha512, version } = groups;\n\n    if (major === undefined || minor === undefined || sha512 === undefined || version === undefined) {\n        return null;\n    }\n\n    return { version, major: Number(major), minor: Number(minor), sha512 };\n};\n\nconst isSupportedPin = (pin: PnpmPin): boolean =>\n    pin.major === STORE_V10_MAJOR || (pin.major === STORE_V11_MAJOR && pin.minor >= TRUST_LOCKFILE_MINOR);\n\nconst resolvePnpmPin = (settings: DeploySettings): PnpmPin => {\n    const field = readPackageManifest(settings.paths.root).packageManager;\n\n    if (field === null) {\n        return DEFAULT_PIN;\n    }\n\n    if (!field.startsWith(PNPM_PREFIX)) {\n        throw new Error(\n            `Cannot vendor pnpm for the Flathub sandbox: \"packageManager\" is \"${field}\" but the offline install ` +\n            \"resolves from a pnpm lockfile. Run `corepack use pnpm@<version>` to pin it to pnpm, or point \" +\n            \"`deploy.flatpak.packageManager` at the manager whose lockfile the build should install from.\",\n        );\n    }\n\n    const pin = pinFromGroups(PNPM_PIN_FIELD.exec(field)?.groups ?? {});\n\n    if (pin === null) {\n        throw new Error(\n            `Cannot vendor pnpm for the Flathub sandbox: \"packageManager\" is \"${field}\", which carries no sha512 ` +\n            \"integrity digest, and every source in a Flathub build has to be hash-pinned. Run \" +\n            \"`corepack use pnpm@<version>` to rewrite it with its digest.\",\n        );\n    }\n\n    if (!isSupportedPin(pin)) {\n        throw new Error(\n            `Cannot vendor pnpm ${pin.version} for the Flathub sandbox: the offline install runs on pnpm 10, or on ` +\n            \"pnpm 11 from 11.3.0 on, where `--trust-lockfile` exists. Earlier pnpm 11 releases reach the registry \" +\n            'during the supply-chain check and the sandbox has no network. Pin \"packageManager\" to one of those.',\n        );\n    }\n\n    return pin;\n};\n\nconst pnpmPathFor = (moduleDir: string): string => `${moduleDir}/${PNPM_DIR}`;\n\nconst pnpmSources = (pin: PnpmPin, moduleDir: string): FlatpakModule[] => [\n    { type: \"archive\", url: `${PNPM_TARBALL_URL}${pin.version}.tgz`, sha512: pin.sha512, dest: PNPM_DIR },\n    {\n        type: \"script\",\n        dest: PNPM_DIR,\n        \"dest-filename\": PNPM_COMMAND,\n        commands: [`exec node ${pnpmPathFor(moduleDir)}/bin/pnpm.cjs \"$@\"`],\n    },\n];\n\nconst pnpmInstallCommand = (pin: PnpmPin): string =>\n    pin.major === STORE_V11_MAJOR ? `${PNPM_INSTALL} ${TRUST_LOCKFILE}` : PNPM_INSTALL;\n\nconst pnpmStoreVersionFor = (pin: PnpmPin): string =>\n    pin.major === STORE_V10_MAJOR ? STORE_V10 : STORE_V11;\n\nexport {\n    pnpmInstallCommand,\n    pnpmPathFor,\n    type PnpmPin,\n    pnpmSources,\n    pnpmStoreVersionFor,\n    resolvePnpmPin,\n};\n"]}
+{"version":3,"file":"flatpak-pnpm.js","sourceRoot":"","sources":["../../../src/deploy/targets/flatpak-pnpm.ts"],"names":[],"mappings":"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","sourcesContent":["import type { DeploySettings } from \"../types.js\";\nimport type { FlatpakModule } from \"./flatpak-prebuilt.js\";\nimport { readPackageManifest } from \"../settings/package-manifest.js\";\n\ntype PnpmPin = {\n    version: string;\n    major: number;\n    minor: number;\n    sha512: string;\n};\n\nconst PNPM_VERSION = \"11.26.0\";\nconst PNPM_MAJOR = 11;\nconst PNPM_MINOR = 26;\n\nconst PNPM_SHA512 = \"fc0e2bf890b9f983611f1ab68c0637bce914390653699f83c1a78b005ed25f2c81e77920c8\" +\n    \"fd8eee2ecf0b58b28cdcb00a84d97f69bcf7c56b2f344710238664\";\n\nconst PNPM_DIR = \"flatpak-pnpm\";\nconst PNPM_COMMAND = \"pnpm\";\nconst PNPM_PREFIX = \"pnpm@\";\nconst PNPM_TARBALL_URL = \"https://registry.npmjs.org/pnpm/-/pnpm-\";\nconst PNPM_INSTALL = \"pnpm install --offline --frozen-lockfile\";\nconst TRUST_LOCKFILE = \"--trust-lockfile\";\nconst STORE_V10 = \"v10\";\nconst STORE_V11 = \"v11\";\nconst STORE_V10_MAJOR = 10;\nconst STORE_V11_MAJOR = 11;\nconst TRUST_LOCKFILE_MINOR = 3;\n\nconst DEFAULT_PIN: PnpmPin = {\n    version: PNPM_VERSION,\n    major: PNPM_MAJOR,\n    minor: PNPM_MINOR,\n    sha512: PNPM_SHA512,\n};\n\nconst PNPM_PIN_FIELD =\n    /^pnpm@(?<version>(?<major>\\d+)\\.(?<minor>\\d+)\\.\\d+)\\+sha512\\.(?<sha512>[\\da-f]{128})$/;\n\nconst pinFromGroups = (groups: Record<string, string | undefined>): PnpmPin | null => {\n    const { major, minor, sha512, version } = groups;\n\n    if (major === undefined || minor === undefined || sha512 === undefined || version === undefined) {\n        return null;\n    }\n\n    return { version, major: Number(major), minor: Number(minor), sha512 };\n};\n\nconst isSupportedPin = (pin: PnpmPin): boolean =>\n    pin.major === STORE_V10_MAJOR || (pin.major === STORE_V11_MAJOR && pin.minor >= TRUST_LOCKFILE_MINOR);\n\nconst resolvePnpmPin = (settings: DeploySettings): PnpmPin => {\n    const field = readPackageManifest(settings.paths.root).packageManager;\n\n    if (field === null) {\n        return DEFAULT_PIN;\n    }\n\n    if (!field.startsWith(PNPM_PREFIX)) {\n        throw new Error(\n            `Cannot vendor pnpm for the Flathub sandbox: \"packageManager\" is \"${field}\" but the offline install ` +\n            \"resolves from a pnpm lockfile. Run `corepack use pnpm@<version>` to pin it to pnpm, or point \" +\n            \"`deploy.flatpak.packageManager` at the manager whose lockfile the build should install from.\",\n        );\n    }\n\n    const pin = pinFromGroups(PNPM_PIN_FIELD.exec(field)?.groups ?? {});\n\n    if (pin === null) {\n        throw new Error(\n            `Cannot vendor pnpm for the Flathub sandbox: \"packageManager\" is \"${field}\", which carries no sha512 ` +\n            \"integrity digest, and every source in a Flathub build has to be hash-pinned. Run \" +\n            \"`corepack use pnpm@<version>` to rewrite it with its digest.\",\n        );\n    }\n\n    if (!isSupportedPin(pin)) {\n        throw new Error(\n            `Cannot vendor pnpm ${pin.version} for the Flathub sandbox: the offline install runs on pnpm 10, or on ` +\n            \"pnpm 11 from 11.3.0 on, where `--trust-lockfile` exists. Earlier pnpm 11 releases reach the registry \" +\n            'during the supply-chain check and the sandbox has no network. Pin \"packageManager\" to one of those.',\n        );\n    }\n\n    return pin;\n};\n\nconst pnpmPathFor = (moduleDir: string): string => `${moduleDir}/${PNPM_DIR}`;\n\nconst pnpmSources = (pin: PnpmPin, moduleDir: string): FlatpakModule[] => [\n    { type: \"archive\", url: `${PNPM_TARBALL_URL}${pin.version}.tgz`, sha512: pin.sha512, dest: PNPM_DIR },\n    {\n        type: \"script\",\n        dest: PNPM_DIR,\n        \"dest-filename\": PNPM_COMMAND,\n        commands: [`exec node ${pnpmPathFor(moduleDir)}/bin/pnpm.cjs \"$@\"`],\n    },\n];\n\nconst pnpmInstallCommand = (pin: PnpmPin): string =>\n    pin.major === STORE_V11_MAJOR ? `${PNPM_INSTALL} ${TRUST_LOCKFILE}` : PNPM_INSTALL;\n\nconst pnpmStoreVersionFor = (pin: PnpmPin): string =>\n    pin.major === STORE_V10_MAJOR ? STORE_V10 : STORE_V11;\n\nexport {\n    pnpmInstallCommand,\n    pnpmPathFor,\n    type PnpmPin,\n    pnpmSources,\n    pnpmStoreVersionFor,\n    resolvePnpmPin,\n};\n"]}

package/dist/deploy/targets/flatpak-source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"flatpak-source.d.ts","sourceRoot":"","sources":["../../../src/deploy/targets/flatpak-source.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAkB,MAAM,aAAa,CAAC;AAajE,OAAO,EAAe,KAAK,aAAa,EAA2C,MAAM,uBAAuB,CAAC;AAuOjH,QAAA,MAAM,mBAAmB,GAAI,SAAS,aAAa,KAAG,aAwCrD,CAAC;AAEF,OAAO,EAAE,mBAAmB,EAAE,CAAC"}
+{"version":3,"file":"flatpak-source.d.ts","sourceRoot":"","sources":["../../../src/deploy/targets/flatpak-source.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAkB,MAAM,aAAa,CAAC;AAajE,OAAO,EAAe,KAAK,aAAa,EAA2C,MAAM,uBAAuB,CAAC;AAmPjH,QAAA,MAAM,mBAAmB,GAAI,SAAS,aAAa,KAAG,aAwCrD,CAAC;AAEF,OAAO,EAAE,mBAAmB,EAAE,CAAC"}

package/dist/deploy/targets/flatpak-source.js

@@ -1,6 +1,8 @@
+import { isPathInside, toPosixPath } from "@gtkx/utils";
 import { existsSync, readFileSync, realpathSync } from "node:fs";
 import { posix, relative, resolve } from "node:path";
 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";
@@ -10,7 +12,6 @@ import { executableModeFor } from "../payload/copy-tree.js";
 import { iconPathFor } from "../payload/icons.js";
 import { renderLauncher } from "../payload/launcher.js";
 import { licenseDestination, nodeLicenseDestination, NOTICES_FILENAME, noticesDestination } from "../payload/stage.js";
-import { isInside } from "../settings/paths.js";
 import { pnpmPathFor, pnpmSources } from "./flatpak-pnpm.js";
 import { DESTINATION, postInstallCommands, validationCommands } from "./flatpak-prebuilt.js";
 import { detectPackageManager, GENERATED_SOURCES, installCommandFor, nodeExtensionPathFor, pnpmPinFor, resolveGitSource, } from "./flatpak-sources.js";
@@ -27,7 +28,7 @@ const inlineSource = (fileName, contents) => ({
     "dest-filename": fileName,
     contents,
 });
-const projectRelative = (settings, path) => relative(settings.paths.root, path).replaceAll("\\", "/");
+const projectRelative = (settings, path) => toPosixPath(relative(settings.paths.root, path));
 const shellArgument = (value) => PLAIN_ARGUMENT.test(value) ? value : `'${value.split("'").join(QUOTE_ESCAPE)}'`;
 const pathArgument = (value) => shellArgument(value.startsWith("-") ? `./${value}` : value);
 const installCommand = (source, destination, mode) => `install -D${mode} ${pathArgument(source)} ${destination}`;
@@ -42,6 +43,7 @@ const runtimeInstallCommands = (settings, nodeExtensionPath) => {
         "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"),
     ];
@@ -85,7 +87,7 @@ const schemaInstallCommands = (settings) => settings.paths.schemaFiles.map((file
     assertInsideProject(settings, { destination, source, resolved: file });
     return installCommand(source, destination, "m644");
 });
-const iconInstallCommand = (settings, source, rel) => installCommand(projectRelative(settings, source), `${DESTINATION}/share/icons/${shellArgument(rel.replaceAll("\\", "/"))}`, "m644");
+const iconInstallCommand = (settings, source, rel) => installCommand(projectRelative(settings, source), `${DESTINATION}/share/icons/${shellArgument(toPosixPath(rel))}`, "m644");
 const iconInstallCommands = (settings) => {
     const source = settings.paths.applicationIcon;
     if (source.kind === "file") {
@@ -99,7 +101,7 @@ const iconInstallCommands = (settings) => {
 const assertInsideProject = (settings, installed) => {
     const { resolved } = installed;
     const target = existsSync(resolved) ? realpathSync(resolved) : resolved;
-    if (isInside(settings.paths.root, target)) {
+    if (isPathInside(settings.paths.root, target)) {
         return;
     }
     throw new Error(`Cannot install "${installed.destination}" from "${installed.source}": a source-mode manifest builds from ` +
@@ -143,6 +145,15 @@ const offlineEnvFor = (manager, settings) => {
 const appendPathFor = (settings, pin, nodeExtensionPath) => pin === null
     ? `${nodeExtensionPath}/bin`
     : `${pnpmPathFor(moduleDirFor(settings))}:${nodeExtensionPath}/bin`;
+const sourceBuildCommand = (settings) => {
+    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) => {
     const settings = payload.settings;
     const manager = detectPackageManager(settings);
@@ -169,14 +180,14 @@ const flatpakSourceModule = (payload) => {
         ],
         "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),
         ],