feat: support pnpm

.circleci/config.yml

@@ -9,6 +9,11 @@ commands:
       - run: git config --global core.autocrlf input
       - node/install:
           node-version: '18.15.0'
+      - run:
+          name: Install pnpm package manager
+          command: |
+            corepack enable
+            corepack prepare pnpm@latest-8 --activate
       - checkout
   run-lint-and-build:
     steps:

package.json

@@ -83,8 +83,7 @@
     "which": "^2.0.2",
     "xterm": "^4.9.0",
     "xterm-addon-fit": "^0.5.0",
-    "xterm-addon-search": "^0.8.0",
-    "yarn-or-npm": "^3.0.1"
+    "xterm-addon-search": "^0.8.0"
   },
   "devDependencies": {
     "@electron/fuses": ">=1.0.0",

packages/api/cli/src/electron-forge-make.ts

@@ -1,7 +1,7 @@
 import path from 'path';
 
-import { api, MakeOptions } from '@electron-forge/core';
 import { initializeProxy } from '@electron/get';
+import { api, MakeOptions } from '@electron-forge/core';
 import program from 'commander';
 import fs from 'fs-extra';
 

packages/api/cli/src/electron-forge-package.ts

@@ -1,7 +1,7 @@
 import path from 'path';
 
-import { api, PackageOptions } from '@electron-forge/core';
 import { initializeProxy } from '@electron/get';
+import { api, PackageOptions } from '@electron-forge/core';
 import program from 'commander';
 import fs from 'fs-extra';
 

packages/api/cli/src/electron-forge-publish.ts

@@ -1,7 +1,7 @@
 import path from 'path';
 
-import { api, PublishOptions } from '@electron-forge/core';
 import { initializeProxy } from '@electron/get';
+import { api, PublishOptions } from '@electron-forge/core';
 import program from 'commander';
 import fs from 'fs-extra';
 

packages/api/cli/src/util/check-system.ts

@@ -55,14 +55,20 @@ function warnIfPackageManagerIsntAKnownGoodVersion(packageManager: string, versi
 }
 
 async function checkPackageManagerVersion() {
-  const version = await forgeUtils.yarnOrNpmSpawn(['--version']);
+  const version = await forgeUtils.packageManagerSpawn(['--version']);
   const versionString = version.toString().trim();
-  if (forgeUtils.hasYarn()) {
+  const _isNpm = await forgeUtils.isNpm();
+  const _isYarn = await forgeUtils.isYarn();
+  if (_isYarn) {
     warnIfPackageManagerIsntAKnownGoodVersion('Yarn', versionString, YARN_ALLOWLISTED_VERSIONS);
     return `yarn@${versionString}`;
-  } else {
+  } else if (_isNpm) {
     warnIfPackageManagerIsntAKnownGoodVersion('NPM', versionString, NPM_ALLOWLISTED_VERSIONS);
     return `npm@${versionString}`;
+  } else {
+    // I think we don't need to check version of pnpm since 2023
+    const pm = await forgeUtils.getPackageManager();
+    return `${pm}@${versionString}`;
   }
 }
 

packages/api/core/package.json

@@ -73,8 +73,7 @@
     "semver": "^7.2.1",
     "source-map-support": "^0.5.13",
     "sudo-prompt": "^9.1.1",
-    "username": "^5.1.0",
-    "yarn-or-npm": "^3.0.1"
+    "username": "^5.1.0"
   },
   "engines": {
     "node": ">= 16.4.0"

packages/api/core/src/api/import.ts

@@ -1,6 +1,6 @@
 import path from 'path';
 
-import { safeYarnOrNpm, updateElectronDependency } from '@electron-forge/core-utils';
+import { getPackageManager, updateElectronDependency } from '@electron-forge/core-utils';
 import { ForgeListrOptions, ForgeListrTaskFn } from '@electron-forge/shared-types';
 import baseTemplate from '@electron-forge/template-base';
 import { autoTrace } from '@electron-forge/tracer';
@@ -193,23 +193,23 @@ export default autoTrace(
                 {
                   title: 'Installing dependencies',
                   task: async (_, task) => {
-                    const packageManager = safeYarnOrNpm();
+                    const packageManager = getPackageManager();
                     await writeChanges();
 
                     d('deleting old dependencies forcefully');
                     await fs.remove(path.resolve(dir, 'node_modules/.bin/electron'));
                     await fs.remove(path.resolve(dir, 'node_modules/.bin/electron.cmd'));
 
                     d('installing dependencies');
-                    task.output = `${packageManager} install ${importDeps.join(' ')}`;
+                    task.output = `${packageManager} add ${importDeps.join(' ')}`;
                     await installDepList(dir, importDeps);
 
                     d('installing devDependencies');
-                    task.output = `${packageManager} install --dev ${importDevDeps.join(' ')}`;
+                    task.output = `${packageManager} add -D ${importDevDeps.join(' ')}`;
                     await installDepList(dir, importDevDeps, DepType.DEV);
 
                     d('installing exactDevDependencies');
-                    task.output = `${packageManager} install --dev --exact ${importExactDevDeps.join(' ')}`;
+                    task.output = `${packageManager} add -D -E ${importExactDevDeps.join(' ')}`;
                     await installDepList(dir, importExactDevDeps, DepType.DEV, DepVersionRestriction.EXACT);
                   },
                 },
@@ -257,7 +257,7 @@ export default autoTrace(
           },
           task: childTrace<Parameters<ForgeListrTaskFn>>({ name: 'finalize-import', category: '@electron-forge/core' }, (_, __, task) => {
             task.output = `We have attempted to convert your app to be in a format that Electron Forge understands.
-          
+
           Thanks for using ${chalk.green('Electron Forge')}!`;
           }),
         },

packages/api/core/src/api/init-scripts/init-link.ts

@@ -1,6 +1,6 @@
 import path from 'path';
 
-import { safeYarnOrNpm, yarnOrNpmSpawn } from '@electron-forge/core-utils';
+import { getPackageManager, isPnpm, packageManagerSpawn } from '@electron-forge/core-utils';
 import { ForgeListrTask } from '@electron-forge/shared-types';
 import debug from 'debug';
 
@@ -22,14 +22,24 @@ export async function initLink<T>(dir: string, task?: ForgeListrTask<T>) {
   if (shouldLink) {
     d('Linking forge dependencies');
     const packageJson = await readRawPackageJson(dir);
-    const packageManager = safeYarnOrNpm();
+    const packageManager = getPackageManager();
     const linkFolder = path.resolve(__dirname, '..', '..', '..', '..', '..', '..', '.links');
     for (const packageName of Object.keys(packageJson.devDependencies)) {
       if (packageName.startsWith('@electron-forge/')) {
-        if (task) task.output = `${packageManager} link --link-folder ${linkFolder} ${packageName}`;
-        await yarnOrNpmSpawn(['link', '--link-folder', linkFolder, packageName], {
-          cwd: dir,
-        });
+        if (task) {
+          const _isPnpm = await isPnpm();
+          if (_isPnpm) {
+            task.output = `${packageManager} link ${linkFolder}/${packageName}`;
+            await packageManagerSpawn(['link', `${linkFolder}/${packageName}`], {
+              cwd: dir,
+            });
+          } else {
+            task.output = `${packageManager} link --link-folder ${linkFolder} ${packageName}`;
+            await packageManagerSpawn(['link', '--link-folder', linkFolder, packageName], {
+              cwd: dir,
+            });
+          }
+        }
       }
     }
   } else {

packages/api/core/src/api/init-scripts/init-npm.ts

@@ -1,6 +1,6 @@
 import path from 'path';
 
-import { safeYarnOrNpm } from '@electron-forge/core-utils';
+import { getPackageManager } from '@electron-forge/core-utils';
 import { ForgeListrTask } from '@electron-forge/shared-types';
 import debug from 'debug';
 import fs from 'fs-extra';
@@ -29,17 +29,17 @@ export const exactDevDeps = ['electron'];
 
 export const initNPM = async <T>(dir: string, task: ForgeListrTask<T>): Promise<void> => {
   d('installing dependencies');
-  const packageManager = safeYarnOrNpm();
-  task.output = `${packageManager} install ${deps.join(' ')}`;
+  const packageManager = getPackageManager();
+  task.output = `${packageManager} add ${deps.join(' ')}`;
   await installDepList(dir, deps);
 
   d('installing devDependencies');
-  task.output = `${packageManager} install --dev ${deps.join(' ')}`;
+  task.output = `${packageManager} add -D ${deps.join(' ')}`;
   await installDepList(dir, devDeps, DepType.DEV);
 
   d('installing exact devDependencies');
   for (const packageName of exactDevDeps) {
-    task.output = `${packageManager} install --dev --exact ${packageName}`;
+    task.output = `${packageManager} add -D -E ${packageName}`;
     await installDepList(dir, [packageName], DepType.DEV, DepVersionRestriction.EXACT);
   }
 };

packages/api/core/src/api/init.ts

@@ -1,6 +1,6 @@
 import path from 'path';
 
-import { safeYarnOrNpm } from '@electron-forge/core-utils';
+import { getPackageManager } from '@electron-forge/core-utils';
 import { ForgeTemplate } from '@electron-forge/shared-types';
 import debug from 'debug';
 import { Listr } from 'listr2';
@@ -56,7 +56,7 @@ async function validateTemplate(template: string, templateModule: ForgeTemplate)
 export default async ({ dir = process.cwd(), interactive = false, copyCIFiles = false, force = false, template = 'base' }: InitOptions): Promise<void> => {
   d(`Initializing in: ${dir}`);
 
-  const packageManager = safeYarnOrNpm();
+  const packageManager = getPackageManager();
 
   const runner = new Listr<{
     templateModule: ForgeTemplate;
@@ -103,7 +103,7 @@ export default async ({ dir = process.cwd(), interactive = false, copyCIFiles =
                 task: async (_, task) => {
                   d('installing dependencies');
                   if (templateModule.dependencies?.length) {
-                    task.output = `${packageManager} install ${templateModule.dependencies.join(' ')}`;
+                    task.output = `${packageManager} add ${templateModule.dependencies.join(' ')}`;
                   }
                   return await installDepList(dir, templateModule.dependencies || [], DepType.PROD, DepVersionRestriction.RANGE);
                 },
@@ -114,7 +114,7 @@ export default async ({ dir = process.cwd(), interactive = false, copyCIFiles =
                 task: async (_, task) => {
                   d('installing devDependencies');
                   if (templateModule.devDependencies?.length) {
-                    task.output = `${packageManager} install --dev ${templateModule.devDependencies.join(' ')}`;
+                    task.output = `${packageManager} add -D ${templateModule.devDependencies.join(' ')}`;
                   }
                   await installDepList(dir, templateModule.devDependencies || [], DepType.DEV);
                 },

packages/api/core/src/api/make.ts

@@ -1,5 +1,6 @@
 import path from 'path';
 
+import { getHostArch } from '@electron/get';
 import { getElectronVersion } from '@electron-forge/core-utils';
 import { MakerBase } from '@electron-forge/maker-base';
 import {
@@ -13,7 +14,6 @@ import {
   ResolvedForgeConfig,
 } from '@electron-forge/shared-types';
 import { autoTrace, delayTraceTillSignal } from '@electron-forge/tracer';
-import { getHostArch } from '@electron/get';
 import chalk from 'chalk';
 import filenamify from 'filenamify';
 import fs from 'fs-extra';
@@ -294,7 +294,7 @@ export const listrMake = (
                         arch: targetArch,
                       });
                     } catch (err) {
-                      if (err) {
+                      if (err instanceof Error) {
                         throw err;
                       } else {
                         throw new Error(`An unknown error occurred while making for target: ${uniqMaker.name}`);

packages/api/core/src/api/package.ts

@@ -1,11 +1,11 @@
 import path from 'path';
 import { promisify } from 'util';
 
+import { getHostArch } from '@electron/get';
+import { FinalizePackageTargetsHookFunction, HookFunction, Options, packager, TargetDefinition } from '@electron/packager';
 import { getElectronVersion, listrCompatibleRebuildHook } from '@electron-forge/core-utils';
 import { ForgeArch, ForgeListrTask, ForgeListrTaskDefinition, ForgeListrTaskFn, ForgePlatform, ResolvedForgeConfig } from '@electron-forge/shared-types';
 import { autoTrace, delayTraceTillSignal } from '@electron-forge/tracer';
-import { getHostArch } from '@electron/get';
-import { FinalizePackageTargetsHookFunction, HookFunction, Options, packager, TargetDefinition } from '@electron/packager';
 import chalk from 'chalk';
 import debug from 'debug';
 import glob from 'fast-glob';

packages/api/core/src/util/forge-config.ts

@@ -44,7 +44,7 @@ const proxify = <T extends ProxiedObject>(buildIdentifier: string | (() => strin
         const envValue = process.env[`${envPrefix}_${underscoreCase(name)}`];
         if (envValue) return envValue;
       }
-      const value = Reflect.get(target, name, receiver);
+      const value = Reflect.get(target, name, receiver) as BuildIdentifierConfig<string>;
 
       if (value && typeof value === 'object' && value.__isMagicBuildIdentifierMap) {
         const identifier = typeof buildIdentifier === 'function' ? buildIdentifier() : buildIdentifier;

packages/api/core/src/util/index.ts

@@ -1,4 +1,4 @@
-import { getElectronVersion, hasYarn, yarnOrNpmSpawn } from '@electron-forge/core-utils';
+import { getElectronVersion, getPackageManager, isNpm, isPnpm, isYarn, packageManagerSpawn } from '@electron-forge/core-utils';
 
 import { BuildIdentifierConfig, BuildIdentifierMap, fromBuildIdentifier } from './forge-config';
 
@@ -16,7 +16,13 @@ export default class ForgeUtils {
 
   getElectronVersion = getElectronVersion;
 
-  hasYarn = hasYarn;
+  getPackageManager = getPackageManager;
 
-  yarnOrNpmSpawn = yarnOrNpmSpawn;
+  packageManagerSpawn = packageManagerSpawn;
+
+  isNpm = isNpm;
+
+  isYarn = isYarn;
+
+  isPnpm = isPnpm;
 }

packages/api/core/src/util/install-dependencies.ts

@@ -1,4 +1,4 @@
-import { hasYarn, yarnOrNpmSpawn } from '@electron-forge/core-utils';
+import { isNpm, isPnpm, isYarn, packageManagerSpawn } from '@electron-forge/core-utils';
 import { ExitError } from '@malept/cross-spawn-promise';
 import debug from 'debug';
 
@@ -15,24 +15,32 @@ export enum DepVersionRestriction {
 }
 
 export default async (dir: string, deps: string[], depType = DepType.PROD, versionRestriction = DepVersionRestriction.RANGE): Promise<void> => {
-  d('installing', JSON.stringify(deps), 'in:', dir, `depType=${depType},versionRestriction=${versionRestriction},withYarn=${hasYarn()}`);
+  const _isNpm = await isNpm();
+  const _isYarn = await isYarn();
+  const _isPnpm = await isPnpm();
+  d(
+    'installing',
+    JSON.stringify(deps),
+    'in:',
+    dir,
+    `depType=${depType},versionRestriction=${versionRestriction}},withNpm=${_isNpm},withYarn=${_isYarn},withPnpm=${_isPnpm}`
+  );
   if (deps.length === 0) {
     d('nothing to install, stopping immediately');
     return Promise.resolve();
   }
-  let cmd = ['install'].concat(deps);
-  if (hasYarn()) {
-    cmd = ['add'].concat(deps);
-    if (depType === DepType.DEV) cmd.push('--dev');
-    if (versionRestriction === DepVersionRestriction.EXACT) cmd.push('--exact');
-  } else {
-    if (versionRestriction === DepVersionRestriction.EXACT) cmd.push('--save-exact');
-    if (depType === DepType.DEV) cmd.push('--save-dev');
-    if (depType === DepType.PROD) cmd.push('--save');
-  }
+  /**
+   * To install the specified packages as dependencies
+   * yarn and pnpm use `add` command
+   * npm use `add` as an alias command of `install`
+   * for consistency, we use `add` command here
+   */
+  const cmd = ['add'].concat(deps);
+  if (depType === DepType.DEV) cmd.push('-D');
+  if (versionRestriction === DepVersionRestriction.EXACT) cmd.push('-E');
   d('executing', JSON.stringify(cmd), 'in:', dir);
   try {
-    await yarnOrNpmSpawn(cmd, {
+    await packageManagerSpawn(cmd, {
       cwd: dir,
       stdio: 'pipe',
     });

packages/api/core/src/util/parse-archs.ts

@@ -1,5 +1,5 @@
-import { ForgeArch, ForgePlatform } from '@electron-forge/shared-types';
 import { allOfficialArchsForPlatformAndVersion, SupportedPlatform } from '@electron/packager';
+import { ForgeArch, ForgePlatform } from '@electron-forge/shared-types';
 
 export default function parseArchs(platform: ForgePlatform | string, declaredArch: ForgeArch | 'all' | string, electronVersion: string): ForgeArch[] {
   if (declaredArch === 'all') {