@interopio/iocd-cli 0.0.53 → 0.0.55
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli.js +18 -15
- package/dist/cli.js.map +1 -1
- package/dist/schemas/iocd.cli.config.schema.json +6 -6
- package/dist/services/app.service.js +1 -1
- package/dist/services/app.service.js.map +1 -1
- package/dist/services/components/component.config.js +1 -1
- package/dist/services/components/component.config.js.map +1 -1
- package/dist/services/components/components.registry.js +17 -17
- package/dist/services/components/components.registry.js.map +1 -1
- package/dist/services/components/components.service.js +16 -15
- package/dist/services/components/components.service.js.map +1 -1
- package/dist/services/components/file.helper.js +7 -7
- package/dist/services/components/file.helper.js.map +1 -1
- package/dist/services/components/platform.utils.js +49 -41
- package/dist/services/components/platform.utils.js.map +1 -1
- package/dist/services/components/stores/github.store.js +52 -34
- package/dist/services/components/stores/github.store.js.map +1 -1
- package/dist/services/components/stores/local.store.js +19 -18
- package/dist/services/components/stores/local.store.js.map +1 -1
- package/dist/services/components/stores/s3.store.js +63 -56
- package/dist/services/components/stores/s3.store.js.map +1 -1
- package/dist/services/components/version.selector.js +3 -3
- package/dist/services/components/version.selector.js.map +1 -1
- package/dist/services/config/config.service.js +84 -45
- package/dist/services/config/config.service.js.map +1 -1
- package/dist/services/installer/electronForge.js +44 -44
- package/dist/services/installer/electronForge.js.map +1 -1
- package/dist/services/installer/installer.service.js +24 -24
- package/dist/services/installer/installer.service.js.map +1 -1
- package/dist/services/installer/macOS.helper.js +135 -77
- package/dist/services/installer/macOS.helper.js.map +1 -1
- package/dist/services/installer/prerequisites.js +10 -10
- package/dist/services/installer/windows.helper.js +53 -53
- package/dist/services/modifications/macOS.helper.js +28 -24
- package/dist/services/modifications/macOS.helper.js.map +1 -1
- package/dist/services/modifications/modifications.service.js +57 -57
- package/dist/services/modifications/windows.helper.js +54 -14
- package/dist/services/modifications/windows.helper.js.map +1 -1
- package/dist/templates/groups/apps/groups/src/App.tsx +3 -3
- package/dist/templates/groups/apps/groups/src/index.tsx +15 -13
- package/dist/templates/groups/apps/groups/vite.config.ts +4 -4
- package/dist/templates/launchpad/apps/launchpad/src/app/app.tsx +34 -29
- package/dist/templates/launchpad/apps/launchpad/src/app/constants.ts +20 -20
- package/dist/templates/launchpad/apps/launchpad/src/components/logo.tsx +5 -5
- package/dist/templates/launchpad/apps/launchpad/src/components/main-context-menu.tsx +195 -145
- package/dist/templates/launchpad/apps/launchpad/src/components/notifications-button.tsx +41 -34
- package/dist/templates/launchpad/apps/launchpad/src/main.tsx +3 -1
- package/dist/templates/launchpad/apps/launchpad/vite.config.ts +6 -7
- package/dist/templates/tests/tests/tests/sample.spec.ts +16 -16
- package/dist/templates/tests/tests/wdio.config.ts +9 -9
- package/dist/templates/workspaces/apps/workspaces/src/AddWindowButton.tsx +40 -33
- package/dist/templates/workspaces/apps/workspaces/src/AfterTabs.tsx +40 -27
- package/dist/templates/workspaces/apps/workspaces/src/App.tsx +93 -88
- package/dist/templates/workspaces/apps/workspaces/src/GroupHeaderButtons.tsx +11 -9
- package/dist/templates/workspaces/apps/workspaces/src/index.tsx +19 -14
- package/dist/templates/workspaces/apps/workspaces/src/reportWebVitals.ts +4 -4
- package/dist/templates/workspaces/apps/workspaces/src/setupTests.ts +1 -1
- package/dist/templates/workspaces/apps/workspaces/src/useAddWindowButtonVisible.tsx +36 -30
- package/dist/templates/workspaces/apps/workspaces/vite.config.ts +4 -4
- package/dist/utils/proxy.js +68 -0
- package/dist/utils/proxy.js.map +1 -0
- package/package.json +8 -7
|
@@ -52,7 +52,8 @@ class ConfigManager {
|
|
|
52
52
|
const configCopy = JSON.parse(JSON.stringify(ConfigManager.config));
|
|
53
53
|
// Remove or mask any sensitive information here if needed
|
|
54
54
|
if (configCopy.win?.codeSign) {
|
|
55
|
-
configCopy.win.codeSign =
|
|
55
|
+
configCopy.win.codeSign =
|
|
56
|
+
`{ type: "${configCopy.win.codeSign.type}", <removed for security>}`;
|
|
56
57
|
}
|
|
57
58
|
if (configCopy.mac?.codeSign) {
|
|
58
59
|
configCopy.mac.codeSign = "<removed for security>";
|
|
@@ -65,16 +66,16 @@ class ConfigManager {
|
|
|
65
66
|
static saveComponents(newComponents) {
|
|
66
67
|
// read the current config to preserve other fields, do not expand env vars or anything else
|
|
67
68
|
const configPath = path_1.PathUtils.getCliConfigPath();
|
|
68
|
-
const configContent = fs.readFileSync(configPath,
|
|
69
|
+
const configContent = fs.readFileSync(configPath, "utf8");
|
|
69
70
|
const currentConfig = JSON.parse(configContent);
|
|
70
71
|
const updatedConfig = {
|
|
71
72
|
...currentConfig,
|
|
72
73
|
components: {
|
|
73
74
|
...currentConfig.components,
|
|
74
|
-
list: newComponents
|
|
75
|
-
}
|
|
75
|
+
list: newComponents,
|
|
76
|
+
},
|
|
76
77
|
};
|
|
77
|
-
fs.writeFileSync(configPath, JSON.stringify(updatedConfig, null, 4),
|
|
78
|
+
fs.writeFileSync(configPath, JSON.stringify(updatedConfig, null, 4), "utf-8");
|
|
78
79
|
// Invalidate cached config, so config is reloaded next time
|
|
79
80
|
this.cachedConfig = null;
|
|
80
81
|
}
|
|
@@ -91,7 +92,7 @@ class ConfigManager {
|
|
|
91
92
|
console.debug(`${this.configName} not found at ${configPath}, using fallback configuration`);
|
|
92
93
|
return defaultConfig;
|
|
93
94
|
}
|
|
94
|
-
const configContent = fs.readFileSync(configPath,
|
|
95
|
+
const configContent = fs.readFileSync(configPath, "utf8");
|
|
95
96
|
// Expand environment variables and template variables in the string before parsing
|
|
96
97
|
const expandedContent = this.expandVariablesInString(configContent);
|
|
97
98
|
const rawConfig = JSON.parse(expandedContent);
|
|
@@ -120,9 +121,9 @@ class ConfigManager {
|
|
|
120
121
|
static expandVariablesInString(content) {
|
|
121
122
|
// Expand environment variables in ${VAR_NAME} format
|
|
122
123
|
let expanded = content.replace(/\$\{([^}]+)\}/g, (_, varName) => {
|
|
123
|
-
const value = process.env[varName] ||
|
|
124
|
+
const value = process.env[varName] || "";
|
|
124
125
|
// Normalize path separators to forward slashes for JSON safety
|
|
125
|
-
return value.replace(/\\/g,
|
|
126
|
+
return value.replace(/\\/g, "/");
|
|
126
127
|
});
|
|
127
128
|
return expanded;
|
|
128
129
|
}
|
|
@@ -136,7 +137,9 @@ class ConfigManager {
|
|
|
136
137
|
// Resolve final values with priority: package.json > env var > hardcoded default
|
|
137
138
|
const productSlug = pkgProductSlug || process.env["PRODUCT_SLUG"] || "io-connect-desktop";
|
|
138
139
|
const productName = pkgProductName || process.env["PRODUCT_NAME"] || "io.Connect Desktop";
|
|
139
|
-
const productDescription = pkgProductDescription ||
|
|
140
|
+
const productDescription = pkgProductDescription ||
|
|
141
|
+
process.env["PRODUCT_DESCRIPTION"] ||
|
|
142
|
+
"io.Connect Desktop is a real-time user interface integration platform.";
|
|
140
143
|
const company = pkgCompany || process.env["COMPANY"] || "interop.io";
|
|
141
144
|
const version = pkgVersion || process.env["npm_package_version"] || "1.0.0";
|
|
142
145
|
// Auto-generate copyright from company name if not explicitly set
|
|
@@ -151,67 +154,103 @@ class ConfigManager {
|
|
|
151
154
|
win: {
|
|
152
155
|
exe: {
|
|
153
156
|
exeName: process.env["WIN_EXE_NAME"] || "io-connect-desktop.exe",
|
|
154
|
-
exeIconPath: process.env["WIN_EXE_ICON_PATH"] ||
|
|
157
|
+
exeIconPath: process.env["WIN_EXE_ICON_PATH"] ||
|
|
158
|
+
(0, path_2.join)(process.env["IOCD_COMPONENT_DIR"] ?? "", "assets/images/logo.ico"),
|
|
155
159
|
},
|
|
156
160
|
codeSign: {
|
|
157
|
-
type: process.env["WIN_CODE_SIGN_TYPE"] ||
|
|
158
|
-
...(process.env["WIN_PFX_PATH"] && {
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
...(process.env["
|
|
161
|
+
type: process.env["WIN_CODE_SIGN_TYPE"] || "off",
|
|
162
|
+
...(process.env["WIN_PFX_PATH"] && {
|
|
163
|
+
pfxPath: process.env["WIN_PFX_PATH"],
|
|
164
|
+
}),
|
|
165
|
+
...(process.env["WIN_PFX_PASS"] && {
|
|
166
|
+
pfxPassword: process.env["WIN_PFX_PASS"],
|
|
167
|
+
}),
|
|
168
|
+
...(process.env["WIN_CERT_SHA1"] && {
|
|
169
|
+
certificateSha1: process.env["WIN_CERT_SHA1"],
|
|
170
|
+
}),
|
|
171
|
+
...(process.env["WIN_CUSTOM_CODE_SIGNING"] && {
|
|
172
|
+
customCodeSignScriptPath: process.env["WIN_CUSTOM_CODE_SIGNING"],
|
|
173
|
+
}),
|
|
162
174
|
tsaURL: process.env["WIN_TSA_URL"] || "http://timestamp.digicert.com",
|
|
163
|
-
}
|
|
175
|
+
},
|
|
164
176
|
},
|
|
165
177
|
components: {
|
|
166
178
|
store: {
|
|
167
179
|
// Set github as default if COMPONENT_STORE is not specified or is "github"
|
|
168
|
-
...(!process.env["COMPONENT_STORE"] ||
|
|
169
|
-
github
|
|
170
|
-
|
|
180
|
+
...(!process.env["COMPONENT_STORE"] ||
|
|
181
|
+
process.env["COMPONENT_STORE"] === "github"
|
|
182
|
+
? {
|
|
183
|
+
github: {
|
|
184
|
+
repo: process.env["COMPONENT_STORE_GITHUB_REPO"] ||
|
|
185
|
+
"interopio/iocd-components/releases",
|
|
186
|
+
},
|
|
171
187
|
}
|
|
172
|
-
|
|
188
|
+
: {}),
|
|
173
189
|
// Set local if COMPONENT_STORE is "local"
|
|
174
|
-
...(process.env["COMPONENT_STORE"] === "local"
|
|
175
|
-
|
|
176
|
-
|
|
190
|
+
...(process.env["COMPONENT_STORE"] === "local"
|
|
191
|
+
? {
|
|
192
|
+
local: {
|
|
193
|
+
path: process.env["COMPONENT_STORE_LOCAL_PATH"] ||
|
|
194
|
+
"/components-store",
|
|
195
|
+
},
|
|
177
196
|
}
|
|
178
|
-
|
|
197
|
+
: {}),
|
|
179
198
|
// Set s3 if COMPONENT_STORE is "s3"
|
|
180
|
-
...(process.env["COMPONENT_STORE"] === "s3"
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
199
|
+
...(process.env["COMPONENT_STORE"] === "s3"
|
|
200
|
+
? {
|
|
201
|
+
s3: {
|
|
202
|
+
bucketName: process.env["COMPONENT_STORE_S3_BUCKET"] || "",
|
|
203
|
+
region: process.env["COMPONENT_STORE_S3_REGION"] || "us-east-1",
|
|
204
|
+
...(process.env["COMPONENT_STORE_S3_PREFIX"] && {
|
|
205
|
+
prefix: process.env["COMPONENT_STORE_S3_PREFIX"],
|
|
206
|
+
}),
|
|
207
|
+
...(process.env["AWS_ACCESS_KEY_ID"] && {
|
|
208
|
+
accessKeyId: process.env["AWS_ACCESS_KEY_ID"],
|
|
209
|
+
}),
|
|
210
|
+
...(process.env["AWS_SECRET_ACCESS_KEY"] && {
|
|
211
|
+
secretAccessKey: process.env["AWS_SECRET_ACCESS_KEY"],
|
|
212
|
+
}),
|
|
213
|
+
},
|
|
187
214
|
}
|
|
188
|
-
|
|
215
|
+
: {}),
|
|
189
216
|
},
|
|
190
|
-
list: {
|
|
217
|
+
list: { iocd: "latest" },
|
|
191
218
|
},
|
|
192
219
|
mac: {
|
|
193
220
|
appBundleName: process.env["MAC_APP_BUNDLE_NAME"] || "io.Connect Desktop.app",
|
|
194
221
|
appBundleId: process.env["MAC_APP_BUNDLE_ID"] || "io.interopio.desktop",
|
|
195
222
|
codeSign: {
|
|
196
|
-
type: process.env["MAC_CODE_SIGN_TYPE"] ||
|
|
197
|
-
...(process.env["MAC_IDENTITY"] && {
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
...(process.env["
|
|
201
|
-
|
|
223
|
+
type: process.env["MAC_CODE_SIGN_TYPE"] || "keychain",
|
|
224
|
+
...(process.env["MAC_IDENTITY"] && {
|
|
225
|
+
identity: process.env["MAC_IDENTITY"],
|
|
226
|
+
}),
|
|
227
|
+
...(process.env["MAC_KEYCHAIN"] && {
|
|
228
|
+
keychain: process.env["MAC_KEYCHAIN"],
|
|
229
|
+
}),
|
|
230
|
+
...(process.env["MAC_CERTIFICATE_PATH"] && {
|
|
231
|
+
certificatePath: process.env["MAC_CERTIFICATE_PATH"],
|
|
232
|
+
}),
|
|
233
|
+
...(process.env["MAC_CERTIFICATE_PASSWORD"] && {
|
|
234
|
+
certificatePassword: process.env["MAC_CERTIFICATE_PASSWORD"],
|
|
235
|
+
}),
|
|
236
|
+
...(process.env["MAC_CUSTOM_CODE_SIGNING"] && {
|
|
237
|
+
customCodeSignScriptPath: process.env["MAC_CUSTOM_CODE_SIGNING"],
|
|
238
|
+
}),
|
|
202
239
|
},
|
|
203
240
|
notarization: {
|
|
204
|
-
type: process.env["MAC_NOTARIZATION_TYPE"] ||
|
|
241
|
+
type: process.env["MAC_NOTARIZATION_TYPE"] || "notarytool",
|
|
205
242
|
appleId: process.env["MAC_NOTARIZATION_APPLE_ID"] || "",
|
|
206
243
|
appleIdPassword: process.env["MAC_NOTARIZATION_APPLE_ID_PASSWORD"] || "",
|
|
207
244
|
appleTeamId: process.env["MAC_NOTARIZATION_APPLE_TEAM_ID"] || "",
|
|
208
|
-
...(process.env["MAC_CUSTOM_NOTARIZATION"] && {
|
|
209
|
-
|
|
245
|
+
...(process.env["MAC_CUSTOM_NOTARIZATION"] && {
|
|
246
|
+
customNotarizationScriptPath: process.env["MAC_CUSTOM_NOTARIZATION"],
|
|
247
|
+
}),
|
|
248
|
+
},
|
|
210
249
|
},
|
|
211
|
-
sentry: process.env["SENTRY_ENABLED"] !==
|
|
250
|
+
sentry: process.env["SENTRY_ENABLED"] !== "false", // default to true
|
|
212
251
|
license: {
|
|
213
|
-
copyLicenseToOutput: true
|
|
214
|
-
}
|
|
252
|
+
copyLicenseToOutput: true,
|
|
253
|
+
},
|
|
215
254
|
};
|
|
216
255
|
}
|
|
217
256
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.service.js","sourceRoot":"","sources":["../../../src/services/config/config.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AAEzB,uDAAmD;AACnD,2CAA6C;AAC7C,+BAA4B;AAC5B,yEAAoE;AAEpE,MAAa,aAAa;
|
|
1
|
+
{"version":3,"file":"config.service.js","sourceRoot":"","sources":["../../../src/services/config/config.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ const error_handler_1 = require("../../utils/error.handler");
|
|
|
16
16
|
const logger = logger_1.Logger.getInstance("electronForge");
|
|
17
17
|
async function createPackageWithElectronForge() {
|
|
18
18
|
try {
|
|
19
|
-
logger.info(
|
|
19
|
+
logger.info("Creating build...");
|
|
20
20
|
// copy forge.config.js from config to root if exists
|
|
21
21
|
await copyForgeConfig();
|
|
22
22
|
// copy PathUtils.getIOCDDir() to PathUtils.getDistDir() in a folder called <name>-<platform>-<arch>/
|
|
@@ -39,11 +39,11 @@ async function createPackageWithElectronForge() {
|
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
41
|
function removeForgeConfig() {
|
|
42
|
-
const forgeConfigDest = (0, path_2.join)(path_1.PathUtils.getRootDir(),
|
|
42
|
+
const forgeConfigDest = (0, path_2.join)(path_1.PathUtils.getRootDir(), "forge.config.js");
|
|
43
43
|
if ((0, fs_extra_1.existsSync)(forgeConfigDest)) {
|
|
44
44
|
try {
|
|
45
45
|
(0, fs_1.rmSync)(forgeConfigDest);
|
|
46
|
-
logger.debug(
|
|
46
|
+
logger.debug("Removed temporary forge.config.js from root directory");
|
|
47
47
|
}
|
|
48
48
|
catch (err) {
|
|
49
49
|
logger.warn(`Failed to remove temporary forge.config.js: ${err instanceof Error ? err.message : String(err)}`);
|
|
@@ -53,29 +53,29 @@ function removeForgeConfig() {
|
|
|
53
53
|
async function copyForgeConfig() {
|
|
54
54
|
const forgeConfigSrc = path_1.PathUtils.getForgeConfigPath();
|
|
55
55
|
if (await file_1.FileUtils.exists(forgeConfigSrc)) {
|
|
56
|
-
const forgeConfigDest = (0, path_2.join)(path_1.PathUtils.getRootDir(),
|
|
56
|
+
const forgeConfigDest = (0, path_2.join)(path_1.PathUtils.getRootDir(), "forge.config.js");
|
|
57
57
|
await (0, promises_1.cp)(forgeConfigSrc, forgeConfigDest);
|
|
58
|
-
logger.debug(
|
|
58
|
+
logger.debug("Copied forge.config.js to root directory for packaging");
|
|
59
59
|
}
|
|
60
60
|
else {
|
|
61
|
-
logger.warn(
|
|
61
|
+
logger.warn("No forge.config.js found in config directory, using default configuration");
|
|
62
62
|
}
|
|
63
63
|
}
|
|
64
64
|
async function callForgeMake(appPackageTempDir) {
|
|
65
65
|
let makeTargets = getTargetsFromConfig();
|
|
66
66
|
if (makeTargets.length === 0) {
|
|
67
|
-
throw new error_handler_1.CLIError(
|
|
67
|
+
throw new error_handler_1.CLIError("No makers configured in forge.config.js. Please configure at least one maker (e.g. Squirrel for Windows, DMG for macOS).", {
|
|
68
68
|
suggestions: [
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
]
|
|
69
|
+
"Add at least one maker to the makers array in forge.config.js",
|
|
70
|
+
"Refer to https://www.electronforge.io/config/makers for available makers and configuration examples",
|
|
71
|
+
],
|
|
72
72
|
});
|
|
73
73
|
}
|
|
74
74
|
const makeOptions = {
|
|
75
75
|
dir: appPackageTempDir,
|
|
76
76
|
skipPackage: true, // <— consume prepackaged app in out/<name>-<platform>-<arch>/
|
|
77
77
|
outDir: path_1.PathUtils.getDistDir(),
|
|
78
|
-
overrideTargets: makeTargets
|
|
78
|
+
overrideTargets: makeTargets,
|
|
79
79
|
};
|
|
80
80
|
const options = {
|
|
81
81
|
dir: appPackageTempDir,
|
|
@@ -84,36 +84,36 @@ async function callForgeMake(appPackageTempDir) {
|
|
|
84
84
|
outDir: path_1.PathUtils.getDistDir(),
|
|
85
85
|
};
|
|
86
86
|
// we call make by actually calling publish with dryRun :((
|
|
87
|
-
logger.debug(
|
|
87
|
+
logger.debug("Calling publish (dry run) with make options:", JSON.stringify(options, null, 4));
|
|
88
88
|
await core_1.api.publish(options);
|
|
89
89
|
logger.debug("publish (dry run) done");
|
|
90
90
|
// read results from dist/makeResults.json
|
|
91
|
-
const makeResultsJSON = (0, path_2.join)(path_1.PathUtils.getDistDir(),
|
|
91
|
+
const makeResultsJSON = (0, path_2.join)(path_1.PathUtils.getDistDir(), "makeResults.json");
|
|
92
92
|
if ((0, fs_extra_1.existsSync)(makeResultsJSON)) {
|
|
93
93
|
const makeResults = await (0, fs_extra_1.readJson)(makeResultsJSON);
|
|
94
|
-
logger.debug(
|
|
94
|
+
logger.debug("Read artifacts from dist/makeResults.json successfully!");
|
|
95
95
|
return makeResults;
|
|
96
96
|
}
|
|
97
97
|
else {
|
|
98
|
-
throw new error_handler_1.CLIError(
|
|
98
|
+
throw new error_handler_1.CLIError("No makeResults found after make process. Please ensure at least one maker is configured correctly in forge.config.js.", {
|
|
99
99
|
suggestions: [
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
]
|
|
100
|
+
"Check the output above for any errors during the make process",
|
|
101
|
+
"Ensure that the makers in forge.config.js are configured correctly for your platform",
|
|
102
|
+
],
|
|
103
103
|
});
|
|
104
104
|
}
|
|
105
105
|
}
|
|
106
106
|
async function callForgePublish() {
|
|
107
107
|
const publishers = getPublishersFromConfig();
|
|
108
108
|
if (publishers.length === 0) {
|
|
109
|
-
logger.info(
|
|
109
|
+
logger.info("No publishers configured in forge.config.js, skipping publish step");
|
|
110
110
|
return false;
|
|
111
111
|
}
|
|
112
112
|
logger.info("Publishing build...");
|
|
113
113
|
const config = {
|
|
114
114
|
dryRunResume: true,
|
|
115
115
|
publishTargets: publishers,
|
|
116
|
-
outDir: path_1.PathUtils.getDistDir()
|
|
116
|
+
outDir: path_1.PathUtils.getDistDir(),
|
|
117
117
|
};
|
|
118
118
|
logger.debug(`Calling publish with config `, JSON.stringify(config, null, 4));
|
|
119
119
|
await core_1.api.publish(config);
|
|
@@ -127,9 +127,9 @@ async function callForgePublish() {
|
|
|
127
127
|
*/
|
|
128
128
|
async function copyAppToDist() {
|
|
129
129
|
const projectDir = path_1.PathUtils.getIOCDDir();
|
|
130
|
-
const productNameToUseInTempDir = (0, os_1.platform)() === "win32"
|
|
131
|
-
config_service_1.ConfigManager.config.productSlug
|
|
132
|
-
config_service_1.ConfigManager.config.productName;
|
|
130
|
+
const productNameToUseInTempDir = (0, os_1.platform)() === "win32"
|
|
131
|
+
? config_service_1.ConfigManager.config.productSlug
|
|
132
|
+
: config_service_1.ConfigManager.config.productName;
|
|
133
133
|
let appPackageTempDir = (0, path_2.join)(path_1.PathUtils.getDistDir(), `${productNameToUseInTempDir}-${process.platform}-${process.arch}`);
|
|
134
134
|
if ((0, fs_extra_1.existsSync)(appPackageTempDir)) {
|
|
135
135
|
(0, fs_1.rmSync)(appPackageTempDir, { recursive: true, force: true });
|
|
@@ -140,11 +140,11 @@ async function copyAppToDist() {
|
|
|
140
140
|
await (0, promises_1.cp)(projectDir, appPackageTempDir, { recursive: true });
|
|
141
141
|
logger.debug(`Copied prepackaged app to ${appPackageTempDir} successfully!`);
|
|
142
142
|
// copy license from root dir to outDir
|
|
143
|
-
const licenseSrc = (0, path_2.join)(path_1.PathUtils.getRootDir(),
|
|
144
|
-
const licenseDest = (0, path_2.join)(appPackageTempDir,
|
|
143
|
+
const licenseSrc = (0, path_2.join)(path_1.PathUtils.getRootDir(), "LICENSE");
|
|
144
|
+
const licenseDest = (0, path_2.join)(appPackageTempDir, "LICENSE");
|
|
145
145
|
if (await file_1.FileUtils.exists(licenseSrc)) {
|
|
146
146
|
(0, fs_1.cpSync)(licenseSrc, licenseDest);
|
|
147
|
-
logger.debug(
|
|
147
|
+
logger.debug("Copied LICENSE to packaged app");
|
|
148
148
|
}
|
|
149
149
|
}
|
|
150
150
|
else if ((0, os_1.platform)() === "darwin") {
|
|
@@ -154,7 +154,7 @@ async function copyAppToDist() {
|
|
|
154
154
|
const destination = (0, path_2.join)(appPackageTempDir, config_service_1.ConfigManager.config.mac.appBundleName);
|
|
155
155
|
//const destination = join(appPackageTempDir, ConfigManager.config.productSlug + ".app");
|
|
156
156
|
logger.debug(`Copying prepackaged app bundle from ${source} to ${destination}`);
|
|
157
|
-
(0, child_process_1.execSync)(`ditto "${source}" "${destination}"`, { stdio:
|
|
157
|
+
(0, child_process_1.execSync)(`ditto "${source}" "${destination}"`, { stdio: "pipe" });
|
|
158
158
|
logger.debug(`Copied prepackaged app to ${appPackageTempDir} successfully!`);
|
|
159
159
|
}
|
|
160
160
|
return appPackageTempDir;
|
|
@@ -170,7 +170,7 @@ async function signArtifacts(makeResults) {
|
|
|
170
170
|
// Sign all produced build artifacts BEFORE publishing
|
|
171
171
|
for (const result of makeResults) {
|
|
172
172
|
for (const artifact of result.artifacts) {
|
|
173
|
-
// artifact is a full path to e.g. Setup.exe / .msi / .dmg / .zip
|
|
173
|
+
// artifact is a full path to e.g. Setup.exe / .msi / .dmg / .zip
|
|
174
174
|
await signBinary(artifact);
|
|
175
175
|
}
|
|
176
176
|
}
|
|
@@ -201,12 +201,12 @@ function getTargetsFromConfig() {
|
|
|
201
201
|
}
|
|
202
202
|
overrideTargets = forgeConfig.makers.map((t) => {
|
|
203
203
|
const config = config_service_1.ConfigManager.config;
|
|
204
|
-
if (t.name ===
|
|
204
|
+
if (t.name === "@electron-forge/maker-squirrel") {
|
|
205
205
|
const ioAssetsDir = path_1.PathUtils.getIOCDAssetsDir();
|
|
206
|
-
const icon = (0, path_2.join)(ioAssetsDir,
|
|
206
|
+
const icon = (0, path_2.join)(ioAssetsDir, "images", "logo.ico");
|
|
207
207
|
const setupExeName = `${(0, path_2.basename)(config.win.exe.exeName).replace(".exe", "")}-v${config.version}-setup.exe`;
|
|
208
208
|
return {
|
|
209
|
-
name:
|
|
209
|
+
name: "@electron-forge/maker-squirrel",
|
|
210
210
|
config: {
|
|
211
211
|
// iconUrl: icon, // needs to be HTTPs; displayed in Control Panel ➡ Programs and Features.
|
|
212
212
|
exe: config.win.exe.exeName, // * The name of your app's main `.exe` file.
|
|
@@ -215,33 +215,33 @@ function getTargetsFromConfig() {
|
|
|
215
215
|
setupExe: setupExeName,
|
|
216
216
|
version: config.version,
|
|
217
217
|
// Optional: ensure Squirrel uses your short product name
|
|
218
|
-
name: config.productSlug, // used for package IDs
|
|
218
|
+
name: config.productSlug, // used for package IDs
|
|
219
219
|
productName: config.productName, // The app name with spaces (will be shown to your users) - https://www.electronforge.io/config/makers/squirrel.windows#spaces-in-the-app-name
|
|
220
220
|
authors: config.company, // The `authors` value for the NuGet package metadata.
|
|
221
221
|
owners: config.company, // The `owners` value for the NuGet package metadata.
|
|
222
222
|
copyRight: config.copyright, // The `copyright` value for the NuGet package metadata.
|
|
223
223
|
title: config.productName, // used as install window title
|
|
224
|
-
description: config.productDescription, // used in Control Panel ➡ Programs and Features.
|
|
224
|
+
description: config.productDescription, // used in Control Panel ➡ Programs and Features.
|
|
225
225
|
noMSI: true,
|
|
226
|
-
...t.config ?? {},
|
|
226
|
+
...(t.config ?? {}),
|
|
227
227
|
// Keep the nuspect template
|
|
228
228
|
nuspecTemplate: "config/win-build/template.nuspectemplate",
|
|
229
229
|
usePackageJson: false,
|
|
230
|
-
}
|
|
230
|
+
},
|
|
231
231
|
};
|
|
232
232
|
}
|
|
233
|
-
if (t.name ===
|
|
233
|
+
if (t.name === "@electron-forge/maker-dmg") {
|
|
234
234
|
const ioAssetsDir = path_1.PathUtils.getIOCDAssetsDir();
|
|
235
|
-
let icon = (0, path_2.join)(ioAssetsDir,
|
|
235
|
+
let icon = (0, path_2.join)(ioAssetsDir, "images", "logo.icns");
|
|
236
236
|
return {
|
|
237
|
-
name:
|
|
237
|
+
name: "@electron-forge/maker-dmg",
|
|
238
238
|
config: {
|
|
239
239
|
name: `${config.productName}-v${config.version}`,
|
|
240
240
|
icon: icon,
|
|
241
241
|
overwrite: true,
|
|
242
242
|
title: `${config.productName}`,
|
|
243
|
-
...t.config ?? {},
|
|
244
|
-
}
|
|
243
|
+
...(t.config ?? {}),
|
|
244
|
+
},
|
|
245
245
|
};
|
|
246
246
|
}
|
|
247
247
|
return t;
|
|
@@ -266,7 +266,7 @@ function getPublishersFromConfig() {
|
|
|
266
266
|
async function ensureElectronVersionIsSet() {
|
|
267
267
|
const electronVersion = await getElectronVersionFromComponent();
|
|
268
268
|
if (!electronVersion) {
|
|
269
|
-
throw new Error(
|
|
269
|
+
throw new Error("Electron version not found in iocd component metadata");
|
|
270
270
|
}
|
|
271
271
|
logger.debug(`Using Electron version: ${electronVersion}`);
|
|
272
272
|
}
|
|
@@ -274,16 +274,16 @@ async function ensureElectronVersionIsSet() {
|
|
|
274
274
|
async function getElectronVersionFromComponent() {
|
|
275
275
|
try {
|
|
276
276
|
const resourcesDir = path_1.PathUtils.getIOCDResourcesDir();
|
|
277
|
-
const metadataPath = (0, path_2.join)(resourcesDir,
|
|
277
|
+
const metadataPath = (0, path_2.join)(resourcesDir, "metadata.json");
|
|
278
278
|
if (!(await file_1.FileUtils.exists(metadataPath))) {
|
|
279
|
-
logger.debug(
|
|
279
|
+
logger.debug("No iocd component metadata found, skipping electron version detection");
|
|
280
280
|
return null;
|
|
281
281
|
}
|
|
282
282
|
const metadata = await (0, fs_extra_1.readJson)(metadataPath);
|
|
283
283
|
if (metadata && metadata.electronVersion) {
|
|
284
284
|
return metadata.electronVersion;
|
|
285
285
|
}
|
|
286
|
-
logger.debug(
|
|
286
|
+
logger.debug("No electron version found in iocd component metadata");
|
|
287
287
|
return null;
|
|
288
288
|
}
|
|
289
289
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electronForge.js","sourceRoot":"","sources":["../../../src/services/installer/electronForge.ts"],"names":[],"mappings":";;AAmBA,
|
|
1
|
+
{"version":3,"file":"electronForge.js","sourceRoot":"","sources":["../../../src/services/installer/electronForge.ts"],"names":[],"mappings":"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"}
|