@finsemble/finsemble-core 8.0.0-alpha-3 → 8.0.0-beta.2

package/configs/schemas/fileBasedSchemas/project.schema.json

@@ -0,0 +1,199 @@
+{
+	"$schema": "http://json-schema.org/draft-07/schema#",
+	"description": "JSON format for product.json file. This file contains non-runtime configuration for a [seed] project.",
+	"type": "object",
+	"properties": {
+		"installer": {
+			"$ref": "#/definitions/installer"
+		},
+		"launch": {
+			"$ref": "#/definitions/launch"
+		},
+		"environments": {
+			"description": "Environmental configuration. These use installer and launch as a based, applying overrides using JSON merge patch. https://www.rfc-editor.org/rfc/rfc7386",
+			"type": "object",
+			"additionalProperties": {
+				"$ref": "#/definitions/environment"
+			}
+		},
+		"deployInfo": {
+			"description": "Deployment info that is added by the Smart Desktop Designer (SDD)",
+			"type": "object",
+			"properties": {
+				"uuid": {
+					"description": "A unique identifier assigned to this project when it is deployed to Cosaic Cloud",
+					"type": "string"
+				},
+				"installerURL": {
+					"description": "The URL that contains the installer for this project. This URL is created by Cosaic Cloud",
+					"type": "string"
+				},
+				"manifestURL": {
+					"description": "The production manifest location that was created when the project was deployed to Cosaic Cloud",
+					"type": "string"
+				}
+			}
+		},
+		"name": {
+			"description": "Name of the project. This should match back to an entry in the Smart Desktop Designer (SDD)",
+			"type": "string"
+		}
+	},
+	"additionalProperties": true,
+	"definitions": {
+		"environment": {
+			"description": "An environment configuration. installer and launch are both optional. Any specified fields will override the global values using JSON merge patch rules.",
+			"type": "object",
+			"properties": {
+				"installer": {
+					"$ref": "#/definitions/installer"
+				},
+				"launch": {
+					"$ref": "#/definitions/launch"
+				}
+			}
+		},
+		"installer": {
+			"description": "Configuration for generating smart desktop installers",
+			"type": "object",
+			"additionalProperties": false,
+			"properties": {
+				"manifestUrl": {
+					"description": "The URL of the hosted production Finsemble manifest for this installer configuration.",
+					"type": "string"
+				},
+				"updateUrl": {
+					"description": "URL for artifacts generated by npm run makeInstaller in order to enable auto updated of the FEA runtime. The contents of the folder are compared to the user's current installation, and downloaded if they represent a newer version. Default is http://localhost:3375/pkg",
+					"type": ["string", "null"]
+				},
+				"chromiumFlags": {
+					"description": "Chromium flags to be set when starting Finsemble.",
+					"type": "object",
+					"additionalProperties": true
+				},
+				"icon": {
+					"description": "Path to an icon to be used for your executable. This is relative to the root of the seed project.",
+					"type": "string"
+				},
+				"version": {
+					"description": "The version number of this release.",
+					"type": "string"
+				},
+				"outputDirectory": {
+					"description": "Path where you would like the executable to be placed. This is relative to the root of the seed project.",
+					"type": "string"
+				},
+				"name": {
+					"description": "Name of your application. Will be used for the exe, windows metadata, and the name of the installation folder. Only alphanumeric characters, spaces, dashes(-), periods(.), and underscores(_) are allowed",
+					"type": "string"
+				},
+				"authors": {
+					"description": "Your company name.",
+					"type": "string"
+				},
+				"description": {
+					"description": "Description of your application.",
+					"type": "string"
+				},
+				"companyName": {
+					"description": "Name of your company. Will be used for the folder name in the start menu. Defaults to authors if omitted.",
+					"type": "string"
+				},
+				"certificateFile": {
+					"description": "The path to an Authenticode Code Signing Certificate for code-signing the application wioth signtool.exe.",
+					"type": ["string", "null"]
+				},
+				"certificatePassword": {
+					"description": "The password to decrypt the certificate given in certificateFile.",
+					"type": ["string", "null"]
+				},
+				"signWithParams": {
+					"description": "Params to pass to signtool.exe. Specifying a time server is recommended (e.g. '/tr http://timestamp.digicert.com'",
+					"type": ["string", "null"]
+				},
+				"background": {
+					"description": "Path to the image used as the background for a Mac installer. Must be a png file.",
+					"type": "string"
+				},
+				"loadingGif": {
+					"description": "Path to the image used as the splash for a Windows installer. Must be a gif file.",
+					"type": "string"
+				},
+				"macIcon": {
+					"description": "Path to the icon to be used on Mac.",
+					"type": "string"
+				},
+				"osxSign": {
+					"description": "MacOS ONLY - An object with the required info for MacOS App codesign. If not specified your .app won't be notarized. See https://electron.github.io/electron-packager/main/interfaces/electronpackager.options.html#osxsign.",
+					"type": "string"
+				},
+				"osxNotarize": {
+					"description": "MacOS ONLY - An object with the required info for MacOS App to be notarized. If not specified your .app won't be notarized. See https://electron.github.io/electron-packager/main/interfaces/electronpackager.options.html#osxnotarize.",
+					"type": "string"
+				},
+				"download": {
+					"description": "Overrides for where to download the Electron binary when creating an installer.",
+					"type": "object",
+					"properties": {
+						"mirror": {
+							"description": "Location of site from where to download the Electron binary. Finsemble's mirror is https://assets.finsemble.com/electron/",
+							"type": "string"
+						}
+					}
+				},
+				"electronPackagerOptions": {
+					"description": "Config overrides to pass to electron-packager. See https://electron.github.io/electron-packager/main/interfaces/electronpackager.options.html.",
+					"type": "object",
+					"additionalProperties": true
+				},
+				"electronWinstallerOptions": {
+					"description": "Windows Only - Config overrides to pass to electron-winstaller createWindowsInstaller(). See https://github.com/electron/windows-installer",
+					"type": "object",
+					"additionalProperties": true
+				},
+				"electronInstallerDmgOptions": {
+					"description": "MacOS Only - Config overrides to pass to electron-installer-dmg createDMG(). See https://github.com/electron-userland/electron-installer-dmg#createdmgopts-callback",
+					"type": "object",
+					"additionalProperties": true
+				}
+			}
+		},
+		"launch": {
+			"type": "object",
+			"description": "Configuration for launching Finsemble in developer mode (e.g. using `yarn dev`)",
+			"properties": {
+				"port": {
+					"description": "The HTTP port to launch the Finsemble devserver. This must match the port that is set in the manifest url.",
+					"type": "number",
+					"default": 3375
+				},
+				"manifestUrl": {
+					"description": "The URL where the Finsemble manifest is located. The port must match the port field.",
+					"type": "string",
+					"default": "http://localhost:3375/configs/application/manifest-local.json"
+				},
+				"breakpointOnStart": {
+					"description": "When set to true, the finsemble-electron-adapter (FEA) will pause in the node debugger on startup",
+					"type": "boolean",
+					"default": false
+				},
+				"updateUrl": {
+					"description": "(DEPRECATED) Set this field in the installer config.",
+					"type": ["string", "null"]
+				},
+				"chromiumFlags": {
+					"description": "Chromium flags to be set when starting Finsemble. Defaults to `remote-debugging-port: 9222` so that windows can be debugged through chrome://inspect.",
+					"type": "object",
+					"properties": {}
+				},
+				"args": {
+					"description": "Optional command line arguments to be passed to Finsemble - example: ['--arg1=value1', '--arg2=value2']",
+					"type": "array",
+					"items": {
+						"type": "string"
+					}
+				}
+			}
+		}
+	}
+}

package/configs/schemas/finsemble.schema.json

@@ -896,7 +896,7 @@
 			"properties": {
 				"name": {
 					"type": "string",
-					"description": "Defaults to the name of the application as specified in installer.json. This is used for certain dialogs and in the central logger. The name must be alphanumeric characters and spaces. Don't use any other characters",
+					"description": "Defaults to the name of the application as specified in project.json. This is used for certain dialogs and in the central logger. The name must be alphanumeric characters and spaces. Don't use any other characters",
 					"pattern": "^[A-Za-z0-9\\s]*$"
 				},
 				"url": {
@@ -904,7 +904,7 @@
 				},
 				"uuid": {
 					"type": "string",
-					"description": "Uniquely differentiates environmental instances of the same application (see server-environment-startup.json) to avoid storage conflicts. The uuid must be alphanumeric characters. Do not use spaces. The uuid is available for use in storage keys, such as those generated by the IndexedDBStorageAdapter.",
+					"description": "Uniquely differentiates environmental instances of the same application (see project.json) to avoid storage conflicts. The uuid must be alphanumeric characters. Do not use spaces. The uuid is available for use in storage keys, such as those generated by the IndexedDBStorageAdapter.",
 					"pattern": "^[A-Za-z0-9\\s\\-]*$",
 					"default": "Finsemble"
 				},

package/dist/cli/cli-api/tools.cjs

@@ -6,11 +6,34 @@
  *
  * These tools are made available as a command line interface via cli.ts at the root level.
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.build = exports.getWebpackConfig = exports.runWebpack = exports.installTemplates = exports.create = exports.clean = exports.makeInstaller = exports.start = exports.preparePlatform = exports.startFEAServer = exports.launchFEA = exports.getStartupConfigs = exports.argExists = void 0;
+exports.build = exports.getWebpackConfig = exports.runWebpack = exports.installTemplates = exports.create = exports.clean = exports.makeInstaller = exports.start = exports.preparePlatform = exports.startFEAServer = exports.launchFEA = exports.getLaunchConfig = exports.argExists = void 0;
 const webpack_1 = require("./webpack");
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
@@ -18,12 +41,10 @@ const minimist_1 = __importDefault(require("minimist"));
 const webpack_2 = require("webpack");
 const deepmerge_1 = __importDefault(require("deepmerge"));
 const resolve_cwd_1 = __importDefault(require("resolve-cwd"));
-const FEA = require("@finsemble/finsemble-electron-adapter/exports");
-const { e2oLauncher, Server: FEAServer, packager } = FEA;
-const defaultStartupConfig = {
-    port: 3375,
-    manifest: "http://localhost:3375/configs/application/manifest-local.json",
-};
+const jsonMergePatch = __importStar(require("json-merge-patch"));
+const makeInstaller_1 = require("@finsemble/finsemble-electron-adapter/dist/makeInstaller");
+const exports_1 = __importDefault(require("@finsemble/finsemble-electron-adapter/dist/exports"));
+const { e2oLauncher, Server: FEAServer } = exports_1.default;
 /**
  * Returns true if the argument was passed either as "myarg" or "--myarg"
  * @ignore
@@ -31,32 +52,106 @@ const defaultStartupConfig = {
 const argExists = (arg, args) => args["_"].includes(arg) || args[arg];
 exports.argExists = argExists;
 /**
- * Retrieves the config from server-environment-startup.json
- *
- * @returns Resolves to an error string if an error occurs, otherwise to null
+ * Returns the config from legacy server-environment-startup.json file.
  *
- * :::note
+ *  * :::note
  * If deprecated fields `serverConfig` and `serverPort` are found in the config then they are converted to `manifest` and `port`.
  * :::
  */
-const getStartupConfigs = () => {
+const getLaunchConfigFromLegacy = (environment) => {
     var _a, _b;
-    try {
-        const originalConfig = require("./public/configs/other/server-environment-startup");
-        return Object.assign(Object.assign({}, originalConfig), { manifest: (_a = originalConfig.manifest) !== null && _a !== void 0 ? _a : originalConfig.serverConfig, port: (_b = originalConfig.port) !== null && _b !== void 0 ? _b : originalConfig.port });
-    }
-    catch (e) {
+    const rawConfig = fs_extra_1.default.readJSONSync("./public/configs/other/server-environment-startup.json", { throws: false });
+    const config = rawConfig === null || rawConfig === void 0 ? void 0 : rawConfig[environment];
+    return config ? Object.assign(Object.assign({}, config), { manifestUrl: (_a = config.manifestUrl) !== null && _a !== void 0 ? _a : config.serverConfig, port: (_b = config.port) !== null && _b !== void 0 ? _b : config.serverPort }) : null;
+};
+/**
+ * Returns the installer config from project.json, applying environmental overrides if they exist using json-merge-patch.
+ */
+const getLaunchConfigFromProject = (environment) => {
+    var _a, _b;
+    const rawConfig = fs_extra_1.default.readJSONSync("./project.json", { throws: false });
+    const launchConfig = rawConfig === null || rawConfig === void 0 ? void 0 : rawConfig.launch;
+    const overrides = (_b = (_a = rawConfig === null || rawConfig === void 0 ? void 0 : rawConfig.environments) === null || _a === void 0 ? void 0 : _a[environment]) === null || _b === void 0 ? void 0 : _b.launch;
+    if (!launchConfig && !overrides)
         return null;
-    }
+    if (!launchConfig && overrides)
+        return overrides;
+    if (launchConfig && !overrides)
+        return launchConfig;
+    return jsonMergePatch.apply(launchConfig, overrides);
+};
+/**
+ * Returns a launch config for the requested environment. See getLaunchConfig(). The only difference is that this version
+ * returns null if no config is found.
+ */
+const getLaunchConfigNoDefaults = ({ environment = "development" }) => {
+    var _a;
+    const legacyConfigExists = fs_extra_1.default.existsSync("./public/configs/other/server-environment-startup.json");
+    return legacyConfigExists ? getLaunchConfigFromLegacy(environment) : (_a = getLaunchConfigFromProject(environment)) !== null && _a !== void 0 ? _a : null;
+};
+/**
+ * Returns a launch config for the requested environment. This looks in the legacy server-environment-startup.json file before it
+ * looks in the standard project.json file, applying environment overrides using json-merge-patch. If no config is found then a
+ * default config is returned.
+ *
+ * @returns Resolves the launcher config or null if it doesn't exist and useDefaults was set to false
+ */
+const getLaunchConfig = ({ environment = "development" }) => {
+    var _a, _b, _c;
+    const defaultLaunchConfig = {
+        port: 3375,
+        manifestUrl: "http://localhost:3375/configs/application/manifest-local.json",
+        // Renderer windows will appear in chrome://inspect if this flag is set
+        // (as an alternative to using localhost:9090)
+        chromiumFlags: {
+            "remote-debugging-port": 9222
+        }
+    };
+    const config = getLaunchConfigNoDefaults({ environment });
+    return Object.assign(Object.assign({}, config), { port: (_a = config === null || config === void 0 ? void 0 : config.port) !== null && _a !== void 0 ? _a : defaultLaunchConfig.port, manifest: (_b = config === null || config === void 0 ? void 0 : config.manifest) !== null && _b !== void 0 ? _b : defaultLaunchConfig.manifestUrl, chromiumFlags: (_c = config === null || config === void 0 ? void 0 : config.chromiumFlags) !== null && _c !== void 0 ? _c : defaultLaunchConfig.chromiumFlags });
+};
+exports.getLaunchConfig = getLaunchConfig;
+/**
+ * Returns the config from legacy installer.json file. This will detect whether the file has a single
+ * installer configuration or multiple configurations by environment.
+ */
+const getInstallerConfigFromLegacy = (environment) => {
+    var _a;
+    const rawConfig = fs_extra_1.default.readJSONSync("./public/configs/other/installer.json", { throws: false });
+    // If the "name" field exists then installer.json has just a single config entry. Otherwise, it has multiple entries per environment
+    return (rawConfig === null || rawConfig === void 0 ? void 0 : rawConfig.name) ? rawConfig : (_a = rawConfig[environment]) !== null && _a !== void 0 ? _a : null;
+};
+/**
+ * Returns the installer config from project.json, applying environmental overrides if they exist using json-merge-patch.
+ */
+const getInstallerConfigFromProject = (environment) => {
+    var _a, _b;
+    const rawConfig = fs_extra_1.default.readJSONSync("./project.json", { throws: false });
+    const installerConfig = rawConfig === null || rawConfig === void 0 ? void 0 : rawConfig.installer;
+    const overrides = (_b = (_a = rawConfig === null || rawConfig === void 0 ? void 0 : rawConfig.environments) === null || _a === void 0 ? void 0 : _a[environment]) === null || _b === void 0 ? void 0 : _b.installer;
+    if (!installerConfig && !overrides)
+        return null;
+    if (!installerConfig && overrides)
+        return overrides;
+    if (installerConfig && !overrides)
+        return installerConfig;
+    return jsonMergePatch.apply(installerConfig, overrides);
+};
+/**
+ * Returns the installer configuration which can be used in makeInstaller. This function deals with both the legacy
+ * installer.json file and the current project.json file. Legacy, if it exists, will take precedence over current config.
+ */
+const getInstallerConfig = (environment) => {
+    const legacyInstallerJSONExists = fs_extra_1.default.existsSync("./public/configs/other/installer.json");
+    return legacyInstallerJSONExists ? getInstallerConfigFromLegacy(environment) : getInstallerConfigFromProject(environment);
 };
-exports.getStartupConfigs = getStartupConfigs;
 /**
  * :::note
  * Use [start()](#start) to launch the dev server and Finsemble with a single command.
  * :::
  *
  * Launches Finsemble (the Finsemble Electron Adapter (FEA)) using e2oLauncher (in the @finsemble/finsemble-electron-adapter module).
- * If an entry exists in server-environment-startup.json for either the requested or default
+ * If an entry exists in project.json for either the requested or default
  * environment then the parameters from that entry are used to determine the server port and manifest
  * location, otherwise the port will default to 3375 and the manifest location will be `public/configs/application/manifest-local.json`.
  *
@@ -81,13 +176,12 @@ exports.getStartupConfigs = getStartupConfigs;
  */
 const launchFEA = async ({ environment = "development", args = [], }) => {
     var _a, _b, _c;
-    const startupConfigs = (0, exports.getStartupConfigs)();
+    const launchConfig = (0, exports.getLaunchConfig)({ environment });
     const parsedArgs = (0, minimist_1.default)(args !== null && args !== void 0 ? args : []);
-    const cfg = (_a = startupConfigs === null || startupConfigs === void 0 ? void 0 : startupConfigs[environment]) !== null && _a !== void 0 ? _a : defaultStartupConfig;
-    const installerConfig = require(path_1.default.resolve("./public/configs/other/installer.json"));
-    const name = (_b = installerConfig === null || installerConfig === void 0 ? void 0 : installerConfig.name) !== null && _b !== void 0 ? _b : "Finsemble";
+    const installerConfig = getInstallerConfig(environment);
+    const name = (_a = installerConfig === null || installerConfig === void 0 ? void 0 : installerConfig.name) !== null && _a !== void 0 ? _a : "Finsemble";
     const isSDD = args.includes("--smartDesktopDevMode");
-    const configuredManifest = (_c = parsedArgs["manifest"]) !== null && _c !== void 0 ? _c : cfg.manifest;
+    const configuredManifest = (_c = (_b = parsedArgs["manifest"]) !== null && _b !== void 0 ? _b : parsedArgs["manifestUrl"]) !== null && _c !== void 0 ? _c : launchConfig.manifestUrl;
     const manifest = isSDD ? undefined : configuredManifest;
     return new Promise((resolve) => {
         /**
@@ -103,9 +197,9 @@ const launchFEA = async ({ environment = "development", args = [], }) => {
         const config = {
             manifest,
             onElectronClose,
-            chromiumFlags: JSON.stringify(cfg.chromiumFlags),
-            breakpointOnStart: cfg.breakpointOnStart,
-            args: ["--name", name].concat(cfg["args"]).concat(args),
+            chromiumFlags: JSON.stringify(launchConfig.chromiumFlags),
+            breakpointOnStart: launchConfig.breakpointOnStart,
+            args: ["--name", name].concat(launchConfig["args"]).concat(args),
         };
         // Start FEA. Resolve when e2oLauncher has successfully launched Electron.
         e2oLauncher(config, () => {
@@ -134,11 +228,11 @@ exports.launchFEA = launchFEA;
  * @returns Resolves to a tuple that contains an instance of the Express server and corresponding Node.js http.server.
  */
 const startFEAServer = async ({ environment = "development", consoleOutput = true, args = [], }) => {
-    var _a, _b, _c;
+    var _a;
     const parsedArgs = (0, minimist_1.default)(args !== null && args !== void 0 ? args : []);
     const root = path_1.default.join("./public");
-    const startupConfig = (0, exports.getStartupConfigs)();
-    const port = parseInt((_c = (_a = parsedArgs["port"]) !== null && _a !== void 0 ? _a : (_b = startupConfig === null || startupConfig === void 0 ? void 0 : startupConfig[environment]) === null || _b === void 0 ? void 0 : _b.port) !== null && _c !== void 0 ? _c : "3375");
+    const launchConfig = (0, exports.getLaunchConfig)({ environment });
+    const port = parseInt((_a = parsedArgs["port"]) !== null && _a !== void 0 ? _a : launchConfig.port);
     if (consoleOutput)
         console.log(`Serving files from directory ${root} on port ${port}`);
     const serverTuple = await FEAServer.start({ root, port });
@@ -225,17 +319,6 @@ const start = async ({ environment = "development", consoleOutput = true, args =
     });
 };
 exports.start = start;
-const resolveRelativePaths = (obj, properties, rootPath) => {
-    properties.forEach((prop) => {
-        if (obj[prop]) {
-            obj[prop] = path_1.default.resolve(rootPath, obj[prop]);
-        }
-        else {
-            console.warn(`Path for property '${prop}' was not resolved as it did not exist in the installer configuration.\nInstaller configuration: ${JSON.stringify(obj, null, 2)}`);
-        }
-    });
-    return obj;
-};
 /**
  * Adds osxSign information to the installer config. This is used to optionally sign MacOS builds. This will only
  * run if an osxSign entry exists. It must at least contain an `identity` field.
@@ -290,67 +373,59 @@ const maybeAddOSXNotarizationConfigs = (installerConfig) => {
             appleIdPassword: (_e = (_d = process.env.osxNotarizationApplePassword) !== null && _d !== void 0 ? _d : process.env.appleIdPassword) !== null && _e !== void 0 ? _e : osxNotarize === null || osxNotarize === void 0 ? void 0 : osxNotarize.appleIdPassword,
         } });
 };
+/**
+ * Scrubs a raw installer config by applying environment variables as necessary, adding default
+ * version from package.json and setting icon entries to absolute paths.
+ *
+ * Note that most of the environment variables are legacy and not documented.
+ */
+const getScrubbedConfig = (originalConfig, environment) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    // Get the version # from package.json (as a fallback)
+    const seedPackageJson = fs_extra_1.default.readJSONSync("./package.json", { throws: false });
+    // Legacy: manifest, updateUrl and chromiumFlags used to be specified in the launch config. Now they are in installer config.
+    const launchConfig = getLaunchConfigNoDefaults({ environment });
+    return Object.assign(Object.assign({}, originalConfig), { manifestUrl: (_b = (_a = process.env.manifesturl) !== null && _a !== void 0 ? _a : originalConfig.manifestUrl) !== null && _b !== void 0 ? _b : launchConfig === null || launchConfig === void 0 ? void 0 : launchConfig.manifestUrl, updateUrl: (_c = originalConfig.updateUrl) !== null && _c !== void 0 ? _c : launchConfig === null || launchConfig === void 0 ? void 0 : launchConfig.updateUrl, chromiumFlags: originalConfig.chromiumFlags, name: (_d = process.env.installername) !== null && _d !== void 0 ? _d : originalConfig.name, version: (_f = (_e = process.env.installerversion) !== null && _e !== void 0 ? _e : originalConfig.version) !== null && _f !== void 0 ? _f : seedPackageJson === null || seedPackageJson === void 0 ? void 0 : seedPackageJson.version, authors: (_g = process.env.installerauthors) !== null && _g !== void 0 ? _g : originalConfig.authors, description: (_h = process.env.installerdescription) !== null && _h !== void 0 ? _h : originalConfig.description, certificatePassword: (_k = (_j = process.env["INSTALLER_CERTIFICATE_PASSPHRASE"]) === null || _j === void 0 ? void 0 : _j.trim()) !== null && _k !== void 0 ? _k : originalConfig.certificatePassword, icon: originalConfig.icon ? path_1.default.resolve("./", originalConfig.icon) : null, macIcon: originalConfig.macIcon ? path_1.default.resolve("./", originalConfig.macIcon) : null, background: originalConfig.background ? path_1.default.resolve("./", originalConfig.background) : null });
+};
 /**
  * Makes an installer from the seed project. See [Deploying your smart desktop](/docs/managing-and-administrating/deployingYourSmartDesktop).
  *
  * @param __namedParameters.environment - Specify which environment to use. Defaults to "development".
- * @param __namedParameters.configPath - Optional path to a config file to be used in lieu of installer.json.
- * @returns Resolves when the installer has been created
- */
-const makeInstaller = async ({ environment = "development", configPath, }) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-    let seedPackageJson = null;
-    // Most of the process.env references are legacy and probably not used.
-    // If we're not in the correct directory then this require may fail. It's only used to get the version # so not a big deal
-    // since that can be obtained from the installer config.
-    try {
-        seedPackageJson = require(path_1.default.resolve("./package.json"));
-    }
-    catch (e) { }
-    let installerConfig = require(path_1.default.resolve(configPath !== null && configPath !== void 0 ? configPath : "./public/configs/other/installer.json"));
-    //check if we have an installer config matching the environment name, if not assume we just have a single config for all environments
-    if (installerConfig[environment]) {
-        installerConfig = installerConfig[environment];
-    }
-    installerConfig.name = (_a = process.env.installername) !== null && _a !== void 0 ? _a : installerConfig.name;
-    installerConfig.version = (_c = (_b = process.env.installerversion) !== null && _b !== void 0 ? _b : installerConfig.version) !== null && _c !== void 0 ? _c : seedPackageJson === null || seedPackageJson === void 0 ? void 0 : seedPackageJson.version;
-    installerConfig.authors = (_d = process.env.installerauthors) !== null && _d !== void 0 ? _d : installerConfig.authors;
-    installerConfig.description = (_e = process.env.installerdescription) !== null && _e !== void 0 ? _e : installerConfig.description;
-    installerConfig.certificatePassword =
-        (_f = installerConfig.certificatePassword) !== null && _f !== void 0 ? _f : (_g = process.env["INSTALLER_CERTIFICATE_PASSPHRASE"]) === null || _g === void 0 ? void 0 : _g.trim();
+ * @param __namedParameters.configPath - Optional path to a config file to be used for installer configuration (overrides default of project.json).
+ * @returns Resolves to null when the installer has been created, or to an error string if there is an error.
+ */
+const makeInstaller = async ({ environment = "development", configPath, output = true }) => {
+    // Get either the installer config that was passed in, or from standard locations (such as project.json), or use a default
+    const rawConfig = configPath ? require(path_1.default.resolve(configPath)) : getInstallerConfig(environment);
+    if (!rawConfig) {
+        const error = `No installer config section found. Please add an "installer" section to your project.json file.`;
+        if (output)
+            console.log(error);
+        return error;
+    }
+    const installerConfig = getScrubbedConfig(maybeAddOSXNotarizationConfigs(maybeAddOSXSignConfigs(rawConfig)), environment);
     if (installerConfig.certificateFile && !installerConfig.certificatePassword) {
-        // Throw error if a certificate file was provided and a password can't be found
-        throw new Error(`A certificate file was provided but a password cannot be found. Please provide one in the config or as an environment variable: INSTALLER_CERTIFICATE_PASSPHRASE`);
-    }
-    // need absolute paths for certain installer configs
-    installerConfig = resolveRelativePaths(installerConfig, ["icon", "macIcon", "background"], "./");
-    installerConfig = maybeAddOSXSignConfigs(installerConfig);
-    installerConfig = maybeAddOSXNotarizationConfigs(installerConfig);
-    const startupConfigs = (0, exports.getStartupConfigs)();
-    const cfg = (_h = startupConfigs === null || startupConfigs === void 0 ? void 0 : startupConfigs[environment]) !== null && _h !== void 0 ? _h : defaultStartupConfig;
-    const manifestUrl = (_j = process.env.manifesturl) !== null && _j !== void 0 ? _j : cfg.manifest;
-    console.log("The manifest location is: ", manifestUrl);
-    const { updateUrl, chromiumFlags } = cfg;
-    // Installer won't work without a proper manifest. Throw a helpful error.
-    if (!manifestUrl) {
-        throw new Error(`Installer misconfigured. No 'manifest' in configs/other/server-environment-startup.json under ${environment}. This is required to launch Finsemble.`);
-    }
-    // If an installer is pointing to localhost, it's likely an error. Let the dev know with a helpful error.
-    if (manifestUrl.includes("localhost")) {
-        console.log(`>>>> WARNING: Installer is pointing to a manifest hosted at ${manifestUrl}. Was this accidental?
-		environment (e.g. NODE_ENV) == ${environment}`);
+        const error = `A certificate file was provided but a password cannot be found. Please provide one in the config or as an environment variable: INSTALLER_CERTIFICATE_PASSPHRASE`;
+        if (output)
+            console.log(error);
+        return error;
+    }
+    if (!installerConfig.manifestUrl) {
+        const error = `Installer misconfigured. No 'manifest' found in project.json's "installer" section. This field must be set to the hosted location of your production manifest file.`;
+        if (output)
+            console.log(error);
+        return error;
+    }
+    // If an installer is pointing to localhost, it's likely a misconfiguration.
+    if (output && installerConfig.manifestUrl.includes("localhost")) {
+        console.log(`WARNING: Installer is pointing to a manifest hosted at "${installerConfig.manifestUrl}". Installers should point to production hosted manifest locations.`);
     }
     // UpdateURL isn't required, but we let them know in case they're expecting it to work.
-    if (!updateUrl) {
-        console.log(`[Info] Did not find 'updateUrl' in configs/other/server-environment-startup.json under ${environment}. The application will still work, but it will not update itself with new versions of the finsemble-electron-adapter.`);
-    }
-    const FEA_PATH = path_1.default.resolve("./node_modules/@finsemble/finsemble-electron-adapter");
-    packager.setFeaPath(FEA_PATH);
-    await packager.setApplicationFolderName(installerConfig.name);
-    await packager.setManifestURL(manifestUrl);
-    await packager.setUpdateURL(updateUrl !== null && updateUrl !== void 0 ? updateUrl : null);
-    await packager.setChromiumFlags(chromiumFlags || {});
-    await packager.createFullInstaller(installerConfig);
+    if (output && !installerConfig.updateUrl) {
+        console.log(`Did not find 'updateUrl' in project.json's "installer" section. The application will not be configured for auto-update.`);
+    }
+    await (0, makeInstaller_1.makeInstaller)(installerConfig);
+    return null;
 };
 exports.makeInstaller = makeInstaller;
 /**