From cb656908606bf803866738e9b970303bd9fe206b Mon Sep 17 00:00:00 2001 From: Mark Lee Date: Fri, 29 Nov 2019 19:00:35 -0800 Subject: [PATCH] Don't make requiredExternalBinaries an abstract property --- packages/api/core/src/api/make.ts | 2 -- packages/maker/appx/src/MakerAppX.ts | 2 -- packages/maker/base/src/Maker.ts | 2 +- packages/maker/base/test/ensure-output_spec.ts | 2 -- packages/maker/dmg/src/MakerDMG.ts | 2 -- packages/maker/flatpak/test/MakerFlatpak_spec.ts | 4 ++-- packages/maker/pkg/src/MakerPKG.ts | 2 -- packages/maker/rpm/test/MakerRpm_spec.ts | 4 ++-- packages/maker/squirrel/src/MakerSquirrel.ts | 2 -- packages/maker/wix/src/MakerWix.ts | 2 -- packages/maker/zip/src/MakerZIP.ts | 2 -- 11 files changed, 5 insertions(+), 21 deletions(-) diff --git a/packages/api/core/src/api/make.ts b/packages/api/core/src/api/make.ts index aae27178ee..6900561bfd 100644 --- a/packages/api/core/src/api/make.ts +++ b/packages/api/core/src/api/make.ts @@ -24,8 +24,6 @@ class MakerImpl extends MakerBase { name = 'impl'; defaultPlatforms = []; - - requiredExternalBinaries = []; } export interface MakeOptions { diff --git a/packages/maker/appx/src/MakerAppX.ts b/packages/maker/appx/src/MakerAppX.ts index 24139ea324..67d02bebc1 100644 --- a/packages/maker/appx/src/MakerAppX.ts +++ b/packages/maker/appx/src/MakerAppX.ts @@ -81,8 +81,6 @@ export default class MakerAppX extends MakerBase { defaultPlatforms: ForgePlatform[] = ['win32']; - requiredExternalBinaries: string[] = []; - isSupportedOnCurrentPlatform() { return process.platform === 'win32'; } diff --git a/packages/maker/base/src/Maker.ts b/packages/maker/base/src/Maker.ts index 1c79025944..d1ee44f26e 100644 --- a/packages/maker/base/src/Maker.ts +++ b/packages/maker/base/src/Maker.ts @@ -44,7 +44,7 @@ export default abstract class Maker implements IForgeMaker { public abstract defaultPlatforms: ForgePlatform[]; - public abstract requiredExternalBinaries: string[] = []; + public requiredExternalBinaries: string[] = []; __isElectronForgeMaker!: true; diff --git a/packages/maker/base/test/ensure-output_spec.ts b/packages/maker/base/test/ensure-output_spec.ts index 350fdad223..4522739f45 100644 --- a/packages/maker/base/test/ensure-output_spec.ts +++ b/packages/maker/base/test/ensure-output_spec.ts @@ -9,8 +9,6 @@ class MakerImpl extends MakerBase<{}> { name = 'test'; defaultPlatforms = []; - - requiredExternalBinaries = []; } describe('ensure-output', () => { diff --git a/packages/maker/dmg/src/MakerDMG.ts b/packages/maker/dmg/src/MakerDMG.ts index f6743b99aa..0bb8a8d861 100644 --- a/packages/maker/dmg/src/MakerDMG.ts +++ b/packages/maker/dmg/src/MakerDMG.ts @@ -11,8 +11,6 @@ export default class MakerDMG extends MakerBase { defaultPlatforms: ForgePlatform[] = ['darwin', 'mas']; - requiredExternalBinaries: string[] = []; - isSupportedOnCurrentPlatform() { return process.platform === 'darwin'; } diff --git a/packages/maker/flatpak/test/MakerFlatpak_spec.ts b/packages/maker/flatpak/test/MakerFlatpak_spec.ts index bf1045057b..6adf3ab0b3 100644 --- a/packages/maker/flatpak/test/MakerFlatpak_spec.ts +++ b/packages/maker/flatpak/test/MakerFlatpak_spec.ts @@ -11,9 +11,9 @@ import { flatpakArch } from '../src/MakerFlatpak'; import { MakerFlatpakConfig } from '../src/Config'; class MakerImpl extends MakerBase { - name = 'test'; + name = 'test'; - defaultPlatforms = []; + defaultPlatforms = []; } describe('MakerFlatpak', () => { diff --git a/packages/maker/pkg/src/MakerPKG.ts b/packages/maker/pkg/src/MakerPKG.ts index 576f111907..77ad908e77 100644 --- a/packages/maker/pkg/src/MakerPKG.ts +++ b/packages/maker/pkg/src/MakerPKG.ts @@ -11,8 +11,6 @@ export default class MakerDMG extends MakerBase { defaultPlatforms: ForgePlatform[] = ['darwin', 'mas']; - requiredExternalBinaries: string[] = []; - isSupportedOnCurrentPlatform() { return process.platform === 'darwin'; } diff --git a/packages/maker/rpm/test/MakerRpm_spec.ts b/packages/maker/rpm/test/MakerRpm_spec.ts index 0061e00d24..dee708b701 100644 --- a/packages/maker/rpm/test/MakerRpm_spec.ts +++ b/packages/maker/rpm/test/MakerRpm_spec.ts @@ -10,9 +10,9 @@ import { MakerRpmConfig } from '../src/Config'; import { rpmArch } from '../src/MakerRpm'; class MakerImpl extends MakerBase { - name = 'test'; + name = 'test'; - defaultPlatforms = []; + defaultPlatforms = []; } describe('MakerRpm', () => { diff --git a/packages/maker/squirrel/src/MakerSquirrel.ts b/packages/maker/squirrel/src/MakerSquirrel.ts index 759f0f56b3..91b1e0d049 100644 --- a/packages/maker/squirrel/src/MakerSquirrel.ts +++ b/packages/maker/squirrel/src/MakerSquirrel.ts @@ -12,8 +12,6 @@ export default class MakerSquirrel extends MakerBase { defaultPlatforms: ForgePlatform[] = ['win32']; - requiredExternalBinaries: string[] = []; - isSupportedOnCurrentPlatform() { return this.isInstalled('electron-winstaller') && !process.env.DISABLE_SQUIRREL_TEST; } diff --git a/packages/maker/wix/src/MakerWix.ts b/packages/maker/wix/src/MakerWix.ts index 313e0d6511..8850513337 100644 --- a/packages/maker/wix/src/MakerWix.ts +++ b/packages/maker/wix/src/MakerWix.ts @@ -14,8 +14,6 @@ export default class MakerWix extends MakerBase { defaultPlatforms: ForgePlatform[] = ['win32']; - requiredExternalBinaries: string[] = []; - isSupportedOnCurrentPlatform() { return process.platform === 'win32'; } diff --git a/packages/maker/zip/src/MakerZIP.ts b/packages/maker/zip/src/MakerZIP.ts index 0d1718fddb..af309a353d 100644 --- a/packages/maker/zip/src/MakerZIP.ts +++ b/packages/maker/zip/src/MakerZIP.ts @@ -11,8 +11,6 @@ export default class MakerZIP extends MakerBase { defaultPlatforms: ForgePlatform[] = ['darwin', 'mas', 'win32', 'linux']; - requiredExternalBinaries: string[] = []; - isSupportedOnCurrentPlatform() { return true; }