app-builder-lib 26.16.1 → 26.17.0

package/out/node-module-collector/pnpmNodeModulesCollector.d.ts

@@ -1,3 +1,4 @@
+import { Lazy } from "lazy-val";
 import { NodeModulesCollector } from "./nodeModulesCollector";
 import { PM } from "./packageManager";
 import { PnpmDependency } from "./types";
@@ -9,6 +10,30 @@ export declare class PnpmNodeModulesCollector extends NodeModulesCollector<PnpmD
     private _allWorkspacePackages;
     private _pnpmMajorVersion;
     private readonly pnpmVersion;
+    /**
+     * Detect pnpm's installed layout from the on-disk structure rather than `pnpm config list`.
+     * pnpm 11 no longer echoes `node-linker` (from `.npmrc`) in `config list`, so the base-class
+     * config-parsing detection silently reports "not hoisted" for a hoisted install, which would
+     * disable the downward search needed to find version-conflicted nested deps.
+     *
+     * In the default isolated store every regular top-level package resolves — through a symlink
+     * on POSIX, a junction on Windows — into `node_modules/.pnpm/<name>@<ver>/node_modules/<name>`.
+     * In a hoisted layout the same package is a real directory directly under `node_modules`.
+     * `realpath` transparently follows both symlinks and junctions, so a layout is isolated iff
+     * *any* top-level package's real path routes through `.pnpm`. We scan rather than sample the
+     * first entry because `link:` packages resolve to their source (never under `.pnpm`) and could
+     * otherwise mask an isolated store.
+     */
+    protected isHoisted: Lazy<boolean>;
+    /**
+     * The pnpm workspace root containing `rootDir` (nearest ancestor with `pnpm-workspace.yaml`, as pnpm
+     * itself resolves it), or null outside a workspace or when `rootDir` is the workspace root.
+     */
+    private readonly workspaceRoot;
+    /** `rootDir`, then the workspace root when `rootDir` is a workspace package. */
+    private readonly layoutRoots;
+    /** Returns true if `nmDir` is an isolated (`.pnpm`) store, false if hoisted, null if it holds no packages. */
+    private scanNodeModulesLayout;
     /**
      * Memo for `locateFromDepOrRoot`, keyed by `name@version`. pnpm's content-addressed virtual
      * store guarantees that any given `name@version` resolves to a single location on disk, so
@@ -22,6 +47,9 @@ export declare class PnpmNodeModulesCollector extends NodeModulesCollector<PnpmD
      * every shared subtree of the pnpm list output, exploding work in deep workspaces.
      */
     private readonly collectedDeps;
+    /** Reverse index of `allDependencies` keyed by package name (without version). Built once on
+     *  first access inside `extractProductionDependencyGraph`, after `allDependencies` is settled. */
+    private _allDepsByName;
     /**
      * Returns the workspace packages to iterate over, gated by detected pnpm version:
      * - pnpm v11+: multi-entry workspace output → return the full parsed array
@@ -29,6 +57,7 @@ export declare class PnpmNodeModulesCollector extends NodeModulesCollector<PnpmD
      */
     private get allWorkspacePackages();
     protected getArgs(): string[];
+    private getAllDepsByName;
     /**
      * Locate a package version, preferring the dep's own reported path before falling back to rootDir.
      * This is critical for pnpm non-hoisted (virtual store) setups where each package has its own
@@ -37,6 +66,19 @@ export declare class PnpmNodeModulesCollector extends NodeModulesCollector<PnpmD
      */
     private locateFromDepOrRoot;
     protected extractProductionDependencyGraph(tree: PnpmDependency, dependencyId: string): Promise<void>;
+    /**
+     * Resolve a dependency that `pnpm list` left out of a package's tree to its `allDependencies` entry.
+     * The lookup goes through the copy node itself would load from `parentPath` (the package's real store
+     * directory), filtered by the declared range, and falls back to a name-only match only when nothing on
+     * disk resolves to a collected entry (a `link:` dep, whose entry is keyed by its `link:` version).
+     *
+     * A name-only lookup returns whichever version was collected first, which is wrong as soon as two
+     * versions of the package are installed: with the app pinning es5-ext@0.10.53 while its transitive
+     * d@1.0.2 needs es5-ext ^0.10.64, `d` was wired to 0.10.53 and the nested 0.10.64 copy (with its own
+     * esniff / event-emitter / next-tick@1.1.0 closure) vanished from the asar (#8493). pnpm 10.29.3+
+     * made this common, because its deduped output routes every repeated package through this recovery.
+     */
+    private resolveOmittedDependency;
     protected collectAllDependencies(_tree: PnpmDependency, _appPackageName: string): Promise<void>;
     private collectDepsRecursively;
     protected getTreeFromWorkspaces(tree: PnpmDependency, packageName: string): PnpmDependency;

package/out/node-module-collector/pnpmNodeModulesCollector.js

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PnpmNodeModulesCollector = void 0;
+const fs = require("fs-extra");
 const lazy_val_1 = require("lazy-val");
+const path = require("path");
 const moduleManager_1 = require("./moduleManager");
 const nodeModulesCollector_1 = require("./nodeModulesCollector");
 const packageManager_1 = require("./packageManager");
+const builder_util_1 = require("builder-util");
 class PnpmNodeModulesCollector extends nodeModulesCollector_1.NodeModulesCollector {
     constructor() {
         super(...arguments);
@@ -23,6 +26,58 @@ class PnpmNodeModulesCollector extends nodeModulesCollector_1.NodeModulesCollect
             const major = parseInt(((_a = result.stdout) !== null && _a !== void 0 ? _a : "0").split(".")[0], 10);
             return isNaN(major) ? 0 : major;
         });
+        /**
+         * Detect pnpm's installed layout from the on-disk structure rather than `pnpm config list`.
+         * pnpm 11 no longer echoes `node-linker` (from `.npmrc`) in `config list`, so the base-class
+         * config-parsing detection silently reports "not hoisted" for a hoisted install, which would
+         * disable the downward search needed to find version-conflicted nested deps.
+         *
+         * In the default isolated store every regular top-level package resolves — through a symlink
+         * on POSIX, a junction on Windows — into `node_modules/.pnpm/<name>@<ver>/node_modules/<name>`.
+         * In a hoisted layout the same package is a real directory directly under `node_modules`.
+         * `realpath` transparently follows both symlinks and junctions, so a layout is isolated iff
+         * *any* top-level package's real path routes through `.pnpm`. We scan rather than sample the
+         * first entry because `link:` packages resolve to their source (never under `.pnpm`) and could
+         * otherwise mask an isolated store.
+         */
+        this.isHoisted = new lazy_val_1.Lazy(async () => {
+            // A workspace package's own `node_modules` is often absent (or holds only its version
+            // conflicts) in a hoisted workspace, so fall back to the workspace root's `node_modules`.
+            let sawPackage = false;
+            for (const dir of await this.layoutRoots.value) {
+                const isolated = await this.scanNodeModulesLayout(path.join(dir, "node_modules"));
+                if (isolated != null) {
+                    if (isolated) {
+                        return false;
+                    }
+                    sawPackage = true;
+                }
+            }
+            // Packages exist and none route through `.pnpm` → hoisted. No packages → flat default.
+            return sawPackage;
+        });
+        /**
+         * The pnpm workspace root containing `rootDir` (nearest ancestor with `pnpm-workspace.yaml`, as pnpm
+         * itself resolves it), or null outside a workspace or when `rootDir` is the workspace root.
+         */
+        this.workspaceRoot = new lazy_val_1.Lazy(async () => {
+            let current = path.resolve(this.rootDir);
+            while (true) {
+                if (await (0, builder_util_1.exists)(path.join(current, "pnpm-workspace.yaml"))) {
+                    return current === path.resolve(this.rootDir) ? null : current;
+                }
+                const parent = path.dirname(current);
+                if (parent === current) {
+                    return null;
+                }
+                current = parent;
+            }
+        });
+        /** `rootDir`, then the workspace root when `rootDir` is a workspace package. */
+        this.layoutRoots = new lazy_val_1.Lazy(async () => {
+            const workspaceRoot = await this.workspaceRoot.value;
+            return workspaceRoot == null ? [this.rootDir] : [this.rootDir, workspaceRoot];
+        });
         /**
          * Memo for `locateFromDepOrRoot`, keyed by `name@version`. pnpm's content-addressed virtual
          * store guarantees that any given `name@version` resolves to a single location on disk, so
@@ -36,6 +91,33 @@ class PnpmNodeModulesCollector extends nodeModulesCollector_1.NodeModulesCollect
          * every shared subtree of the pnpm list output, exploding work in deep workspaces.
          */
         this.collectedDeps = new Set();
+        /** Reverse index of `allDependencies` keyed by package name (without version). Built once on
+         *  first access inside `extractProductionDependencyGraph`, after `allDependencies` is settled. */
+        this._allDepsByName = null;
+    }
+    /** Returns true if `nmDir` is an isolated (`.pnpm`) store, false if hoisted, null if it holds no packages. */
+    async scanNodeModulesLayout(nmDir) {
+        const entries = await fs.readdir(nmDir).catch(() => []);
+        let sawPackage = false;
+        for (const name of entries) {
+            if (name.startsWith(".")) {
+                continue; // .pnpm, .bin, .modules.yaml
+            }
+            const entryPath = path.join(nmDir, name);
+            // A scoped dir (@scope) is not a package itself; descend to its packages.
+            const candidates = name.startsWith("@") ? (await fs.readdir(entryPath).catch(() => [])).map(s => path.join(entryPath, s)) : [entryPath];
+            for (const candidate of candidates) {
+                const real = await fs.realpath(candidate).catch(() => null);
+                if (real == null) {
+                    continue;
+                }
+                sawPackage = true;
+                if (real.split(path.sep).includes(".pnpm")) {
+                    return true; // isolated store: a package routes through the virtual store
+                }
+            }
+        }
+        return sawPackage ? false : null;
     }
     /**
      * Returns the workspace packages to iterate over, gated by detected pnpm version:
@@ -51,6 +133,18 @@ class PnpmNodeModulesCollector extends nodeModulesCollector_1.NodeModulesCollect
     getArgs() {
         return ["list", "--prod", "--json", "--depth", "Infinity", "--silent", "--loglevel=error"];
     }
+    getAllDepsByName() {
+        if (!this._allDepsByName) {
+            this._allDepsByName = new Map();
+            for (const [id, dep] of this.allDependencies.entries()) {
+                const { name } = this.parseNameVersion(id);
+                if (!this._allDepsByName.has(name)) {
+                    this._allDepsByName.set(name, dep);
+                }
+            }
+        }
+        return this._allDepsByName;
+    }
     /**
      * Locate a package version, preferring the dep's own reported path before falling back to rootDir.
      * This is critical for pnpm non-hoisted (virtual store) setups where each package has its own
@@ -76,6 +170,27 @@ class PnpmNodeModulesCollector extends nodeModulesCollector_1.NodeModulesCollect
         // land at `<root>/node_modules/A/node_modules/B` — downward BFS is needed to find them.
         const skipDownwardSearch = !(await this.isHoisted.value);
         const promise = (async () => {
+            // Phase 1: find a version that SATISFIES requiredRange, trying the dep's own location
+            // first, then the workspace root. Crucially, neither pass accepts an out-of-range override
+            // here — so a wrong-version copy reachable via upward search from `parentPath` (e.g. a
+            // hoisted top-level dep) can't shadow the correct nested copy under root. With
+            // `nodeLinker: hoisted`, pnpm still reports virtual-store `path`s that don't exist on disk;
+            // an upward walk from one meets the root copy, which previously got accepted as an
+            // "override" before the root search (whose downward BFS finds the nested copy) ever ran.
+            //
+            // When `rootDir` is a workspace package, a hoisted install keeps the tree — including the
+            // nested `<workspaceRoot>/node_modules/A/node_modules/B` copies — under the workspace root,
+            // which the downward BFS from `rootDir` never reaches (its `node_modules` is often absent),
+            // so search the workspace root last.
+            let satisfying = parentPath ? await this.cache.locatePackageVersion({ pkgName, parentDir: parentPath, requiredRange, skipDownwardSearch, skipOverrideFallback: true }) : null;
+            for (const dir of await this.layoutRoots.value) {
+                satisfying !== null && satisfying !== void 0 ? satisfying : (satisfying = await this.cache.locatePackageVersion({ pkgName, parentDir: dir, requiredRange, skipDownwardSearch, skipOverrideFallback: true }));
+            }
+            if (satisfying) {
+                return satisfying;
+            }
+            // Phase 2: no version satisfies requiredRange (package-manager override, or no range
+            // given). Fall back to the original dep-then-root order, now allowing override versions.
             const fromDep = parentPath ? await this.cache.locatePackageVersion({ pkgName, parentDir: parentPath, requiredRange, skipDownwardSearch }) : null;
             if (fromDep) {
                 return fromDep;
@@ -113,6 +228,19 @@ class PnpmNodeModulesCollector extends nodeModulesCollector_1.NodeModulesCollect
         const all = packageJson ? { ...packageJson.dependencies, ...packageJson.optionalDependencies } : { ...tree.dependencies, ...tree.optionalDependencies };
         const optional = packageJson ? { ...packageJson.optionalDependencies } : {};
         const deps = { ...(tree.dependencies || {}), ...(tree.optionalDependencies || {}) };
+        // pnpm --prod omits sub-deps for link: packages (and synthetic entries derived from them), and pnpm
+        // 10.29.3+ prints a repeated subtree only once, so every later occurrence is a childless `deduped`
+        // stub (which is what `tree` is when the stub was the first occurrence collected). For any dep
+        // declared in the package.json (all) that pnpm left out of the tree, recover the resolved entry
+        // from allDependencies so it lands in the production graph.
+        for (const [depName, declaredRange] of Object.entries(all)) {
+            if (!deps[depName]) {
+                const dep = await this.resolveOmittedDependency(depName, declaredRange, tree.path);
+                if (dep && (0, builder_util_1.isValidKey)(depName)) {
+                    deps[depName] = dep;
+                }
+            }
+        }
         this.productionGraph[dependencyId] = { dependencies: [] };
         const depPromises = Object.entries(deps).map(async ([packageName, dependency]) => {
             // First check if it's in production dependencies
@@ -142,6 +270,24 @@ class PnpmNodeModulesCollector extends nodeModulesCollector_1.NodeModulesCollect
         }
         this.productionGraph[dependencyId] = { dependencies: collectedDependencies };
     }
+    /**
+     * Resolve a dependency that `pnpm list` left out of a package's tree to its `allDependencies` entry.
+     * The lookup goes through the copy node itself would load from `parentPath` (the package's real store
+     * directory), filtered by the declared range, and falls back to a name-only match only when nothing on
+     * disk resolves to a collected entry (a `link:` dep, whose entry is keyed by its `link:` version).
+     *
+     * A name-only lookup returns whichever version was collected first, which is wrong as soon as two
+     * versions of the package are installed: with the app pinning es5-ext@0.10.53 while its transitive
+     * d@1.0.2 needs es5-ext ^0.10.64, `d` was wired to 0.10.53 and the nested 0.10.64 copy (with its own
+     * esniff / event-emitter / next-tick@1.1.0 closure) vanished from the asar (#8493). pnpm 10.29.3+
+     * made this common, because its deduped output routes every repeated package through this recovery.
+     */
+    async resolveOmittedDependency(depName, declaredRange, parentPath) {
+        const range = typeof declaredRange === "string" ? declaredRange : undefined;
+        const located = await this.locateFromDepOrRoot(depName, parentPath, range);
+        const exact = located ? this.allDependencies.get(`${depName}@${located.packageJson.version}`) : undefined;
+        return exact !== null && exact !== void 0 ? exact : this.getAllDepsByName().get(depName);
+    }
     async collectAllDependencies(_tree, _appPackageName) {
         for (const root of this.allWorkspacePackages) {
             await this.collectDepsRecursively(root);

package/out/node-module-collector/pnpmNodeModulesCollector.js.map

@@ -1 +1 @@
-{"version":3,"file":"pnpmNodeModulesCollector.js","sourceRoot":"","sources":["../../src/node-module-collector/pnpmNodeModulesCollector.ts"],"names":[],"mappings":"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","sourcesContent":["import { Lazy } from \"lazy-val\"\nimport { LogMessageByKey, type Package } from \"./moduleManager\"\nimport { NodeModulesCollector } from \"./nodeModulesCollector\"\nimport { getPackageManagerCommand, PM } from \"./packageManager\"\nimport { PnpmDependency } from \"./types\"\n\nexport class PnpmNodeModulesCollector extends NodeModulesCollector<PnpmDependency, PnpmDependency> {\n  public readonly installOptions = {\n    manager: PM.PNPM,\n    lockfile: \"pnpm-lock.yaml\",\n  }\n\n  // Raw backing field — all entries from `pnpm list --json`\n  private _allWorkspacePackages: PnpmDependency[] = []\n  // Cached after parseDependenciesTree resolves the Lazy; 0 = safe default (treated as < v11)\n  private _pnpmMajorVersion = 0\n  // Runs `pnpm --version` once and caches the major version number\n  private readonly pnpmVersion = new Lazy<number>(async () => {\n    const result = await this.asyncExec(getPackageManagerCommand(PM.PNPM), [\"--version\"])\n    const major = parseInt((result.stdout ?? \"0\").split(\".\")[0], 10)\n    return isNaN(major) ? 0 : major\n  })\n\n  /**\n   * Memo for `locateFromDepOrRoot`, keyed by `name@version`. pnpm's content-addressed virtual\n   * store guarantees that any given `name@version` resolves to a single location on disk, so\n   * once we've resolved a package we can short-circuit every subsequent lookup. This is the\n   * dominant speedup for large workspaces where the `pnpm list --json` tree contains the same\n   * `name@version` thousands of times (one entry per dependent).\n   */\n  private readonly locateMemo: Map<string, Promise<Package | null>> = new Map()\n\n  /**\n   * Visited set for `collectDepsRecursively`, keyed by `name@version`. Without this we re-walk\n   * every shared subtree of the pnpm list output, exploding work in deep workspaces.\n   */\n  private readonly collectedDeps: Set<string> = new Set()\n\n  /**\n   * Returns the workspace packages to iterate over, gated by detected pnpm version:\n   * - pnpm v11+: multi-entry workspace output → return the full parsed array\n   * - pnpm < v11 / non-workspace / detection failure: single-tree behavior → return only [0]\n   */\n  private get allWorkspacePackages(): PnpmDependency[] {\n    if (this._pnpmMajorVersion >= 11) {\n      return this._allWorkspacePackages\n    }\n    return this._allWorkspacePackages.slice(0, 1)\n  }\n\n  protected getArgs(): string[] {\n    return [\"list\", \"--prod\", \"--json\", \"--depth\", \"Infinity\", \"--silent\", \"--loglevel=error\"]\n  }\n\n  /**\n   * Locate a package version, preferring the dep's own reported path before falling back to rootDir.\n   * This is critical for pnpm non-hoisted (virtual store) setups where each package has its own\n   * nested node_modules. Searching only from rootDir can resolve the wrong version when multiple\n   * versions of a dep exist in the workspace.\n   */\n  private async locateFromDepOrRoot(pkgName: string, parentPath: string | undefined, requiredRange?: string) {\n    // pnpm's virtual store is content-addressed: every `name@version` lookup is deterministic,\n    // so memoize on the exact version. `requiredRange` is normally an exact version coming from\n    // the pnpm list output (e.g. `value.version`), which makes this cache hit on duplicates.\n    // Only memoize when we have a concrete version — semver ranges could resolve differently\n    // depending on what's installed at `parentPath` vs root, so skip the cache for those.\n    const memoKey = requiredRange && /^\\d/.test(requiredRange) ? `${pkgName}@${requiredRange}` : null\n    if (memoKey != null) {\n      const cached = this.locateMemo.get(memoKey)\n      if (cached != null) {\n        return cached\n      }\n    }\n\n    // pnpm's default `.pnpm` virtual store is flat, so `downwardSearch` would burn thousands\n    // of `readdir`/`lstat` calls finding nothing. With `nodeLinker: hoisted`, however, the\n    // layout is a traditional nested `node_modules` tree where version-conflicted packages\n    // land at `<root>/node_modules/A/node_modules/B` — downward BFS is needed to find them.\n    const skipDownwardSearch = !(await this.isHoisted.value)\n    const promise = (async (): Promise<Package | null> => {\n      const fromDep = parentPath ? await this.cache.locatePackageVersion({ pkgName, parentDir: parentPath, requiredRange, skipDownwardSearch }) : null\n      if (fromDep) {\n        return fromDep\n      }\n      return this.cache.locatePackageVersion({ pkgName, parentDir: this.rootDir, requiredRange, skipDownwardSearch })\n    })()\n\n    if (memoKey != null) {\n      this.locateMemo.set(memoKey, promise)\n    }\n    return promise\n  }\n\n  // pnpm 10+ does not automatically preserve transitive optional platform-specific\n  // packages (e.g. sass-embedded-linux-x64) across lock file regeneration. Users\n  // must list them as direct optionalDependencies. Missing ones are emitted as\n  // PKG_OPTIONAL_PLATFORM_NOT_INSTALLED warnings in the log summary.\n  protected async extractProductionDependencyGraph(tree: PnpmDependency, dependencyId: string) {\n    if (this.productionGraph[dependencyId]) {\n      return\n    }\n    this.productionGraph[dependencyId] = { dependencies: [] }\n\n    if ((tree.dedupedDependenciesCount ?? 0) > 0) {\n      const realDep = this.allDependencies.get(dependencyId)\n      if (realDep) {\n        this.cache.logSummary[LogMessageByKey.PKG_DUPLICATE_REF].push(dependencyId)\n        tree = realDep\n      } else {\n        this.cache.logSummary[LogMessageByKey.PKG_DUPLICATE_REF_UNRESOLVED].push(dependencyId)\n        return\n      }\n    }\n\n    const packageName = tree.name || tree.from\n    const { packageJson } = (await this.locateFromDepOrRoot(packageName, tree.path, tree.version)) || {}\n\n    const all = packageJson ? { ...packageJson.dependencies, ...packageJson.optionalDependencies } : { ...tree.dependencies, ...tree.optionalDependencies }\n    const optional = packageJson ? { ...packageJson.optionalDependencies } : {}\n\n    const deps = { ...(tree.dependencies || {}), ...(tree.optionalDependencies || {}) }\n    this.productionGraph[dependencyId] = { dependencies: [] }\n    const depPromises = Object.entries(deps).map(async ([packageName, dependency]) => {\n      // First check if it's in production dependencies\n      if (!all[packageName]) {\n        return undefined\n      }\n\n      // Then check if optional dependency path exists (using actual resolved path)\n      if (optional[packageName]) {\n        const pkg = await this.locateFromDepOrRoot(packageName, tree.path, dependency.version)\n        if (!pkg) {\n          // Declared in `optionalDependencies`, so a miss is an expected condition (e.g. fsevents\n          // on Linux/Windows) — classify it as a missing optional dependency, not PKG_NOT_ON_DISK.\n          this.logMissingDependency(`${packageName}@${dependency.version}`, true)\n          return undefined\n        }\n      }\n      const { id: childDependencyId, pkgOverride } = this.normalizePackageVersion(packageName, dependency)\n      await this.extractProductionDependencyGraph(pkgOverride, childDependencyId)\n      return childDependencyId\n    })\n\n    const collectedDependencies: string[] = []\n    for (const dep of depPromises) {\n      const result = await dep\n      if (result !== undefined) {\n        collectedDependencies.push(result)\n      }\n    }\n    this.productionGraph[dependencyId] = { dependencies: collectedDependencies }\n  }\n\n  protected async collectAllDependencies(_tree: PnpmDependency, _appPackageName: string): Promise<void> {\n    for (const root of this.allWorkspacePackages) {\n      await this.collectDepsRecursively(root)\n    }\n  }\n\n  private async collectDepsRecursively(tree: PnpmDependency): Promise<void> {\n    const visit = async (key: string, value: PnpmDependency) => {\n      if ((value?.dedupedDependenciesCount ?? 0) > 0) {\n        return\n      }\n      const id = `${key}@${value.version}`\n      // The pnpm list output can include the same `name@version` thousands of times across a\n      // deep workspace; without this guard we re-resolve and re-recurse each occurrence.\n      if (this.collectedDeps.has(id)) {\n        return\n      }\n      this.collectedDeps.add(id)\n      const pkg = await this.locateFromDepOrRoot(key, value.path, value.version)\n      this.allDependencies.set(id, { ...value, path: pkg?.packageDir ?? value.path })\n      await this.collectDepsRecursively(value)\n    }\n\n    for (const [key, value] of Object.entries(tree.dependencies || {})) {\n      await visit(key, value)\n    }\n    for (const [key, value] of Object.entries(tree.optionalDependencies || {})) {\n      await visit(key, value)\n    }\n  }\n\n  protected override getTreeFromWorkspaces(tree: PnpmDependency, packageName: string): PnpmDependency {\n    // pnpm v10 workspace: app is nested as a dependency of root — handled by base class\n    const result = super.getTreeFromWorkspaces(tree, packageName)\n    if (result !== tree) {\n      return result\n    }\n    // pnpm v11 workspace: each workspace package is a separate top-level array entry;\n    // non-workspace (single-tree): find returns the one entry or undefined → falls back to tree\n    const match = this.allWorkspacePackages.find(pkg => pkg.name === packageName || pkg.from === packageName)\n    return match ?? tree\n  }\n\n  protected async parseDependenciesTree(jsonBlob: string): Promise<PnpmDependency> {\n    const dependencyTree = this.extractJsonFromPollutedOutput<PnpmDependency[]>(jsonBlob)\n    this._allWorkspacePackages = dependencyTree\n    this._pnpmMajorVersion = await this.pnpmVersion.value\n    return dependencyTree[0]\n  }\n}\n"]}
+{"version":3,"file":"pnpmNodeModulesCollector.js","sourceRoot":"","sources":["../../src/node-module-collector/pnpmNodeModulesCollector.ts"],"names":[],"mappings":"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","sourcesContent":["import * as fs from \"fs-extra\"\nimport { Lazy } from \"lazy-val\"\nimport * as path from \"path\"\nimport { LogMessageByKey, type Package } from \"./moduleManager\"\nimport { NodeModulesCollector } from \"./nodeModulesCollector\"\nimport { getPackageManagerCommand, PM } from \"./packageManager\"\nimport { PnpmDependency } from \"./types\"\nimport { exists, isValidKey } from \"builder-util\"\n\nexport class PnpmNodeModulesCollector extends NodeModulesCollector<PnpmDependency, PnpmDependency> {\n  public readonly installOptions = {\n    manager: PM.PNPM,\n    lockfile: \"pnpm-lock.yaml\",\n  }\n\n  // Raw backing field — all entries from `pnpm list --json`\n  private _allWorkspacePackages: PnpmDependency[] = []\n  // Cached after parseDependenciesTree resolves the Lazy; 0 = safe default (treated as < v11)\n  private _pnpmMajorVersion = 0\n  // Runs `pnpm --version` once and caches the major version number\n  private readonly pnpmVersion = new Lazy<number>(async () => {\n    const result = await this.asyncExec(getPackageManagerCommand(PM.PNPM), [\"--version\"])\n    const major = parseInt((result.stdout ?? \"0\").split(\".\")[0], 10)\n    return isNaN(major) ? 0 : major\n  })\n\n  /**\n   * Detect pnpm's installed layout from the on-disk structure rather than `pnpm config list`.\n   * pnpm 11 no longer echoes `node-linker` (from `.npmrc`) in `config list`, so the base-class\n   * config-parsing detection silently reports \"not hoisted\" for a hoisted install, which would\n   * disable the downward search needed to find version-conflicted nested deps.\n   *\n   * In the default isolated store every regular top-level package resolves — through a symlink\n   * on POSIX, a junction on Windows — into `node_modules/.pnpm/<name>@<ver>/node_modules/<name>`.\n   * In a hoisted layout the same package is a real directory directly under `node_modules`.\n   * `realpath` transparently follows both symlinks and junctions, so a layout is isolated iff\n   * *any* top-level package's real path routes through `.pnpm`. We scan rather than sample the\n   * first entry because `link:` packages resolve to their source (never under `.pnpm`) and could\n   * otherwise mask an isolated store.\n   */\n  protected override isHoisted = new Lazy<boolean>(async () => {\n    // A workspace package's own `node_modules` is often absent (or holds only its version\n    // conflicts) in a hoisted workspace, so fall back to the workspace root's `node_modules`.\n    let sawPackage = false\n    for (const dir of await this.layoutRoots.value) {\n      const isolated = await this.scanNodeModulesLayout(path.join(dir, \"node_modules\"))\n      if (isolated != null) {\n        if (isolated) {\n          return false\n        }\n        sawPackage = true\n      }\n    }\n    // Packages exist and none route through `.pnpm` → hoisted. No packages → flat default.\n    return sawPackage\n  })\n\n  /**\n   * The pnpm workspace root containing `rootDir` (nearest ancestor with `pnpm-workspace.yaml`, as pnpm\n   * itself resolves it), or null outside a workspace or when `rootDir` is the workspace root.\n   */\n  private readonly workspaceRoot = new Lazy<string | null>(async () => {\n    let current = path.resolve(this.rootDir)\n    while (true) {\n      if (await exists(path.join(current, \"pnpm-workspace.yaml\"))) {\n        return current === path.resolve(this.rootDir) ? null : current\n      }\n      const parent = path.dirname(current)\n      if (parent === current) {\n        return null\n      }\n      current = parent\n    }\n  })\n\n  /** `rootDir`, then the workspace root when `rootDir` is a workspace package. */\n  private readonly layoutRoots = new Lazy<string[]>(async () => {\n    const workspaceRoot = await this.workspaceRoot.value\n    return workspaceRoot == null ? [this.rootDir] : [this.rootDir, workspaceRoot]\n  })\n\n  /** Returns true if `nmDir` is an isolated (`.pnpm`) store, false if hoisted, null if it holds no packages. */\n  private async scanNodeModulesLayout(nmDir: string): Promise<boolean | null> {\n    const entries = await fs.readdir(nmDir).catch(() => [] as string[])\n    let sawPackage = false\n    for (const name of entries) {\n      if (name.startsWith(\".\")) {\n        continue // .pnpm, .bin, .modules.yaml\n      }\n      const entryPath = path.join(nmDir, name)\n      // A scoped dir (@scope) is not a package itself; descend to its packages.\n      const candidates = name.startsWith(\"@\") ? (await fs.readdir(entryPath).catch(() => [] as string[])).map(s => path.join(entryPath, s)) : [entryPath]\n      for (const candidate of candidates) {\n        const real = await fs.realpath(candidate).catch(() => null)\n        if (real == null) {\n          continue\n        }\n        sawPackage = true\n        if (real.split(path.sep).includes(\".pnpm\")) {\n          return true // isolated store: a package routes through the virtual store\n        }\n      }\n    }\n    return sawPackage ? false : null\n  }\n\n  /**\n   * Memo for `locateFromDepOrRoot`, keyed by `name@version`. pnpm's content-addressed virtual\n   * store guarantees that any given `name@version` resolves to a single location on disk, so\n   * once we've resolved a package we can short-circuit every subsequent lookup. This is the\n   * dominant speedup for large workspaces where the `pnpm list --json` tree contains the same\n   * `name@version` thousands of times (one entry per dependent).\n   */\n  private readonly locateMemo: Map<string, Promise<Package | null>> = new Map()\n\n  /**\n   * Visited set for `collectDepsRecursively`, keyed by `name@version`. Without this we re-walk\n   * every shared subtree of the pnpm list output, exploding work in deep workspaces.\n   */\n  private readonly collectedDeps: Set<string> = new Set()\n\n  /** Reverse index of `allDependencies` keyed by package name (without version). Built once on\n   *  first access inside `extractProductionDependencyGraph`, after `allDependencies` is settled. */\n  private _allDepsByName: Map<string, PnpmDependency> | null = null\n\n  /**\n   * Returns the workspace packages to iterate over, gated by detected pnpm version:\n   * - pnpm v11+: multi-entry workspace output → return the full parsed array\n   * - pnpm < v11 / non-workspace / detection failure: single-tree behavior → return only [0]\n   */\n  private get allWorkspacePackages(): PnpmDependency[] {\n    if (this._pnpmMajorVersion >= 11) {\n      return this._allWorkspacePackages\n    }\n    return this._allWorkspacePackages.slice(0, 1)\n  }\n\n  protected getArgs(): string[] {\n    return [\"list\", \"--prod\", \"--json\", \"--depth\", \"Infinity\", \"--silent\", \"--loglevel=error\"]\n  }\n\n  private getAllDepsByName(): Map<string, PnpmDependency> {\n    if (!this._allDepsByName) {\n      this._allDepsByName = new Map()\n      for (const [id, dep] of this.allDependencies.entries()) {\n        const { name } = this.parseNameVersion(id)\n        if (!this._allDepsByName.has(name)) {\n          this._allDepsByName.set(name, dep)\n        }\n      }\n    }\n    return this._allDepsByName\n  }\n\n  /**\n   * Locate a package version, preferring the dep's own reported path before falling back to rootDir.\n   * This is critical for pnpm non-hoisted (virtual store) setups where each package has its own\n   * nested node_modules. Searching only from rootDir can resolve the wrong version when multiple\n   * versions of a dep exist in the workspace.\n   */\n  private async locateFromDepOrRoot(pkgName: string, parentPath: string | undefined, requiredRange?: string) {\n    // pnpm's virtual store is content-addressed: every `name@version` lookup is deterministic,\n    // so memoize on the exact version. `requiredRange` is normally an exact version coming from\n    // the pnpm list output (e.g. `value.version`), which makes this cache hit on duplicates.\n    // Only memoize when we have a concrete version — semver ranges could resolve differently\n    // depending on what's installed at `parentPath` vs root, so skip the cache for those.\n    const memoKey = requiredRange && /^\\d/.test(requiredRange) ? `${pkgName}@${requiredRange}` : null\n    if (memoKey != null) {\n      const cached = this.locateMemo.get(memoKey)\n      if (cached != null) {\n        return cached\n      }\n    }\n\n    // pnpm's default `.pnpm` virtual store is flat, so `downwardSearch` would burn thousands\n    // of `readdir`/`lstat` calls finding nothing. With `nodeLinker: hoisted`, however, the\n    // layout is a traditional nested `node_modules` tree where version-conflicted packages\n    // land at `<root>/node_modules/A/node_modules/B` — downward BFS is needed to find them.\n    const skipDownwardSearch = !(await this.isHoisted.value)\n    const promise = (async (): Promise<Package | null> => {\n      // Phase 1: find a version that SATISFIES requiredRange, trying the dep's own location\n      // first, then the workspace root. Crucially, neither pass accepts an out-of-range override\n      // here — so a wrong-version copy reachable via upward search from `parentPath` (e.g. a\n      // hoisted top-level dep) can't shadow the correct nested copy under root. With\n      // `nodeLinker: hoisted`, pnpm still reports virtual-store `path`s that don't exist on disk;\n      // an upward walk from one meets the root copy, which previously got accepted as an\n      // \"override\" before the root search (whose downward BFS finds the nested copy) ever ran.\n      //\n      // When `rootDir` is a workspace package, a hoisted install keeps the tree — including the\n      // nested `<workspaceRoot>/node_modules/A/node_modules/B` copies — under the workspace root,\n      // which the downward BFS from `rootDir` never reaches (its `node_modules` is often absent),\n      // so search the workspace root last.\n      let satisfying = parentPath ? await this.cache.locatePackageVersion({ pkgName, parentDir: parentPath, requiredRange, skipDownwardSearch, skipOverrideFallback: true }) : null\n      for (const dir of await this.layoutRoots.value) {\n        satisfying ??= await this.cache.locatePackageVersion({ pkgName, parentDir: dir, requiredRange, skipDownwardSearch, skipOverrideFallback: true })\n      }\n      if (satisfying) {\n        return satisfying\n      }\n      // Phase 2: no version satisfies requiredRange (package-manager override, or no range\n      // given). Fall back to the original dep-then-root order, now allowing override versions.\n      const fromDep = parentPath ? await this.cache.locatePackageVersion({ pkgName, parentDir: parentPath, requiredRange, skipDownwardSearch }) : null\n      if (fromDep) {\n        return fromDep\n      }\n      return this.cache.locatePackageVersion({ pkgName, parentDir: this.rootDir, requiredRange, skipDownwardSearch })\n    })()\n\n    if (memoKey != null) {\n      this.locateMemo.set(memoKey, promise)\n    }\n    return promise\n  }\n\n  // pnpm 10+ does not automatically preserve transitive optional platform-specific\n  // packages (e.g. sass-embedded-linux-x64) across lock file regeneration. Users\n  // must list them as direct optionalDependencies. Missing ones are emitted as\n  // PKG_OPTIONAL_PLATFORM_NOT_INSTALLED warnings in the log summary.\n  protected async extractProductionDependencyGraph(tree: PnpmDependency, dependencyId: string) {\n    if (this.productionGraph[dependencyId]) {\n      return\n    }\n    this.productionGraph[dependencyId] = { dependencies: [] }\n\n    if ((tree.dedupedDependenciesCount ?? 0) > 0) {\n      const realDep = this.allDependencies.get(dependencyId)\n      if (realDep) {\n        this.cache.logSummary[LogMessageByKey.PKG_DUPLICATE_REF].push(dependencyId)\n        tree = realDep\n      } else {\n        this.cache.logSummary[LogMessageByKey.PKG_DUPLICATE_REF_UNRESOLVED].push(dependencyId)\n        return\n      }\n    }\n\n    const packageName = tree.name || tree.from\n    const { packageJson } = (await this.locateFromDepOrRoot(packageName, tree.path, tree.version)) || {}\n\n    const all = packageJson ? { ...packageJson.dependencies, ...packageJson.optionalDependencies } : { ...tree.dependencies, ...tree.optionalDependencies }\n    const optional = packageJson ? { ...packageJson.optionalDependencies } : {}\n\n    const deps: Record<string, PnpmDependency> = { ...(tree.dependencies || {}), ...(tree.optionalDependencies || {}) }\n\n    // pnpm --prod omits sub-deps for link: packages (and synthetic entries derived from them), and pnpm\n    // 10.29.3+ prints a repeated subtree only once, so every later occurrence is a childless `deduped`\n    // stub (which is what `tree` is when the stub was the first occurrence collected). For any dep\n    // declared in the package.json (all) that pnpm left out of the tree, recover the resolved entry\n    // from allDependencies so it lands in the production graph.\n    for (const [depName, declaredRange] of Object.entries(all)) {\n      if (!deps[depName]) {\n        const dep = await this.resolveOmittedDependency(depName, declaredRange, tree.path)\n        if (dep && isValidKey(depName)) {\n          deps[depName] = dep\n        }\n      }\n    }\n\n    this.productionGraph[dependencyId] = { dependencies: [] }\n    const depPromises = Object.entries(deps).map(async ([packageName, dependency]) => {\n      // First check if it's in production dependencies\n      if (!all[packageName]) {\n        return undefined\n      }\n\n      // Then check if optional dependency path exists (using actual resolved path)\n      if (optional[packageName]) {\n        const pkg = await this.locateFromDepOrRoot(packageName, tree.path, dependency.version)\n        if (!pkg) {\n          // Declared in `optionalDependencies`, so a miss is an expected condition (e.g. fsevents\n          // on Linux/Windows) — classify it as a missing optional dependency, not PKG_NOT_ON_DISK.\n          this.logMissingDependency(`${packageName}@${dependency.version}`, true)\n          return undefined\n        }\n      }\n      const { id: childDependencyId, pkgOverride } = this.normalizePackageVersion(packageName, dependency)\n      await this.extractProductionDependencyGraph(pkgOverride, childDependencyId)\n      return childDependencyId\n    })\n\n    const collectedDependencies: string[] = []\n    for (const dep of depPromises) {\n      const result = await dep\n      if (result !== undefined) {\n        collectedDependencies.push(result)\n      }\n    }\n    this.productionGraph[dependencyId] = { dependencies: collectedDependencies }\n  }\n\n  /**\n   * Resolve a dependency that `pnpm list` left out of a package's tree to its `allDependencies` entry.\n   * The lookup goes through the copy node itself would load from `parentPath` (the package's real store\n   * directory), filtered by the declared range, and falls back to a name-only match only when nothing on\n   * disk resolves to a collected entry (a `link:` dep, whose entry is keyed by its `link:` version).\n   *\n   * A name-only lookup returns whichever version was collected first, which is wrong as soon as two\n   * versions of the package are installed: with the app pinning es5-ext@0.10.53 while its transitive\n   * d@1.0.2 needs es5-ext ^0.10.64, `d` was wired to 0.10.53 and the nested 0.10.64 copy (with its own\n   * esniff / event-emitter / next-tick@1.1.0 closure) vanished from the asar (#8493). pnpm 10.29.3+\n   * made this common, because its deduped output routes every repeated package through this recovery.\n   */\n  private async resolveOmittedDependency(depName: string, declaredRange: unknown, parentPath: string | undefined): Promise<PnpmDependency | undefined> {\n    const range = typeof declaredRange === \"string\" ? declaredRange : undefined\n    const located = await this.locateFromDepOrRoot(depName, parentPath, range)\n    const exact = located ? this.allDependencies.get(`${depName}@${located.packageJson.version}`) : undefined\n    return exact ?? this.getAllDepsByName().get(depName)\n  }\n\n  protected async collectAllDependencies(_tree: PnpmDependency, _appPackageName: string): Promise<void> {\n    for (const root of this.allWorkspacePackages) {\n      await this.collectDepsRecursively(root)\n    }\n  }\n\n  private async collectDepsRecursively(tree: PnpmDependency): Promise<void> {\n    const visit = async (key: string, value: PnpmDependency) => {\n      if ((value?.dedupedDependenciesCount ?? 0) > 0) {\n        return\n      }\n      const id = `${key}@${value.version}`\n      // The pnpm list output can include the same `name@version` thousands of times across a\n      // deep workspace; without this guard we re-resolve and re-recurse each occurrence.\n      if (this.collectedDeps.has(id)) {\n        return\n      }\n      this.collectedDeps.add(id)\n      const pkg = await this.locateFromDepOrRoot(key, value.path, value.version)\n      this.allDependencies.set(id, { ...value, path: pkg?.packageDir ?? value.path })\n      await this.collectDepsRecursively(value)\n    }\n\n    for (const [key, value] of Object.entries(tree.dependencies || {})) {\n      await visit(key, value)\n    }\n    for (const [key, value] of Object.entries(tree.optionalDependencies || {})) {\n      await visit(key, value)\n    }\n  }\n\n  protected override getTreeFromWorkspaces(tree: PnpmDependency, packageName: string): PnpmDependency {\n    // pnpm v10 workspace: app is nested as a dependency of root — handled by base class\n    const result = super.getTreeFromWorkspaces(tree, packageName)\n    if (result !== tree) {\n      return result\n    }\n    // pnpm v11 workspace: each workspace package is a separate top-level array entry;\n    // non-workspace (single-tree): find returns the one entry or undefined → falls back to tree\n    const match = this.allWorkspacePackages.find(pkg => pkg.name === packageName || pkg.from === packageName)\n    return match ?? tree\n  }\n\n  protected async parseDependenciesTree(jsonBlob: string): Promise<PnpmDependency> {\n    const dependencyTree = this.extractJsonFromPollutedOutput<PnpmDependency[]>(jsonBlob)\n    this._allWorkspacePackages = dependencyTree\n    this._pnpmMajorVersion = await this.pnpmVersion.value\n    return dependencyTree[0]\n  }\n}\n"]}

package/out/targets/FlatpakTarget.js

@@ -79,6 +79,7 @@ class FlatpakTarget extends core_1.Target {
         await Promise.all(copyIcons);
     }
     getFlatpakBuilderOptions(appOutDir, stageDir, artifactName, arch) {
+        var _a, _b;
         const appIdentifier = this.appId;
         const { executableName } = this.packager;
         const flatpakArch = (0, builder_util_1.toLinuxArchString)(arch, "flatpak");
@@ -94,13 +95,17 @@ class FlatpakTarget extends core_1.Target {
             branch: this.options.branch,
             modules: this.options.modules,
         };
+        // `this.options` is `linux` deep-merged with `flatpak`, and deepAssign concatenates arrays, so the
+        // shared `linux.files` globs (string | FileSet | array of either) would leak into this [src, dest] tuple
+        // list. Read the flatpak-specific list from the raw config instead of the merged options.
+        const extraFiles = (_b = (_a = this.packager.config.flatpak) === null || _a === void 0 ? void 0 : _a.files) !== null && _b !== void 0 ? _b : [];
         const buildOptions = {
             baseFlatpakref: `app/${manifest.base}/${flatpakArch}/${manifest.baseVersion}`,
             runtimeFlatpakref: `runtime/${manifest.runtime}/${flatpakArch}/${manifest.runtimeVersion}`,
             sdkFlatpakref: `runtime/${manifest.sdk}/${flatpakArch}/${manifest.runtimeVersion}`,
             arch: flatpakArch,
             bundlePath: path.join(this.outDir, artifactName),
-            files: [[stageDir, "/"], [appOutDir, path.join("/lib", appIdentifier)], ...(this.options.files || [])],
+            files: [[stageDir, "/"], [appOutDir, path.join("/lib", appIdentifier)], ...extraFiles],
             symlinks: [[path.join("/lib", appIdentifier, executableName), path.join("/bin", executableName)], ...(this.options.symlinks || [])],
         };
         return { manifest, buildOptions };

package/out/targets/FlatpakTarget.js.map

@@ -1 +1 @@
-{"version":3,"file":"FlatpakTarget.js","sourceRoot":"","sources":["../../src/targets/FlatpakTarget.ts"],"names":[],"mappings":"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","sourcesContent":["import { bundle as bundleFlatpak, FlatpakBundlerBuildOptions, FlatpakManifest } from \"@malept/flatpak-bundler\"\nimport { Arch, copyFile, toLinuxArchString } from \"builder-util\"\nimport { chmod, outputFile } from \"fs-extra\"\nimport * as path from \"path\"\nimport { Target } from \"../core\"\nimport { LinuxPackager } from \"../linuxPackager\"\nimport { FlatpakOptions } from \"../options/linuxOptions\"\nimport { getNotLocalizedLicenseFile } from \"../util/license\"\nimport { LinuxTargetHelper } from \"./LinuxTargetHelper\"\nimport { createStageDir, StageDir } from \"./targetUtil\"\nimport { deepAssign, Nullish } from \"builder-util-runtime\"\n\nexport default class FlatpakTarget extends Target {\n  readonly options: FlatpakOptions = deepAssign({}, this.packager.platformSpecificBuildOptions, (this.packager.config as any)[this.name])\n\n  constructor(\n    name: string,\n    private readonly packager: LinuxPackager,\n    private helper: LinuxTargetHelper,\n    readonly outDir: string\n  ) {\n    super(name)\n  }\n\n  get appId(): string {\n    return filterFlatpakAppIdentifier(this.packager.appInfo.id)\n  }\n\n  async build(appOutDir: string, arch: Arch): Promise<any> {\n    const { packager, options } = this\n    const artifactName = packager.expandArtifactNamePattern(options, \"flatpak\", arch, undefined, false)\n    const artifactPath = path.join(this.outDir, artifactName)\n    await packager.info.emitArtifactBuildStarted({\n      targetPresentableName: \"flatpak\",\n      file: artifactPath,\n      arch,\n    })\n\n    const stageDir = await this.prepareStageDir(arch)\n\n    const { manifest, buildOptions } = this.getFlatpakBuilderOptions(appOutDir, stageDir.dir, artifactName, arch)\n    await bundleFlatpak(manifest, buildOptions)\n\n    await stageDir.cleanup()\n\n    await packager.info.emitArtifactBuildCompleted({\n      file: artifactPath,\n      safeArtifactName: packager.computeSafeArtifactName(artifactName, \"flatpak\", arch, false),\n      target: this,\n      arch,\n      packager,\n      isWriteUpdateInfo: false,\n    })\n  }\n\n  private async prepareStageDir(arch: Arch): Promise<StageDir> {\n    const stageDir = await createStageDir(this, this.packager, arch)\n\n    await Promise.all([this.createSandboxBinWrapper(stageDir), this.createDesktopFile(stageDir), this.copyLicenseFile(stageDir), this.copyIcons(stageDir)])\n\n    return stageDir\n  }\n\n  private async createSandboxBinWrapper(stageDir: StageDir) {\n    const useWaylandFlags = !!this.options.useWaylandFlags\n    const electronWrapperPath = stageDir.getTempFile(path.join(\"bin\", \"electron-wrapper\"))\n    await outputFile(electronWrapperPath, getElectronWrapperScript(this.packager.executableName, this.options.executableArgs, useWaylandFlags))\n    await chmod(electronWrapperPath, 0o755)\n  }\n\n  private async createDesktopFile(stageDir: StageDir) {\n    const appIdentifier = this.appId\n    const desktopFile = stageDir.getTempFile(path.join(\"share\", \"applications\", `${appIdentifier}.desktop`))\n    await this.helper.writeDesktopEntry(this.options, \"electron-wrapper %U\", desktopFile, { Icon: appIdentifier })\n  }\n\n  private async copyLicenseFile(stageDir: StageDir) {\n    const licenseSrc = await getNotLocalizedLicenseFile(this.options.license, this.packager, [\"txt\", \"html\"])\n    if (licenseSrc) {\n      const licenseDst = stageDir.getTempFile(path.join(\"share\", \"doc\", this.appId, \"copyright\"))\n      await copyFile(licenseSrc, licenseDst)\n    }\n  }\n\n  private async copyIcons(stageDir: StageDir) {\n    const icons = await this.helper.icons\n    const copyIcons = icons.map(async icon => {\n      if (icon.size > 512) {\n        // Flatpak does not allow icons larger than 512 pixels\n        return Promise.resolve()\n      }\n      const extWithDot = path.extname(icon.file)\n      const sizeName = extWithDot === \".svg\" ? \"scalable\" : `${icon.size}x${icon.size}`\n      const iconDst = stageDir.getTempFile(path.join(\"share\", \"icons\", \"hicolor\", sizeName, \"apps\", `${this.appId}${extWithDot}`))\n\n      return copyFile(icon.file, iconDst)\n    })\n\n    await Promise.all(copyIcons)\n  }\n\n  private getFlatpakBuilderOptions(appOutDir: string, stageDir: string, artifactName: string, arch: Arch): { manifest: FlatpakManifest; buildOptions: FlatpakBundlerBuildOptions } {\n    const appIdentifier = this.appId\n    const { executableName } = this.packager\n    const flatpakArch = toLinuxArchString(arch, \"flatpak\")\n\n    const manifest: FlatpakManifest = {\n      id: appIdentifier,\n      command: \"electron-wrapper\",\n      runtime: this.options.runtime || flatpakBuilderDefaults.runtime,\n      runtimeVersion: this.options.runtimeVersion || flatpakBuilderDefaults.runtimeVersion,\n      sdk: this.options.sdk || flatpakBuilderDefaults.sdk,\n      base: this.options.base || flatpakBuilderDefaults.base,\n      baseVersion: this.options.baseVersion || flatpakBuilderDefaults.baseVersion,\n      finishArgs: this.options.finishArgs || flatpakBuilderDefaults.finishArgs,\n      branch: this.options.branch,\n      modules: this.options.modules,\n    }\n\n    const buildOptions: FlatpakBundlerBuildOptions = {\n      baseFlatpakref: `app/${manifest.base}/${flatpakArch}/${manifest.baseVersion}`,\n      runtimeFlatpakref: `runtime/${manifest.runtime}/${flatpakArch}/${manifest.runtimeVersion}`,\n      sdkFlatpakref: `runtime/${manifest.sdk}/${flatpakArch}/${manifest.runtimeVersion}`,\n      arch: flatpakArch as any,\n      bundlePath: path.join(this.outDir, artifactName),\n      files: [[stageDir, \"/\"], [appOutDir, path.join(\"/lib\", appIdentifier)], ...(this.options.files || [])],\n      symlinks: [[path.join(\"/lib\", appIdentifier, executableName), path.join(\"/bin\", executableName)], ...(this.options.symlinks || [])],\n    }\n\n    return { manifest, buildOptions }\n  }\n}\n\nconst flatpakBuilderDefaults: Omit<FlatpakManifest, \"id\" | \"command\"> = {\n  runtime: \"org.freedesktop.Platform\",\n  runtimeVersion: \"20.08\",\n  sdk: \"org.freedesktop.Sdk\",\n  base: \"org.electronjs.Electron2.BaseApp\",\n  baseVersion: \"20.08\",\n  finishArgs: [\n    // Wayland/X11 Rendering\n    \"--socket=wayland\",\n    \"--socket=x11\",\n    \"--share=ipc\",\n    // Open GL\n    \"--device=dri\",\n    // Audio output\n    \"--socket=pulseaudio\",\n    // Read/write home directory access\n    \"--filesystem=home\",\n    // Allow communication with network\n    \"--share=network\",\n    // System notifications with libnotify\n    \"--talk-name=org.freedesktop.Notifications\",\n  ],\n}\n\nfunction getElectronWrapperScript(executableName: string, executableArgs: string[] | Nullish, useWaylandFlags: boolean): string {\n  const stringifiedExecutableArgs = executableArgs?.join(\" \") || \"\"\n  if (useWaylandFlags) {\n    return `#!/bin/sh\n\nexport TMPDIR=\"$XDG_RUNTIME_DIR/app/$FLATPAK_ID\"\n\nif [ \"\\${XDG_SESSION_TYPE}\" == \"wayland\" ]; then\n    zypak-wrapper \"${executableName}\" ${stringifiedExecutableArgs} --enable-features=UseOzonePlatform --ozone-platform=wayland \"$@\"\nelse\n    zypak-wrapper \"${executableName}\" ${stringifiedExecutableArgs} \"$@\"\nfi\n`\n  }\n  return `#!/bin/sh\n\nexport TMPDIR=\"$XDG_RUNTIME_DIR/app/$FLATPAK_ID\"\n\nzypak-wrapper \"${executableName}\" ${stringifiedExecutableArgs} \"$@\"\n`\n}\n\nfunction filterFlatpakAppIdentifier(identifier: string) {\n  // Remove special characters and allow only alphanumeric (A-Z,a-z,0-9), underscore (_), and period (.)\n  // Flatpak documentation: https://docs.flatpak.org/en/latest/conventions.html#application-ids\n  return identifier.replace(/-/g, \"_\").replace(/[^a-zA-Z0-9._]/g, \"\")\n}\n"]}
+{"version":3,"file":"FlatpakTarget.js","sourceRoot":"","sources":["../../src/targets/FlatpakTarget.ts"],"names":[],"mappings":";;AAAA,6DAA8G;AAC9G,+CAAgE;AAChE,uCAA4C;AAC5C,6BAA4B;AAC5B,kCAAgC;AAGhC,6CAA4D;AAE5D,6CAAuD;AACvD,+DAA0D;AAE1D,MAAqB,aAAc,SAAQ,aAAM;IAG/C,YACE,IAAY,EACK,QAAuB,EAChC,MAAyB,EACxB,MAAc;QAEvB,KAAK,CAAC,IAAI,CAAC,CAAA;QAJM,aAAQ,GAAR,QAAQ,CAAe;QAChC,WAAM,GAAN,MAAM,CAAmB;QACxB,WAAM,GAAN,MAAM,CAAQ;QANhB,YAAO,GAAmB,IAAA,iCAAU,EAAC,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,4BAA4B,EAAG,IAAI,CAAC,QAAQ,CAAC,MAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IASvI,CAAC;IAED,IAAI,KAAK;QACP,OAAO,0BAA0B,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAC7D,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,SAAiB,EAAE,IAAU;QACvC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;QAClC,MAAM,YAAY,GAAG,QAAQ,CAAC,yBAAyB,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;QACnG,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;QACzD,MAAM,QAAQ,CAAC,IAAI,CAAC,wBAAwB,CAAC;YAC3C,qBAAqB,EAAE,SAAS;YAChC,IAAI,EAAE,YAAY;YAClB,IAAI;SACL,CAAC,CAAA;QAEF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;QAEjD,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,wBAAwB,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,EAAE,YAAY,EAAE,IAAI,CAAC,CAAA;QAC7G,MAAM,IAAA,wBAAa,EAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;QAE3C,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAA;QAExB,MAAM,QAAQ,CAAC,IAAI,CAAC,0BAA0B,CAAC;YAC7C,IAAI,EAAE,YAAY;YAClB,gBAAgB,EAAE,QAAQ,CAAC,uBAAuB,CAAC,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,CAAC;YACxF,MAAM,EAAE,IAAI;YACZ,IAAI;YACJ,QAAQ;YACR,iBAAiB,EAAE,KAAK;SACzB,CAAC,CAAA;IACJ,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,IAAU;QACtC,MAAM,QAAQ,GAAG,MAAM,IAAA,2BAAc,EAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;QAEhE,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;QAEvJ,OAAO,QAAQ,CAAA;IACjB,CAAC;IAEO,KAAK,CAAC,uBAAuB,CAAC,QAAkB;QACtD,MAAM,eAAe,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAA;QACtD,MAAM,mBAAmB,GAAG,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC,CAAA;QACtF,MAAM,IAAA,qBAAU,EAAC,mBAAmB,EAAE,wBAAwB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC,CAAA;QAC3I,MAAM,IAAA,gBAAK,EAAC,mBAAmB,EAAE,KAAK,CAAC,CAAA;IACzC,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,QAAkB;QAChD,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAA;QAChC,MAAM,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,EAAE,GAAG,aAAa,UAAU,CAAC,CAAC,CAAA;QACxG,MAAM,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAA;IAChH,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,QAAkB;QAC9C,MAAM,UAAU,GAAG,MAAM,IAAA,oCAA0B,EAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAA;QACzG,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,UAAU,GAAG,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,CAAA;YAC3F,MAAM,IAAA,uBAAQ,EAAC,UAAU,EAAE,UAAU,CAAC,CAAA;QACxC,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,SAAS,CAAC,QAAkB;QACxC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAA;QACrC,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,EAAC,IAAI,EAAC,EAAE;YACvC,IAAI,IAAI,CAAC,IAAI,GAAG,GAAG,EAAE,CAAC;gBACpB,sDAAsD;gBACtD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;YAC1B,CAAC;YACD,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAC1C,MAAM,QAAQ,GAAG,UAAU,KAAK,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAA;YACjF,MAAM,OAAO,GAAG,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,GAAG,UAAU,EAAE,CAAC,CAAC,CAAA;YAE5H,OAAO,IAAA,uBAAQ,EAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QACrC,CAAC,CAAC,CAAA;QAEF,MAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IAC9B,CAAC;IAEO,wBAAwB,CAAC,SAAiB,EAAE,QAAgB,EAAE,YAAoB,EAAE,IAAU;;QACpG,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAA;QAChC,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAA;QACxC,MAAM,WAAW,GAAG,IAAA,gCAAiB,EAAC,IAAI,EAAE,SAAS,CAAC,CAAA;QAEtD,MAAM,QAAQ,GAAoB;YAChC,EAAE,EAAE,aAAa;YACjB,OAAO,EAAE,kBAAkB;YAC3B,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,sBAAsB,CAAC,OAAO;YAC/D,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,cAAc,IAAI,sBAAsB,CAAC,cAAc;YACpF,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,sBAAsB,CAAC,GAAG;YACnD,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,sBAAsB,CAAC,IAAI;YACtD,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,sBAAsB,CAAC,WAAW;YAC3E,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,sBAAsB,CAAC,UAAU;YACxE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;YAC3B,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO;SAC9B,CAAA;QAED,mGAAmG;QACnG,yGAAyG;QACzG,0FAA0F;QAC1F,MAAM,UAAU,GAAG,MAAA,MAAA,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,0CAAE,KAAK,mCAAI,EAAE,CAAA;QAE5D,MAAM,YAAY,GAA+B;YAC/C,cAAc,EAAE,OAAO,QAAQ,CAAC,IAAI,IAAI,WAAW,IAAI,QAAQ,CAAC,WAAW,EAAE;YAC7E,iBAAiB,EAAE,WAAW,QAAQ,CAAC,OAAO,IAAI,WAAW,IAAI,QAAQ,CAAC,cAAc,EAAE;YAC1F,aAAa,EAAE,WAAW,QAAQ,CAAC,GAAG,IAAI,WAAW,IAAI,QAAQ,CAAC,cAAc,EAAE;YAClF,IAAI,EAAE,WAAkB;YACxB,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC;YAChD,KAAK,EAAE,CAAC,CAAC,QAAQ,EAAE,GAAG,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,EAAE,GAAG,UAAU,CAAC;YACtF,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,aAAa,EAAE,cAAc,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;SACpI,CAAA;QAED,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAA;IACnC,CAAC;CACF;AA5HD,gCA4HC;AAED,MAAM,sBAAsB,GAA4C;IACtE,OAAO,EAAE,0BAA0B;IACnC,cAAc,EAAE,OAAO;IACvB,GAAG,EAAE,qBAAqB;IAC1B,IAAI,EAAE,kCAAkC;IACxC,WAAW,EAAE,OAAO;IACpB,UAAU,EAAE;QACV,wBAAwB;QACxB,kBAAkB;QAClB,cAAc;QACd,aAAa;QACb,UAAU;QACV,cAAc;QACd,eAAe;QACf,qBAAqB;QACrB,mCAAmC;QACnC,mBAAmB;QACnB,mCAAmC;QACnC,iBAAiB;QACjB,sCAAsC;QACtC,2CAA2C;KAC5C;CACF,CAAA;AAED,SAAS,wBAAwB,CAAC,cAAsB,EAAE,cAAkC,EAAE,eAAwB;IACpH,MAAM,yBAAyB,GAAG,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,IAAI,CAAC,GAAG,CAAC,KAAI,EAAE,CAAA;IACjE,IAAI,eAAe,EAAE,CAAC;QACpB,OAAO;;;;;qBAKU,cAAc,KAAK,yBAAyB;;qBAE5C,cAAc,KAAK,yBAAyB;;CAEhE,CAAA;IACC,CAAC;IACD,OAAO;;;;iBAIQ,cAAc,KAAK,yBAAyB;CAC5D,CAAA;AACD,CAAC;AAED,SAAS,0BAA0B,CAAC,UAAkB;IACpD,sGAAsG;IACtG,6FAA6F;IAC7F,OAAO,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAA;AACrE,CAAC","sourcesContent":["import { bundle as bundleFlatpak, FlatpakBundlerBuildOptions, FlatpakManifest } from \"@malept/flatpak-bundler\"\nimport { Arch, copyFile, toLinuxArchString } from \"builder-util\"\nimport { chmod, outputFile } from \"fs-extra\"\nimport * as path from \"path\"\nimport { Target } from \"../core\"\nimport { LinuxPackager } from \"../linuxPackager\"\nimport { FlatpakOptions } from \"../options/linuxOptions\"\nimport { getNotLocalizedLicenseFile } from \"../util/license\"\nimport { LinuxTargetHelper } from \"./LinuxTargetHelper\"\nimport { createStageDir, StageDir } from \"./targetUtil\"\nimport { deepAssign, Nullish } from \"builder-util-runtime\"\n\nexport default class FlatpakTarget extends Target {\n  readonly options: FlatpakOptions = deepAssign({}, this.packager.platformSpecificBuildOptions, (this.packager.config as any)[this.name])\n\n  constructor(\n    name: string,\n    private readonly packager: LinuxPackager,\n    private helper: LinuxTargetHelper,\n    readonly outDir: string\n  ) {\n    super(name)\n  }\n\n  get appId(): string {\n    return filterFlatpakAppIdentifier(this.packager.appInfo.id)\n  }\n\n  async build(appOutDir: string, arch: Arch): Promise<any> {\n    const { packager, options } = this\n    const artifactName = packager.expandArtifactNamePattern(options, \"flatpak\", arch, undefined, false)\n    const artifactPath = path.join(this.outDir, artifactName)\n    await packager.info.emitArtifactBuildStarted({\n      targetPresentableName: \"flatpak\",\n      file: artifactPath,\n      arch,\n    })\n\n    const stageDir = await this.prepareStageDir(arch)\n\n    const { manifest, buildOptions } = this.getFlatpakBuilderOptions(appOutDir, stageDir.dir, artifactName, arch)\n    await bundleFlatpak(manifest, buildOptions)\n\n    await stageDir.cleanup()\n\n    await packager.info.emitArtifactBuildCompleted({\n      file: artifactPath,\n      safeArtifactName: packager.computeSafeArtifactName(artifactName, \"flatpak\", arch, false),\n      target: this,\n      arch,\n      packager,\n      isWriteUpdateInfo: false,\n    })\n  }\n\n  private async prepareStageDir(arch: Arch): Promise<StageDir> {\n    const stageDir = await createStageDir(this, this.packager, arch)\n\n    await Promise.all([this.createSandboxBinWrapper(stageDir), this.createDesktopFile(stageDir), this.copyLicenseFile(stageDir), this.copyIcons(stageDir)])\n\n    return stageDir\n  }\n\n  private async createSandboxBinWrapper(stageDir: StageDir) {\n    const useWaylandFlags = !!this.options.useWaylandFlags\n    const electronWrapperPath = stageDir.getTempFile(path.join(\"bin\", \"electron-wrapper\"))\n    await outputFile(electronWrapperPath, getElectronWrapperScript(this.packager.executableName, this.options.executableArgs, useWaylandFlags))\n    await chmod(electronWrapperPath, 0o755)\n  }\n\n  private async createDesktopFile(stageDir: StageDir) {\n    const appIdentifier = this.appId\n    const desktopFile = stageDir.getTempFile(path.join(\"share\", \"applications\", `${appIdentifier}.desktop`))\n    await this.helper.writeDesktopEntry(this.options, \"electron-wrapper %U\", desktopFile, { Icon: appIdentifier })\n  }\n\n  private async copyLicenseFile(stageDir: StageDir) {\n    const licenseSrc = await getNotLocalizedLicenseFile(this.options.license, this.packager, [\"txt\", \"html\"])\n    if (licenseSrc) {\n      const licenseDst = stageDir.getTempFile(path.join(\"share\", \"doc\", this.appId, \"copyright\"))\n      await copyFile(licenseSrc, licenseDst)\n    }\n  }\n\n  private async copyIcons(stageDir: StageDir) {\n    const icons = await this.helper.icons\n    const copyIcons = icons.map(async icon => {\n      if (icon.size > 512) {\n        // Flatpak does not allow icons larger than 512 pixels\n        return Promise.resolve()\n      }\n      const extWithDot = path.extname(icon.file)\n      const sizeName = extWithDot === \".svg\" ? \"scalable\" : `${icon.size}x${icon.size}`\n      const iconDst = stageDir.getTempFile(path.join(\"share\", \"icons\", \"hicolor\", sizeName, \"apps\", `${this.appId}${extWithDot}`))\n\n      return copyFile(icon.file, iconDst)\n    })\n\n    await Promise.all(copyIcons)\n  }\n\n  private getFlatpakBuilderOptions(appOutDir: string, stageDir: string, artifactName: string, arch: Arch): { manifest: FlatpakManifest; buildOptions: FlatpakBundlerBuildOptions } {\n    const appIdentifier = this.appId\n    const { executableName } = this.packager\n    const flatpakArch = toLinuxArchString(arch, \"flatpak\")\n\n    const manifest: FlatpakManifest = {\n      id: appIdentifier,\n      command: \"electron-wrapper\",\n      runtime: this.options.runtime || flatpakBuilderDefaults.runtime,\n      runtimeVersion: this.options.runtimeVersion || flatpakBuilderDefaults.runtimeVersion,\n      sdk: this.options.sdk || flatpakBuilderDefaults.sdk,\n      base: this.options.base || flatpakBuilderDefaults.base,\n      baseVersion: this.options.baseVersion || flatpakBuilderDefaults.baseVersion,\n      finishArgs: this.options.finishArgs || flatpakBuilderDefaults.finishArgs,\n      branch: this.options.branch,\n      modules: this.options.modules,\n    }\n\n    // `this.options` is `linux` deep-merged with `flatpak`, and deepAssign concatenates arrays, so the\n    // shared `linux.files` globs (string | FileSet | array of either) would leak into this [src, dest] tuple\n    // list. Read the flatpak-specific list from the raw config instead of the merged options.\n    const extraFiles = this.packager.config.flatpak?.files ?? []\n\n    const buildOptions: FlatpakBundlerBuildOptions = {\n      baseFlatpakref: `app/${manifest.base}/${flatpakArch}/${manifest.baseVersion}`,\n      runtimeFlatpakref: `runtime/${manifest.runtime}/${flatpakArch}/${manifest.runtimeVersion}`,\n      sdkFlatpakref: `runtime/${manifest.sdk}/${flatpakArch}/${manifest.runtimeVersion}`,\n      arch: flatpakArch as any,\n      bundlePath: path.join(this.outDir, artifactName),\n      files: [[stageDir, \"/\"], [appOutDir, path.join(\"/lib\", appIdentifier)], ...extraFiles],\n      symlinks: [[path.join(\"/lib\", appIdentifier, executableName), path.join(\"/bin\", executableName)], ...(this.options.symlinks || [])],\n    }\n\n    return { manifest, buildOptions }\n  }\n}\n\nconst flatpakBuilderDefaults: Omit<FlatpakManifest, \"id\" | \"command\"> = {\n  runtime: \"org.freedesktop.Platform\",\n  runtimeVersion: \"20.08\",\n  sdk: \"org.freedesktop.Sdk\",\n  base: \"org.electronjs.Electron2.BaseApp\",\n  baseVersion: \"20.08\",\n  finishArgs: [\n    // Wayland/X11 Rendering\n    \"--socket=wayland\",\n    \"--socket=x11\",\n    \"--share=ipc\",\n    // Open GL\n    \"--device=dri\",\n    // Audio output\n    \"--socket=pulseaudio\",\n    // Read/write home directory access\n    \"--filesystem=home\",\n    // Allow communication with network\n    \"--share=network\",\n    // System notifications with libnotify\n    \"--talk-name=org.freedesktop.Notifications\",\n  ],\n}\n\nfunction getElectronWrapperScript(executableName: string, executableArgs: string[] | Nullish, useWaylandFlags: boolean): string {\n  const stringifiedExecutableArgs = executableArgs?.join(\" \") || \"\"\n  if (useWaylandFlags) {\n    return `#!/bin/sh\n\nexport TMPDIR=\"$XDG_RUNTIME_DIR/app/$FLATPAK_ID\"\n\nif [ \"\\${XDG_SESSION_TYPE}\" == \"wayland\" ]; then\n    zypak-wrapper \"${executableName}\" ${stringifiedExecutableArgs} --enable-features=UseOzonePlatform --ozone-platform=wayland \"$@\"\nelse\n    zypak-wrapper \"${executableName}\" ${stringifiedExecutableArgs} \"$@\"\nfi\n`\n  }\n  return `#!/bin/sh\n\nexport TMPDIR=\"$XDG_RUNTIME_DIR/app/$FLATPAK_ID\"\n\nzypak-wrapper \"${executableName}\" ${stringifiedExecutableArgs} \"$@\"\n`\n}\n\nfunction filterFlatpakAppIdentifier(identifier: string) {\n  // Remove special characters and allow only alphanumeric (A-Z,a-z,0-9), underscore (_), and period (.)\n  // Flatpak documentation: https://docs.flatpak.org/en/latest/conventions.html#application-ids\n  return identifier.replace(/-/g, \"_\").replace(/[^a-zA-Z0-9._]/g, \"\")\n}\n"]}

package/out/targets/archive.d.ts

@@ -23,6 +23,18 @@ export interface ArchiveOptions {
      * @default false
      */
     preserveSymlinks?: boolean;
+    /**
+     * Paths, relative to the archived directory, to append as uncompressed (`Copy`) members instead of
+     * compressing them with the rest of the archive. Differential updates diff the *compressed* archive
+     * with a content-defined blockmap, and a large compressed member (an asar) diverges wholesale from
+     * its previous version on any change — storing it keeps unchanged regions byte-identical between
+     * builds, so the delta stays proportional to what actually changed. The stored members are excluded
+     * from the main (compressed) pass and appended in a second 7za invocation with `-mx=0`; the
+     * `ELECTRON_BUILDER_COMPRESSION_LEVEL` override deliberately does not apply to them (byte-stability
+     * is the point), while `preserveSymlinks` and `isArchiveHeaderCompressed` are mirrored into the
+     * append pass. Paths that do not exist are skipped. Not supported by the native-zip NFD fallback.
+     */
+    storedPaths?: Array<string> | null;
     /**
      * Restrict the 7z filter to one the install-time extractor (the self-vendored Nsis7z plugin) can
      * decode. Modern 7za (24.09) auto-applies a CPU branch converter to executable content at

package/out/targets/archive.js

@@ -150,6 +150,7 @@ function compute7zCompressArgs(format, options = {}) {
 // 7z is very fast, so, use ultra compression
 /** @internal */
 async function archive(format, outFile, dirToArchive, options = {}) {
+    var _a;
     const outFileStat = await (0, builder_util_1.statOrNull)(outFile);
     const dirStat = await (0, builder_util_1.statOrNull)(dirToArchive);
     if (outFileStat && dirStat && outFileStat.mtime > dirStat.mtime) {
@@ -163,6 +164,21 @@ async function archive(format, outFile, dirToArchive, options = {}) {
         builder_util_1.log.warn({ reason: "7z doesn't support NFD-normalized filenames" }, `using zip`);
         use7z = false;
     }
+    // Resolve storedPaths before the main pass so they can be excluded from it. Member names are
+    // native-separator, relative to the 7za cwd (which differs with withoutDir), so the same string
+    // works as both the exact `-x!` exclude mask and the append argument.
+    const storedMembers = [];
+    for (const storedPath of (_a = options.storedPaths) !== null && _a !== void 0 ? _a : []) {
+        if (storedPath.includes("..")) {
+            throw new Error(`Stored archive path contains path traversal sequence: "${storedPath}"`);
+        }
+        if (await (0, builder_util_1.exists)(path.join(dirToArchive, storedPath))) {
+            storedMembers.push(path.normalize(options.withoutDir ? storedPath : path.join(path.basename(dirToArchive), storedPath)));
+        }
+    }
+    if (storedMembers.length > 0 && !use7z) {
+        throw new Error("storedPaths is not supported with the native zip fallback");
+    }
     if (use7z) {
         const args = compute7zCompressArgs(format, options);
         // Modern 7-Zip (24.09) dereferences symlinks by default; the 7-Zip 16.02 bundled before
@@ -175,8 +191,11 @@ async function archive(format, outFile, dirToArchive, options = {}) {
         await (0, builder_util_1.unlinkIfExists)(outFile);
         args.push(outFile, options.withoutDir ? "." : path.basename(dirToArchive));
         args.push(...buildExcludeArgs(options.excluded, "-xr!"));
+        // `-x!` (exact, non-recursive) so only the member itself is skipped, never a same-named sibling
+        args.push(...storedMembers.map(member => `-x!${member}`));
+        const cwd = options.withoutDir ? dirToArchive : path.dirname(dirToArchive);
         try {
-            await (0, builder_util_1.exec)(await (0, _7zip_1.getPath7za)(), args, { cwd: options.withoutDir ? dirToArchive : path.dirname(dirToArchive) }, builder_util_1.debug7z.enabled);
+            await (0, builder_util_1.exec)(await (0, _7zip_1.getPath7za)(), args, { cwd }, builder_util_1.debug7z.enabled);
         }
         catch (e) {
             if (e.code === "ENOENT" && !(await (0, builder_util_1.exists)(dirToArchive))) {
@@ -186,6 +205,31 @@ async function archive(format, outFile, dirToArchive, options = {}) {
                 throw e;
             }
         }
+        if (storedMembers.length > 0) {
+            // Second pass: append the stored members with no compression. -mx=0 unconditionally — the
+            // compression-level env override must not reach these members (see storedPaths docs). The
+            // main pass's symlink, timestamp, and header-compression flags are mirrored so the option
+            // stays generic: the append rewrites the archive header and may itself store a symlink.
+            const appendArgs = debug7zArgs("a");
+            appendArgs.push("-mx=0");
+            if (options.preserveSymlinks) {
+                appendArgs.push("-snl");
+            }
+            if (!options.isRegularFile) {
+                appendArgs.push("-mtc=off");
+            }
+            if (format === "7z" || format.endsWith(".7z")) {
+                if (options.isArchiveHeaderCompressed === false) {
+                    appendArgs.push("-mhc=off");
+                }
+                appendArgs.push("-mtm=off", "-mta=off");
+            }
+            else if (format === "zip") {
+                appendArgs.push("-mm=Copy", "-mcu");
+            }
+            appendArgs.push(outFile, ...storedMembers);
+            await (0, builder_util_1.exec)(await (0, _7zip_1.getPath7za)(), appendArgs, { cwd }, builder_util_1.debug7z.enabled);
+        }
     }
     else {
         // macOS native zip (NFD fallback): -y preserves symlinks