@electron-forge/maker-base 6.0.0-beta.7 → 6.0.0-beta.70

package/dist/Maker.d.ts

@@ -1,4 +1,5 @@
-import { ForgeArch, ForgeConfig, ForgePlatform } from '@electron-forge/shared-types';
+import { ForgeArch, ForgePlatform, IForgeMaker, ResolvedForgeConfig } from '@electron-forge/shared-types';
+export declare type EmptyConfig = Record<string, never>;
 export interface MakerOptions {
     /**
      * The directory containing the packaged Electron application
@@ -24,20 +25,28 @@ export interface MakerOptions {
     /**
      * Fully resolved forge configuration, you shouldn't really need this
      */
-    forgeConfig: ForgeConfig;
+    forgeConfig: ResolvedForgeConfig;
     /**
-     * The applications package.json file
+     * The application's package.json file
      */
     packageJSON: any;
 }
-export default abstract class Maker<C> {
+export default abstract class Maker<C> implements IForgeMaker {
+    private configOrConfigFetcher;
+    protected platformsToMakeOn?: string[] | undefined;
     config: C;
-    protected providedPlatforms: ForgePlatform[] | undefined;
     abstract name: string;
     abstract defaultPlatforms: ForgePlatform[];
+    requiredExternalBinaries: string[];
+    /** @internal */
     __isElectronForgeMaker: true;
-    constructor(config?: C, providedPlatforms?: ForgePlatform[] | undefined);
-    readonly platforms: ForgePlatform[];
+    /**
+     * @param configOrConfigFetcher - Either a configuration object for this maker or a simple method that returns such a configuration for a given target architecture
+     * @param platformsToMakeOn - If you want this maker to run on platforms different from `defaultPlatforms` you can provide those platforms here
+     */
+    constructor(configOrConfigFetcher?: C | ((arch: ForgeArch) => C), platformsToMakeOn?: string[] | undefined);
+    get platforms(): ForgePlatform[];
+    prepareConfig(targetArch: ForgeArch): void;
     /**
      * Makers must implement this method and return true or false indicating whether
      * this maker can be run on the current platform.  Normally this is just a process.platform
@@ -69,9 +78,24 @@ export default abstract class Maker<C> {
      * I.e. If the file already exists it is deleted and the path created
      */
     ensureFile(file: string): Promise<void>;
+    /**
+     * Checks if the specified binaries exist, which are required for the maker to be used.
+     */
+    externalBinariesExist(): boolean;
+    /**
+     * Throws an error if any of the binaries don't exist.
+     */
+    ensureExternalBinariesExist(): void;
     /**
      * Checks if the given module is installed, used for testing if optional dependencies
      * are installed or not
      */
     isInstalled(module: string): boolean;
+    /**
+     * Normalize the given semver-formatted version to a 4-part dot delimited version number without
+     * prerelease information for use in Windows apps.
+     */
+    normalizeWindowsVersion(version: string): string;
 }
+export { Maker as MakerBase };
+//# sourceMappingURL=Maker.d.ts.map

package/dist/Maker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Maker.d.ts","sourceRoot":"","sources":["../src/Maker.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAI1G,oBAAY,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAEhD,MAAM,WAAW,YAAY;IAC3B;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,cAAc,EAAE,aAAa,CAAC;IAC9B;;OAEG;IACH,UAAU,EAAE,SAAS,CAAC;IACtB;;OAEG;IACH,WAAW,EAAE,mBAAmB,CAAC;IACjC;;OAEG;IACH,WAAW,EAAE,GAAG,CAAC;CAClB;AAED,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,KAAK,CAAC,CAAC,CAAE,YAAW,WAAW;IAgB/C,OAAO,CAAC,qBAAqB;IAA0C,SAAS,CAAC,iBAAiB,CAAC;IAfxG,MAAM,EAAG,CAAC,CAAC;IAElB,SAAgB,IAAI,EAAE,MAAM,CAAC;IAE7B,SAAgB,gBAAgB,EAAE,aAAa,EAAE,CAAC;IAE3C,wBAAwB,EAAE,MAAM,EAAE,CAAM;IAE/C,gBAAgB;IAChB,sBAAsB,EAAG,IAAI,CAAC;IAE9B;;;OAGG;gBACiB,qBAAqB,GAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,SAAS,KAAK,CAAC,CAAW,EAAY,iBAAiB,CAAC,sBAAiB;IAQhI,IAAI,SAAS,IAAI,aAAa,EAAE,CAG/B;IAID,aAAa,CAAC,UAAU,EAAE,SAAS,GAAG,IAAI;IAQ1C;;;;;;;;OAQG;IACH,4BAA4B,IAAI,OAAO;IAOvC;;;OAGG;IAEG,IAAI,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAOjD;;OAEG;IAEH;;;;;OAKG;IACG,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOjD;;;;OAIG;IACG,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO7C;;OAEG;IACH,qBAAqB,IAAI,OAAO;IAIhC;;OAEG;IACH,2BAA2B,IAAI,IAAI;IAMnC;;;OAGG;IACH,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAUpC;;;OAGG;IACH,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;CAIjD;AAED,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,CAAC"}

package/dist/Maker.js

@@ -1,57 +1,44 @@
 "use strict";
-
 Object.defineProperty(exports, "__esModule", {
-  value: true
+    value: true
 });
-exports.default = void 0;
-
-require("source-map-support/register");
-
-var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
+exports.MakerBase = exports.default = void 0;
 var _path = _interopRequireDefault(require("path"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } function _next(value) { step("next", value); } function _throw(err) { step("throw", err); } _next(); }); }; }
-
+var _fsExtra = _interopRequireDefault(require("fs-extra"));
+var _which = _interopRequireDefault(require("which"));
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
 class Maker {
-  /* tslint:disable variable-name */
-
-  /* tslint:enable variable-name */
-  constructor(config = {}, providedPlatforms) {
-    this.config = config;
-    this.providedPlatforms = providedPlatforms;
-    Object.defineProperty(this, "name", {
-      configurable: true,
-      enumerable: true,
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, "defaultPlatforms", {
-      configurable: true,
-      enumerable: true,
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, "__isElectronForgeMaker", {
-      configurable: true,
-      enumerable: true,
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, '__isElectronForgeMaker', {
-      value: true,
-      enumerable: false,
-      configurable: false
-    });
-  }
-
-  get platforms() {
-    if (this.providedPlatforms) return this.providedPlatforms;
-    return this.defaultPlatforms;
-  }
-  /**
+    /**
+   * @param configOrConfigFetcher - Either a configuration object for this maker or a simple method that returns such a configuration for a given target architecture
+   * @param platformsToMakeOn - If you want this maker to run on platforms different from `defaultPlatforms` you can provide those platforms here
+   */ constructor(configOrConfigFetcher = {}, platformsToMakeOn){
+        this.configOrConfigFetcher = configOrConfigFetcher;
+        this.platformsToMakeOn = platformsToMakeOn;
+        this.requiredExternalBinaries = [];
+        Object.defineProperty(this, '__isElectronForgeMaker', {
+            value: true,
+            enumerable: false,
+            configurable: false
+        });
+    }
+    get platforms() {
+        if (this.platformsToMakeOn) return this.platformsToMakeOn;
+        return this.defaultPlatforms;
+    }
+    // TODO: Remove this, it is an eye-sore and is a nasty hack to provide forge
+    //       v5 style functionality in the new API
+    prepareConfig(targetArch) {
+        if (typeof this.configOrConfigFetcher === 'function') {
+            this.config = this.configOrConfigFetcher(targetArch);
+        } else {
+            this.config = this.configOrConfigFetcher;
+        }
+    }
+    /**
    * Makers must implement this method and return true or false indicating whether
    * this maker can be run on the current platform.  Normally this is just a process.platform
    * check but it can be a deeper check for dependencies like fake-root or other
@@ -59,80 +46,81 @@ class Maker {
    *
    * If the issue is a missing dependency you should log out a HELPFUL error message
    * telling the developer exactly what is missing and if possible how to get it.
-   */
-
-
-  isSupportedOnCurrentPlatform() {
-    throw new Error(`Maker ${this.name} did not implement the isSupportedOnCurrentPlatform method`);
-  }
-  /**
+   */ isSupportedOnCurrentPlatform() {
+        if (this.isSupportedOnCurrentPlatform === Maker.prototype.isSupportedOnCurrentPlatform) {
+            throw new Error(`Maker ${this.name} did not implement the isSupportedOnCurrentPlatform method`);
+        }
+        return true;
+    }
+    /**
    * Makers must implement this method and return an array of absolute paths
    * to the artifacts generated by your maker
-   */
-
-
-  make(opts) {
-    var _this = this;
-
-    return _asyncToGenerator(function* () {
-      throw new Error(`Maker ${_this.name} did not implement the make method`);
-    })();
-  }
-  /**
+   */ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    async make(opts) {
+        if (this.make === Maker.prototype.make) {
+            throw new Error(`Maker ${this.name} did not implement the make method`);
+        }
+        return [];
+    }
+    /**
    * Helpers
-   */
-
-  /**
+   */ /**
    * Ensures the directory exists and is forced to be empty.
    *
    * I.e. If the directory already exists it is deleted and recreated, this
    * is a destructive operation
-   */
-
-
-  ensureDirectory(dir) {
-    return _asyncToGenerator(function* () {
-      if (yield _fsExtra.default.pathExists(dir)) {
-        yield _fsExtra.default.remove(dir);
-      }
-
-      return _fsExtra.default.mkdirs(dir);
-    })();
-  }
-  /**
+   */ async ensureDirectory(dir) {
+        if (await _fsExtra.default.pathExists(dir)) {
+            await _fsExtra.default.remove(dir);
+        }
+        return _fsExtra.default.mkdirs(dir);
+    }
+    /**
    * Ensures the path to the file exists and the file does not exist
    *
    * I.e. If the file already exists it is deleted and the path created
-   */
-
-
-  ensureFile(file) {
-    return _asyncToGenerator(function* () {
-      if (yield _fsExtra.default.pathExists(file)) {
-        yield _fsExtra.default.remove(file);
-      }
-
-      yield _fsExtra.default.mkdirs(_path.default.dirname(file));
-    })();
-  }
-  /**
+   */ async ensureFile(file) {
+        if (await _fsExtra.default.pathExists(file)) {
+            await _fsExtra.default.remove(file);
+        }
+        await _fsExtra.default.mkdirs(_path.default.dirname(file));
+    }
+    /**
+   * Checks if the specified binaries exist, which are required for the maker to be used.
+   */ externalBinariesExist() {
+        return this.requiredExternalBinaries.every((binary)=>_which.default.sync(binary, {
+                nothrow: true
+            }) !== null
+        );
+    }
+    /**
+   * Throws an error if any of the binaries don't exist.
+   */ ensureExternalBinariesExist() {
+        if (!this.externalBinariesExist()) {
+            throw new Error(`Cannot make for ${this.name}, the following external binaries need to be installed: ${this.requiredExternalBinaries.join(', ')}`);
+        }
+    }
+    /**
    * Checks if the given module is installed, used for testing if optional dependencies
    * are installed or not
-   */
-
-
-  isInstalled(module) {
-    try {
-      require(module);
-
-      return true;
-    } catch (e) {
-      // Package doesn't exist -- must not be installable on this platform
-      return false;
+   */ isInstalled(module) {
+        try {
+            require(module);
+            return true;
+        } catch (e) {
+            // Package doesn't exist -- must not be installable on this platform
+            return false;
+        }
+    }
+    /**
+   * Normalize the given semver-formatted version to a 4-part dot delimited version number without
+   * prerelease information for use in Windows apps.
+   */ normalizeWindowsVersion(version) {
+        const noPrerelease = version.replace(/-.*/, '');
+        return `${noPrerelease}.0`;
     }
-  }
-
 }
-
 exports.default = Maker;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9NYWtlci50cyJdLCJuYW1lcyI6WyJNYWtlciIsImNvbnN0cnVjdG9yIiwiY29uZmlnIiwicHJvdmlkZWRQbGF0Zm9ybXMiLCJPYmplY3QiLCJkZWZpbmVQcm9wZXJ0eSIsInZhbHVlIiwiZW51bWVyYWJsZSIsImNvbmZpZ3VyYWJsZSIsInBsYXRmb3JtcyIsImRlZmF1bHRQbGF0Zm9ybXMiLCJpc1N1cHBvcnRlZE9uQ3VycmVudFBsYXRmb3JtIiwiRXJyb3IiLCJuYW1lIiwibWFrZSIsIm9wdHMiLCJlbnN1cmVEaXJlY3RvcnkiLCJkaXIiLCJmcyIsInBhdGhFeGlzdHMiLCJyZW1vdmUiLCJta2RpcnMiLCJlbnN1cmVGaWxlIiwiZmlsZSIsInBhdGgiLCJkaXJuYW1lIiwiaXNJbnN0YWxsZWQiLCJtb2R1bGUiLCJyZXF1aXJlIiwiZSJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBR0E7O0FBQ0E7Ozs7OztBQWtDZSxNQUFlQSxLQUFmLENBQXdCO0FBR3JDOztBQUVBO0FBRUFDLGNBQW1CQyxTQUFZLEVBQS9CLEVBQWtEQyxpQkFBbEQsRUFBdUY7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQ3JGQyxXQUFPQyxjQUFQLENBQXNCLElBQXRCLEVBQTRCLHdCQUE1QixFQUFzRDtBQUNwREMsYUFBTyxJQUQ2QztBQUVwREMsa0JBQVksS0FGd0M7QUFHcERDLG9CQUFjO0FBSHNDLEtBQXREO0FBS0Q7O0FBRUQsTUFBSUMsU0FBSixHQUFnQjtBQUNkLFFBQUksS0FBS04saUJBQVQsRUFBNEIsT0FBTyxLQUFLQSxpQkFBWjtBQUM1QixXQUFPLEtBQUtPLGdCQUFaO0FBQ0Q7QUFFRDs7Ozs7Ozs7Ozs7QUFTQUMsaUNBQXdDO0FBQ3RDLFVBQU0sSUFBSUMsS0FBSixDQUFXLFNBQVEsS0FBS0MsSUFBSyw0REFBN0IsQ0FBTjtBQUNEO0FBRUQ7Ozs7OztBQUlNQyxNQUFOLENBQVdDLElBQVgsRUFBa0Q7QUFBQTs7QUFBQTtBQUNoRCxZQUFNLElBQUlILEtBQUosQ0FBVyxTQUFRLE1BQUtDLElBQUssb0NBQTdCLENBQU47QUFEZ0Q7QUFFakQ7QUFHRDs7OztBQUlBOzs7Ozs7OztBQU1NRyxpQkFBTixDQUFzQkMsR0FBdEIsRUFBa0Q7QUFBQTtBQUNoRCxnQkFBVUMsaUJBQUdDLFVBQUgsQ0FBY0YsR0FBZCxDQUFWLEVBQThCO0FBQzVCLGNBQU1DLGlCQUFHRSxNQUFILENBQVVILEdBQVYsQ0FBTjtBQUNEOztBQUNELGFBQU9DLGlCQUFHRyxNQUFILENBQVVKLEdBQVYsQ0FBUDtBQUpnRDtBQUtqRDtBQUVEOzs7Ozs7O0FBS01LLFlBQU4sQ0FBaUJDLElBQWpCLEVBQThDO0FBQUE7QUFDNUMsZ0JBQVVMLGlCQUFHQyxVQUFILENBQWNJLElBQWQsQ0FBVixFQUErQjtBQUM3QixjQUFNTCxpQkFBR0UsTUFBSCxDQUFVRyxJQUFWLENBQU47QUFDRDs7QUFDRCxZQUFNTCxpQkFBR0csTUFBSCxDQUFVRyxjQUFLQyxPQUFMLENBQWFGLElBQWIsQ0FBVixDQUFOO0FBSjRDO0FBSzdDO0FBRUQ7Ozs7OztBQUlBRyxjQUFZQyxNQUFaLEVBQXFDO0FBQ25DLFFBQUk7QUFDRkMsY0FBUUQsTUFBUjs7QUFDQSxhQUFPLElBQVA7QUFDRCxLQUhELENBR0UsT0FBT0UsQ0FBUCxFQUFVO0FBQ1Y7QUFDQSxhQUFPLEtBQVA7QUFDRDtBQUNGOztBQW5Gb0MiLCJzb3VyY2VzQ29udGVudCI6WyIvKiBlc2xpbnQtZGlzYWJsZSBuby11bnVzZWQtdmFycyAqL1xuXG5pbXBvcnQgeyBGb3JnZUFyY2gsIEZvcmdlQ29uZmlnLCBGb3JnZVBsYXRmb3JtLCBJRm9yZ2VNYWtlciB9IGZyb20gJ0BlbGVjdHJvbi1mb3JnZS9zaGFyZWQtdHlwZXMnO1xuaW1wb3J0IGZzIGZyb20gJ2ZzLWV4dHJhJztcbmltcG9ydCBwYXRoIGZyb20gJ3BhdGgnO1xuXG5leHBvcnQgaW50ZXJmYWNlIE1ha2VyT3B0aW9ucyB7XG4gIC8qKlxuICAgKiBUaGUgZGlyZWN0b3J5IGNvbnRhaW5pbmcgdGhlIHBhY2thZ2VkIEVsZWN0cm9uIGFwcGxpY2F0aW9uXG4gICAqL1xuICBkaXI6IHN0cmluZztcbiAgLyoqXG4gICAqIFRoZSBkaXJlY3RvcnkgeW91IHNob3VsZCBwdXQgYWxsIHlvdXIgYXJ0aWZhY3RzIGluIChwb3RlbnRpYWxseSBpbiBzdWIgZm9sZGVycylcbiAgICogTk9URTogdGhpcyBkaXJlY3RvcnkgaXMgbm90IGd1YXJ1bnRlZWQgdG8gYWxyZWFkeSBleGlzdFxuICAgKi9cbiAgbWFrZURpcjogc3RyaW5nO1xuICAvKipcbiAgICogVGhlIHJlc29sdmVkIGh1bWFuIGZyaWVuZGx5IG5hbWUgb2YgdGhlIHByb2plY3RcbiAgICovXG4gIGFwcE5hbWU6IHN0cmluZztcbiAgLyoqXG4gICAqIFRoZSB0YXJnZXQgcGxhdGZvcm0geW91IHNob3VsZCBtYWtlIGZvclxuICAgKi9cbiAgdGFyZ2V0UGxhdGZvcm06IEZvcmdlUGxhdGZvcm07XG4gIC8qKlxuICAgKiBUaGUgdGFyZ2V0IGFyY2hpdGVjdHVyZSB5b3Ugc2hvdWxkIG1ha2UgZm9yXG4gICAqL1xuICB0YXJnZXRBcmNoOiBGb3JnZUFyY2g7XG4gIC8qKlxuICAgKiBGdWxseSByZXNvbHZlZCBmb3JnZSBjb25maWd1cmF0aW9uLCB5b3Ugc2hvdWxkbid0IHJlYWxseSBuZWVkIHRoaXNcbiAgICovXG4gIGZvcmdlQ29uZmlnOiBGb3JnZUNvbmZpZztcbiAgLyoqXG4gICAqIFRoZSBhcHBsaWNhdGlvbnMgcGFja2FnZS5qc29uIGZpbGVcbiAgICovXG4gIHBhY2thZ2VKU09OOiBhbnk7XG59XG5cbmV4cG9ydCBkZWZhdWx0IGFic3RyYWN0IGNsYXNzIE1ha2VyPEM+IHtcbiAgcHVibGljIGFic3RyYWN0IG5hbWU6IHN0cmluZztcbiAgcHVibGljIGFic3RyYWN0IGRlZmF1bHRQbGF0Zm9ybXM6IEZvcmdlUGxhdGZvcm1bXTtcbiAgLyogdHNsaW50OmRpc2FibGUgdmFyaWFibGUtbmFtZSAqL1xuICBfX2lzRWxlY3Ryb25Gb3JnZU1ha2VyITogdHJ1ZTtcbiAgLyogdHNsaW50OmVuYWJsZSB2YXJpYWJsZS1uYW1lICovXG5cbiAgY29uc3RydWN0b3IocHVibGljIGNvbmZpZzogQyA9IHt9IGFzIEMsIHByb3RlY3RlZCBwcm92aWRlZFBsYXRmb3Jtcz86IEZvcmdlUGxhdGZvcm1bXSkge1xuICAgIE9iamVjdC5kZWZpbmVQcm9wZXJ0eSh0aGlzLCAnX19pc0VsZWN0cm9uRm9yZ2VNYWtlcicsIHtcbiAgICAgIHZhbHVlOiB0cnVlLFxuICAgICAgZW51bWVyYWJsZTogZmFsc2UsXG4gICAgICBjb25maWd1cmFibGU6IGZhbHNlLFxuICAgIH0pO1xuICB9XG5cbiAgZ2V0IHBsYXRmb3JtcygpIHtcbiAgICBpZiAodGhpcy5wcm92aWRlZFBsYXRmb3JtcykgcmV0dXJuIHRoaXMucHJvdmlkZWRQbGF0Zm9ybXM7XG4gICAgcmV0dXJuIHRoaXMuZGVmYXVsdFBsYXRmb3JtcztcbiAgfVxuXG4gIC8qKlxuICAgKiBNYWtlcnMgbXVzdCBpbXBsZW1lbnQgdGhpcyBtZXRob2QgYW5kIHJldHVybiB0cnVlIG9yIGZhbHNlIGluZGljYXRpbmcgd2hldGhlclxuICAgKiB0aGlzIG1ha2VyIGNhbiBiZSBydW4gb24gdGhlIGN1cnJlbnQgcGxhdGZvcm0uICBOb3JtYWxseSB0aGlzIGlzIGp1c3QgYSBwcm9jZXNzLnBsYXRmb3JtXG4gICAqIGNoZWNrIGJ1dCBpdCBjYW4gYmUgYSBkZWVwZXIgY2hlY2sgZm9yIGRlcGVuZGVuY2llcyBsaWtlIGZha2Utcm9vdCBvciBvdGhlclxuICAgKiByZXF1aXJlZCBleHRlcm5hbCBidWlsZCB0b29scy5cbiAgICpcbiAgICogSWYgdGhlIGlzc3VlIGlzIGEgbWlzc2luZyBkZXBlbmRlbmN5IHlvdSBzaG91bGQgbG9nIG91dCBhIEhFTFBGVUwgZXJyb3IgbWVzc2FnZVxuICAgKiB0ZWxsaW5nIHRoZSBkZXZlbG9wZXIgZXhhY3RseSB3aGF0IGlzIG1pc3NpbmcgYW5kIGlmIHBvc3NpYmxlIGhvdyB0byBnZXQgaXQuXG4gICAqL1xuICBpc1N1cHBvcnRlZE9uQ3VycmVudFBsYXRmb3JtKCk6IGJvb2xlYW4ge1xuICAgIHRocm93IG5ldyBFcnJvcihgTWFrZXIgJHt0aGlzLm5hbWV9IGRpZCBub3QgaW1wbGVtZW50IHRoZSBpc1N1cHBvcnRlZE9uQ3VycmVudFBsYXRmb3JtIG1ldGhvZGApO1xuICB9XG5cbiAgLyoqXG4gICAqIE1ha2VycyBtdXN0IGltcGxlbWVudCB0aGlzIG1ldGhvZCBhbmQgcmV0dXJuIGFuIGFycmF5IG9mIGFic29sdXRlIHBhdGhzXG4gICAqIHRvIHRoZSBhcnRpZmFjdHMgZ2VuZXJhdGVkIGJ5IHlvdXIgbWFrZXJcbiAgICovXG4gIGFzeW5jIG1ha2Uob3B0czogTWFrZXJPcHRpb25zKTogUHJvbWlzZTxzdHJpbmdbXT4ge1xuICAgIHRocm93IG5ldyBFcnJvcihgTWFrZXIgJHt0aGlzLm5hbWV9IGRpZCBub3QgaW1wbGVtZW50IHRoZSBtYWtlIG1ldGhvZGApO1xuICB9XG5cblxuICAvKipcbiAgICogSGVscGVyc1xuICAgKi9cblxuICAvKipcbiAgICogRW5zdXJlcyB0aGUgZGlyZWN0b3J5IGV4aXN0cyBhbmQgaXMgZm9yY2VkIHRvIGJlIGVtcHR5LlxuICAgKlxuICAgKiBJLmUuIElmIHRoZSBkaXJlY3RvcnkgYWxyZWFkeSBleGlzdHMgaXQgaXMgZGVsZXRlZCBhbmQgcmVjcmVhdGVkLCB0aGlzXG4gICAqIGlzIGEgZGVzdHJ1Y3RpdmUgb3BlcmF0aW9uXG4gICAqL1xuICBhc3luYyBlbnN1cmVEaXJlY3RvcnkoZGlyOiBzdHJpbmcpOiBQcm9taXNlPHZvaWQ+IHtcbiAgICBpZiAoYXdhaXQgZnMucGF0aEV4aXN0cyhkaXIpKSB7XG4gICAgICBhd2FpdCBmcy5yZW1vdmUoZGlyKTtcbiAgICB9XG4gICAgcmV0dXJuIGZzLm1rZGlycyhkaXIpO1xuICB9XG5cbiAgLyoqXG4gICAqIEVuc3VyZXMgdGhlIHBhdGggdG8gdGhlIGZpbGUgZXhpc3RzIGFuZCB0aGUgZmlsZSBkb2VzIG5vdCBleGlzdFxuICAgKlxuICAgKiBJLmUuIElmIHRoZSBmaWxlIGFscmVhZHkgZXhpc3RzIGl0IGlzIGRlbGV0ZWQgYW5kIHRoZSBwYXRoIGNyZWF0ZWRcbiAgICovXG4gIGFzeW5jIGVuc3VyZUZpbGUoZmlsZTogc3RyaW5nKTogUHJvbWlzZTx2b2lkPiB7XG4gICAgaWYgKGF3YWl0IGZzLnBhdGhFeGlzdHMoZmlsZSkpIHtcbiAgICAgIGF3YWl0IGZzLnJlbW92ZShmaWxlKTtcbiAgICB9XG4gICAgYXdhaXQgZnMubWtkaXJzKHBhdGguZGlybmFtZShmaWxlKSk7XG4gIH1cblxuICAvKipcbiAgICogQ2hlY2tzIGlmIHRoZSBnaXZlbiBtb2R1bGUgaXMgaW5zdGFsbGVkLCB1c2VkIGZvciB0ZXN0aW5nIGlmIG9wdGlvbmFsIGRlcGVuZGVuY2llc1xuICAgKiBhcmUgaW5zdGFsbGVkIG9yIG5vdFxuICAgKi9cbiAgaXNJbnN0YWxsZWQobW9kdWxlOiBzdHJpbmcpOiBib29sZWFuIHtcbiAgICB0cnkge1xuICAgICAgcmVxdWlyZShtb2R1bGUpO1xuICAgICAgcmV0dXJuIHRydWU7XG4gICAgfSBjYXRjaCAoZSkge1xuICAgICAgLy8gUGFja2FnZSBkb2Vzbid0IGV4aXN0IC0tIG11c3Qgbm90IGJlIGluc3RhbGxhYmxlIG9uIHRoaXMgcGxhdGZvcm1cbiAgICAgIHJldHVybiBmYWxzZTtcbiAgICB9XG4gIH1cbn1cbiJdfQ==
+exports.MakerBase = Maker;
+
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/Maker.ts"],"sourcesContent":["import path from 'path';\n\nimport { ForgeArch, ForgePlatform, IForgeMaker, ResolvedForgeConfig } from '@electron-forge/shared-types';\nimport fs from 'fs-extra';\nimport which from 'which';\n\nexport type EmptyConfig = Record<string, never>;\n\nexport interface MakerOptions {\n  /**\n   * The directory containing the packaged Electron application\n   */\n  dir: string;\n  /**\n   * The directory you should put all your artifacts in (potentially in sub folders)\n   * NOTE: this directory is not guarunteed to already exist\n   */\n  makeDir: string;\n  /**\n   * The resolved human friendly name of the project\n   */\n  appName: string;\n  /**\n   * The target platform you should make for\n   */\n  targetPlatform: ForgePlatform;\n  /**\n   * The target architecture you should make for\n   */\n  targetArch: ForgeArch;\n  /**\n   * Fully resolved forge configuration, you shouldn't really need this\n   */\n  forgeConfig: ResolvedForgeConfig;\n  /**\n   * The application's package.json file\n   */\n  packageJSON: any; // eslint-disable-line @typescript-eslint/no-explicit-any\n}\n\nexport default abstract class Maker<C> implements IForgeMaker {\n  public config!: C;\n\n  public abstract name: string;\n\n  public abstract defaultPlatforms: ForgePlatform[];\n\n  public requiredExternalBinaries: string[] = [];\n\n  /** @internal */\n  __isElectronForgeMaker!: true;\n\n  /**\n   * @param configOrConfigFetcher - Either a configuration object for this maker or a simple method that returns such a configuration for a given target architecture\n   * @param platformsToMakeOn - If you want this maker to run on platforms different from `defaultPlatforms` you can provide those platforms here\n   */\n  constructor(private configOrConfigFetcher: C | ((arch: ForgeArch) => C) = {} as C, protected platformsToMakeOn?: ForgePlatform[]) {\n    Object.defineProperty(this, '__isElectronForgeMaker', {\n      value: true,\n      enumerable: false,\n      configurable: false,\n    });\n  }\n\n  get platforms(): ForgePlatform[] {\n    if (this.platformsToMakeOn) return this.platformsToMakeOn;\n    return this.defaultPlatforms;\n  }\n\n  // TODO: Remove this, it is an eye-sore and is a nasty hack to provide forge\n  //       v5 style functionality in the new API\n  prepareConfig(targetArch: ForgeArch): void {\n    if (typeof this.configOrConfigFetcher === 'function') {\n      this.config = (this.configOrConfigFetcher as unknown as (arch: ForgeArch) => C)(targetArch);\n    } else {\n      this.config = this.configOrConfigFetcher as C;\n    }\n  }\n\n  /**\n   * Makers must implement this method and return true or false indicating whether\n   * this maker can be run on the current platform.  Normally this is just a process.platform\n   * check but it can be a deeper check for dependencies like fake-root or other\n   * required external build tools.\n   *\n   * If the issue is a missing dependency you should log out a HELPFUL error message\n   * telling the developer exactly what is missing and if possible how to get it.\n   */\n  isSupportedOnCurrentPlatform(): boolean {\n    if (this.isSupportedOnCurrentPlatform === Maker.prototype.isSupportedOnCurrentPlatform) {\n      throw new Error(`Maker ${this.name} did not implement the isSupportedOnCurrentPlatform method`);\n    }\n    return true;\n  }\n\n  /**\n   * Makers must implement this method and return an array of absolute paths\n   * to the artifacts generated by your maker\n   */\n  // eslint-disable-next-line @typescript-eslint/no-unused-vars\n  async make(opts: MakerOptions): Promise<string[]> {\n    if (this.make === Maker.prototype.make) {\n      throw new Error(`Maker ${this.name} did not implement the make method`);\n    }\n    return [];\n  }\n\n  /**\n   * Helpers\n   */\n\n  /**\n   * Ensures the directory exists and is forced to be empty.\n   *\n   * I.e. If the directory already exists it is deleted and recreated, this\n   * is a destructive operation\n   */\n  async ensureDirectory(dir: string): Promise<void> {\n    if (await fs.pathExists(dir)) {\n      await fs.remove(dir);\n    }\n    return fs.mkdirs(dir);\n  }\n\n  /**\n   * Ensures the path to the file exists and the file does not exist\n   *\n   * I.e. If the file already exists it is deleted and the path created\n   */\n  async ensureFile(file: string): Promise<void> {\n    if (await fs.pathExists(file)) {\n      await fs.remove(file);\n    }\n    await fs.mkdirs(path.dirname(file));\n  }\n\n  /**\n   * Checks if the specified binaries exist, which are required for the maker to be used.\n   */\n  externalBinariesExist(): boolean {\n    return this.requiredExternalBinaries.every((binary) => which.sync(binary, { nothrow: true }) !== null);\n  }\n\n  /**\n   * Throws an error if any of the binaries don't exist.\n   */\n  ensureExternalBinariesExist(): void {\n    if (!this.externalBinariesExist()) {\n      throw new Error(`Cannot make for ${this.name}, the following external binaries need to be installed: ${this.requiredExternalBinaries.join(', ')}`);\n    }\n  }\n\n  /**\n   * Checks if the given module is installed, used for testing if optional dependencies\n   * are installed or not\n   */\n  isInstalled(module: string): boolean {\n    try {\n      require(module);\n      return true;\n    } catch (e) {\n      // Package doesn't exist -- must not be installable on this platform\n      return false;\n    }\n  }\n\n  /**\n   * Normalize the given semver-formatted version to a 4-part dot delimited version number without\n   * prerelease information for use in Windows apps.\n   */\n  normalizeWindowsVersion(version: string): string {\n    const noPrerelease = version.replace(/-.*/, '');\n    return `${noPrerelease}.0`;\n  }\n}\n\nexport { Maker as MakerBase };\n"],"names":["Maker","configOrConfigFetcher","platformsToMakeOn","requiredExternalBinaries","Object","defineProperty","value","enumerable","configurable","platforms","defaultPlatforms","prepareConfig","targetArch","config","isSupportedOnCurrentPlatform","prototype","Error","name","make","opts","ensureDirectory","dir","fs","pathExists","remove","mkdirs","ensureFile","file","path","dirname","externalBinariesExist","every","binary","which","sync","nothrow","ensureExternalBinariesExist","join","isInstalled","module","require","e","normalizeWindowsVersion","version","noPrerelease","replace","MakerBase"],"mappings":"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"}

package/index.ts

@@ -0,0 +1,5 @@
+// ⚠️ AUTOGENERATED ⚠️ AUTOGENERATED ⚠️ AUTOGENERATED ⚠️
+// This file was automatically generated by `tools/gen-ts-glue.ts`. Do not modify directly if you want to keep your changes.
+export * from "./src/Maker";
+import defaultExport from "./src/Maker";
+export default defaultExport;

package/package.json

@@ -1,24 +1,23 @@
 {
   "name": "@electron-forge/maker-base",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.70",
   "description": "Base maker for Electron Forge",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Samuel Attard",
   "license": "MIT",
   "main": "dist/Maker.js",
   "typings": "dist/Maker.d.ts",
-  "scripts": {
-    "test": "mocha --require ts-node/register test/**/*_spec.ts test/**/**/*_spec.ts --opts ../../../mocha.opts"
-  },
   "devDependencies": {
-    "chai": "^4.0.0",
-    "mocha": "^5.0.0"
+    "chai": "^4.3.3",
+    "mocha": "^9.0.1",
+    "sinon": "^13.0.1"
   },
   "engines": {
-    "node": ">= 6.0"
+    "node": ">= 14.17.5"
   },
   "dependencies": {
-    "@electron-forge/shared-types": "6.0.0-beta.7",
-    "fs-extra": "^5.0.0"
+    "@electron-forge/shared-types": "6.0.0-beta.70",
+    "fs-extra": "^10.0.0",
+    "which": "^2.0.2"
   }
 }

package/src/Maker.ts

@@ -1,8 +1,10 @@
-/* eslint-disable no-unused-vars */
+import path from 'path';
 
-import { ForgeArch, ForgeConfig, ForgePlatform, IForgeMaker } from '@electron-forge/shared-types';
+import { ForgeArch, ForgePlatform, IForgeMaker, ResolvedForgeConfig } from '@electron-forge/shared-types';
 import fs from 'fs-extra';
-import path from 'path';
+import which from 'which';
+
+export type EmptyConfig = Record<string, never>;
 
 export interface MakerOptions {
   /**
@@ -29,21 +31,30 @@ export interface MakerOptions {
   /**
    * Fully resolved forge configuration, you shouldn't really need this
    */
-  forgeConfig: ForgeConfig;
+  forgeConfig: ResolvedForgeConfig;
   /**
-   * The applications package.json file
+   * The application's package.json file
    */
-  packageJSON: any;
+  packageJSON: any; // eslint-disable-line @typescript-eslint/no-explicit-any
 }
 
-export default abstract class Maker<C> {
+export default abstract class Maker<C> implements IForgeMaker {
+  public config!: C;
+
   public abstract name: string;
+
   public abstract defaultPlatforms: ForgePlatform[];
-  /* tslint:disable variable-name */
+
+  public requiredExternalBinaries: string[] = [];
+
+  /** @internal */
   __isElectronForgeMaker!: true;
-  /* tslint:enable variable-name */
 
-  constructor(public config: C = {} as C, protected providedPlatforms?: ForgePlatform[]) {
+  /**
+   * @param configOrConfigFetcher - Either a configuration object for this maker or a simple method that returns such a configuration for a given target architecture
+   * @param platformsToMakeOn - If you want this maker to run on platforms different from `defaultPlatforms` you can provide those platforms here
+   */
+  constructor(private configOrConfigFetcher: C | ((arch: ForgeArch) => C) = {} as C, protected platformsToMakeOn?: ForgePlatform[]) {
     Object.defineProperty(this, '__isElectronForgeMaker', {
       value: true,
       enumerable: false,
@@ -51,11 +62,21 @@ export default abstract class Maker<C> {
     });
   }
 
-  get platforms() {
-    if (this.providedPlatforms) return this.providedPlatforms;
+  get platforms(): ForgePlatform[] {
+    if (this.platformsToMakeOn) return this.platformsToMakeOn;
     return this.defaultPlatforms;
   }
 
+  // TODO: Remove this, it is an eye-sore and is a nasty hack to provide forge
+  //       v5 style functionality in the new API
+  prepareConfig(targetArch: ForgeArch): void {
+    if (typeof this.configOrConfigFetcher === 'function') {
+      this.config = (this.configOrConfigFetcher as unknown as (arch: ForgeArch) => C)(targetArch);
+    } else {
+      this.config = this.configOrConfigFetcher as C;
+    }
+  }
+
   /**
    * Makers must implement this method and return true or false indicating whether
    * this maker can be run on the current platform.  Normally this is just a process.platform
@@ -66,18 +87,24 @@ export default abstract class Maker<C> {
    * telling the developer exactly what is missing and if possible how to get it.
    */
   isSupportedOnCurrentPlatform(): boolean {
-    throw new Error(`Maker ${this.name} did not implement the isSupportedOnCurrentPlatform method`);
+    if (this.isSupportedOnCurrentPlatform === Maker.prototype.isSupportedOnCurrentPlatform) {
+      throw new Error(`Maker ${this.name} did not implement the isSupportedOnCurrentPlatform method`);
+    }
+    return true;
   }
 
   /**
    * Makers must implement this method and return an array of absolute paths
    * to the artifacts generated by your maker
    */
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   async make(opts: MakerOptions): Promise<string[]> {
-    throw new Error(`Maker ${this.name} did not implement the make method`);
+    if (this.make === Maker.prototype.make) {
+      throw new Error(`Maker ${this.name} did not implement the make method`);
+    }
+    return [];
   }
 
-
   /**
    * Helpers
    */
@@ -107,6 +134,22 @@ export default abstract class Maker<C> {
     await fs.mkdirs(path.dirname(file));
   }
 
+  /**
+   * Checks if the specified binaries exist, which are required for the maker to be used.
+   */
+  externalBinariesExist(): boolean {
+    return this.requiredExternalBinaries.every((binary) => which.sync(binary, { nothrow: true }) !== null);
+  }
+
+  /**
+   * Throws an error if any of the binaries don't exist.
+   */
+  ensureExternalBinariesExist(): void {
+    if (!this.externalBinariesExist()) {
+      throw new Error(`Cannot make for ${this.name}, the following external binaries need to be installed: ${this.requiredExternalBinaries.join(', ')}`);
+    }
+  }
+
   /**
    * Checks if the given module is installed, used for testing if optional dependencies
    * are installed or not
@@ -120,4 +163,15 @@ export default abstract class Maker<C> {
       return false;
     }
   }
+
+  /**
+   * Normalize the given semver-formatted version to a 4-part dot delimited version number without
+   * prerelease information for use in Windows apps.
+   */
+  normalizeWindowsVersion(version: string): string {
+    const noPrerelease = version.replace(/-.*/, '');
+    return `${noPrerelease}.0`;
+  }
 }
+
+export { Maker as MakerBase };

package/test/config-fetcher_spec.ts

@@ -0,0 +1,42 @@
+import { expect } from 'chai';
+import { stub } from 'sinon';
+
+import { MakerBase } from '../src/Maker';
+
+class MakerImpl extends MakerBase<{ a: number }> {
+  name = 'test';
+
+  defaultPlatforms = [];
+}
+
+describe('prepareConfig', () => {
+  it('should call the provided configure function', () => {
+    const fetcher = stub();
+    fetcher.returns({
+      a: 123,
+    });
+    const maker = new MakerImpl(fetcher, []);
+    expect(maker.config).to.be.undefined;
+    expect(fetcher.callCount).to.equal(0);
+    maker.prepareConfig('x64');
+    expect(maker.config).to.deep.equal({
+      a: 123,
+    });
+    expect(fetcher.callCount).to.equal(1);
+    expect(fetcher.firstCall.args).to.deep.equal(['x64']);
+  });
+
+  it('should hand through the provided object', () => {
+    const maker = new MakerImpl(
+      {
+        a: 234,
+      },
+      []
+    );
+    expect(maker.config).to.be.undefined;
+    maker.prepareConfig('x64');
+    expect(maker.config).to.deep.equal({
+      a: 234,
+    });
+  });
+});

package/test/ensure-output_spec.ts

@@ -1,12 +1,14 @@
-import { expect } from 'chai';
-import fs from 'fs-extra';
 import os from 'os';
 import path from 'path';
 
-import MakerBase from '../src/Maker';
+import { expect } from 'chai';
+import fs from 'fs-extra';
+
+import { EmptyConfig, MakerBase } from '../src/Maker';
 
-class MakerImpl extends MakerBase<{}> {
+class MakerImpl extends MakerBase<EmptyConfig> {
   name = 'test';
+
   defaultPlatforms = [];
 }
 

package/test/support_spec.ts

@@ -0,0 +1,19 @@
+import { expect } from 'chai';
+
+import { EmptyConfig, MakerBase } from '../src/Maker';
+
+class MakerImpl extends MakerBase<EmptyConfig> {
+  name = 'test';
+
+  defaultPlatforms = [];
+
+  requiredExternalBinaries = ['bash', 'nonexistent'];
+}
+
+describe('ensureExternalBinariesExist', () => {
+  const maker = new MakerImpl({}, []);
+
+  it('throws an error when one of the binaries does not exist', () => {
+    expect(() => maker.ensureExternalBinariesExist()).to.throw(/the following external binaries need to be installed: bash, nonexistent/);
+  });
+});

package/test/version_spec.ts

@@ -0,0 +1,22 @@
+import { expect } from 'chai';
+
+import { EmptyConfig, MakerBase } from '../src/Maker';
+
+class MakerImpl extends MakerBase<EmptyConfig> {
+  name = 'test';
+
+  defaultPlatforms = [];
+}
+
+describe('normalizeWindowsVersion', () => {
+  const maker = new MakerImpl({}, []);
+
+  it('removes everything after the dash', () => {
+    for (const version of ['1.0.0-alpha', '1.0.0-alpha.1', '1.0.0-0.3.7', '1.0.0-x.7.z.92']) {
+      expect(maker.normalizeWindowsVersion(version)).to.equal('1.0.0.0');
+    }
+  });
+  it('does not truncate the version when there is no dash', () => {
+    expect(maker.normalizeWindowsVersion('2.0.0')).to.equal('2.0.0.0');
+  });
+});