refactor: Rename forge config generator to electron.js

This commit is contained in:
Susmitha Girumala committed 2021-05-24 15:20:02 -04:00
1 parent 5bb7d41903
commit c99449d8e5
3 files changed
+18 -17

No files matched your search

@@ -8,26 +8,27 @@ const DEFAULT_CONFIG = {
name: 'Boundary',
version: '0.0.0',
appBundleId: 'com.electron.boundary',
appCopyright: 'Copyright © 2021 HashiCorp, Inc.',
appCopyright: `Copyright © ${new Date().getFullYear()} HashiCorp, Inc.`,
},
makers: [
{
name: '@electron-forge/maker-zip',
},
],
}
};
// Create forge config based on platform
const createConfig = () => {
const config = { ...DEFAULT_CONFIG };
const config = {
releaseVersion: process.env.RELEASE_VERSION,
releaseCommit: process.env.RELEASE_COMMIT,
...DEFAULT_CONFIG,
};
// Store env vars in config
['RELEASE_COMMIT', 'RELEASE_VERSION'].forEach((envVar) => {
if (process.env[envVar]) {
config[envVar] = process.env[envVar];
console.log(`[forge-config] ${envVar} ${config[envVar]}`);
}
});
console.log(`[forge-config]
release version: ${config.releaseVersion}
release commit: ${config.releaseVersion}
`);
if (os.platform().match(/(darwin)/i)) {
config.packagerConfig.icon = './config/macos/icon.icns';
@@ -39,8 +40,8 @@ const createConfig = () => {
};
// Version
if (config.RELEASE_VERSION)
config.packagerConfig.version = config.RELEASE_VERSION;
if (config.releaseVersion)
config.packagerConfig.version = config.releaseVersion;
// Signing identity
const signingIdentity = process.env.BOUNDARY_DESKTOP_SIGNING_IDENTITY;
+1 -1
View File
@@ -9,7 +9,7 @@
"main": "src/index.js",
"scripts": {
"build:cli": "node -e 'require(\"./config/cli.js\").setup()'",
"build:config": "node -e 'require(\"./config/forge.js\").setup()'",
"build:config": "node -e 'require(\"./config/electron.js\").setup()'",
"start": "electron-forge start",
"package": "electron-forge package",
"premake": "yarn build:cli && yarn build:config",
+4 -4
View File
@@ -1,6 +1,6 @@
const { app, shell, dialog } = require('electron');
const appUpdater = require('../helpers/app-updater.js');
const forgeConfig = require('../../config/forge.config.js');
const electronConfig = require('../../config/forge.config.js');
const { version } = require('../cli/index.js');
const generateMenuTemplate = () => {
@@ -13,10 +13,10 @@ const generateMenuTemplate = () => {
{
label: `About ${app.getName()}`,
click: () => {
const appVersion = `Version: ${forgeConfig.RELEASE_VERSION}`;
const appCommit = `Commit: ${forgeConfig.RELEASE_COMMIT}`;
const appVersion = `Version: ${electronConfig.releaseVersion}`;
const appCommit = `Commit: ${electronConfig.releaseCommit}`;
const cliVersion = version().formatted;
const copyright = forgeConfig.packagerConfig.appCopyright;
const copyright = electronConfig.packagerConfig.appCopyright;
const dialogOpts = {
type: 'none',