app-builder-lib 26.0.4 → 26.0.6

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

@@ -1,14 +1,17 @@
-import { NodeModuleInfo, DependencyTree, DependencyGraph } from "./types";
+import { NodeModuleInfo, DependencyTree } from "./types";
 export declare abstract class NodeModulesCollector {
     private readonly rootDir;
     private nodeModules;
     protected dependencyPathMap: Map<string, string>;
+    protected allDependencies: Map<string, DependencyTree>;
     constructor(rootDir: string);
     private transToHoisterTree;
-    private resolvePath;
-    convertToDependencyGraph(tree: DependencyTree): DependencyGraph;
+    protected resolvePath(filePath: string): string;
+    private convertToDependencyGraph;
+    getAllDependencies(tree: DependencyTree): void;
     abstract getCommand(): string;
     abstract getArgs(): string[];
+    abstract removeNonProductionDependencie(tree: DependencyTree): void;
     protected getDependenciesTree(): Promise<DependencyTree>;
     private _getNodeModules;
     private getTreeFromWorkspaces;

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

@@ -8,6 +8,7 @@ const builder_util_1 = require("builder-util");
 class NodeModulesCollector {
     constructor(rootDir) {
         this.rootDir = rootDir;
+        this.allDependencies = new Map();
         this.dependencyPathMap = new Map();
         this.nodeModules = [];
     }
@@ -67,6 +68,15 @@ class NodeModulesCollector {
         flatten(tree);
         return result;
     }
+    getAllDependencies(tree) {
+        const dependencies = tree.dependencies || {};
+        for (const [key, value] of Object.entries(dependencies)) {
+            if (value.dependencies && Object.keys(value.dependencies).length > 0) {
+                this.allDependencies.set(`${key}@${value.version}`, value);
+                this.getAllDependencies(value);
+            }
+        }
+    }
     async getDependenciesTree() {
         const command = this.getCommand();
         const args = this.getArgs();
@@ -75,7 +85,16 @@ class NodeModulesCollector {
             shell: true,
         });
         const dependencyTree = JSON.parse(dependencies);
-        return Array.isArray(dependencyTree) ? dependencyTree[0] : dependencyTree;
+        // pnpm returns an array of dependency trees
+        if (Array.isArray(dependencyTree)) {
+            const tree = dependencyTree[0];
+            if (tree.optionalDependencies) {
+                tree.dependencies = { ...tree.dependencies, ...tree.optionalDependencies };
+            }
+            return tree;
+        }
+        // yarn and npm return a single dependency tree
+        return dependencyTree;
     }
     _getNodeModules(dependencies, result) {
         if (dependencies.size === 0) {
@@ -114,6 +133,8 @@ class NodeModulesCollector {
     async getNodeModules() {
         const tree = await this.getDependenciesTree();
         const realTree = this.getTreeFromWorkspaces(tree);
+        this.getAllDependencies(realTree);
+        this.removeNonProductionDependencie(realTree);
         const dependencyGraph = this.convertToDependencyGraph(realTree);
         const hoisterResult = (0, hoist_1.hoist)(this.transToHoisterTree(dependencyGraph), { check: true });
         this._getNodeModules(hoisterResult.dependencies, this.nodeModules);

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

@@ -1 +1 @@
-{"version":3,"file":"nodeModulesCollector.js","sourceRoot":"","sources":["../../src/node-module-collector/nodeModulesCollector.ts"],"names":[],"mappings":"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","sourcesContent":["import { hoist, type HoisterTree, type HoisterResult } from \"./hoist\"\nimport * as path from \"path\"\nimport * as fs from \"fs\"\nimport { NodeModuleInfo, DependencyTree, DependencyGraph } from \"./types\"\nimport { exec, log } from \"builder-util\"\n\nexport abstract class NodeModulesCollector {\n  private nodeModules: NodeModuleInfo[]\n  protected dependencyPathMap: Map<string, string>\n\n  constructor(private readonly rootDir: string) {\n    this.dependencyPathMap = new Map()\n    this.nodeModules = []\n  }\n\n  private transToHoisterTree(obj: DependencyGraph, key: string = `.`, nodes: Map<string, HoisterTree> = new Map()): HoisterTree {\n    let node = nodes.get(key)\n    const name = key.match(/@?[^@]+/)![0]\n    if (!node) {\n      node = {\n        name,\n        identName: name,\n        reference: key.match(/@?[^@]+@?(.+)?/)![1] || ``,\n        dependencies: new Set<HoisterTree>(),\n        peerNames: new Set<string>([]),\n      }\n      nodes.set(key, node)\n\n      for (const dep of (obj[key] || {}).dependencies || []) {\n        node.dependencies.add(this.transToHoisterTree(obj, dep, nodes))\n      }\n    }\n    return node\n  }\n\n  private resolvePath(filePath: string) {\n    try {\n      const stats = fs.lstatSync(filePath)\n      if (stats.isSymbolicLink()) {\n        return fs.realpathSync(filePath)\n      } else {\n        return filePath\n      }\n    } catch (error: any) {\n      log.debug({ message: error.message || error.stack }, \"error resolving path\")\n      return filePath\n    }\n  }\n\n  public convertToDependencyGraph(tree: DependencyTree): DependencyGraph {\n    const result: DependencyGraph = { \".\": {} }\n\n    const flatten = (node: DependencyTree, parentKey = \".\") => {\n      const dependencies = node.dependencies || {}\n\n      for (const [key, value] of Object.entries(dependencies)) {\n        // Skip empty dependencies(like some optionalDependencies)\n        if (Object.keys(value).length === 0) {\n          continue\n        }\n        const version = value.version || \"\"\n        const newKey = `${key}@${version}`\n        this.dependencyPathMap.set(newKey, path.normalize(this.resolvePath(value.path)))\n        if (!result[parentKey]?.dependencies) {\n          result[parentKey] = { dependencies: [] }\n        }\n        result[parentKey].dependencies!.push(newKey)\n        flatten(value, newKey)\n      }\n    }\n\n    flatten(tree)\n    return result\n  }\n\n  abstract getCommand(): string\n  abstract getArgs(): string[]\n\n  protected async getDependenciesTree(): Promise<DependencyTree> {\n    const command = this.getCommand()\n    const args = this.getArgs()\n    const dependencies = await exec(command, args, {\n      cwd: this.rootDir,\n      shell: true,\n    })\n    const dependencyTree: DependencyTree | DependencyTree[] = JSON.parse(dependencies)\n    return Array.isArray(dependencyTree) ? dependencyTree[0] : dependencyTree\n  }\n\n  private _getNodeModules(dependencies: Set<HoisterResult>, result: NodeModuleInfo[]) {\n    if (dependencies.size === 0) {\n      return\n    }\n\n    for (const d of dependencies.values()) {\n      const reference = [...d.references][0]\n      const p = this.dependencyPathMap.get(`${d.name}@${reference}`)\n      if (p === undefined) {\n        log.debug({ name: d.name, reference }, \"cannot find path for dependency\")\n        continue\n      }\n      const node: NodeModuleInfo = {\n        name: d.name,\n        version: reference,\n        dir: p,\n      }\n      result.push(node)\n      if (d.dependencies.size > 0) {\n        node[\"dependencies\"] = []\n        this._getNodeModules(d.dependencies, node[\"dependencies\"])\n      }\n    }\n    result.sort((a, b) => a.name.localeCompare(b.name))\n  }\n\n  private getTreeFromWorkspaces(tree: DependencyTree): DependencyTree {\n    if (tree.workspaces && tree.dependencies) {\n      for (const [key, value] of Object.entries(tree.dependencies)) {\n        if (this.rootDir.endsWith(path.normalize(key))) {\n          return value\n        }\n      }\n    }\n    return tree\n  }\n\n  public async getNodeModules(): Promise<NodeModuleInfo[]> {\n    const tree = await this.getDependenciesTree()\n    const realTree = this.getTreeFromWorkspaces(tree)\n    const dependencyGraph = this.convertToDependencyGraph(realTree)\n    const hoisterResult = hoist(this.transToHoisterTree(dependencyGraph), { check: true })\n    this._getNodeModules(hoisterResult.dependencies, this.nodeModules)\n    return this.nodeModules\n  }\n}\n"]}
+{"version":3,"file":"nodeModulesCollector.js","sourceRoot":"","sources":["../../src/node-module-collector/nodeModulesCollector.ts"],"names":[],"mappings":"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","sourcesContent":["import { hoist, type HoisterTree, type HoisterResult } from \"./hoist\"\nimport * as path from \"path\"\nimport * as fs from \"fs\"\nimport { NodeModuleInfo, DependencyTree, DependencyGraph } from \"./types\"\nimport { exec, log } from \"builder-util\"\n\nexport abstract class NodeModulesCollector {\n  private nodeModules: NodeModuleInfo[]\n  protected dependencyPathMap: Map<string, string>\n  protected allDependencies: Map<string, DependencyTree> = new Map()\n\n  constructor(private readonly rootDir: string) {\n    this.dependencyPathMap = new Map()\n    this.nodeModules = []\n  }\n\n  private transToHoisterTree(obj: DependencyGraph, key: string = `.`, nodes: Map<string, HoisterTree> = new Map()): HoisterTree {\n    let node = nodes.get(key)\n    const name = key.match(/@?[^@]+/)![0]\n    if (!node) {\n      node = {\n        name,\n        identName: name,\n        reference: key.match(/@?[^@]+@?(.+)?/)![1] || ``,\n        dependencies: new Set<HoisterTree>(),\n        peerNames: new Set<string>([]),\n      }\n      nodes.set(key, node)\n\n      for (const dep of (obj[key] || {}).dependencies || []) {\n        node.dependencies.add(this.transToHoisterTree(obj, dep, nodes))\n      }\n    }\n    return node\n  }\n\n  protected resolvePath(filePath: string) {\n    try {\n      const stats = fs.lstatSync(filePath)\n      if (stats.isSymbolicLink()) {\n        return fs.realpathSync(filePath)\n      } else {\n        return filePath\n      }\n    } catch (error: any) {\n      log.debug({ message: error.message || error.stack }, \"error resolving path\")\n      return filePath\n    }\n  }\n\n  private convertToDependencyGraph(tree: DependencyTree): DependencyGraph {\n    const result: DependencyGraph = { \".\": {} }\n\n    const flatten = (node: DependencyTree, parentKey = \".\") => {\n      const dependencies = node.dependencies || {}\n\n      for (const [key, value] of Object.entries(dependencies)) {\n        // Skip empty dependencies(like some optionalDependencies)\n        if (Object.keys(value).length === 0) {\n          continue\n        }\n        const version = value.version || \"\"\n        const newKey = `${key}@${version}`\n        this.dependencyPathMap.set(newKey, path.normalize(this.resolvePath(value.path)))\n        if (!result[parentKey]?.dependencies) {\n          result[parentKey] = { dependencies: [] }\n        }\n        result[parentKey].dependencies!.push(newKey)\n        flatten(value, newKey)\n      }\n    }\n\n    flatten(tree)\n    return result\n  }\n\n  getAllDependencies(tree: DependencyTree) {\n    const dependencies = tree.dependencies || {}\n    for (const [key, value] of Object.entries(dependencies)) {\n      if (value.dependencies && Object.keys(value.dependencies).length > 0) {\n        this.allDependencies.set(`${key}@${value.version}`, value)\n        this.getAllDependencies(value)\n      }\n    }\n  }\n\n  abstract getCommand(): string\n  abstract getArgs(): string[]\n  abstract removeNonProductionDependencie(tree: DependencyTree): void\n\n  protected async getDependenciesTree(): Promise<DependencyTree> {\n    const command = this.getCommand()\n    const args = this.getArgs()\n    const dependencies = await exec(command, args, {\n      cwd: this.rootDir,\n      shell: true,\n    })\n    const dependencyTree: DependencyTree | DependencyTree[] = JSON.parse(dependencies)\n\n    // pnpm returns an array of dependency trees\n    if (Array.isArray(dependencyTree)) {\n      const tree = dependencyTree[0]\n      if (tree.optionalDependencies) {\n        tree.dependencies = { ...tree.dependencies, ...tree.optionalDependencies }\n      }\n      return tree\n    }\n\n    // yarn and npm return a single dependency tree\n    return dependencyTree\n  }\n\n  private _getNodeModules(dependencies: Set<HoisterResult>, result: NodeModuleInfo[]) {\n    if (dependencies.size === 0) {\n      return\n    }\n\n    for (const d of dependencies.values()) {\n      const reference = [...d.references][0]\n      const p = this.dependencyPathMap.get(`${d.name}@${reference}`)\n      if (p === undefined) {\n        log.debug({ name: d.name, reference }, \"cannot find path for dependency\")\n        continue\n      }\n      const node: NodeModuleInfo = {\n        name: d.name,\n        version: reference,\n        dir: p,\n      }\n      result.push(node)\n      if (d.dependencies.size > 0) {\n        node[\"dependencies\"] = []\n        this._getNodeModules(d.dependencies, node[\"dependencies\"])\n      }\n    }\n    result.sort((a, b) => a.name.localeCompare(b.name))\n  }\n\n  private getTreeFromWorkspaces(tree: DependencyTree): DependencyTree {\n    if (tree.workspaces && tree.dependencies) {\n      for (const [key, value] of Object.entries(tree.dependencies)) {\n        if (this.rootDir.endsWith(path.normalize(key))) {\n          return value\n        }\n      }\n    }\n    return tree\n  }\n\n  public async getNodeModules(): Promise<NodeModuleInfo[]> {\n    const tree = await this.getDependenciesTree()\n    const realTree = this.getTreeFromWorkspaces(tree)\n    this.getAllDependencies(realTree)\n    this.removeNonProductionDependencie(realTree)\n    const dependencyGraph = this.convertToDependencyGraph(realTree)\n    const hoisterResult = hoist(this.transToHoisterTree(dependencyGraph), { check: true })\n    this._getNodeModules(hoisterResult.dependencies, this.nodeModules)\n    return this.nodeModules\n  }\n}\n"]}

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

@@ -1,6 +1,8 @@
 import { NodeModulesCollector } from "./nodeModulesCollector";
+import { DependencyTree } from "./types";
 export declare class NpmNodeModulesCollector extends NodeModulesCollector {
     constructor(rootDir: string);
     getCommand(): string;
     getArgs(): string[];
+    removeNonProductionDependencie(tree: DependencyTree): void;
 }

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

@@ -10,7 +10,22 @@ class NpmNodeModulesCollector extends nodeModulesCollector_1.NodeModulesCollecto
         return process.platform === "win32" ? "npm.cmd" : "npm";
     }
     getArgs() {
-        return ["list", "--omit", "dev", "-a", "--json", "--long", "--silent"];
+        return ["list", "-a", "--include", "prod", "--include", "optional", "--omit", "dev", "--json", "--long", "--silent"];
+    }
+    removeNonProductionDependencie(tree) {
+        var _a;
+        const dependencies = tree.dependencies || {};
+        const _dependencies = tree._dependencies || {};
+        if (dependencies && Object.keys(dependencies).length === 0) {
+            tree.dependencies = ((_a = this.allDependencies.get(`${tree.name}@${tree.version}`)) === null || _a === void 0 ? void 0 : _a.dependencies) || {};
+        }
+        for (const [key, value] of Object.entries(dependencies)) {
+            if (!_dependencies[key] || Object.keys(value).length === 0) {
+                delete dependencies[key];
+                continue;
+            }
+            this.removeNonProductionDependencie(value);
+        }
     }
 }
 exports.NpmNodeModulesCollector = NpmNodeModulesCollector;

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

@@ -1 +1 @@
-{"version":3,"file":"npmNodeModulesCollector.js","sourceRoot":"","sources":["../../src/node-module-collector/npmNodeModulesCollector.ts"],"names":[],"mappings":";;;AAAA,iEAA6D;AAE7D,MAAa,uBAAwB,SAAQ,2CAAoB;IAC/D,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAA;IAChB,CAAC;IAED,UAAU;QACR,OAAO,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAA;IACzD,CAAC;IAED,OAAO;QACL,OAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAA;IACxE,CAAC;CACF;AAZD,0DAYC","sourcesContent":["import { NodeModulesCollector } from \"./nodeModulesCollector\"\n\nexport class NpmNodeModulesCollector extends NodeModulesCollector {\n  constructor(rootDir: string) {\n    super(rootDir)\n  }\n\n  getCommand(): string {\n    return process.platform === \"win32\" ? \"npm.cmd\" : \"npm\"\n  }\n\n  getArgs(): string[] {\n    return [\"list\", \"--omit\", \"dev\", \"-a\", \"--json\", \"--long\", \"--silent\"]\n  }\n}\n"]}
+{"version":3,"file":"npmNodeModulesCollector.js","sourceRoot":"","sources":["../../src/node-module-collector/npmNodeModulesCollector.ts"],"names":[],"mappings":";;;AAAA,iEAA6D;AAG7D,MAAa,uBAAwB,SAAQ,2CAAoB;IAC/D,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAA;IAChB,CAAC;IAED,UAAU;QACR,OAAO,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAA;IACzD,CAAC;IAED,OAAO;QACL,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAA;IACtH,CAAC;IAED,8BAA8B,CAAC,IAAoB;;QACjD,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,IAAI,EAAE,CAAA;QAC5C,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,IAAI,EAAE,CAAA;QAC9C,IAAI,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3D,IAAI,CAAC,YAAY,GAAG,CAAA,MAAA,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC,0CAAE,YAAY,KAAI,EAAE,CAAA;QAClG,CAAC;QAED,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YACxD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC3D,OAAO,YAAY,CAAC,GAAG,CAAC,CAAA;gBACxB,SAAQ;YACV,CAAC;YACD,IAAI,CAAC,8BAA8B,CAAC,KAAK,CAAC,CAAA;QAC5C,CAAC;IACH,CAAC;CACF;AA5BD,0DA4BC","sourcesContent":["import { NodeModulesCollector } from \"./nodeModulesCollector\"\nimport { DependencyTree } from \"./types\"\n\nexport class NpmNodeModulesCollector extends NodeModulesCollector {\n  constructor(rootDir: string) {\n    super(rootDir)\n  }\n\n  getCommand(): string {\n    return process.platform === \"win32\" ? \"npm.cmd\" : \"npm\"\n  }\n\n  getArgs(): string[] {\n    return [\"list\", \"-a\", \"--include\", \"prod\", \"--include\", \"optional\", \"--omit\", \"dev\", \"--json\", \"--long\", \"--silent\"]\n  }\n\n  removeNonProductionDependencie(tree: DependencyTree) {\n    const dependencies = tree.dependencies || {}\n    const _dependencies = tree._dependencies || {}\n    if (dependencies && Object.keys(dependencies).length === 0) {\n      tree.dependencies = this.allDependencies.get(`${tree.name}@${tree.version}`)?.dependencies || {}\n    }\n\n    for (const [key, value] of Object.entries(dependencies)) {\n      if (!_dependencies[key] || Object.keys(value).length === 0) {\n        delete dependencies[key]\n        continue\n      }\n      this.removeNonProductionDependencie(value)\n    }\n  }\n}\n"]}

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

@@ -1,6 +1,8 @@
 import { NodeModulesCollector } from "./nodeModulesCollector";
+import { DependencyTree } from "./types";
 export declare class PnpmNodeModulesCollector extends NodeModulesCollector {
     constructor(rootDir: string);
     getCommand(): string;
     getArgs(): string[];
+    removeNonProductionDependencie(tree: DependencyTree): void;
 }

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PnpmNodeModulesCollector = void 0;
 const nodeModulesCollector_1 = require("./nodeModulesCollector");
+const path = require("path");
 class PnpmNodeModulesCollector extends nodeModulesCollector_1.NodeModulesCollector {
     constructor(rootDir) {
         super(rootDir);
@@ -10,7 +11,22 @@ class PnpmNodeModulesCollector extends nodeModulesCollector_1.NodeModulesCollect
         return process.platform === "win32" ? "pnpm.cmd" : "pnpm";
     }
     getArgs() {
-        return ["list", "--prod", "--json", "--long", "--depth", "Infinity"];
+        return ["list", "--prod", "--json", "--depth", "Infinity"];
+    }
+    removeNonProductionDependencie(tree) {
+        const dependencies = tree.dependencies || {};
+        const p = path.normalize(this.resolvePath(tree.path));
+        const pJson = require(path.join(p, "package.json"));
+        const _dependencies = pJson.dependencies || {};
+        const _optionalDependencies = pJson.optionalDependencies || {};
+        const prodDependencies = { ..._dependencies, ..._optionalDependencies };
+        for (const [key, value] of Object.entries(dependencies)) {
+            if (!prodDependencies[key]) {
+                delete dependencies[key];
+                continue;
+            }
+            this.removeNonProductionDependencie(value);
+        }
     }
 }
 exports.PnpmNodeModulesCollector = PnpmNodeModulesCollector;

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":";;;AAAA,iEAA6D;AAE7D,MAAa,wBAAyB,SAAQ,2CAAoB;IAChE,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAA;IAChB,CAAC;IAED,UAAU;QACR,OAAO,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAA;IAC3D,CAAC;IAED,OAAO;QACL,OAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;IACtE,CAAC;CACF;AAZD,4DAYC","sourcesContent":["import { NodeModulesCollector } from \"./nodeModulesCollector\"\n\nexport class PnpmNodeModulesCollector extends NodeModulesCollector {\n  constructor(rootDir: string) {\n    super(rootDir)\n  }\n\n  getCommand(): string {\n    return process.platform === \"win32\" ? \"pnpm.cmd\" : \"pnpm\"\n  }\n\n  getArgs(): string[] {\n    return [\"list\", \"--prod\", \"--json\", \"--long\", \"--depth\", \"Infinity\"]\n  }\n}\n"]}
+{"version":3,"file":"pnpmNodeModulesCollector.js","sourceRoot":"","sources":["../../src/node-module-collector/pnpmNodeModulesCollector.ts"],"names":[],"mappings":";;;AAAA,iEAA6D;AAE7D,6BAA4B;AAE5B,MAAa,wBAAyB,SAAQ,2CAAoB;IAChE,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAA;IAChB,CAAC;IAED,UAAU;QACR,OAAO,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAA;IAC3D,CAAC;IAED,OAAO;QACL,OAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;IAC5D,CAAC;IAED,8BAA8B,CAAC,IAAoB;QACjD,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,IAAI,EAAE,CAAA;QAC5C,MAAM,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QACrD,MAAM,KAAK,GAAe,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,CAAA;QAC/D,MAAM,aAAa,GAAG,KAAK,CAAC,YAAY,IAAI,EAAE,CAAA;QAC9C,MAAM,qBAAqB,GAAG,KAAK,CAAC,oBAAoB,IAAI,EAAE,CAAA;QAC9D,MAAM,gBAAgB,GAAG,EAAE,GAAG,aAAa,EAAE,GAAG,qBAAqB,EAAE,CAAA;QACvE,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YACxD,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC3B,OAAO,YAAY,CAAC,GAAG,CAAC,CAAA;gBACxB,SAAQ;YACV,CAAC;YACD,IAAI,CAAC,8BAA8B,CAAC,KAAK,CAAC,CAAA;QAC5C,CAAC;IACH,CAAC;CACF;AA5BD,4DA4BC","sourcesContent":["import { NodeModulesCollector } from \"./nodeModulesCollector\"\nimport { DependencyTree, Dependency } from \"./types\"\nimport * as path from \"path\"\n\nexport class PnpmNodeModulesCollector extends NodeModulesCollector {\n  constructor(rootDir: string) {\n    super(rootDir)\n  }\n\n  getCommand(): string {\n    return process.platform === \"win32\" ? \"pnpm.cmd\" : \"pnpm\"\n  }\n\n  getArgs(): string[] {\n    return [\"list\", \"--prod\", \"--json\", \"--depth\", \"Infinity\"]\n  }\n\n  removeNonProductionDependencie(tree: DependencyTree) {\n    const dependencies = tree.dependencies || {}\n    const p = path.normalize(this.resolvePath(tree.path))\n    const pJson: Dependency = require(path.join(p, \"package.json\"))\n    const _dependencies = pJson.dependencies || {}\n    const _optionalDependencies = pJson.optionalDependencies || {}\n    const prodDependencies = { ..._dependencies, ..._optionalDependencies }\n    for (const [key, value] of Object.entries(dependencies)) {\n      if (!prodDependencies[key]) {\n        delete dependencies[key]\n        continue\n      }\n      this.removeNonProductionDependencie(value)\n    }\n  }\n}\n"]}

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

@@ -10,9 +10,26 @@ export interface DependencyTree {
     readonly from?: string;
     readonly workspaces?: string[];
     readonly path: string;
-    dependencies: {
+    dependencies?: {
         [packageName: string]: DependencyTree;
     };
+    _dependencies?: {
+        [packageName: string]: string;
+    };
+    optionalDependencies?: {
+        [packageName: string]: DependencyTree;
+    };
+    peerDependencies?: {
+        [packageName: string]: DependencyTree;
+    };
+}
+export interface Dependency {
+    dependencies?: {
+        [packageName: string]: string;
+    };
+    optionalDependencies?: {
+        [packageName: string]: string;
+    };
 }
 export interface DependencyGraph {
     [packageNameAndVersion: string]: PackageDependencies;

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/node-module-collector/types.ts"],"names":[],"mappings":"","sourcesContent":["export interface NodeModuleInfo {\n  name: string\n  version: string\n  dir: string\n  dependencies?: Array<NodeModuleInfo>\n}\n\nexport interface DependencyTree {\n  readonly version?: string\n  readonly name?: string\n  readonly from?: string\n  readonly workspaces?: string[]\n  readonly path: string\n  dependencies: {\n    [packageName: string]: DependencyTree\n  }\n}\n\nexport interface DependencyGraph {\n  [packageNameAndVersion: string]: PackageDependencies\n}\n\ninterface PackageDependencies {\n  dependencies?: string[]\n}\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/node-module-collector/types.ts"],"names":[],"mappings":"","sourcesContent":["export interface NodeModuleInfo {\n  name: string\n  version: string\n  dir: string\n  dependencies?: Array<NodeModuleInfo>\n}\n\nexport interface DependencyTree {\n  readonly version?: string\n  readonly name?: string\n  readonly from?: string\n  readonly workspaces?: string[]\n  readonly path: string\n  dependencies?: {\n    [packageName: string]: DependencyTree\n  }\n  // for npm list --json\n  _dependencies?: {\n    [packageName: string]: string\n  }\n  optionalDependencies?: {\n    [packageName: string]: DependencyTree\n  }\n  peerDependencies?: {\n    [packageName: string]: DependencyTree\n  }\n}\n\nexport interface Dependency {\n  dependencies?: {\n    [packageName: string]: string\n  }\n  optionalDependencies?: {\n    [packageName: string]: string\n  }\n}\n\nexport interface DependencyGraph {\n  [packageNameAndVersion: string]: PackageDependencies\n}\n\ninterface PackageDependencies {\n  dependencies?: string[]\n}\n"]}

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

@@ -1,6 +1,8 @@
 import { NodeModulesCollector } from "./nodeModulesCollector";
+import { DependencyTree } from "./types";
 export declare class YarnNodeModulesCollector extends NodeModulesCollector {
     constructor(rootDir: string);
     getCommand(): string;
     getArgs(): string[];
+    removeNonProductionDependencie(tree: DependencyTree): void;
 }

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

@@ -10,7 +10,22 @@ class YarnNodeModulesCollector extends nodeModulesCollector_1.NodeModulesCollect
         return process.platform === "win32" ? "npm.cmd" : "npm";
     }
     getArgs() {
-        return ["list", "--omit", "dev", "-a", "--json", "--long", "--silent"];
+        return ["list", "-a", "--include", "prod", "--include", "optional", "--omit", "dev", "--json", "--long", "--silent"];
+    }
+    removeNonProductionDependencie(tree) {
+        var _a;
+        const dependencies = tree.dependencies || {};
+        const _dependencies = tree._dependencies || {};
+        if (dependencies && Object.keys(dependencies).length === 0) {
+            tree.dependencies = ((_a = this.allDependencies.get(`${tree.name}@${tree.version}`)) === null || _a === void 0 ? void 0 : _a.dependencies) || {};
+        }
+        for (const [key, value] of Object.entries(dependencies)) {
+            if (!_dependencies[key] || Object.keys(value).length === 0) {
+                delete dependencies[key];
+                continue;
+            }
+            this.removeNonProductionDependencie(value);
+        }
     }
 }
 exports.YarnNodeModulesCollector = YarnNodeModulesCollector;

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

@@ -1 +1 @@
-{"version":3,"file":"yarnNodeModulesCollector.js","sourceRoot":"","sources":["../../src/node-module-collector/yarnNodeModulesCollector.ts"],"names":[],"mappings":";;;AAAA,iEAA6D;AAE7D,MAAa,wBAAyB,SAAQ,2CAAoB;IAChE,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAA;IAChB,CAAC;IAED,UAAU;QACR,OAAO,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAA;IACzD,CAAC;IAED,OAAO;QACL,OAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAA;IACxE,CAAC;CACF;AAZD,4DAYC","sourcesContent":["import { NodeModulesCollector } from \"./nodeModulesCollector\"\n\nexport class YarnNodeModulesCollector extends NodeModulesCollector {\n  constructor(rootDir: string) {\n    super(rootDir)\n  }\n\n  getCommand(): string {\n    return process.platform === \"win32\" ? \"npm.cmd\" : \"npm\"\n  }\n\n  getArgs(): string[] {\n    return [\"list\", \"--omit\", \"dev\", \"-a\", \"--json\", \"--long\", \"--silent\"]\n  }\n}\n"]}
+{"version":3,"file":"yarnNodeModulesCollector.js","sourceRoot":"","sources":["../../src/node-module-collector/yarnNodeModulesCollector.ts"],"names":[],"mappings":";;;AAAA,iEAA6D;AAG7D,MAAa,wBAAyB,SAAQ,2CAAoB;IAChE,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAA;IAChB,CAAC;IAED,UAAU;QACR,OAAO,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAA;IACzD,CAAC;IAED,OAAO;QACL,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAA;IACtH,CAAC;IAED,8BAA8B,CAAC,IAAoB;;QACjD,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,IAAI,EAAE,CAAA;QAC5C,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,IAAI,EAAE,CAAA;QAC9C,IAAI,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3D,IAAI,CAAC,YAAY,GAAG,CAAA,MAAA,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC,0CAAE,YAAY,KAAI,EAAE,CAAA;QAClG,CAAC;QAED,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YACxD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC3D,OAAO,YAAY,CAAC,GAAG,CAAC,CAAA;gBACxB,SAAQ;YACV,CAAC;YACD,IAAI,CAAC,8BAA8B,CAAC,KAAK,CAAC,CAAA;QAC5C,CAAC;IACH,CAAC;CACF;AA5BD,4DA4BC","sourcesContent":["import { NodeModulesCollector } from \"./nodeModulesCollector\"\nimport { DependencyTree } from \"./types\"\n\nexport class YarnNodeModulesCollector extends NodeModulesCollector {\n  constructor(rootDir: string) {\n    super(rootDir)\n  }\n\n  getCommand(): string {\n    return process.platform === \"win32\" ? \"npm.cmd\" : \"npm\"\n  }\n\n  getArgs(): string[] {\n    return [\"list\", \"-a\", \"--include\", \"prod\", \"--include\", \"optional\", \"--omit\", \"dev\", \"--json\", \"--long\", \"--silent\"]\n  }\n\n  removeNonProductionDependencie(tree: DependencyTree) {\n    const dependencies = tree.dependencies || {}\n    const _dependencies = tree._dependencies || {}\n    if (dependencies && Object.keys(dependencies).length === 0) {\n      tree.dependencies = this.allDependencies.get(`${tree.name}@${tree.version}`)?.dependencies || {}\n    }\n\n    for (const [key, value] of Object.entries(dependencies)) {\n      if (!_dependencies[key] || Object.keys(value).length === 0) {\n        delete dependencies[key]\n        continue\n      }\n      this.removeNonProductionDependencie(value)\n    }\n  }\n}\n"]}

package/out/version.d.ts

@@ -1 +1 @@
-export declare const PACKAGE_VERSION = "26.0.4";
+export declare const PACKAGE_VERSION = "26.0.6";

package/out/version.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PACKAGE_VERSION = void 0;
-exports.PACKAGE_VERSION = "26.0.4";
+exports.PACKAGE_VERSION = "26.0.6";
 //# sourceMappingURL=version.js.map

package/out/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG,QAAQ,CAAA","sourcesContent":["export const PACKAGE_VERSION = \"26.0.4\"\n"]}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG,QAAQ,CAAA","sourcesContent":["export const PACKAGE_VERSION = \"26.0.6\"\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "app-builder-lib",
   "description": "electron-builder lib",
-  "version": "26.0.4",
+  "version": "26.0.6",
   "main": "out/index.js",
   "files": [
     "out",
@@ -76,8 +76,8 @@
     "temp-file": "^3.4.0",
     "tiny-async-pool": "1.3.0",
     "builder-util": "26.0.4",
-    "electron-publish": "26.0.4",
-    "builder-util-runtime": "9.3.1"
+    "builder-util-runtime": "9.3.1",
+    "electron-publish": "26.0.4"
   },
   "///": "babel in devDependencies for proton tests",
   "devDependencies": {
@@ -109,12 +109,12 @@
     "@types/tar": "^6.1.3",
     "@types/tiny-async-pool": "^1",
     "toml": "^3.0.0",
-    "dmg-builder": "26.0.4",
-    "electron-builder-squirrel-windows": "26.0.4"
+    "dmg-builder": "26.0.6",
+    "electron-builder-squirrel-windows": "26.0.6"
   },
   "peerDependencies": {
-    "dmg-builder": "26.0.4",
-    "electron-builder-squirrel-windows": "26.0.4"
+    "dmg-builder": "26.0.6",
+    "electron-builder-squirrel-windows": "26.0.6"
   },
   "//": "electron-builder-squirrel-windows and dmg-builder added as dev dep for tests (as otherwise `require` doesn't work using Yarn 2)",
   "typings": "./out/index.d.ts"

package/templates/linux/after-install.tpl

@@ -42,7 +42,10 @@ if test -d "/etc/apparmor.d"; then
   if apparmor_parser --skip-kernel-load --debug "$APPARMOR_PROFILE_SOURCE" > /dev/null 2>&1; then
     cp -f "$APPARMOR_PROFILE_SOURCE" "$APPARMOR_PROFILE_TARGET"
 
-    if hash apparmor_parser 2>/dev/null; then
+    # Updating the current AppArmor profile is not possible and probably not meaningful in a chroot'ed environment.
+    # Use cases are for example environments where images for clients are maintained.
+    # There, AppArmor might correctly be installed, but live updating makes no sense.
+    if ! { [ -x '/usr/bin/ischroot' ] && /usr/bin/ischroot; } && hash apparmor_parser 2>/dev/null; then
       # Extra flags taken from dh_apparmor:
       # > By using '-W -T' we ensure that any abstraction updates are also pulled in.
       # https://wiki.debian.org/AppArmor/Contribute/FirstTimeProfileImport