Merge remote-tracking branch 'origin/generate-forge-config-on-build' into ICU-1356-enable-windows-platform-support

ui/desktop/electron-app/config/electron.js

@@ -8,30 +8,31 @@ 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}
+  `);
 
   // Version
-  if (config.RELEASE_VERSION)
-    config.packagerConfig.version = config.RELEASE_VERSION;
+  config.packagerConfig.version = config.releaseVersion;
+
   if (isMac()) {
     config.packagerConfig.icon = './config/macos/icon.icns';
     config.packagerConfig.osxSign = {

ui/desktop/electron-app/package.json

@@ -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",

ui/desktop/electron-app/src/config/menu.js

@@ -1,15 +1,15 @@
 const { app, shell, dialog } = require('electron');
 const appUpdater = require('../helpers/app-updater.js');
 const { isMac, isWindows } = require('../helpers/platform.js');
-const forgeConfig = require('../../config/forge.config.js');
+const electronConfig = require('../../config/forge.config.js');
 const { version } = require('../cli/index.js');
 
 const generateMenuTemplate = () => {
   const aboutDialog = () => {
-    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',