@gtkx/cli 1.2.2 → 1.4.0

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

@@ -1,7 +1,10 @@
+import type { Config } from "@gtkx/config";
 import type { DeployConfig, DeployPaths } from "../types.js";
 type PathsRequest = {
     root: string;
     deploy: DeployConfig;
+    applicationIcon: Config["applicationIcon"];
+    applicationId: Config["applicationId"];
     outDirOverride: string | undefined;
 };
 declare const isInside: (parent: string, candidate: string) => boolean;

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":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI7D,KAAK,YAAY,GAAG;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,YAAY,CAAC;IACrB,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;CACtC,CAAC;AAYF,QAAA,MAAM,QAAQ,GAAI,QAAQ,MAAM,EAAE,WAAW,MAAM,KAAG,OAIrD,CAAC;AAgEF,QAAA,MAAM,YAAY,GAAI,SAAS,YAAY,KAAG,WAsB7C,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;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"}

package/dist/deploy/settings/paths.js

@@ -1,10 +1,8 @@
 import { statSync } from "node:fs";
 import { isAbsolute, join, relative, resolve } from "node:path";
-import { resolveDataDir } from "../../internal/data-dir.js";
-import { findSchemaFiles } from "../../settings/schema.js";
+import { resolveApplicationIcon } from "../../internal/icon-path.js";
 const DEFAULT_OUT_DIR = "build";
 const DIST_DIR = "dist";
-const ICONS_DIR = "icons";
 const LICENSE_CANDIDATES = ["LICENSE", "LICENSE.md", "LICENSE.txt", "COPYING", "COPYING.md"];
 const isInside = (parent, candidate) => {
     const rel = relative(parent, candidate);
@@ -18,16 +16,14 @@ const resolveOutDir = ({ root, deploy, outDirOverride }) => {
     }
     return outDir;
 };
-const getStats = (path) => {
+const existingFile = (path) => {
     try {
-        return statSync(path, { throwIfNoEntry: false });
+        return statSync(path, { throwIfNoEntry: false })?.isFile() === true ? path : null;
     }
     catch {
-        return undefined;
+        return null;
     }
 };
-const existingFile = (path) => (getStats(path)?.isFile() === true ? path : null);
-const existingDir = (path) => (getStats(path)?.isDirectory() === true ? path : null);
 const resolveLicenseFile = (root, configured) => {
     if (configured !== undefined) {
         const path = resolve(root, configured);
@@ -38,29 +34,9 @@ const resolveLicenseFile = (root, configured) => {
     }
     return LICENSE_CANDIDATES.map((name) => existingFile(join(root, name))).find((path) => path !== null) ?? null;
 };
-const configuredIcons = (root, configured) => {
-    const path = resolve(root, configured);
-    if (!isInside(root, path)) {
-        throw new Error(`Cannot use "${configured}" as the icon path: it is outside ${root}`);
-    }
-    if (existingDir(path) !== null) {
-        return { iconsDir: path, iconFile: null };
-    }
-    if (existingFile(path) === null) {
-        throw new Error(`Cannot read the icon path "${configured}": no such file or directory under ${root}`);
-    }
-    return { iconsDir: null, iconFile: path };
-};
-const defaultIcons = (root, dataDir) => ({
-    iconsDir: dataDir === null ? null : existingDir(join(root, dataDir, ICONS_DIR)),
-    iconFile: null,
-});
-const resolveIcons = (root, dataDir, configured) => configured === undefined ? defaultIcons(root, dataDir) : configuredIcons(root, configured);
 const resolvePaths = (request) => {
     const { root, deploy } = request;
     const outDir = resolveOutDir(request);
-    const dataDir = resolveDataDir(root);
-    const { iconsDir, iconFile } = resolveIcons(root, dataDir, deploy.icons);
     return {
         root,
         dist: join(root, DIST_DIR),
@@ -71,11 +47,9 @@ const resolvePaths = (request) => {
         overlay: join(outDir, "overlay"),
         targets: join(outDir, "targets"),
         output: join(outDir, "out"),
-        dataDir,
-        iconsDir,
-        iconFile,
+        applicationIcon: resolveApplicationIcon(root, request.applicationId, request.applicationIcon),
         licenseFile: resolveLicenseFile(root, deploy.licenseFile),
-        schemaFiles: dataDir === null ? [] : findSchemaFiles(join(root, dataDir)),
+        schemaFiles: [],
     };
 };
 export { isInside, resolvePaths };

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 Stats, statSync } from \"node:fs\";\nimport { isAbsolute, join, relative, resolve } from \"node:path\";\nimport type { DeployConfig, DeployPaths } from \"../types.js\";\nimport { resolveDataDir } from \"../../internal/data-dir.js\";\nimport { findSchemaFiles } from \"../../settings/schema.js\";\n\ntype PathsRequest = {\n    root: string;\n    deploy: DeployConfig;\n    outDirOverride: string | undefined;\n};\n\ntype ResolvedIcons = {\n    iconsDir: string | null;\n    iconFile: string | null;\n};\n\nconst DEFAULT_OUT_DIR = \"build\";\nconst DIST_DIR = \"dist\";\nconst ICONS_DIR = \"icons\";\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 getStats = (path: string): Stats | undefined => {\n    try {\n        return statSync(path, { throwIfNoEntry: false });\n    } catch {\n        return undefined;\n    }\n};\n\nconst existingFile = (path: string): string | null => (getStats(path)?.isFile() === true ? path : null);\nconst existingDir = (path: string): string | null => (getStats(path)?.isDirectory() === 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 configuredIcons = (root: string, configured: string): ResolvedIcons => {\n    const path = resolve(root, configured);\n\n    if (!isInside(root, path)) {\n        throw new Error(`Cannot use \"${configured}\" as the icon path: it is outside ${root}`);\n    }\n\n    if (existingDir(path) !== null) {\n        return { iconsDir: path, iconFile: null };\n    }\n\n    if (existingFile(path) === null) {\n        throw new Error(`Cannot read the icon path \"${configured}\": no such file or directory under ${root}`);\n    }\n\n    return { iconsDir: null, iconFile: path };\n};\n\nconst defaultIcons = (root: string, dataDir: string | null): ResolvedIcons => ({\n    iconsDir: dataDir === null ? null : existingDir(join(root, dataDir, ICONS_DIR)),\n    iconFile: null,\n});\n\nconst resolveIcons = (root: string, dataDir: string | null, configured: string | undefined): ResolvedIcons =>\n    configured === undefined ? defaultIcons(root, dataDir) : configuredIcons(root, configured);\n\nconst resolvePaths = (request: PathsRequest): DeployPaths => {\n    const { root, deploy } = request;\n    const outDir = resolveOutDir(request);\n    const dataDir = resolveDataDir(root);\n    const { iconsDir, iconFile } = resolveIcons(root, dataDir, deploy.icons);\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        dataDir,\n        iconsDir,\n        iconFile,\n        licenseFile: resolveLicenseFile(root, deploy.licenseFile),\n        schemaFiles: dataDir === null ? [] : findSchemaFiles(join(root, dataDir)),\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 { 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"]}

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;AAgBrB,QAAA,MAAM,cAAc,EAAE,YAMrB,CAAC;AA4GF,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,YAMrB,CAAC;AA0HF,OAAO,EAAE,cAAc,EAAE,CAAC"}

package/dist/deploy/targets/appimage.js

@@ -1,8 +1,8 @@
 import { existsSync, mkdirSync, rmSync, statSync } from "node:fs";
-import { join } from "node:path";
+import { basename, join } from "node:path";
 import { runCliTool } from "../../internal/run-cli-tool.js";
 import { copyInto, copyTree, EXECUTABLE_MODE, writeInto } from "../payload/copy-tree.js";
-import { getIconSize } from "../payload/icons.js";
+import { classifyApplicationIcon } from "../payload/icons.js";
 import { FILE_TOOL } from "../tools.js";
 import { resolveAppimageTooling } from "../vendored/appimagetool.js";
 const PREFIX = "/usr";
@@ -10,9 +10,7 @@ const TARGET_DIR = "appimage";
 const APPRUN_FILENAME = "AppRun";
 const APPDIR_NAME = "AppDir";
 const USR_DIR = "usr";
-const ICON_EXTENSIONS = [".svg", ".png", ".xpm"];
 const EXTRACT_AND_RUN = "APPIMAGE_EXTRACT_AND_RUN";
-const SCALABLE_RANK = Number.MAX_SAFE_INTEGER;
 const appimageTarget = {
     name: "appimage",
     prefix: PREFIX,
@@ -35,24 +33,32 @@ const renderAppRun = (settings) => [
 const renderManifests = (payload) => [
     { path: appRunPathFor(payload.settings), contents: renderAppRun(payload.settings) },
 ];
-const iconRank = (file) => file.rel.endsWith(".svg") ? SCALABLE_RANK : (getIconSize(file.rel) ?? 0);
-const largestIcon = (icons) => {
+const rankedIcon = (applicationId, file) => {
+    const variant = classifyApplicationIcon(applicationId, file.rel);
+    return variant === null ? null : { file, variant };
+};
+const isLargerIcon = (candidate, best) => candidate.variant.scalable === best.variant.scalable
+    ? candidate.variant.effectivePixels > best.variant.effectivePixels
+    : candidate.variant.scalable;
+const largerIcon = (best, candidate) => best === undefined || isLargerIcon(candidate, best) ? candidate : best;
+const largestIcon = (applicationId, files) => {
     let best;
-    for (const file of icons) {
-        if (best === undefined || iconRank(file) > iconRank(best)) {
-            best = file;
+    for (const file of files) {
+        const candidate = rankedIcon(applicationId, file);
+        if (candidate === null) {
+            continue;
         }
+        best = largerIcon(best, candidate);
     }
-    return best;
+    return best?.file;
 };
 const rootIconFor = (payload) => {
     const { applicationId } = payload.settings;
-    const names = new Set(ICON_EXTENSIONS.map((extension) => `${applicationId}${extension}`));
-    const icon = largestIcon(payload.stage.filter((file) => names.has(file.rel.split("/").at(-1) ?? "")));
+    const icon = largestIcon(applicationId, payload.stage);
     if (icon === undefined) {
         throw new Error(`Cannot build an AppImage without a ${applicationId} icon in the staged icon tree`);
     }
-    return { rel: icon.rel.split("/").at(-1) ?? "", abs: icon.abs };
+    return { rel: basename(icon.rel), abs: icon.abs };
 };
 const buildAppDir = (payload) => {
     const settings = payload.settings;

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 { 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 { getIconSize } from \"../payload/icons.js\";\nimport { FILE_TOOL } from \"../tools.js\";\nimport { resolveAppimageTooling } from \"../vendored/appimagetool.js\";\n\nconst PREFIX = \"/usr\";\nconst TARGET_DIR = \"appimage\";\nconst APPRUN_FILENAME = \"AppRun\";\nconst APPDIR_NAME = \"AppDir\";\nconst USR_DIR = \"usr\";\nconst ICON_EXTENSIONS = [\".svg\", \".png\", \".xpm\"];\nconst EXTRACT_AND_RUN = \"APPIMAGE_EXTRACT_AND_RUN\";\nconst SCALABLE_RANK = Number.MAX_SAFE_INTEGER;\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 iconRank = (file: StagedFile): number =>\n    file.rel.endsWith(\".svg\") ? SCALABLE_RANK : (getIconSize(file.rel) ?? 0);\n\nconst largestIcon = (icons: StagedFile[]): StagedFile | undefined => {\n    let best: StagedFile | undefined;\n\n    for (const file of icons) {\n        if (best === undefined || iconRank(file) > iconRank(best)) {\n            best = file;\n        }\n    }\n\n    return best;\n};\n\nconst rootIconFor = (payload: DeployPayload): { rel: string; abs: string } => {\n    const { applicationId } = payload.settings;\n    const names = new Set(ICON_EXTENSIONS.map((extension) => `${applicationId}${extension}`));\n    const icon = largestIcon(payload.stage.filter((file) => names.has(file.rel.split(\"/\").at(-1) ?? \"\")));\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: icon.rel.split(\"/\").at(-1) ?? \"\", 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":"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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"]}

package/dist/deploy/targets/flatpak-manifest.d.ts

@@ -3,6 +3,7 @@ type FlatpakManifest = Record<string, unknown>;
 declare const branchFor: (settings: DeploySettings) => string;
 declare const finishArgsFor: (settings: DeploySettings) => string[];
 declare const hasDisplaySocket: (args: string[]) => boolean;
+declare const runtimeLabelFor: (settings: DeploySettings) => string;
 declare const renderFlatpakManifest: (payload: DeployPayload) => FlatpakManifest;
-export { branchFor, finishArgsFor, hasDisplaySocket, renderFlatpakManifest };
+export { branchFor, finishArgsFor, hasDisplaySocket, renderFlatpakManifest, runtimeLabelFor };
 //# sourceMappingURL=flatpak-manifest.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"flatpak-manifest.d.ts","sourceRoot":"","sources":["../../../src/deploy/targets/flatpak-manifest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAMjE,KAAK,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAkB/C,QAAA,MAAM,SAAS,GAAI,UAAU,cAAc,KAAG,MAA2D,CAAC;AAyB1G,QAAA,MAAM,aAAa,GAAI,UAAU,cAAc,KAAG,MAAM,EACqB,CAAC;AA4B9E,QAAA,MAAM,gBAAgB,GAAI,MAAM,MAAM,EAAE,KAAG,OAI1C,CAAC;AA8BF,QAAA,MAAM,qBAAqB,GAAI,SAAS,aAAa,KAAG,eAWvD,CAAC;AAEF,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,CAAC"}
+{"version":3,"file":"flatpak-manifest.d.ts","sourceRoot":"","sources":["../../../src/deploy/targets/flatpak-manifest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAMjE,KAAK,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAkB/C,QAAA,MAAM,SAAS,GAAI,UAAU,cAAc,KAAG,MAA2D,CAAC;AAyB1G,QAAA,MAAM,aAAa,GAAI,UAAU,cAAc,KAAG,MAAM,EACqB,CAAC;AA4B9E,QAAA,MAAM,gBAAgB,GAAI,MAAM,MAAM,EAAE,KAAG,OAI1C,CAAC;AA8BF,QAAA,MAAM,eAAe,GAAI,UAAU,cAAc,KAAG,MAInD,CAAC;AAEF,QAAA,MAAM,qBAAqB,GAAI,SAAS,aAAa,KAAG,eAWvD,CAAC;AAEF,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,eAAe,EAAE,CAAC"}

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

@@ -79,6 +79,10 @@ const runtimeKeys = (settings) => {
         ...optional("sdk-extensions", extensions.length === 0 ? undefined : extensions),
     };
 };
+const runtimeLabelFor = (settings) => {
+    const flatpak = settings.deploy.flatpak ?? {};
+    return `${flatpak.runtime ?? DEFAULT_RUNTIME}//${flatpak.runtimeVersion ?? DEFAULT_RUNTIME_VERSION}`;
+};
 const renderFlatpakManifest = (payload) => {
     const settings = payload.settings;
     return {
@@ -90,5 +94,5 @@ const renderFlatpakManifest = (payload) => {
         modules: modulesFor(payload),
     };
 };
-export { branchFor, finishArgsFor, hasDisplaySocket, renderFlatpakManifest };
+export { branchFor, finishArgsFor, hasDisplaySocket, renderFlatpakManifest, runtimeLabelFor };
 //# sourceMappingURL=flatpak-manifest.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"flatpak-manifest.js","sourceRoot":"","sources":["../../../src/deploy/targets/flatpak-manifest.ts"],"names":[],"mappings":"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","sourcesContent":["import type { DeployPayload, DeploySettings } from \"../types.js\";\nimport { optional } from \"../nfpm/optional.js\";\nimport { flatpakPrebuiltModule } from \"./flatpak-prebuilt.js\";\nimport { flatpakSourceModule } from \"./flatpak-source.js\";\nimport { nodeExtensionFor } from \"./flatpak-sources.js\";\n\ntype FlatpakManifest = Record<string, unknown>;\n\nconst DEFAULT_BRANCH = \"stable\";\nconst DEFAULT_RUNTIME = \"org.gnome.Platform\";\nconst DEFAULT_RUNTIME_VERSION = \"50\";\nconst DEFAULT_SDK = \"org.gnome.Sdk\";\nconst DEFAULT_FINISH_ARGS = [\"--share=ipc\", \"--socket=wayland\", \"--socket=fallback-x11\", \"--device=dri\"];\nconst DEFAULT_CLEANUP = [\"/include\", \"/share/pkgconfig\", \"*.la\", \"*.a\"];\nconst DISPLAY_SOCKETS = [\"fallback-x11\", \"wayland\", \"x11\"];\nconst SOCKET_ARG = \"--socket=\";\nconst NO_SOCKET_ARG = \"--nosocket=\";\n\nconst NEGATED_ARGS: [string, string][] = [\n    [\"--device=\", \"--nodevice=\"],\n    [\"--share=\", \"--unshare=\"],\n    [SOCKET_ARG, NO_SOCKET_ARG],\n];\n\nconst branchFor = (settings: DeploySettings): string => settings.deploy.flatpak?.branch ?? DEFAULT_BRANCH;\nconst isSourceMode = (settings: DeploySettings): boolean => settings.deploy.flatpak?.mode === \"source\";\n\nconst negationFor = (arg: string): string | null => {\n    const negated = NEGATED_ARGS.find(([prefix]) => arg.startsWith(prefix));\n\n    if (negated === undefined) {\n        return null;\n    }\n\n    const [prefix, negation] = negated;\n\n    return `${negation}${arg.slice(prefix.length)}`;\n};\n\nconst mergeArgs = (defaults: string[], overrides: string[]): string[] => {\n    const kept = defaults.filter((arg) => {\n        const negation = negationFor(arg);\n\n        return negation === null || !overrides.includes(negation);\n    });\n\n    return [...new Set([...kept, ...overrides])];\n};\n\nconst finishArgsFor = (settings: DeploySettings): string[] =>\n    mergeArgs(DEFAULT_FINISH_ARGS, settings.deploy.flatpak?.finishArgs ?? []);\n\nconst cleanupFor = (settings: DeploySettings): string[] => {\n    const cleanup = settings.deploy.flatpak?.cleanup;\n\n    if (cleanup === undefined) {\n        return DEFAULT_CLEANUP;\n    }\n\n    return cleanup.length === 0 ? [] : mergeArgs(DEFAULT_CLEANUP, cleanup);\n};\n\nconst grantedSockets = (args: string[]): Set<string> => {\n    const granted: Set<string> = new Set();\n\n    for (const arg of args) {\n        if (arg.startsWith(SOCKET_ARG)) {\n            granted.add(arg.slice(SOCKET_ARG.length));\n        }\n\n        if (arg.startsWith(NO_SOCKET_ARG)) {\n            granted.delete(arg.slice(NO_SOCKET_ARG.length));\n        }\n    }\n\n    return granted;\n};\n\nconst hasDisplaySocket = (args: string[]): boolean => {\n    const granted = grantedSockets(args);\n\n    return DISPLAY_SOCKETS.some((socket) => granted.has(socket));\n};\n\nconst sdkExtensionsFor = (settings: DeploySettings): string[] => {\n    const flatpak = settings.deploy.flatpak ?? {};\n    const nodeExtension = isSourceMode(settings) ? [nodeExtensionFor(settings)] : [];\n\n    return [...nodeExtension, ...(flatpak.sdkExtensions ?? [])];\n};\n\nconst modulesFor = (payload: DeployPayload): unknown[] => {\n    const settings = payload.settings;\n    const own = isSourceMode(settings) ? flatpakSourceModule(payload) : flatpakPrebuiltModule(payload);\n\n    return [...(settings.deploy.flatpak?.modules ?? []), own];\n};\n\nconst runtimeKeys = (settings: DeploySettings): FlatpakManifest => {\n    const flatpak = settings.deploy.flatpak ?? {};\n    const extensions = sdkExtensionsFor(settings);\n\n    return {\n        runtime: flatpak.runtime ?? DEFAULT_RUNTIME,\n        \"runtime-version\": flatpak.runtimeVersion ?? DEFAULT_RUNTIME_VERSION,\n        sdk: flatpak.sdk ?? DEFAULT_SDK,\n        ...optional(\"base\", flatpak.base),\n        ...optional(\"base-version\", flatpak.baseVersion),\n        ...optional(\"sdk-extensions\", extensions.length === 0 ? undefined : extensions),\n    };\n};\n\nconst renderFlatpakManifest = (payload: DeployPayload): FlatpakManifest => {\n    const settings = payload.settings;\n\n    return {\n        id: settings.applicationId,\n        ...runtimeKeys(settings),\n        command: settings.binaryName,\n        \"finish-args\": finishArgsFor(settings),\n        cleanup: cleanupFor(settings),\n        modules: modulesFor(payload),\n    };\n};\n\nexport { branchFor, finishArgsFor, hasDisplaySocket, renderFlatpakManifest };\n"]}
+{"version":3,"file":"flatpak-manifest.js","sourceRoot":"","sources":["../../../src/deploy/targets/flatpak-manifest.ts"],"names":[],"mappings":"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","sourcesContent":["import type { DeployPayload, DeploySettings } from \"../types.js\";\nimport { optional } from \"../nfpm/optional.js\";\nimport { flatpakPrebuiltModule } from \"./flatpak-prebuilt.js\";\nimport { flatpakSourceModule } from \"./flatpak-source.js\";\nimport { nodeExtensionFor } from \"./flatpak-sources.js\";\n\ntype FlatpakManifest = Record<string, unknown>;\n\nconst DEFAULT_BRANCH = \"stable\";\nconst DEFAULT_RUNTIME = \"org.gnome.Platform\";\nconst DEFAULT_RUNTIME_VERSION = \"50\";\nconst DEFAULT_SDK = \"org.gnome.Sdk\";\nconst DEFAULT_FINISH_ARGS = [\"--share=ipc\", \"--socket=wayland\", \"--socket=fallback-x11\", \"--device=dri\"];\nconst DEFAULT_CLEANUP = [\"/include\", \"/share/pkgconfig\", \"*.la\", \"*.a\"];\nconst DISPLAY_SOCKETS = [\"fallback-x11\", \"wayland\", \"x11\"];\nconst SOCKET_ARG = \"--socket=\";\nconst NO_SOCKET_ARG = \"--nosocket=\";\n\nconst NEGATED_ARGS: [string, string][] = [\n    [\"--device=\", \"--nodevice=\"],\n    [\"--share=\", \"--unshare=\"],\n    [SOCKET_ARG, NO_SOCKET_ARG],\n];\n\nconst branchFor = (settings: DeploySettings): string => settings.deploy.flatpak?.branch ?? DEFAULT_BRANCH;\nconst isSourceMode = (settings: DeploySettings): boolean => settings.deploy.flatpak?.mode === \"source\";\n\nconst negationFor = (arg: string): string | null => {\n    const negated = NEGATED_ARGS.find(([prefix]) => arg.startsWith(prefix));\n\n    if (negated === undefined) {\n        return null;\n    }\n\n    const [prefix, negation] = negated;\n\n    return `${negation}${arg.slice(prefix.length)}`;\n};\n\nconst mergeArgs = (defaults: string[], overrides: string[]): string[] => {\n    const kept = defaults.filter((arg) => {\n        const negation = negationFor(arg);\n\n        return negation === null || !overrides.includes(negation);\n    });\n\n    return [...new Set([...kept, ...overrides])];\n};\n\nconst finishArgsFor = (settings: DeploySettings): string[] =>\n    mergeArgs(DEFAULT_FINISH_ARGS, settings.deploy.flatpak?.finishArgs ?? []);\n\nconst cleanupFor = (settings: DeploySettings): string[] => {\n    const cleanup = settings.deploy.flatpak?.cleanup;\n\n    if (cleanup === undefined) {\n        return DEFAULT_CLEANUP;\n    }\n\n    return cleanup.length === 0 ? [] : mergeArgs(DEFAULT_CLEANUP, cleanup);\n};\n\nconst grantedSockets = (args: string[]): Set<string> => {\n    const granted: Set<string> = new Set();\n\n    for (const arg of args) {\n        if (arg.startsWith(SOCKET_ARG)) {\n            granted.add(arg.slice(SOCKET_ARG.length));\n        }\n\n        if (arg.startsWith(NO_SOCKET_ARG)) {\n            granted.delete(arg.slice(NO_SOCKET_ARG.length));\n        }\n    }\n\n    return granted;\n};\n\nconst hasDisplaySocket = (args: string[]): boolean => {\n    const granted = grantedSockets(args);\n\n    return DISPLAY_SOCKETS.some((socket) => granted.has(socket));\n};\n\nconst sdkExtensionsFor = (settings: DeploySettings): string[] => {\n    const flatpak = settings.deploy.flatpak ?? {};\n    const nodeExtension = isSourceMode(settings) ? [nodeExtensionFor(settings)] : [];\n\n    return [...nodeExtension, ...(flatpak.sdkExtensions ?? [])];\n};\n\nconst modulesFor = (payload: DeployPayload): unknown[] => {\n    const settings = payload.settings;\n    const own = isSourceMode(settings) ? flatpakSourceModule(payload) : flatpakPrebuiltModule(payload);\n\n    return [...(settings.deploy.flatpak?.modules ?? []), own];\n};\n\nconst runtimeKeys = (settings: DeploySettings): FlatpakManifest => {\n    const flatpak = settings.deploy.flatpak ?? {};\n    const extensions = sdkExtensionsFor(settings);\n\n    return {\n        runtime: flatpak.runtime ?? DEFAULT_RUNTIME,\n        \"runtime-version\": flatpak.runtimeVersion ?? DEFAULT_RUNTIME_VERSION,\n        sdk: flatpak.sdk ?? DEFAULT_SDK,\n        ...optional(\"base\", flatpak.base),\n        ...optional(\"base-version\", flatpak.baseVersion),\n        ...optional(\"sdk-extensions\", extensions.length === 0 ? undefined : extensions),\n    };\n};\n\nconst runtimeLabelFor = (settings: DeploySettings): string => {\n    const flatpak = settings.deploy.flatpak ?? {};\n\n    return `${flatpak.runtime ?? DEFAULT_RUNTIME}//${flatpak.runtimeVersion ?? DEFAULT_RUNTIME_VERSION}`;\n};\n\nconst renderFlatpakManifest = (payload: DeployPayload): FlatpakManifest => {\n    const settings = payload.settings;\n\n    return {\n        id: settings.applicationId,\n        ...runtimeKeys(settings),\n        command: settings.binaryName,\n        \"finish-args\": finishArgsFor(settings),\n        cleanup: cleanupFor(settings),\n        modules: modulesFor(payload),\n    };\n};\n\nexport { branchFor, finishArgsFor, hasDisplaySocket, renderFlatpakManifest, runtimeLabelFor };\n"]}

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

@@ -1,9 +1,9 @@
 import { readPackageManifest } from "../settings/package-manifest.js";
-const PNPM_VERSION = "11.21.0";
+const PNPM_VERSION = "11.22.0";
 const PNPM_MAJOR = 11;
-const PNPM_MINOR = 21;
-const PNPM_SHA512 = "521705bce689924eac72f5a3587122f362689ef6571e55ba80076fd637c11132ecffada26" +
-    "fad4ea79c485bfddbfd3d5a2a5b05805a77e893de71ec8a6cca3bb1";
+const PNPM_MINOR = 22;
+const PNPM_SHA512 = "1ff870c4c6133dfd88fb2afc46dd13d47f09c9794b438c6fdb47ca98caf3bc16381ee0be9" +
+    "3a091b8e3824cf01f889f46d7d9e20910fb0be1ab0fb5baa80dd621";
 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.21.0\";\nconst PNPM_MAJOR = 11;\nconst PNPM_MINOR = 21;\n\nconst PNPM_SHA512 = \"521705bce689924eac72f5a3587122f362689ef6571e55ba80076fd637c11132ecffada26\" +\n    \"fad4ea79c485bfddbfd3d5a2a5b05805a77e893de71ec8a6cca3bb1\";\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.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"]}

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;AAejE,OAAO,EAAe,KAAK,aAAa,EAA2C,MAAM,uBAAuB,CAAC;AA6MjH,QAAA,MAAM,mBAAmB,GAAI,SAAS,aAAa,KAAG,aA0CrD,CAAC;AAEF,OAAO,EAAE,mBAAmB,EAAE,CAAC"}
+{"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;AAejE,OAAO,EAAe,KAAK,aAAa,EAA2C,MAAM,uBAAuB,CAAC;AA4MjH,QAAA,MAAM,mBAAmB,GAAI,SAAS,aAAa,KAAG,aA0CrD,CAAC;AAEF,OAAO,EAAE,mBAAmB,EAAE,CAAC"}

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

@@ -67,18 +67,21 @@ const metadataInstallCommands = (settings) => [
 ];
 const schemaInstallCommands = (settings) => settings.paths.schemaFiles.map((file) => {
     const name = posix.basename(file);
-    return installCommand(projectRelative(settings, file), `${DESTINATION}/share/glib-2.0/schemas/${shellArgument(name)}`, "m644");
+    const source = projectRelative(settings, file);
+    const destination = `${DESTINATION}/share/glib-2.0/schemas/${shellArgument(name)}`;
+    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 iconInstallCommands = (settings) => {
-    const { iconsDir, iconFile } = settings.paths;
-    if (iconFile !== null) {
-        return [iconInstallCommand(settings, iconFile, iconPathFor(settings, iconFile))];
+    const source = settings.paths.applicationIcon;
+    if (source.kind === "file") {
+        return [iconInstallCommand(settings, source.path, iconPathFor(settings, source.path))];
     }
-    if (iconsDir === null) {
+    if (source.kind === "none") {
         return [];
     }
-    return listFilesRecursive(iconsDir).map((icon) => iconInstallCommand(settings, icon.absPath, icon.rel));
+    return listFilesRecursive(source.path).map((icon) => iconInstallCommand(settings, icon.absPath, icon.rel));
 };
 const assertInsideProject = (settings, installed) => {
     const { resolved } = installed;

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

@@ -1 +1 @@
-{"version":3,"file":"flatpak-source.js","sourceRoot":"","sources":["../../../src/deploy/targets/flatpak-source.ts"],"names":[],"mappings":"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","sourcesContent":["import { existsSync, realpathSync } from \"node:fs\";\nimport { posix, relative, resolve } from \"node:path\";\nimport type { DeployPayload, DeploySettings } from \"../types.js\";\nimport { listFilesRecursive } from \"../../internal/list-files.js\";\nimport { BUNDLE_FILENAME } from \"../../vite-plugins/esm-extension.js\";\nimport { renderDbusService } from \"../freedesktop/dbus-service.js\";\nimport { renderDesktopEntry } from \"../freedesktop/desktop-entry.js\";\nimport { renderMetainfo } from \"../freedesktop/metainfo.js\";\nimport { renderMimePackage } from \"../freedesktop/mime-package.js\";\nimport { optional } from \"../nfpm/optional.js\";\nimport { renderNotices } from \"../notices/render.js\";\nimport { executableModeFor } from \"../payload/copy-tree.js\";\nimport { iconPathFor } from \"../payload/icons.js\";\nimport { renderLauncher } from \"../payload/launcher.js\";\nimport { licenseDestination, nodeLicenseDestination, NOTICES_FILENAME, noticesDestination } from \"../payload/stage.js\";\nimport { isInside } from \"../settings/paths.js\";\nimport { pnpmPathFor, type PnpmPin, pnpmSources } from \"./flatpak-pnpm.js\";\nimport { DESTINATION, type FlatpakModule, postInstallCommands, validationCommands } from \"./flatpak-prebuilt.js\";\nimport {\n    detectPackageManager,\n    GENERATED_SOURCES,\n    installCommandFor,\n    nodeExtensionPathFor,\n    type PackageManager,\n    pnpmPinFor,\n    resolveGitSource,\n} from \"./flatpak-sources.js\";\n\ntype InstalledFile = {\n    destination: string;\n    source: string;\n    resolved: string;\n};\n\nconst LAUNCHER_FILENAME = \"launcher.sh\";\nconst MODULE_BUILD_ROOT = \"/run/build\";\nconst RUNTIME_PREFIX = \"/app\";\nconst NPM_CACHE_DIR = \"flatpak-node/npm-cache\";\nconst YARN_MIRROR_DIR = \"flatpak-node/yarn-mirror\";\nconst PLAIN_ARGUMENT = /^[\\w./-]+$/;\nconst QUOTE_ESCAPE = String.raw`'\\''`;\nconst OCTAL_RADIX = 8;\n\nconst inlineSource = (fileName: string, contents: string): FlatpakModule => ({\n    type: \"inline\",\n    \"dest-filename\": fileName,\n    contents,\n});\n\nconst projectRelative = (settings: DeploySettings, path: string): string =>\n    relative(settings.paths.root, path).replaceAll(\"\\\\\", \"/\");\n\nconst shellArgument = (value: string): string =>\n    PLAIN_ARGUMENT.test(value) ? value : `'${value.split(\"'\").join(QUOTE_ESCAPE)}'`;\n\nconst pathArgument = (value: string): string => shellArgument(value.startsWith(\"-\") ? `./${value}` : value);\n\nconst installCommand = (source: string, destination: string, mode: string): string =>\n    `install -D${mode} ${pathArgument(source)} ${destination}`;\n\nconst runtimeInstallCommands = (settings: DeploySettings, nodeExtensionPath: string): string[] => {\n    const lib = `${DESTINATION}/lib/${settings.binaryName}`;\n\n    return [\n        installCommand(`${nodeExtensionPath}/bin/node`, `${lib}/node`, \"m755\"),\n        installCommand(`dist/${BUNDLE_FILENAME}`, `${lib}/${BUNDLE_FILENAME}`, \"m644\"),\n        installCommand(\"dist/gtkx.node\", `${lib}/gtkx.node`, \"m755\"),\n        \"test ! -f dist/gtkx.gresource || \" + installCommand(\"dist/gtkx.gresource\", `${lib}/gtkx.gresource`, \"m644\"),\n        \"test ! -f dist/gschemas.compiled || \" +\n        installCommand(\"dist/gschemas.compiled\", `${lib}/gschemas.compiled`, \"m644\"),\n        `test ! -d dist/assets || cp -a dist/assets ${lib}/assets`,\n        installCommand(LAUNCHER_FILENAME, `${DESTINATION}/bin/${settings.binaryName}`, \"m755\"),\n    ];\n};\n\nconst activationSource = (settings: DeploySettings): FlatpakModule[] =>\n    settings.isDbusActivatable\n        ? [inlineSource(`${settings.applicationId}.service`, renderDbusService(settings, RUNTIME_PREFIX))]\n        : [];\n\nconst activationInstallCommands = (settings: DeploySettings): string[] =>\n    settings.isDbusActivatable\n        ? [installCommand(\n                `${settings.applicationId}.service`,\n                `${DESTINATION}/share/dbus-1/services/${settings.applicationId}.service`,\n                \"m644\",\n            )]\n        : [];\n\nconst mimeSources = (settings: DeploySettings): FlatpakModule[] => {\n    const contents = renderMimePackage(settings);\n\n    return contents === null ? [] : [inlineSource(`${settings.applicationId}.xml`, contents)];\n};\n\nconst mimeInstallCommands = (settings: DeploySettings): string[] =>\n    settings.fileAssociations.length === 0\n        ? []\n        : [installCommand(\n                `${settings.applicationId}.xml`,\n                `${DESTINATION}/share/mime/packages/${settings.applicationId}.xml`,\n                \"m644\",\n            )];\n\nconst metadataInstallCommands = (settings: DeploySettings): string[] => [\n    installCommand(\n        `${settings.applicationId}.desktop`,\n        `${DESTINATION}/share/applications/${settings.applicationId}.desktop`,\n        \"m644\",\n    ),\n    installCommand(\n        `${settings.applicationId}.metainfo.xml`,\n        `${DESTINATION}/share/metainfo/${settings.applicationId}.metainfo.xml`,\n        \"m644\",\n    ),\n    ...activationInstallCommands(settings),\n    ...mimeInstallCommands(settings),\n];\n\nconst schemaInstallCommands = (settings: DeploySettings): string[] =>\n    settings.paths.schemaFiles.map((file) => {\n        const name = posix.basename(file);\n\n        return installCommand(\n            projectRelative(settings, file),\n            `${DESTINATION}/share/glib-2.0/schemas/${shellArgument(name)}`,\n            \"m644\",\n        );\n    });\n\nconst iconInstallCommand = (settings: DeploySettings, source: string, rel: string): string =>\n    installCommand(\n        projectRelative(settings, source),\n        `${DESTINATION}/share/icons/${shellArgument(rel.replaceAll(\"\\\\\", \"/\"))}`,\n        \"m644\",\n    );\n\nconst iconInstallCommands = (settings: DeploySettings): string[] => {\n    const { iconsDir, iconFile } = settings.paths;\n\n    if (iconFile !== null) {\n        return [iconInstallCommand(settings, iconFile, iconPathFor(settings, iconFile))];\n    }\n\n    if (iconsDir === null) {\n        return [];\n    }\n\n    return listFilesRecursive(iconsDir).map((icon) => iconInstallCommand(settings, icon.absPath, icon.rel));\n};\n\nconst assertInsideProject = (settings: DeploySettings, installed: InstalledFile): void => {\n    const { resolved } = installed;\n    const target = existsSync(resolved) ? realpathSync(resolved) : resolved;\n\n    if (isInside(settings.paths.root, target)) {\n        return;\n    }\n\n    throw new Error(\n        `Cannot install \"${installed.destination}\" from \"${installed.source}\": a source-mode manifest builds from ` +\n        `your git checkout, so every file it installs has to live inside ${settings.paths.root} and be committed. ` +\n        \"Move it into the project, or drop it from the source build.\",\n    );\n};\n\nconst licenseInstallCommands = (settings: DeploySettings): string[] => {\n    const licenseFile = settings.paths.licenseFile;\n\n    if (licenseFile === null) {\n        return [];\n    }\n\n    const destination = licenseDestination(settings);\n    assertInsideProject(settings, { destination, source: licenseFile, resolved: licenseFile });\n    const target = `${DESTINATION}/${shellArgument(destination)}`;\n\n    return [installCommand(projectRelative(settings, licenseFile), target, \"m644\")];\n};\n\nconst noticesInstallCommands = (settings: DeploySettings): string[] => {\n    const extensionLicense = `${nodeExtensionPathFor(settings)}/LICENSE`;\n    const nodeTarget = `${DESTINATION}/${shellArgument(nodeLicenseDestination(settings))}`;\n\n    return [\n        installCommand(NOTICES_FILENAME, `${DESTINATION}/${shellArgument(noticesDestination(settings))}`, \"m644\"),\n        `test ! -f ${extensionLicense} || ${installCommand(extensionLicense, nodeTarget, \"m644\")}`,\n    ];\n};\n\nconst extraFileInstallCommands = (settings: DeploySettings): string[] =>\n    settings.extraFiles.map((file) => {\n        const resolved = resolve(settings.paths.root, file.source);\n        assertInsideProject(settings, { destination: file.destination, source: file.source, resolved });\n        const mode = file.mode ?? executableModeFor(resolved);\n\n        return installCommand(\n            projectRelative(settings, resolved),\n            `${DESTINATION}/${shellArgument(file.destination)}`,\n            `m${mode.toString(OCTAL_RADIX)}`,\n        );\n    });\n\nconst moduleDirFor = (settings: DeploySettings): string => `${MODULE_BUILD_ROOT}/${settings.binaryName}`;\n\nconst offlineEnvFor = (manager: PackageManager, settings: DeploySettings): Record<string, string> => {\n    if (manager === \"pnpm\") {\n        return {};\n    }\n\n    if (manager === \"yarn\") {\n        return { YARN_OFFLINE_MIRROR: `${moduleDirFor(settings)}/${YARN_MIRROR_DIR}` };\n    }\n\n    return { npm_config_cache: `${moduleDirFor(settings)}/${NPM_CACHE_DIR}`, npm_config_offline: \"true\" };\n};\n\nconst appendPathFor = (settings: DeploySettings, pin: PnpmPin | null, nodeExtensionPath: string): string =>\n    pin === null\n        ? `${nodeExtensionPath}/bin`\n        : `${pnpmPathFor(moduleDirFor(settings))}:${nodeExtensionPath}/bin`;\n\nconst flatpakSourceModule = (payload: DeployPayload): FlatpakModule => {\n    const settings = payload.settings;\n    const manager = detectPackageManager(settings);\n    const pin = pnpmPinFor(settings, manager);\n    const postInstall = postInstallCommands(payload);\n    const nodeExtensionPath = nodeExtensionPathFor(settings);\n\n    return {\n        name: settings.binaryName,\n        buildsystem: \"simple\",\n        \"build-options\": {\n            \"append-path\": appendPathFor(settings, pin, nodeExtensionPath),\n            env: { npm_config_nodedir: nodeExtensionPath, ...offlineEnvFor(manager, settings) },\n            strip: false,\n            \"no-debuginfo\": true,\n        },\n        sources: [\n            resolveGitSource(settings),\n            ...(pin === null ? [] : pnpmSources(pin, moduleDirFor(settings))),\n            GENERATED_SOURCES,\n            inlineSource(`${settings.applicationId}.desktop`, renderDesktopEntry(settings)),\n            inlineSource(`${settings.applicationId}.metainfo.xml`, renderMetainfo(settings)),\n            ...mimeSources(settings),\n            inlineSource(LAUNCHER_FILENAME, renderLauncher(settings)),\n            inlineSource(NOTICES_FILENAME, renderNotices(settings, payload.notices)),\n            ...activationSource(settings),\n        ],\n        \"build-commands\": [\n            installCommandFor(settings, manager),\n            \"npx gtkx build\",\n            ...runtimeInstallCommands(settings, nodeExtensionPath),\n            ...metadataInstallCommands(settings),\n            ...schemaInstallCommands(settings),\n            ...iconInstallCommands(settings),\n            ...licenseInstallCommands(settings),\n            ...noticesInstallCommands(settings),\n            ...extraFileInstallCommands(settings),\n            ...(settings.deploy.flatpak?.buildCommands ?? []),\n            ...validationCommands(settings),\n        ],\n        ...optional(\"post-install\", postInstall.length === 0 ? undefined : postInstall),\n    };\n};\n\nexport { flatpakSourceModule };\n"]}
+{"version":3,"file":"flatpak-source.js","sourceRoot":"","sources":["../../../src/deploy/targets/flatpak-source.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAErD,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACvH,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAgB,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAsB,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AACjH,OAAO,EACH,oBAAoB,EACpB,iBAAiB,EACjB,iBAAiB,EACjB,oBAAoB,EAEpB,UAAU,EACV,gBAAgB,GACnB,MAAM,sBAAsB,CAAC;AAQ9B,MAAM,iBAAiB,GAAG,aAAa,CAAC;AACxC,MAAM,iBAAiB,GAAG,YAAY,CAAC;AACvC,MAAM,cAAc,GAAG,MAAM,CAAC;AAC9B,MAAM,aAAa,GAAG,wBAAwB,CAAC;AAC/C,MAAM,eAAe,GAAG,0BAA0B,CAAC;AACnD,MAAM,cAAc,GAAG,YAAY,CAAC;AACpC,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAAA,MAAM,CAAC;AACtC,MAAM,WAAW,GAAG,CAAC,CAAC;AAEtB,MAAM,YAAY,GAAG,CAAC,QAAgB,EAAE,QAAgB,EAAiB,EAAE,CAAC,CAAC;IACzE,IAAI,EAAE,QAAQ;IACd,eAAe,EAAE,QAAQ;IACzB,QAAQ;CACX,CAAC,CAAC;AAEH,MAAM,eAAe,GAAG,CAAC,QAAwB,EAAE,IAAY,EAAU,EAAE,CACvE,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AAE9D,MAAM,aAAa,GAAG,CAAC,KAAa,EAAU,EAAE,CAC5C,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC;AAEpF,MAAM,YAAY,GAAG,CAAC,KAAa,EAAU,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;AAE5G,MAAM,cAAc,GAAG,CAAC,MAAc,EAAE,WAAmB,EAAE,IAAY,EAAU,EAAE,CACjF,aAAa,IAAI,IAAI,YAAY,CAAC,MAAM,CAAC,IAAI,WAAW,EAAE,CAAC;AAE/D,MAAM,sBAAsB,GAAG,CAAC,QAAwB,EAAE,iBAAyB,EAAY,EAAE;IAC7F,MAAM,GAAG,GAAG,GAAG,WAAW,QAAQ,QAAQ,CAAC,UAAU,EAAE,CAAC;IAExD,OAAO;QACH,cAAc,CAAC,GAAG,iBAAiB,WAAW,EAAE,GAAG,GAAG,OAAO,EAAE,MAAM,CAAC;QACtE,cAAc,CAAC,QAAQ,eAAe,EAAE,EAAE,GAAG,GAAG,IAAI,eAAe,EAAE,EAAE,MAAM,CAAC;QAC9E,cAAc,CAAC,gBAAgB,EAAE,GAAG,GAAG,YAAY,EAAE,MAAM,CAAC;QAC5D,mCAAmC,GAAG,cAAc,CAAC,qBAAqB,EAAE,GAAG,GAAG,iBAAiB,EAAE,MAAM,CAAC;QAC5G,sCAAsC;YACtC,cAAc,CAAC,wBAAwB,EAAE,GAAG,GAAG,oBAAoB,EAAE,MAAM,CAAC;QAC5E,8CAA8C,GAAG,SAAS;QAC1D,cAAc,CAAC,iBAAiB,EAAE,GAAG,WAAW,QAAQ,QAAQ,CAAC,UAAU,EAAE,EAAE,MAAM,CAAC;KACzF,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,QAAwB,EAAmB,EAAE,CACnE,QAAQ,CAAC,iBAAiB;IACtB,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,QAAQ,CAAC,aAAa,UAAU,EAAE,iBAAiB,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC;IAClG,CAAC,CAAC,EAAE,CAAC;AAEb,MAAM,yBAAyB,GAAG,CAAC,QAAwB,EAAY,EAAE,CACrE,QAAQ,CAAC,iBAAiB;IACtB,CAAC,CAAC,CAAC,cAAc,CACT,GAAG,QAAQ,CAAC,aAAa,UAAU,EACnC,GAAG,WAAW,0BAA0B,QAAQ,CAAC,aAAa,UAAU,EACxE,MAAM,CACT,CAAC;IACN,CAAC,CAAC,EAAE,CAAC;AAEb,MAAM,WAAW,GAAG,CAAC,QAAwB,EAAmB,EAAE;IAC9D,MAAM,QAAQ,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAE7C,OAAO,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,QAAQ,CAAC,aAAa,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;AAC9F,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,QAAwB,EAAY,EAAE,CAC/D,QAAQ,CAAC,gBAAgB,CAAC,MAAM,KAAK,CAAC;IAClC,CAAC,CAAC,EAAE;IACJ,CAAC,CAAC,CAAC,cAAc,CACT,GAAG,QAAQ,CAAC,aAAa,MAAM,EAC/B,GAAG,WAAW,wBAAwB,QAAQ,CAAC,aAAa,MAAM,EAClE,MAAM,CACT,CAAC,CAAC;AAEf,MAAM,uBAAuB,GAAG,CAAC,QAAwB,EAAY,EAAE,CAAC;IACpE,cAAc,CACV,GAAG,QAAQ,CAAC,aAAa,UAAU,EACnC,GAAG,WAAW,uBAAuB,QAAQ,CAAC,aAAa,UAAU,EACrE,MAAM,CACT;IACD,cAAc,CACV,GAAG,QAAQ,CAAC,aAAa,eAAe,EACxC,GAAG,WAAW,mBAAmB,QAAQ,CAAC,aAAa,eAAe,EACtE,MAAM,CACT;IACD,GAAG,yBAAyB,CAAC,QAAQ,CAAC;IACtC,GAAG,mBAAmB,CAAC,QAAQ,CAAC;CACnC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAAC,QAAwB,EAAY,EAAE,CACjE,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;IACpC,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAClC,MAAM,MAAM,GAAG,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC/C,MAAM,WAAW,GAAG,GAAG,WAAW,2BAA2B,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;IACnF,mBAAmB,CAAC,QAAQ,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IAEvE,OAAO,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;AACvD,CAAC,CAAC,CAAC;AAEP,MAAM,kBAAkB,GAAG,CAAC,QAAwB,EAAE,MAAc,EAAE,GAAW,EAAU,EAAE,CACzF,cAAc,CACV,eAAe,CAAC,QAAQ,EAAE,MAAM,CAAC,EACjC,GAAG,WAAW,gBAAgB,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,EAAE,EACxE,MAAM,CACT,CAAC;AAEN,MAAM,mBAAmB,GAAG,CAAC,QAAwB,EAAY,EAAE;IAC/D,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC;IAE9C,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QACzB,OAAO,CAAC,kBAAkB,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC3F,CAAC;IAED,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QACzB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,OAAO,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,kBAAkB,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAC/G,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,QAAwB,EAAE,SAAwB,EAAQ,EAAE;IACrF,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;IAC/B,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;IAExE,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC;QACxC,OAAO;IACX,CAAC;IAED,MAAM,IAAI,KAAK,CACX,mBAAmB,SAAS,CAAC,WAAW,WAAW,SAAS,CAAC,MAAM,wCAAwC;QAC3G,mEAAmE,QAAQ,CAAC,KAAK,CAAC,IAAI,qBAAqB;QAC3G,6DAA6D,CAChE,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAAC,QAAwB,EAAY,EAAE;IAClE,MAAM,WAAW,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC;IAE/C,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;QACvB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,MAAM,WAAW,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IACjD,mBAAmB,CAAC,QAAQ,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC;IAC3F,MAAM,MAAM,GAAG,GAAG,WAAW,IAAI,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC;IAE9D,OAAO,CAAC,cAAc,CAAC,eAAe,CAAC,QAAQ,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AACpF,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAAC,QAAwB,EAAY,EAAE;IAClE,MAAM,gBAAgB,GAAG,GAAG,oBAAoB,CAAC,QAAQ,CAAC,UAAU,CAAC;IACrE,MAAM,UAAU,GAAG,GAAG,WAAW,IAAI,aAAa,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;IAEvF,OAAO;QACH,cAAc,CAAC,gBAAgB,EAAE,GAAG,WAAW,IAAI,aAAa,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,MAAM,CAAC;QACzG,aAAa,gBAAgB,OAAO,cAAc,CAAC,gBAAgB,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE;KAC7F,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAAG,CAAC,QAAwB,EAAY,EAAE,CACpE,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;IAC7B,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC3D,mBAAmB,CAAC,QAAQ,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IAChG,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAEtD,OAAO,cAAc,CACjB,eAAe,CAAC,QAAQ,EAAE,QAAQ,CAAC,EACnC,GAAG,WAAW,IAAI,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,EACnD,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CACnC,CAAC;AACN,CAAC,CAAC,CAAC;AAEP,MAAM,YAAY,GAAG,CAAC,QAAwB,EAAU,EAAE,CAAC,GAAG,iBAAiB,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC;AAEzG,MAAM,aAAa,GAAG,CAAC,OAAuB,EAAE,QAAwB,EAA0B,EAAE;IAChG,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;QACrB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;QACrB,OAAO,EAAE,mBAAmB,EAAE,GAAG,YAAY,CAAC,QAAQ,CAAC,IAAI,eAAe,EAAE,EAAE,CAAC;IACnF,CAAC;IAED,OAAO,EAAE,gBAAgB,EAAE,GAAG,YAAY,CAAC,QAAQ,CAAC,IAAI,aAAa,EAAE,EAAE,kBAAkB,EAAE,MAAM,EAAE,CAAC;AAC1G,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,QAAwB,EAAE,GAAmB,EAAE,iBAAyB,EAAU,EAAE,CACvG,GAAG,KAAK,IAAI;IACR,CAAC,CAAC,GAAG,iBAAiB,MAAM;IAC5B,CAAC,CAAC,GAAG,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,IAAI,iBAAiB,MAAM,CAAC;AAE5E,MAAM,mBAAmB,GAAG,CAAC,OAAsB,EAAiB,EAAE;IAClE,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IAClC,MAAM,OAAO,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC;IAC/C,MAAM,GAAG,GAAG,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC1C,MAAM,WAAW,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;IACjD,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC;IAEzD,OAAO;QACH,IAAI,EAAE,QAAQ,CAAC,UAAU;QACzB,WAAW,EAAE,QAAQ;QACrB,eAAe,EAAE;YACb,aAAa,EAAE,aAAa,CAAC,QAAQ,EAAE,GAAG,EAAE,iBAAiB,CAAC;YAC9D,GAAG,EAAE,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,GAAG,aAAa,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE;YACnF,KAAK,EAAE,KAAK;YACZ,cAAc,EAAE,IAAI;SACvB;QACD,OAAO,EAAE;YACL,gBAAgB,CAAC,QAAQ,CAAC;YAC1B,GAAG,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;YACjE,iBAAiB;YACjB,YAAY,CAAC,GAAG,QAAQ,CAAC,aAAa,UAAU,EAAE,kBAAkB,CAAC,QAAQ,CAAC,CAAC;YAC/E,YAAY,CAAC,GAAG,QAAQ,CAAC,aAAa,eAAe,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;YAChF,GAAG,WAAW,CAAC,QAAQ,CAAC;YACxB,YAAY,CAAC,iBAAiB,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;YACzD,YAAY,CAAC,gBAAgB,EAAE,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;YACxE,GAAG,gBAAgB,CAAC,QAAQ,CAAC;SAChC;QACD,gBAAgB,EAAE;YACd,iBAAiB,CAAC,QAAQ,EAAE,OAAO,CAAC;YACpC,gBAAgB;YAChB,GAAG,sBAAsB,CAAC,QAAQ,EAAE,iBAAiB,CAAC;YACtD,GAAG,uBAAuB,CAAC,QAAQ,CAAC;YACpC,GAAG,qBAAqB,CAAC,QAAQ,CAAC;YAClC,GAAG,mBAAmB,CAAC,QAAQ,CAAC;YAChC,GAAG,sBAAsB,CAAC,QAAQ,CAAC;YACnC,GAAG,sBAAsB,CAAC,QAAQ,CAAC;YACnC,GAAG,wBAAwB,CAAC,QAAQ,CAAC;YACrC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,aAAa,IAAI,EAAE,CAAC;YACjD,GAAG,kBAAkB,CAAC,QAAQ,CAAC;SAClC;QACD,GAAG,QAAQ,CAAC,cAAc,EAAE,WAAW,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC;KAClF,CAAC;AACN,CAAC,CAAC;AAEF,OAAO,EAAE,mBAAmB,EAAE,CAAC","sourcesContent":["import { existsSync, realpathSync } from \"node:fs\";\nimport { posix, relative, resolve } from \"node:path\";\nimport type { DeployPayload, DeploySettings } from \"../types.js\";\nimport { listFilesRecursive } from \"../../internal/list-files.js\";\nimport { BUNDLE_FILENAME } from \"../../vite-plugins/esm-extension.js\";\nimport { renderDbusService } from \"../freedesktop/dbus-service.js\";\nimport { renderDesktopEntry } from \"../freedesktop/desktop-entry.js\";\nimport { renderMetainfo } from \"../freedesktop/metainfo.js\";\nimport { renderMimePackage } from \"../freedesktop/mime-package.js\";\nimport { optional } from \"../nfpm/optional.js\";\nimport { renderNotices } from \"../notices/render.js\";\nimport { executableModeFor } from \"../payload/copy-tree.js\";\nimport { iconPathFor } from \"../payload/icons.js\";\nimport { renderLauncher } from \"../payload/launcher.js\";\nimport { licenseDestination, nodeLicenseDestination, NOTICES_FILENAME, noticesDestination } from \"../payload/stage.js\";\nimport { isInside } from \"../settings/paths.js\";\nimport { pnpmPathFor, type PnpmPin, pnpmSources } from \"./flatpak-pnpm.js\";\nimport { DESTINATION, type FlatpakModule, postInstallCommands, validationCommands } from \"./flatpak-prebuilt.js\";\nimport {\n    detectPackageManager,\n    GENERATED_SOURCES,\n    installCommandFor,\n    nodeExtensionPathFor,\n    type PackageManager,\n    pnpmPinFor,\n    resolveGitSource,\n} from \"./flatpak-sources.js\";\n\ntype InstalledFile = {\n    destination: string;\n    source: string;\n    resolved: string;\n};\n\nconst LAUNCHER_FILENAME = \"launcher.sh\";\nconst MODULE_BUILD_ROOT = \"/run/build\";\nconst RUNTIME_PREFIX = \"/app\";\nconst NPM_CACHE_DIR = \"flatpak-node/npm-cache\";\nconst YARN_MIRROR_DIR = \"flatpak-node/yarn-mirror\";\nconst PLAIN_ARGUMENT = /^[\\w./-]+$/;\nconst QUOTE_ESCAPE = String.raw`'\\''`;\nconst OCTAL_RADIX = 8;\n\nconst inlineSource = (fileName: string, contents: string): FlatpakModule => ({\n    type: \"inline\",\n    \"dest-filename\": fileName,\n    contents,\n});\n\nconst projectRelative = (settings: DeploySettings, path: string): string =>\n    relative(settings.paths.root, path).replaceAll(\"\\\\\", \"/\");\n\nconst shellArgument = (value: string): string =>\n    PLAIN_ARGUMENT.test(value) ? value : `'${value.split(\"'\").join(QUOTE_ESCAPE)}'`;\n\nconst pathArgument = (value: string): string => shellArgument(value.startsWith(\"-\") ? `./${value}` : value);\n\nconst installCommand = (source: string, destination: string, mode: string): string =>\n    `install -D${mode} ${pathArgument(source)} ${destination}`;\n\nconst runtimeInstallCommands = (settings: DeploySettings, nodeExtensionPath: string): string[] => {\n    const lib = `${DESTINATION}/lib/${settings.binaryName}`;\n\n    return [\n        installCommand(`${nodeExtensionPath}/bin/node`, `${lib}/node`, \"m755\"),\n        installCommand(`dist/${BUNDLE_FILENAME}`, `${lib}/${BUNDLE_FILENAME}`, \"m644\"),\n        installCommand(\"dist/gtkx.node\", `${lib}/gtkx.node`, \"m755\"),\n        \"test ! -f dist/gtkx.gresource || \" + installCommand(\"dist/gtkx.gresource\", `${lib}/gtkx.gresource`, \"m644\"),\n        \"test ! -f dist/gschemas.compiled || \" +\n        installCommand(\"dist/gschemas.compiled\", `${lib}/gschemas.compiled`, \"m644\"),\n        `test ! -d dist/assets || cp -a dist/assets ${lib}/assets`,\n        installCommand(LAUNCHER_FILENAME, `${DESTINATION}/bin/${settings.binaryName}`, \"m755\"),\n    ];\n};\n\nconst activationSource = (settings: DeploySettings): FlatpakModule[] =>\n    settings.isDbusActivatable\n        ? [inlineSource(`${settings.applicationId}.service`, renderDbusService(settings, RUNTIME_PREFIX))]\n        : [];\n\nconst activationInstallCommands = (settings: DeploySettings): string[] =>\n    settings.isDbusActivatable\n        ? [installCommand(\n                `${settings.applicationId}.service`,\n                `${DESTINATION}/share/dbus-1/services/${settings.applicationId}.service`,\n                \"m644\",\n            )]\n        : [];\n\nconst mimeSources = (settings: DeploySettings): FlatpakModule[] => {\n    const contents = renderMimePackage(settings);\n\n    return contents === null ? [] : [inlineSource(`${settings.applicationId}.xml`, contents)];\n};\n\nconst mimeInstallCommands = (settings: DeploySettings): string[] =>\n    settings.fileAssociations.length === 0\n        ? []\n        : [installCommand(\n                `${settings.applicationId}.xml`,\n                `${DESTINATION}/share/mime/packages/${settings.applicationId}.xml`,\n                \"m644\",\n            )];\n\nconst metadataInstallCommands = (settings: DeploySettings): string[] => [\n    installCommand(\n        `${settings.applicationId}.desktop`,\n        `${DESTINATION}/share/applications/${settings.applicationId}.desktop`,\n        \"m644\",\n    ),\n    installCommand(\n        `${settings.applicationId}.metainfo.xml`,\n        `${DESTINATION}/share/metainfo/${settings.applicationId}.metainfo.xml`,\n        \"m644\",\n    ),\n    ...activationInstallCommands(settings),\n    ...mimeInstallCommands(settings),\n];\n\nconst schemaInstallCommands = (settings: DeploySettings): string[] =>\n    settings.paths.schemaFiles.map((file) => {\n        const name = posix.basename(file);\n        const source = projectRelative(settings, file);\n        const destination = `${DESTINATION}/share/glib-2.0/schemas/${shellArgument(name)}`;\n        assertInsideProject(settings, { destination, source, resolved: file });\n\n        return installCommand(source, destination, \"m644\");\n    });\n\nconst iconInstallCommand = (settings: DeploySettings, source: string, rel: string): string =>\n    installCommand(\n        projectRelative(settings, source),\n        `${DESTINATION}/share/icons/${shellArgument(rel.replaceAll(\"\\\\\", \"/\"))}`,\n        \"m644\",\n    );\n\nconst iconInstallCommands = (settings: DeploySettings): string[] => {\n    const source = settings.paths.applicationIcon;\n\n    if (source.kind === \"file\") {\n        return [iconInstallCommand(settings, source.path, iconPathFor(settings, source.path))];\n    }\n\n    if (source.kind === \"none\") {\n        return [];\n    }\n\n    return listFilesRecursive(source.path).map((icon) => iconInstallCommand(settings, icon.absPath, icon.rel));\n};\n\nconst assertInsideProject = (settings: DeploySettings, installed: InstalledFile): void => {\n    const { resolved } = installed;\n    const target = existsSync(resolved) ? realpathSync(resolved) : resolved;\n\n    if (isInside(settings.paths.root, target)) {\n        return;\n    }\n\n    throw new Error(\n        `Cannot install \"${installed.destination}\" from \"${installed.source}\": a source-mode manifest builds from ` +\n        `your git checkout, so every file it installs has to live inside ${settings.paths.root} and be committed. ` +\n        \"Move it into the project, or drop it from the source build.\",\n    );\n};\n\nconst licenseInstallCommands = (settings: DeploySettings): string[] => {\n    const licenseFile = settings.paths.licenseFile;\n\n    if (licenseFile === null) {\n        return [];\n    }\n\n    const destination = licenseDestination(settings);\n    assertInsideProject(settings, { destination, source: licenseFile, resolved: licenseFile });\n    const target = `${DESTINATION}/${shellArgument(destination)}`;\n\n    return [installCommand(projectRelative(settings, licenseFile), target, \"m644\")];\n};\n\nconst noticesInstallCommands = (settings: DeploySettings): string[] => {\n    const extensionLicense = `${nodeExtensionPathFor(settings)}/LICENSE`;\n    const nodeTarget = `${DESTINATION}/${shellArgument(nodeLicenseDestination(settings))}`;\n\n    return [\n        installCommand(NOTICES_FILENAME, `${DESTINATION}/${shellArgument(noticesDestination(settings))}`, \"m644\"),\n        `test ! -f ${extensionLicense} || ${installCommand(extensionLicense, nodeTarget, \"m644\")}`,\n    ];\n};\n\nconst extraFileInstallCommands = (settings: DeploySettings): string[] =>\n    settings.extraFiles.map((file) => {\n        const resolved = resolve(settings.paths.root, file.source);\n        assertInsideProject(settings, { destination: file.destination, source: file.source, resolved });\n        const mode = file.mode ?? executableModeFor(resolved);\n\n        return installCommand(\n            projectRelative(settings, resolved),\n            `${DESTINATION}/${shellArgument(file.destination)}`,\n            `m${mode.toString(OCTAL_RADIX)}`,\n        );\n    });\n\nconst moduleDirFor = (settings: DeploySettings): string => `${MODULE_BUILD_ROOT}/${settings.binaryName}`;\n\nconst offlineEnvFor = (manager: PackageManager, settings: DeploySettings): Record<string, string> => {\n    if (manager === \"pnpm\") {\n        return {};\n    }\n\n    if (manager === \"yarn\") {\n        return { YARN_OFFLINE_MIRROR: `${moduleDirFor(settings)}/${YARN_MIRROR_DIR}` };\n    }\n\n    return { npm_config_cache: `${moduleDirFor(settings)}/${NPM_CACHE_DIR}`, npm_config_offline: \"true\" };\n};\n\nconst appendPathFor = (settings: DeploySettings, pin: PnpmPin | null, nodeExtensionPath: string): string =>\n    pin === null\n        ? `${nodeExtensionPath}/bin`\n        : `${pnpmPathFor(moduleDirFor(settings))}:${nodeExtensionPath}/bin`;\n\nconst flatpakSourceModule = (payload: DeployPayload): FlatpakModule => {\n    const settings = payload.settings;\n    const manager = detectPackageManager(settings);\n    const pin = pnpmPinFor(settings, manager);\n    const postInstall = postInstallCommands(payload);\n    const nodeExtensionPath = nodeExtensionPathFor(settings);\n\n    return {\n        name: settings.binaryName,\n        buildsystem: \"simple\",\n        \"build-options\": {\n            \"append-path\": appendPathFor(settings, pin, nodeExtensionPath),\n            env: { npm_config_nodedir: nodeExtensionPath, ...offlineEnvFor(manager, settings) },\n            strip: false,\n            \"no-debuginfo\": true,\n        },\n        sources: [\n            resolveGitSource(settings),\n            ...(pin === null ? [] : pnpmSources(pin, moduleDirFor(settings))),\n            GENERATED_SOURCES,\n            inlineSource(`${settings.applicationId}.desktop`, renderDesktopEntry(settings)),\n            inlineSource(`${settings.applicationId}.metainfo.xml`, renderMetainfo(settings)),\n            ...mimeSources(settings),\n            inlineSource(LAUNCHER_FILENAME, renderLauncher(settings)),\n            inlineSource(NOTICES_FILENAME, renderNotices(settings, payload.notices)),\n            ...activationSource(settings),\n        ],\n        \"build-commands\": [\n            installCommandFor(settings, manager),\n            \"npx gtkx build\",\n            ...runtimeInstallCommands(settings, nodeExtensionPath),\n            ...metadataInstallCommands(settings),\n            ...schemaInstallCommands(settings),\n            ...iconInstallCommands(settings),\n            ...licenseInstallCommands(settings),\n            ...noticesInstallCommands(settings),\n            ...extraFileInstallCommands(settings),\n            ...(settings.deploy.flatpak?.buildCommands ?? []),\n            ...validationCommands(settings),\n        ],\n        ...optional(\"post-install\", postInstall.length === 0 ? undefined : postInstall),\n    };\n};\n\nexport { flatpakSourceModule };\n"]}

package/dist/deploy/types.d.ts

@@ -1,4 +1,5 @@
 import type { Config } from "@gtkx/config";
+import type { ResolvedApplicationIcon } from "../internal/icon-path.js";
 type DeployConfig = NonNullable<Config["deploy"]>;
 type DeployTargetName = NonNullable<DeployConfig["targets"]>[number];
 type PackageFamily = "arch" | "debian" | "fedora" | "suse" | "unknown";
@@ -17,7 +18,7 @@ type NodeRuntime = {
     path: string;
     licenseFile: string | null;
     version: string;
-    glibcFloor: string | null;
+    glibcMinimum: string | null;
     isStripped: boolean;
 };
 type Notice = {
@@ -91,9 +92,7 @@ type DeployPaths = {
     overlay: string;
     targets: string;
     output: string;
-    dataDir: string | null;
-    iconsDir: string | null;
-    iconFile: string | null;
+    applicationIcon: ResolvedApplicationIcon;
     licenseFile: string | null;
     schemaFiles: string[];
 };
@@ -132,6 +131,7 @@ type DeploySettings = {
     arch: DeployArch;
     paths: DeployPaths;
     libraries: string[];
+    minimumLibraryVersions: Record<string, string>;
     deploy: DeployConfig;
 };
 type DeployPayload = {

package/dist/deploy/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/deploy/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C,KAAK,YAAY,GAAG,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;AAClD,KAAK,gBAAgB,GAAG,WAAW,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AACrE,KAAK,aAAa,GAAG,MAAM,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,SAAS,CAAC;AAEvE,KAAK,UAAU,GAAG;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC;CAC7B,CAAC;AAEF,KAAK,UAAU,GAAG;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,KAAK,WAAW,GAAG;IACf,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,KAAK,MAAM,GAAG;IACV,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB,CAAC;AAEF,KAAK,aAAa,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAEF,KAAK,eAAe,GAAG;IACnB,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,KAAK,aAAa,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB,CAAC;AAEF,KAAK,qBAAqB,GAAG;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B,CAAC;AAEF,KAAK,eAAe,GAAG;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB,CAAC;AAEF,KAAK,cAAc,GAAG;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB,CAAC;AAEF,KAAK,UAAU,GAAG;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,KAAK,WAAW,GAAG;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,WAAW,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAEF,KAAK,cAAc,GAAG;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,eAAe,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,WAAW,EAAE,gBAAgB,EAAE,CAAC;IAChC,QAAQ,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACjD,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,gBAAgB,EAAE,qBAAqB,EAAE,CAAC;IAC1C,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,cAAc,EAAE,mBAAmB,EAAE,CAAC;IACtC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,UAAU,EAAE,eAAe,EAAE,CAAC;IAC9B,QAAQ,EAAE,cAAc,CAAC;IACzB,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,EAAE,WAAW,CAAC;IACnB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,EAAE,YAAY,CAAC;CACxB,CAAC;AAEF,KAAK,aAAa,GAAG;IACjB,QAAQ,EAAE,cAAc,CAAC;IACzB,IAAI,EAAE,WAAW,GAAG,IAAI,CAAC;IACzB,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC,gBAAgB,EAAE,UAAU,EAAE,CAAC,CAAC;CACpD,CAAC;AAEF,KAAK,cAAc,GAAG;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,KAAK,cAAc,GAAG;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,KAAK,YAAY,GAAG;IAChB,IAAI,EAAE,gBAAgB,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,MAAM,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,cAAc,EAAE,CAAC;IACrD,IAAI,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,cAAc,EAAE,KAAK,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;CAC5F,CAAC;AAEF,YAAY,EACR,UAAU,EACV,cAAc,EACd,YAAY,EACZ,mBAAmB,EACnB,eAAe,EACf,eAAe,EACf,qBAAqB,EACrB,cAAc,EACd,WAAW,EACX,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,cAAc,EACd,YAAY,EACZ,gBAAgB,EAChB,UAAU,EACV,cAAc,EACd,WAAW,EACX,MAAM,EACN,aAAa,EACb,aAAa,EACb,UAAU,GACb,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/deploy/types.ts"],"names":[],"mappings":"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"}