fix: escape file names for make step (#2752)

* fix

* fix

* test lol

* remove unused fixture file

* make test gooder

package.json

@@ -55,6 +55,7 @@
     "express": "^4.17.1",
     "express-ws": "^5.0.2",
     "fast-glob": "^3.2.7",
+    "filenamify": "^4.1.0",
     "find-up": "^5.0.0",
     "form-data": "^4.0.0",
     "fs-extra": "^10.0.0",

packages/api/core/package.json

@@ -58,6 +58,7 @@
     "electron-packager": "^15.4.0",
     "electron-rebuild": "^3.2.6",
     "fast-glob": "^3.2.7",
+    "filenamify": "^4.1.0",
     "find-up": "^5.0.0",
     "fs-extra": "^10.0.0",
     "lodash": "^4.17.20",

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

@@ -5,6 +5,7 @@ import { IForgeResolvableMaker, ForgeConfig, ForgeArch, ForgePlatform, ForgeMake
 import MakerBase from '@electron-forge/maker-base';
 import fs from 'fs-extra';
 import path from 'path';
+import filenamify from 'filenamify';
 
 import getForgeConfig from '../util/forge-config';
 import { runHook, runMutatingHook } from '../util/hook';
@@ -179,7 +180,7 @@ export default async ({
   info(interactive, `Making for the following targets: ${chalk.cyan(`${targets.map((_t, i) => makers[i].name).join(', ')}`)}`);
 
   const packageJSON = await readMutatedPackageJson(dir, forgeConfig);
-  const appName = forgeConfig.packagerConfig.name || packageJSON.productName || packageJSON.name;
+  const appName = filenamify(forgeConfig.packagerConfig.name || packageJSON.productName || packageJSON.name, { replacement: '-' });
   const outputs: ForgeMakeResult[] = [];
 
   await runHook(forgeConfig, 'preMake');

packages/api/core/test/fast/make_spec.ts

@@ -9,6 +9,22 @@ import make from '../../src/api/make';
 describe('make', () => {
   const fixtureDir = path.resolve(__dirname, '..', 'fixture');
 
+  it('works with scoped package names', async () => {
+    const stubbedMake: (opts: MakeOptions) => Promise<ForgeMakeResult[]> = proxyquire.noCallThru().load('../../src/api/make', {
+      '../util/read-package-json': {
+        readMutatedPackageJson: () => Promise.resolve(require('../fixture/app-with-scoped-name/package.json')),
+      },
+    }).default;
+    await stubbedMake({
+      arch: 'x64',
+      dir: path.join(fixtureDir, 'app-with-scoped-name'),
+      overrideTargets: ['@electron-forge/maker-zip'],
+      platform: 'linux',
+      skipPackage: true,
+    });
+    after(() => proxyquire.callThru());
+  });
+
   describe('overrideTargets inherits from forge config', () => {
     let stubbedMake: (opts: MakeOptions) => Promise<ForgeMakeResult[]>;
 

packages/api/core/test/fixture/app-with-scoped-name/package.json

@@ -0,0 +1,28 @@
+{
+  "name": "@scope/package",
+  "productName": "",
+  "version": "1.0.0",
+  "description": "",
+  "main": "src/index.js",
+  "scripts": {
+    "start": "electron-forge start"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "MIT",
+  "config": {
+    "forge": {
+      "makers": [
+        {
+          "name": "@electron-forge/maker-zip",
+          "platforms": [
+            "linux"
+          ]
+        }
+      ]
+    }
+  },
+  "devDependencies": {
+    "electron": "1000.100.10"
+  }
+}