@interopio/iocd-cli 0.0.3 → 0.0.5
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/commands/apps.command.js +8 -9
- package/dist/commands/apps.command.js.map +1 -1
- package/dist/commands/components.command.js +20 -6
- package/dist/commands/components.command.js.map +1 -1
- package/dist/commands/installer.command.js +1 -1
- package/dist/commands/installer.command.js.map +1 -1
- package/dist/commands/setup.command.d.ts.map +1 -1
- package/dist/commands/setup.command.js +14 -6
- package/dist/commands/setup.command.js.map +1 -1
- package/dist/services/app.service.d.ts +4 -3
- package/dist/services/app.service.d.ts.map +1 -1
- package/dist/services/app.service.js +17 -16
- package/dist/services/app.service.js.map +1 -1
- package/dist/services/components/component.config.js +1 -1
- package/dist/services/components/components.service.d.ts +9 -1
- package/dist/services/components/components.service.d.ts.map +1 -1
- package/dist/services/components/components.service.js +93 -47
- package/dist/services/components/components.service.js.map +1 -1
- package/dist/services/components/stores/github.store.d.ts +1 -0
- package/dist/services/components/stores/github.store.d.ts.map +1 -1
- package/dist/services/components/stores/github.store.js +4 -3
- package/dist/services/components/stores/github.store.js.map +1 -1
- package/dist/services/components/stores/local.store.d.ts +1 -0
- package/dist/services/components/stores/local.store.d.ts.map +1 -1
- package/dist/services/components/stores/local.store.js +3 -2
- package/dist/services/components/stores/local.store.js.map +1 -1
- package/dist/services/components/stores/s3.store.d.ts +1 -0
- package/dist/services/components/stores/s3.store.d.ts.map +1 -1
- package/dist/services/components/stores/s3.store.js +3 -2
- package/dist/services/components/stores/s3.store.js.map +1 -1
- package/dist/services/components/stores/store.d.ts +1 -0
- package/dist/services/components/stores/store.d.ts.map +1 -1
- package/dist/services/components/version.selector.d.ts.map +1 -1
- package/dist/services/components/version.selector.js +2 -5
- package/dist/services/components/version.selector.js.map +1 -1
- package/dist/services/config/cli.config.d.ts +1 -0
- package/dist/services/config/cli.config.d.ts.map +1 -1
- package/dist/services/config/config.service.d.ts.map +1 -1
- package/dist/services/config/config.service.js +6 -2
- package/dist/services/config/config.service.js.map +1 -1
- package/dist/services/installer/electronForge.d.ts +3 -1
- package/dist/services/installer/electronForge.d.ts.map +1 -1
- package/dist/services/installer/electronForge.js +13 -8
- package/dist/services/installer/electronForge.js.map +1 -1
- package/dist/services/installer/installer.service.d.ts +1 -1
- package/dist/services/installer/installer.service.d.ts.map +1 -1
- package/dist/services/installer/installer.service.js +34 -12
- package/dist/services/installer/installer.service.js.map +1 -1
- package/dist/services/installer/prerequisites.js +4 -0
- package/dist/services/installer/prerequisites.js.map +1 -1
- package/dist/services/modifications/modifications.service.d.ts +1 -1
- package/dist/services/modifications/modifications.service.d.ts.map +1 -1
- package/dist/services/modifications/modifications.service.js +68 -58
- package/dist/services/modifications/modifications.service.js.map +1 -1
- package/dist/services/template.service.js +1 -1
- package/dist/templates/groups/apps/web-groups/README.md +15 -0
- package/dist/templates/groups/apps/web-groups/config/web-group-dev.json +13 -0
- package/dist/templates/groups/apps/web-groups/index.html +18 -0
- package/dist/templates/groups/apps/web-groups/iocd.app.json +20 -0
- package/dist/templates/groups/apps/web-groups/package.json +27 -0
- package/dist/templates/groups/apps/web-groups/public/favicon.ico +0 -0
- package/dist/templates/groups/apps/web-groups/public/logo192.png +0 -0
- package/dist/templates/groups/apps/web-groups/public/logo512.png +0 -0
- package/dist/templates/groups/apps/web-groups/public/manifest.json +25 -0
- package/dist/templates/groups/apps/web-groups/public/robots.txt +3 -0
- package/dist/templates/groups/apps/web-groups/src/App.css +38 -0
- package/dist/templates/groups/apps/web-groups/src/App.tsx +11 -0
- package/dist/templates/groups/apps/web-groups/src/index.css +13 -0
- package/dist/templates/groups/apps/web-groups/src/index.tsx +25 -0
- package/dist/templates/groups/apps/web-groups/src/logo.svg +1 -0
- package/dist/templates/groups/apps/web-groups/src/reportWebVitals.ts +15 -0
- package/dist/templates/groups/apps/web-groups/tsconfig.json +26 -0
- package/dist/templates/groups/apps/web-groups/vite.config.ts +8 -0
- package/dist/templates/groups/template.json +12 -0
- package/dist/templates/ioconnect-desktop/forge.config.js +13 -10
- package/dist/templates/ioconnect-desktop/iocd.cli.config.json +2 -1
- package/dist/templates/ioconnect-desktop/modifications/iocd/config/system.json.merge +2 -1
- package/dist/templates/ioconnect-desktop/modifications/iocd/config/system.json.merge-autoUpdate +10 -0
- package/dist/templates/ioconnect-desktop/package.json +1 -6
- package/dist/templates/launchpad/apps/launchpad/config/iocd.system.installer.json +3 -0
- package/dist/templates/launchpad/apps/launchpad/iocd.app.json +6 -10
- package/dist/templates/launchpad/apps/launchpad/package.json +4 -4
- package/dist/templates/launchpad/apps/launchpad/src/app/app.tsx +7 -4
- package/dist/templates/splash-screen/apps/splash-screen/iocd.app.json +4 -4
- package/dist/templates/web-groups/apps/web-groups/iocd.app.json +3 -7
- package/dist/templates/workspaces/apps/workspaces/iocd.app.json +3 -7
- package/dist/templates/workspaces/apps/workspaces/package.json +4 -4
- package/dist/utils/logger.js +1 -1
- package/dist/utils/logger.js.map +1 -1
- package/dist/utils/pacakge.json.helper.d.ts +8 -4
- package/dist/utils/pacakge.json.helper.d.ts.map +1 -1
- package/dist/utils/pacakge.json.helper.js +6 -13
- package/dist/utils/pacakge.json.helper.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electronForge.d.ts","sourceRoot":"","sources":["../../../src/services/installer/electronForge.ts"],"names":[],"mappings":"AAmBA,wBAAsB,8BAA8B,
|
|
1
|
+
{"version":3,"file":"electronForge.d.ts","sourceRoot":"","sources":["../../../src/services/installer/electronForge.ts"],"names":[],"mappings":"AAmBA,wBAAsB,8BAA8B,IAAI,OAAO,CAAC;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,CAAC,CAgBtF"}
|
|
@@ -23,7 +23,8 @@ async function createPackageWithElectronForge() {
|
|
|
23
23
|
// If your app is already prepackaged & signed internally, tell Forge to skip packaging
|
|
24
24
|
const makeResults = await callForgeMake(appPackageTempDir);
|
|
25
25
|
await signArtifacts(makeResults);
|
|
26
|
-
await callForgePublish(appPackageTempDir);
|
|
26
|
+
const published = await callForgePublish(appPackageTempDir);
|
|
27
|
+
return { published };
|
|
27
28
|
}
|
|
28
29
|
async function callForgeMake(appPackageTempDir) {
|
|
29
30
|
let makeTargets = getTargetsFromConfig();
|
|
@@ -44,10 +45,11 @@ async function callForgeMake(appPackageTempDir) {
|
|
|
44
45
|
const options = {
|
|
45
46
|
dir: appPackageTempDir,
|
|
46
47
|
makeOptions,
|
|
47
|
-
dryRun: true
|
|
48
|
+
dryRun: true,
|
|
49
|
+
outDir: path_1.PathUtils.getDistDir(),
|
|
48
50
|
};
|
|
49
51
|
// we call make by actually calling publish with dryRun :((
|
|
50
|
-
logger.debug('Calling publish (dry run) with make options:', JSON.stringify(options, null,
|
|
52
|
+
logger.debug('Calling publish (dry run) with make options:', JSON.stringify(options, null, 4));
|
|
51
53
|
await core_1.api.publish(options);
|
|
52
54
|
logger.debug("publish (dry run) done");
|
|
53
55
|
// read results from dist/makeResults.json
|
|
@@ -66,19 +68,22 @@ async function callForgeMake(appPackageTempDir) {
|
|
|
66
68
|
});
|
|
67
69
|
}
|
|
68
70
|
}
|
|
69
|
-
async function callForgePublish(
|
|
71
|
+
async function callForgePublish(_) {
|
|
70
72
|
const publishers = getPublishersFromConfig();
|
|
71
73
|
if (publishers.length === 0) {
|
|
72
74
|
logger.info('No publishers configured in forge.config.js, skipping publish step');
|
|
73
|
-
return;
|
|
75
|
+
return false;
|
|
74
76
|
}
|
|
77
|
+
logger.info("Publishing installer...");
|
|
75
78
|
const config = {
|
|
76
|
-
dir: appPackageTempDir,
|
|
77
79
|
dryRunResume: true,
|
|
80
|
+
publishTargets: publishers,
|
|
81
|
+
outDir: path_1.PathUtils.getDistDir()
|
|
78
82
|
};
|
|
79
|
-
logger.debug(`Calling publish with config `, JSON.stringify(config, null,
|
|
83
|
+
logger.debug(`Calling publish with config `, JSON.stringify(config, null, 4));
|
|
80
84
|
await core_1.api.publish(config);
|
|
81
|
-
logger.
|
|
85
|
+
logger.info("Installer published successfully.");
|
|
86
|
+
return true;
|
|
82
87
|
}
|
|
83
88
|
/**
|
|
84
89
|
* This function copies the prepackaged app to the dist directory in a platform-specific way
|
|
@@ -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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installer.service.d.ts","sourceRoot":"","sources":["../../../src/services/installer/installer.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"installer.service.d.ts","sourceRoot":"","sources":["../../../src/services/installer/installer.service.ts"],"names":[],"mappings":"AAoCA,wBAAsB,aAAa,CAAC,QAAQ,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CA+BrG"}
|
|
@@ -1,17 +1,22 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.makeInstaller = makeInstaller;
|
|
4
7
|
const logger_1 = require("../../utils/logger");
|
|
5
8
|
const modifications_service_1 = require("../modifications/modifications.service");
|
|
6
9
|
const os_1 = require("os");
|
|
7
10
|
const prerequisites_1 = require("./prerequisites");
|
|
8
|
-
const app_service_1 = require("../app.service");
|
|
11
|
+
const app_service_1 = __importDefault(require("../app.service"));
|
|
12
|
+
const components_service_1 = __importDefault(require("../components/components.service"));
|
|
9
13
|
const electronForge_1 = require("./electronForge");
|
|
10
14
|
const colors_1 = require("../../utils/colors");
|
|
11
15
|
const path_1 = require("../../utils/path");
|
|
12
16
|
const path_2 = require("path");
|
|
13
17
|
const promises_1 = require("fs/promises");
|
|
14
18
|
const fs_extra_1 = require("fs-extra");
|
|
19
|
+
const config_service_1 = require("../config/config.service");
|
|
15
20
|
// Conditionally import macOS helper only on macOS
|
|
16
21
|
let macOSInstallerHelper = null;
|
|
17
22
|
if (process.platform === 'darwin') {
|
|
@@ -35,18 +40,27 @@ if (process.platform === 'win32') {
|
|
|
35
40
|
const logger = logger_1.Logger.getInstance();
|
|
36
41
|
async function makeInstaller(_options) {
|
|
37
42
|
logger.info('Creating installer...');
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
43
|
+
if (_options.skipBuild) {
|
|
44
|
+
logger.info('Skipping build steps as per --skip-build option');
|
|
45
|
+
}
|
|
46
|
+
if (!_options.skipBuild) {
|
|
47
|
+
// Check prerequisites
|
|
48
|
+
await (0, prerequisites_1.validatePrerequisites)(['@electron-forge/core']);
|
|
49
|
+
// Reinstall components to ensure clean state (dev mode modifications might have altered components)
|
|
50
|
+
// Only install components that should be included in the installer (respects excludeFromInstaller)
|
|
51
|
+
logger.info('Reinstalling components for installer (excluding development-only components)...');
|
|
52
|
+
await components_service_1.default.installComponentsForInstaller();
|
|
53
|
+
// Build all apps to ensure latest code; this must be done before applying modifications
|
|
54
|
+
await app_service_1.default.buildAllApps();
|
|
55
|
+
// apply modifications before signing and packaging
|
|
56
|
+
await (0, modifications_service_1.applyModifications)("installer");
|
|
57
|
+
await moveComponentsToIOCDFolder();
|
|
58
|
+
// sign executables
|
|
59
|
+
await sign();
|
|
60
|
+
}
|
|
47
61
|
// Create package using electron-builder
|
|
48
|
-
await (0, electronForge_1.createPackageWithElectronForge)();
|
|
49
|
-
logger.info((0, colors_1.green)(
|
|
62
|
+
const { published } = await (0, electronForge_1.createPackageWithElectronForge)();
|
|
63
|
+
logger.info((0, colors_1.green)(`✨ Installer created ${published ? 'and published' : ''} successfully!`));
|
|
50
64
|
}
|
|
51
65
|
async function sign() {
|
|
52
66
|
if ((0, os_1.platform)() === 'darwin') {
|
|
@@ -72,6 +86,9 @@ async function moveComponentsToIOCDFolder() {
|
|
|
72
86
|
const iocdDir = path_1.PathUtils.getIOCDDir();
|
|
73
87
|
const iocdComponentsDir = (0, path_2.join)(iocdDir, 'components');
|
|
74
88
|
logger.debug(`Copying components from ${componentsDir} to ${iocdComponentsDir}`);
|
|
89
|
+
// Get list of components to exclude from installer
|
|
90
|
+
const excludeFromInstaller = config_service_1.ConfigManager.config.components.excludeFromInstaller || [];
|
|
91
|
+
logger.debug(`Components excluded from installer: ${excludeFromInstaller.join(', ')}`);
|
|
75
92
|
try {
|
|
76
93
|
// remove existing components folder if exists
|
|
77
94
|
if (await (0, fs_extra_1.pathExists)(iocdComponentsDir)) {
|
|
@@ -85,6 +102,11 @@ async function moveComponentsToIOCDFolder() {
|
|
|
85
102
|
if (item === 'iocd') {
|
|
86
103
|
continue; // skip iocd itself
|
|
87
104
|
}
|
|
105
|
+
// Skip components that are excluded from installer
|
|
106
|
+
if (excludeFromInstaller.includes(item)) {
|
|
107
|
+
logger.debug(`Skipping component '${item}' - excluded from installer`);
|
|
108
|
+
continue;
|
|
109
|
+
}
|
|
88
110
|
const srcPath = (0, path_2.join)(componentsDir, item);
|
|
89
111
|
const destPath = (0, path_2.join)(iocdComponentsDir, item);
|
|
90
112
|
logger.debug(`Copying ${srcPath} to ${destPath}....`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installer.service.js","sourceRoot":"","sources":["../../../src/services/installer/installer.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"installer.service.js","sourceRoot":"","sources":["../../../src/services/installer/installer.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,6 +40,10 @@ async function validatePackageInstallation(packageName) {
|
|
|
40
40
|
try {
|
|
41
41
|
// Read the current package.json to check dependency installation
|
|
42
42
|
const packageJson = await pacakge_json_helper_1.PackageJSONHelper.getPackageJson();
|
|
43
|
+
if (!packageJson) {
|
|
44
|
+
logger.debug('No package.json found in the current directory, skipping package installation validation.');
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
43
47
|
// Check if package is in dependencies (bad for build tools)
|
|
44
48
|
if (packageJson.dependencies && packageJson.dependencies[packageName]) {
|
|
45
49
|
logger.warn(`${packageName} is installed as a regular dependency. ` +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prerequisites.js","sourceRoot":"","sources":["../../../src/services/installer/prerequisites.ts"],"names":[],"mappings":";;;;;AAOA,sDAiCC;AAxCD,+CAA4C;AAC5C,yEAAgD;AAChD,yEAAoE;AACpE,uEAA2E;AAE3E,MAAM,MAAM,GAAG,eAAM,CAAC,WAAW,EAAE,CAAC;AAE7B,KAAK,UAAU,qBAAqB,CAAC,YAAsB;IAChE,6CAA6C;IAC7C,MAAM,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;IAG3C,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACvC,MAAM,CAAC,KAAK,CAAC,8BAA8B,WAAW,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;YAC1B,MAAM,CAAC,KAAK,CAAC,GAAG,WAAW,QAAQ,CAAC,CAAC;YAErC,oDAAoD;YACpD,MAAM,2BAA2B,CAAC,WAAW,CAAC,CAAC;QACjD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CACb,GAAG,WAAW,sEAAsE;gBACpF,0BAA0B,WAAW,IAAI;gBACzC,MAAM;gBACN,kBAAkB,WAAW,MAAM;gBACnC,SAAS,WAAW,oFAAoF,CACzG,CAAC;QACJ,CAAC;IACH,CAAC;IAED,IAAA,8CAAyB,GAAE,CAAC;IAE5B,mBAAmB;IACnB,MAAM,WAAW,GAAG,yBAAc,CAAC,eAAe,EAAE,CAAC;IACrD,IAAI,WAAW,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,yCAAyC,WAAW,CAAC,YAAY,IAAI,eAAe,EAAE,CAAC,CAAC;IAC1G,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;AACvD,CAAC;AAED,KAAK,UAAU,2BAA2B,CAAC,WAAmB;IAC5D,IAAI,CAAC;QACH,iEAAiE;QACjE,MAAM,WAAW,GAAG,MAAM,uCAAiB,CAAC,cAAc,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"prerequisites.js","sourceRoot":"","sources":["../../../src/services/installer/prerequisites.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare function applyModifications(mode: "dev" | "
|
|
1
|
+
export declare function applyModifications(mode: "dev" | "installer"): Promise<void>;
|
|
2
2
|
//# sourceMappingURL=modifications.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modifications.service.d.ts","sourceRoot":"","sources":["../../../src/services/modifications/modifications.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"modifications.service.d.ts","sourceRoot":"","sources":["../../../src/services/modifications/modifications.service.ts"],"names":[],"mappings":"AAkCA,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAgFjF"}
|
|
@@ -20,31 +20,22 @@ if (isMac) {
|
|
|
20
20
|
}
|
|
21
21
|
}
|
|
22
22
|
const logger = logger_1.Logger.getInstance();
|
|
23
|
-
const
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
name: "COMPONENTS_PATH",
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
value: "%IO_CD_ROOT_DIR%/components",
|
|
35
|
-
path: true
|
|
36
|
-
}
|
|
37
|
-
]
|
|
23
|
+
const getVars = () => {
|
|
24
|
+
return {
|
|
25
|
+
dev: [
|
|
26
|
+
{ name: "COMPONENTS_PATH", value: isMac ? "%IO_CD_ROOT_DIR%/../../.." : "%IO_CD_ROOT_DIR%/.." },
|
|
27
|
+
{ name: "PRODUCT_VERSION", value: config_service_1.ConfigManager.config.version || "1.0.0" }
|
|
28
|
+
],
|
|
29
|
+
installer: [
|
|
30
|
+
{ name: "COMPONENTS_PATH", value: "%IO_CD_ROOT_DIR%/components" },
|
|
31
|
+
{ name: "PRODUCT_VERSION", value: config_service_1.ConfigManager.config.version || "1.0.0" }
|
|
32
|
+
]
|
|
33
|
+
};
|
|
38
34
|
};
|
|
39
35
|
async function applyModifications(mode) {
|
|
40
36
|
try {
|
|
41
37
|
logger.info(`Applying modifications in ${mode} mode...`);
|
|
42
|
-
const modificationsDir = (0, path_1.join)(process.cwd(), 'modifications');
|
|
43
38
|
const componentsDir = (0, path_1.join)(process.cwd(), 'components');
|
|
44
|
-
if (!(0, fs_1.existsSync)(modificationsDir)) {
|
|
45
|
-
logger.debug('No modifications directory found - skipping modifications');
|
|
46
|
-
return;
|
|
47
|
-
}
|
|
48
39
|
if (!(0, fs_1.existsSync)(componentsDir)) {
|
|
49
40
|
logger.debug('No components directory found - skipping modifications');
|
|
50
41
|
return;
|
|
@@ -54,37 +45,56 @@ async function applyModifications(mode) {
|
|
|
54
45
|
await (0, windows_helper_1.modifyExe)();
|
|
55
46
|
logger.debug('Windows-specific modifications applied successfully!');
|
|
56
47
|
}
|
|
57
|
-
//
|
|
58
|
-
const
|
|
59
|
-
|
|
60
|
-
.
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
}
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
const baseTargetComponentDir = (0, path_1.join)(componentsDir, componentName);
|
|
68
|
-
if (!(0, fs_1.existsSync)(baseTargetComponentDir)) {
|
|
69
|
-
logger.warn(`Target component directory ${componentName} not found - skipping`);
|
|
48
|
+
// Define modification directories to process in order
|
|
49
|
+
const modificationDirs = [
|
|
50
|
+
{ path: (0, path_1.join)(process.cwd(), 'modifications'), name: 'base modifications' },
|
|
51
|
+
{ path: (0, path_1.join)(process.cwd(), `modifications-${mode}`), name: `${mode}-specific modifications` }
|
|
52
|
+
];
|
|
53
|
+
let totalModificationsApplied = 0;
|
|
54
|
+
// Process each modification directory in sequence
|
|
55
|
+
for (const { path: modificationsDir, name: dirDescription } of modificationDirs) {
|
|
56
|
+
if (!(0, fs_1.existsSync)(modificationsDir)) {
|
|
57
|
+
logger.debug(`No ${dirDescription} directory found - skipping`);
|
|
70
58
|
continue;
|
|
71
59
|
}
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
60
|
+
logger.info(`Processing ${dirDescription} from: ${(0, path_1.relative)(process.cwd(), modificationsDir)}`);
|
|
61
|
+
// Get all component directories in this modifications folder
|
|
62
|
+
const componentDirs = (0, fs_1.readdirSync)(modificationsDir, { withFileTypes: true })
|
|
63
|
+
.filter(dirent => dirent.isDirectory())
|
|
64
|
+
.map(dirent => dirent.name);
|
|
65
|
+
if (componentDirs.length === 0) {
|
|
66
|
+
logger.debug(`No component modifications found in ${dirDescription}`);
|
|
67
|
+
continue;
|
|
75
68
|
}
|
|
76
|
-
|
|
77
|
-
const
|
|
78
|
-
|
|
79
|
-
|
|
69
|
+
for (const componentName of componentDirs) {
|
|
70
|
+
const modComponentDir = (0, path_1.join)(modificationsDir, componentName);
|
|
71
|
+
const baseTargetComponentDir = (0, path_1.join)(componentsDir, componentName);
|
|
72
|
+
if (!(0, fs_1.existsSync)(baseTargetComponentDir)) {
|
|
73
|
+
logger.warn(`Target component directory ${componentName} not found - skipping`);
|
|
80
74
|
continue;
|
|
81
75
|
}
|
|
82
|
-
|
|
83
|
-
|
|
76
|
+
// Handle macOS app bundle structure for iocd component
|
|
77
|
+
if (process.platform === 'darwin' && componentName === 'iocd') {
|
|
78
|
+
await processIocdComponentOnMacOS(modComponentDir, baseTargetComponentDir, mode);
|
|
79
|
+
}
|
|
80
|
+
else {
|
|
81
|
+
const targetComponentDir = getActualComponentPath(baseTargetComponentDir, componentName);
|
|
82
|
+
if (!(0, fs_1.existsSync)(targetComponentDir)) {
|
|
83
|
+
logger.warn(`Target component path ${(0, path_1.relative)(process.cwd(), targetComponentDir)} not found - skipping`);
|
|
84
|
+
continue;
|
|
85
|
+
}
|
|
86
|
+
logger.info(`Applying ${dirDescription} for component: ${componentName}`);
|
|
87
|
+
await processModificationDirectory(modComponentDir, targetComponentDir, mode);
|
|
88
|
+
}
|
|
89
|
+
totalModificationsApplied++;
|
|
84
90
|
}
|
|
85
|
-
logger.info(`Modifications applied successfully for component: ${componentName}`);
|
|
86
91
|
}
|
|
87
|
-
|
|
92
|
+
if (totalModificationsApplied === 0) {
|
|
93
|
+
logger.info('No modifications found to apply');
|
|
94
|
+
}
|
|
95
|
+
else {
|
|
96
|
+
logger.info(`All modifications applied successfully! (${totalModificationsApplied} component modification sets processed)`);
|
|
97
|
+
}
|
|
88
98
|
}
|
|
89
99
|
catch (error) {
|
|
90
100
|
logger.error(`Failed to apply modifications: ${error}`);
|
|
@@ -167,7 +177,6 @@ async function processDirectory(modDirPath, targetDirPath, mode) {
|
|
|
167
177
|
* Process a file modification
|
|
168
178
|
*/
|
|
169
179
|
async function processFile(modFilePath, targetFilePath, fileName, mode) {
|
|
170
|
-
logger.debug(`Processing file ${fileName} with target ${targetFilePath} and modFilePath ${modFilePath}`);
|
|
171
180
|
if (fileName.endsWith('.gitkeep')) {
|
|
172
181
|
// ignore .gitkeep files
|
|
173
182
|
return;
|
|
@@ -195,7 +204,7 @@ async function processFile(modFilePath, targetFilePath, fileName, mode) {
|
|
|
195
204
|
const targetFile = baseFileName + '.json'; // Remove '.merge' and ensure .json
|
|
196
205
|
const actualTargetPath = (0, path_1.join)((0, path_1.dirname)(targetFilePath), targetFile);
|
|
197
206
|
await mergeJsonFile(modFilePath, actualTargetPath);
|
|
198
|
-
|
|
207
|
+
expandVarsSync(actualTargetPath, mode);
|
|
199
208
|
return;
|
|
200
209
|
}
|
|
201
210
|
// Handle regular file replacement
|
|
@@ -203,19 +212,23 @@ async function processFile(modFilePath, targetFilePath, fileName, mode) {
|
|
|
203
212
|
(0, fs_1.copyFileSync)(modFilePath, targetFilePath);
|
|
204
213
|
if (fileName.endsWith('.json')) {
|
|
205
214
|
// expand vars in the final file only if json
|
|
206
|
-
|
|
207
|
-
logger.debug(`Expanded env vars in file: ${targetFilePath}`);
|
|
215
|
+
expandVarsSync(targetFilePath, mode);
|
|
208
216
|
}
|
|
209
217
|
logger.debug(`Copied file: ${(0, path_1.relative)(process.cwd(), targetFilePath)}`);
|
|
210
218
|
}
|
|
211
|
-
|
|
212
|
-
const vars =
|
|
219
|
+
function expandVarsSync(filePath, mode) {
|
|
220
|
+
const vars = getVars()[mode] || [];
|
|
213
221
|
// Read the file content
|
|
214
222
|
let content = (0, fs_1.readFileSync)(filePath, 'utf-8');
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
223
|
+
// Expand environment variables in ${VAR_NAME} format
|
|
224
|
+
content = content.replace(/\$\{([^}]+)\}/g, (_, varName) => {
|
|
225
|
+
let varsValue = vars.find(v => v.name === varName)?.value;
|
|
226
|
+
const value = varsValue || process.env[varName] || '';
|
|
227
|
+
// Normalize path separators to forward slashes for JSON safety
|
|
228
|
+
const finalValue = value.replace(/\\/g, '/');
|
|
229
|
+
logger.debug(`Expanded variable ${varName} to ${finalValue}`);
|
|
230
|
+
return finalValue;
|
|
231
|
+
});
|
|
219
232
|
// Write the modified content back to the file
|
|
220
233
|
(0, fs_1.writeFileSync)(filePath, content, 'utf-8');
|
|
221
234
|
}
|
|
@@ -238,7 +251,7 @@ async function mergeJsonFile(mergePath, targetPath) {
|
|
|
238
251
|
const mergedData = (0, deep_merge_1.deepMerge)(targetData, mergeData);
|
|
239
252
|
// Write the merged result
|
|
240
253
|
ensureDirectoryExists((0, path_1.dirname)(targetPath));
|
|
241
|
-
(0, fs_1.writeFileSync)(targetPath, JSON.stringify(mergedData, null,
|
|
254
|
+
(0, fs_1.writeFileSync)(targetPath, JSON.stringify(mergedData, null, 4), 'utf-8');
|
|
242
255
|
logger.debug(`Merged JSON file: ${(0, path_1.relative)(process.cwd(), targetPath)}`);
|
|
243
256
|
}
|
|
244
257
|
catch (error) {
|
|
@@ -378,7 +391,4 @@ async function processIocdComponentOnMacOS(modComponentDir, baseTargetComponentD
|
|
|
378
391
|
throw error;
|
|
379
392
|
}
|
|
380
393
|
}
|
|
381
|
-
function toForwardSlashes(path) {
|
|
382
|
-
return path.replace(/\\/g, "/");
|
|
383
|
-
}
|
|
384
394
|
//# sourceMappingURL=modifications.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modifications.service.js","sourceRoot":"","sources":["../../../src/services/modifications/modifications.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"modifications.service.js","sourceRoot":"","sources":["../../../src/services/modifications/modifications.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -193,7 +193,7 @@ class TemplateService {
|
|
|
193
193
|
config.components.list[component] = "latest";
|
|
194
194
|
}
|
|
195
195
|
// write back the updated config
|
|
196
|
-
(0, node_fs_1.writeFileSync)(configPath, JSON.stringify(config, null,
|
|
196
|
+
(0, node_fs_1.writeFileSync)(configPath, JSON.stringify(config, null, 4), 'utf-8');
|
|
197
197
|
this.logger.debug(`Updated components configuration in iocd.cli.config.json`);
|
|
198
198
|
}
|
|
199
199
|
/**
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
# Web Group App for io.Connect Desktop
|
|
2
|
+
|
|
3
|
+
Template for creating a [custom Web Group App](https://docs.interop.io/desktop/capabilities/windows/window-management/overview/index.html#extending_web_groups) for **io.Connect Desktop**.
|
|
4
|
+
|
|
5
|
+
## Prerequisites
|
|
6
|
+
|
|
7
|
+
For an **io.Connect Desktop** project, **io.Connect Desktop** 9.0 or newer is required.
|
|
8
|
+
|
|
9
|
+
## Usage
|
|
10
|
+
|
|
11
|
+
- Run `npm install` to install all dependencies.
|
|
12
|
+
- Run `npm run start` to start the app.
|
|
13
|
+
- Open the `webGroup.json` definition file located in the `%LocalAppData%\interop.io\io.Connect Desktop\Desktop\config\apps` folder, set the `"disabled"` property to `false`, and set the `"url"` property of the `"details"` top-level key to the location of your Web Group App (the default is `http://localhost:5173`).
|
|
14
|
+
- Set the `"groupType"` property of the `stickywindows.json` file located in `%LocalAppData%\interop.io\io.Connect Desktop\Desktop\config` to `"Web"`.
|
|
15
|
+
- Start **io.Connect Desktop** to start using and modifying your Web Group App.
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
<!doctype html>
|
|
2
|
+
<html lang="en" style="height: 100%;">
|
|
3
|
+
|
|
4
|
+
<head>
|
|
5
|
+
<meta charset="utf-8" />
|
|
6
|
+
<link rel="shortcut icon" href="/favicon.ico" />
|
|
7
|
+
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
|
|
8
|
+
<meta name="theme-color" content="#000000" />
|
|
9
|
+
<link rel="manifest" href="/manifest.json" />
|
|
10
|
+
<title>{{name}}</title>
|
|
11
|
+
</head>
|
|
12
|
+
|
|
13
|
+
<body style="overflow: hidden; margin: 0px; height: 100%; width: 100%;">
|
|
14
|
+
<div id="root" style="display: flex; flex-direction: row; overflow: hidden; height: 100%; width: 100%;"></div>
|
|
15
|
+
<script type="module" src="/src/index.tsx"></script>
|
|
16
|
+
</body>
|
|
17
|
+
|
|
18
|
+
</html>
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
{
|
|
2
|
+
"dev": {
|
|
3
|
+
"script": "start",
|
|
4
|
+
"modifications": [
|
|
5
|
+
{
|
|
6
|
+
"source": "/config/web-group-dev.json",
|
|
7
|
+
"destination": "/modifications-dev/iocd/config/apps/webGroup.json"
|
|
8
|
+
}
|
|
9
|
+
]
|
|
10
|
+
},
|
|
11
|
+
"installer": {
|
|
12
|
+
"script": "build",
|
|
13
|
+
"modifications": [
|
|
14
|
+
{
|
|
15
|
+
"source": "/dist",
|
|
16
|
+
"destination": "/modifications-installer/iocd/assets/webGroups/app-react"
|
|
17
|
+
}
|
|
18
|
+
]
|
|
19
|
+
}
|
|
20
|
+
}
|