@interopio/iocd-cli 0.0.7 → 0.0.8
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/README.md +41 -9
- package/dist/cli.js +1 -1
- package/dist/cli.js.map +1 -1
- package/dist/services/app.service.js +22 -45
- package/dist/services/app.service.js.map +1 -1
- package/dist/services/config/config.service.js +4 -12
- package/dist/services/config/config.service.js.map +1 -1
- package/dist/services/create.service.js +2 -2
- package/dist/services/create.service.js.map +1 -1
- package/dist/services/installer/electronForge.js +57 -14
- package/dist/services/installer/electronForge.js.map +1 -1
- package/dist/services/license.service.js +7 -8
- package/dist/services/license.service.js.map +1 -1
- package/dist/services/template.service.js +7 -2
- package/dist/services/template.service.js.map +1 -1
- package/dist/templates/ioconnect-desktop/package.json +2 -1
- package/dist/utils/path.js +17 -5
- package/dist/utils/path.js.map +1 -1
- package/dist/{sentry.js → utils/sentry.js} +3 -1
- package/dist/utils/sentry.js.map +1 -0
- package/package.json +1 -1
- package/dist/cli.d.ts +0 -3
- package/dist/cli.d.ts.map +0 -1
- package/dist/commands/apps.command.d.ts +0 -3
- package/dist/commands/apps.command.d.ts.map +0 -1
- package/dist/commands/build.command.d.ts +0 -3
- package/dist/commands/build.command.d.ts.map +0 -1
- package/dist/commands/components.command.d.ts +0 -3
- package/dist/commands/components.command.d.ts.map +0 -1
- package/dist/commands/create.command.d.ts +0 -3
- package/dist/commands/create.command.d.ts.map +0 -1
- package/dist/commands/dev.command.d.ts +0 -4
- package/dist/commands/dev.command.d.ts.map +0 -1
- package/dist/commands/license.command.d.ts +0 -3
- package/dist/commands/license.command.d.ts.map +0 -1
- package/dist/commands/modifications.command.d.ts +0 -3
- package/dist/commands/modifications.command.d.ts.map +0 -1
- package/dist/commands/setup.command.d.ts +0 -4
- package/dist/commands/setup.command.d.ts.map +0 -1
- package/dist/sentry.d.ts +0 -2
- package/dist/sentry.d.ts.map +0 -1
- package/dist/sentry.js.map +0 -1
- package/dist/services/app-builder.service.d.ts +0 -2
- package/dist/services/app-builder.service.d.ts.map +0 -1
- package/dist/services/app.service.d.ts +0 -75
- package/dist/services/app.service.d.ts.map +0 -1
- package/dist/services/components/component.config.d.ts +0 -11
- package/dist/services/components/component.config.d.ts.map +0 -1
- package/dist/services/components/component.d.ts +0 -17
- package/dist/services/components/component.d.ts.map +0 -1
- package/dist/services/components/components.registry.d.ts +0 -40
- package/dist/services/components/components.registry.d.ts.map +0 -1
- package/dist/services/components/components.service.d.ts +0 -25
- package/dist/services/components/components.service.d.ts.map +0 -1
- package/dist/services/components/file.helper.d.ts +0 -12
- package/dist/services/components/file.helper.d.ts.map +0 -1
- package/dist/services/components/platform.utils.d.ts +0 -149
- package/dist/services/components/platform.utils.d.ts.map +0 -1
- package/dist/services/components/stores/github.store.d.ts +0 -34
- package/dist/services/components/stores/github.store.d.ts.map +0 -1
- package/dist/services/components/stores/local.store.d.ts +0 -70
- package/dist/services/components/stores/local.store.d.ts.map +0 -1
- package/dist/services/components/stores/s3.store.d.ts +0 -99
- package/dist/services/components/stores/s3.store.d.ts.map +0 -1
- package/dist/services/components/stores/store.d.ts +0 -12
- package/dist/services/components/stores/store.d.ts.map +0 -1
- package/dist/services/components/version.selector.d.ts +0 -4
- package/dist/services/components/version.selector.d.ts.map +0 -1
- package/dist/services/config/cli.config.d.ts +0 -64
- package/dist/services/config/cli.config.d.ts.map +0 -1
- package/dist/services/config/config.service.d.ts +0 -14
- package/dist/services/config/config.service.d.ts.map +0 -1
- package/dist/services/create.service.d.ts +0 -58
- package/dist/services/create.service.d.ts.map +0 -1
- package/dist/services/dev.service.d.ts +0 -2
- package/dist/services/dev.service.d.ts.map +0 -1
- package/dist/services/installer/electronBuilder.d.ts +0 -2
- package/dist/services/installer/electronBuilder.d.ts.map +0 -1
- package/dist/services/installer/electronForge.d.ts +0 -4
- package/dist/services/installer/electronForge.d.ts.map +0 -1
- package/dist/services/installer/installer.service.d.ts +0 -5
- package/dist/services/installer/installer.service.d.ts.map +0 -1
- package/dist/services/installer/macOS.helper.d.ts +0 -3
- package/dist/services/installer/macOS.helper.d.ts.map +0 -1
- package/dist/services/installer/prerequisites.d.ts +0 -2
- package/dist/services/installer/prerequisites.d.ts.map +0 -1
- package/dist/services/installer/windows.helper.d.ts +0 -10
- package/dist/services/installer/windows.helper.d.ts.map +0 -1
- package/dist/services/license.service.d.ts +0 -105
- package/dist/services/license.service.d.ts.map +0 -1
- package/dist/services/modifications/macOS.helper.d.ts +0 -13
- package/dist/services/modifications/macOS.helper.d.ts.map +0 -1
- package/dist/services/modifications/modifications.service.d.ts +0 -2
- package/dist/services/modifications/modifications.service.d.ts.map +0 -1
- package/dist/services/modifications/windows.helper.d.ts +0 -2
- package/dist/services/modifications/windows.helper.d.ts.map +0 -1
- package/dist/services/template.service.d.ts +0 -116
- package/dist/services/template.service.d.ts.map +0 -1
- package/dist/templates/auto-tests/README.md +0 -31
- package/dist/templates/auto-tests/playwright.config.js +0 -19
- package/dist/templates/groups/apps/groups/src/reportWebVitals.ts +0 -15
- package/dist/utils/colors.d.ts +0 -57
- package/dist/utils/colors.d.ts.map +0 -1
- package/dist/utils/deep.merge.d.ts +0 -5
- package/dist/utils/deep.merge.d.ts.map +0 -1
- package/dist/utils/delay.d.ts +0 -2
- package/dist/utils/delay.d.ts.map +0 -1
- package/dist/utils/electron.builder.config.helper.d.ts +0 -6
- package/dist/utils/electron.builder.config.helper.d.ts.map +0 -1
- package/dist/utils/ensure.iocd.exists.d.ts +0 -2
- package/dist/utils/ensure.iocd.exists.d.ts.map +0 -1
- package/dist/utils/error.handler.d.ts +0 -31
- package/dist/utils/error.handler.d.ts.map +0 -1
- package/dist/utils/file.d.ts +0 -10
- package/dist/utils/file.d.ts.map +0 -1
- package/dist/utils/find.package.dir.d.ts +0 -2
- package/dist/utils/find.package.dir.d.ts.map +0 -1
- package/dist/utils/logger.d.ts +0 -19
- package/dist/utils/logger.d.ts.map +0 -1
- package/dist/utils/nextSteps.d.ts +0 -2
- package/dist/utils/nextSteps.d.ts.map +0 -1
- package/dist/utils/pacakge.json.helper.d.ts +0 -13
- package/dist/utils/pacakge.json.helper.d.ts.map +0 -1
- package/dist/utils/path.d.ts +0 -19
- package/dist/utils/path.d.ts.map +0 -1
- package/dist/utils/version.d.ts +0 -2
- package/dist/utils/version.d.ts.map +0 -1
- /package/dist/templates/ioconnect-desktop/{forge.config.js → config/forge.config.js} +0 -0
- /package/dist/templates/ioconnect-desktop/{iocd.cli.config.json → config/iocd.cli.config.json} +0 -0
package/README.md
CHANGED
|
@@ -10,29 +10,61 @@ CLI tool for setting up, building and packaging io.Connect Desktop projects.
|
|
|
10
10
|
|
|
11
11
|
## Usage
|
|
12
12
|
|
|
13
|
-
### Create a new project
|
|
13
|
+
### 1. Create a new project
|
|
14
14
|
```bash
|
|
15
|
-
npx @interopio/
|
|
15
|
+
npx @interopio/iocd-cli create
|
|
16
16
|
```
|
|
17
17
|
|
|
18
|
-
|
|
18
|
+
Follow the instructions.
|
|
19
|
+
|
|
20
|
+
### 2. Setting up the repository
|
|
19
21
|
```bash
|
|
20
22
|
cd <proj_name>
|
|
21
23
|
npm install
|
|
22
24
|
npm run setup
|
|
23
25
|
```
|
|
24
26
|
|
|
25
|
-
### Start io.
|
|
27
|
+
### 3. Start io.Connect Desktop in development mode
|
|
26
28
|
```bash
|
|
27
29
|
npm run start
|
|
28
30
|
```
|
|
29
31
|
|
|
30
|
-
###
|
|
32
|
+
### 4. Build and package for distribution
|
|
33
|
+
|
|
34
|
+
```bash
|
|
35
|
+
npm run build
|
|
36
|
+
```
|
|
37
|
+
|
|
38
|
+
### 5. Start template apps in development mode
|
|
31
39
|
```bash
|
|
32
|
-
npm run start
|
|
40
|
+
npm run apps-start
|
|
33
41
|
```
|
|
34
42
|
|
|
35
|
-
###
|
|
43
|
+
### 6. Run tests
|
|
36
44
|
```bash
|
|
37
|
-
npm run
|
|
38
|
-
```
|
|
45
|
+
npm run test
|
|
46
|
+
```
|
|
47
|
+
|
|
48
|
+
### Configuration
|
|
49
|
+
|
|
50
|
+
The main configuration file is located at `config/iocd.cli.config.json`
|
|
51
|
+
|
|
52
|
+
**Note 1**: Look at the `config/iocd.cli.config.json` win/mac sections for code signing options on Windows and macOS
|
|
53
|
+
**Note 2**: Look at `config/forge.config.js` for configuration about packaging and publishing
|
|
54
|
+
|
|
55
|
+
### License key
|
|
56
|
+
|
|
57
|
+
Your license key should be at `config/iocd.license.key`
|
|
58
|
+
|
|
59
|
+
|
|
60
|
+
Here’s a clearer and more professional version of your message that keeps your reasoning strong but makes it sound constructive and collaborative rather than oppositional:
|
|
61
|
+
|
|
62
|
+
⸻
|
|
63
|
+
|
|
64
|
+
Improved version:
|
|
65
|
+
|
|
66
|
+
|
|
67
|
+
|
|
68
|
+
⸻
|
|
69
|
+
|
|
70
|
+
Would you like me to make it sound a bit more diplomatic (e.g. for an executive audience) or keep it frank and direct (for a peer or direct manager)?
|
package/dist/cli.js
CHANGED
|
@@ -54,7 +54,7 @@ const program = new commander_1.Command();
|
|
|
54
54
|
const logger = logger_1.Logger.getInstance();
|
|
55
55
|
// Initialize Sentry for error tracking
|
|
56
56
|
if (config_service_1.ConfigManager.config.sentry) {
|
|
57
|
-
require('./sentry');
|
|
57
|
+
require('./utils/sentry');
|
|
58
58
|
}
|
|
59
59
|
clack.intro((0, colors_1.bgCyanBlack)(` io.Connect Desktop CLI ${pacakge_json_helper_1.PackageJSONHelper.getCliPackageJson().version} `));
|
|
60
60
|
logger.debug(`io.Connect Desktop CLI ${pacakge_json_helper_1.PackageJSONHelper.getCliPackageJson().version}`);
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;AAE1D,yCAAoC;AACpC,2CAAwC;AACxC,yDAAqD;AACrD,8DAA0D;AAC1D,sEAAkE;AAClE,0DAAsD;AACtD,gEAA4D;AAC5D,4EAAwE;AACxE,4DAAwD;AACxD,wDAAmE;AACnE,4DAAqE;AACrE,sDAAwC;AACxC,2CAA6C;AAC7C,qEAAgE;AAChE,qEAAiE;AAEjE,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAC;AAC9B,MAAM,MAAM,GAAG,eAAM,CAAC,WAAW,EAAE,CAAC;AAEpC,uCAAuC;AACvC,IAAI,8BAAa,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;IAChC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ const logger_1 = require("../utils/logger");
|
|
|
10
10
|
const error_handler_1 = require("../utils/error.handler");
|
|
11
11
|
const concurrently_1 = __importDefault(require("concurrently"));
|
|
12
12
|
const colors_1 = require("../utils/colors");
|
|
13
|
+
;
|
|
13
14
|
/**
|
|
14
15
|
* Service for managing template applications.
|
|
15
16
|
*
|
|
@@ -76,9 +77,15 @@ class AppService {
|
|
|
76
77
|
return;
|
|
77
78
|
}
|
|
78
79
|
this.logger.info(`Found ${apps.length} template applications to start in dev mode: ${apps.map(a => a.name).join(", ")}`);
|
|
79
|
-
//
|
|
80
|
-
apps.
|
|
81
|
-
|
|
80
|
+
// filter out apps that do not have a dev config
|
|
81
|
+
const appsWithDevConfig = apps.filter(app => app.config.dev);
|
|
82
|
+
if (appsWithDevConfig.length > 0) {
|
|
83
|
+
// First copy all modifications for apps that have a dev config
|
|
84
|
+
appsWithDevConfig.forEach(app => this.copyModifications(app, "dev"));
|
|
85
|
+
// Then start all apps that have a dev script in parallel
|
|
86
|
+
const appsThatHaveADevScript = appsWithDevConfig.filter(app => app.config.dev?.script);
|
|
87
|
+
this.startAppsInParallel(appsThatHaveADevScript);
|
|
88
|
+
}
|
|
82
89
|
this.logger.info('All template applications started in dev mode successfully!');
|
|
83
90
|
}
|
|
84
91
|
/**
|
|
@@ -88,16 +95,14 @@ class AppService {
|
|
|
88
95
|
const appPath = (0, path_1.join)(process.cwd(), 'apps', appConfig.name);
|
|
89
96
|
this.logger.debug(`Building application ${appConfig.name}...`);
|
|
90
97
|
try {
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
if (!packageJson.scripts?.build) {
|
|
95
|
-
this.logger.warn(`No build script found for ${appConfig.name} - skipping`);
|
|
98
|
+
const scriptToRun = appConfig.config.build?.script;
|
|
99
|
+
if (!scriptToRun) {
|
|
100
|
+
this.logger.debug(`No build script defined for ${appConfig.name} in iocd.app.json - skipping`);
|
|
96
101
|
return;
|
|
97
102
|
}
|
|
98
103
|
// Execute npm run build in the app directory
|
|
99
|
-
this.logger.debug(`Executing: npm run
|
|
100
|
-
(0, child_process_1.execSync)(
|
|
104
|
+
this.logger.debug(`Executing: npm run ${scriptToRun} in ${appPath}`);
|
|
105
|
+
(0, child_process_1.execSync)(`npm run ${scriptToRun}`, {
|
|
101
106
|
cwd: appPath,
|
|
102
107
|
stdio: 'pipe',
|
|
103
108
|
encoding: 'utf-8'
|
|
@@ -109,33 +114,6 @@ class AppService {
|
|
|
109
114
|
throw new error_handler_1.CLIError(`Failed to build application: ${appConfig.name}. ${error}`, { code: error_handler_1.ErrorCode.BUILD_ERROR });
|
|
110
115
|
}
|
|
111
116
|
}
|
|
112
|
-
/**
|
|
113
|
-
* Start a specific application in development mode
|
|
114
|
-
*/
|
|
115
|
-
async startAppInDevMode(appName) {
|
|
116
|
-
const appPath = (0, path_1.join)(process.cwd(), 'apps', appName);
|
|
117
|
-
this.logger.info(`Starting ${appName} in dev mode...`);
|
|
118
|
-
try {
|
|
119
|
-
// Check if build script exists
|
|
120
|
-
const packageJsonPath = (0, path_1.join)(appPath, 'package.json');
|
|
121
|
-
const packageJson = JSON.parse((0, fs_1.readFileSync)(packageJsonPath, 'utf-8'));
|
|
122
|
-
if (!packageJson.scripts?.build) {
|
|
123
|
-
this.logger.warn(`No build script found for ${appName} - skipping`);
|
|
124
|
-
return;
|
|
125
|
-
}
|
|
126
|
-
// Execute npm run dev in the app directory
|
|
127
|
-
this.logger.debug(`Executing: npm run dev in ${appPath}`);
|
|
128
|
-
(0, child_process_1.exec)('npm run dev', {
|
|
129
|
-
cwd: appPath,
|
|
130
|
-
encoding: 'utf-8'
|
|
131
|
-
});
|
|
132
|
-
this.logger.info(`${appName} started successfully!`);
|
|
133
|
-
}
|
|
134
|
-
catch (error) {
|
|
135
|
-
this.logger.error(`Failed to start ${appName}: ${error}`);
|
|
136
|
-
throw new error_handler_1.CLIError(`Failed to start application: ${appName}. ${error}`, { code: error_handler_1.ErrorCode.BUILD_ERROR });
|
|
137
|
-
}
|
|
138
|
-
}
|
|
139
117
|
async getAllApps() {
|
|
140
118
|
const appsDir = (0, path_1.join)(process.cwd(), 'apps');
|
|
141
119
|
if (!(0, fs_1.existsSync)(appsDir)) {
|
|
@@ -161,13 +139,8 @@ class AppService {
|
|
|
161
139
|
if (!isDirectory) {
|
|
162
140
|
return null;
|
|
163
141
|
}
|
|
164
|
-
const hasPackageJson = (0, fs_1.existsSync)((0, path_1.join)(appPath, 'package.json'));
|
|
165
142
|
const iocdAppJsonPath = (0, path_1.join)(appPath, 'iocd.app.json');
|
|
166
143
|
const hasAppJson = (0, fs_1.existsSync)(iocdAppJsonPath);
|
|
167
|
-
if (!hasPackageJson) {
|
|
168
|
-
this.logger.debug(`Skipping ${item}: no package.json found`);
|
|
169
|
-
return null;
|
|
170
|
-
}
|
|
171
144
|
if (!hasAppJson) {
|
|
172
145
|
this.logger.debug(`Skipping ${item}: no iocd.app.json found`);
|
|
173
146
|
return null;
|
|
@@ -205,7 +178,7 @@ class AppService {
|
|
|
205
178
|
// Check if package.json exists
|
|
206
179
|
const packageJsonPath = (0, path_1.join)(appPath, 'package.json');
|
|
207
180
|
if (!(0, fs_1.existsSync)(packageJsonPath)) {
|
|
208
|
-
this.logger.
|
|
181
|
+
this.logger.debug(` No package.json found for ${appConfig.name} - skipping`);
|
|
209
182
|
return;
|
|
210
183
|
}
|
|
211
184
|
// Execute npm install in the app directory
|
|
@@ -223,8 +196,12 @@ class AppService {
|
|
|
223
196
|
}
|
|
224
197
|
}
|
|
225
198
|
async startAppsInParallel(apps) {
|
|
199
|
+
if (apps.length === 0) {
|
|
200
|
+
this.logger.debug('No applications with a dev script found to start in dev mode - skipping');
|
|
201
|
+
return;
|
|
202
|
+
}
|
|
226
203
|
const tasks = apps.map(app => ({
|
|
227
|
-
command:
|
|
204
|
+
command: `npm run ${app.config.dev?.script}`,
|
|
228
205
|
name: app.name,
|
|
229
206
|
cwd: app.path
|
|
230
207
|
}));
|
|
@@ -239,7 +216,7 @@ class AppService {
|
|
|
239
216
|
copyModifications(appConfig, mode) {
|
|
240
217
|
const modificationsConfigs = appConfig.config[mode]?.modifications;
|
|
241
218
|
if (!modificationsConfigs) {
|
|
242
|
-
this.logger.
|
|
219
|
+
this.logger.debug(`No modifications found for ${appConfig.name} in ${mode} mode - skipping`);
|
|
243
220
|
return;
|
|
244
221
|
}
|
|
245
222
|
this.logger.debug(`Copying ${modificationsConfigs.length} modification(s) for ${appConfig.name} in ${mode} mode`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.service.js","sourceRoot":"","sources":["../../src/services/app.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"app.service.js","sourceRoot":"","sources":["../../src/services/app.service.ts"],"names":[],"mappings":";;;;;AAAA,iDAAyC;AACzC,2BAAsG;AACtG,+BAAqC;AACrC,4CAAyC;AACzC,0DAA6D;AAC7D,gEAAwC;AACxC,4CAAwC;AAgBvC,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,UAAU;IACN,MAAM,GAAW,eAAM,CAAC,WAAW,EAAE,CAAC;IAE9C;;OAEG;IACI,KAAK,CAAC,cAAc;QACzB,MAAM,OAAO,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;QAE5C,IAAI,CAAC,IAAA,eAAU,EAAC,OAAO,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC;YACtE,OAAO;QACT,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAExC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;YAC7D,OAAO;QACT,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,IAAI,CAAC,MAAM,4CAA4C,CAAC,CAAC;QACpF,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uCAAuC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAE1F,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,YAAY;QACvB,MAAM,OAAO,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;QAE5C,IAAI,CAAC,IAAA,eAAU,EAAC,OAAO,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;YACpE,OAAO;QACT,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAExC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;YAC9D,OAAO;QACT,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,MAAM,2BAA2B,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEpG,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;YACtD,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YACzB,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;YAC1C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,GAAG,CAAC,IAAI,gCAAgC,CAAC,CAAC;QAC5E,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAC;IACrE,CAAC;IAEM,KAAK,CAAC,qBAAqB;QAChC,MAAM,OAAO,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;QAE5C,IAAI,CAAC,IAAA,eAAU,EAAC,OAAO,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAC;YACnE,OAAO;QACT,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAExC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;YAC7D,OAAO;QACT,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,MAAM,gDAAgD,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEzH,gDAAgD;QAChD,MAAM,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAE7D,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACjC,mEAAmE;YACnE,iBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;YAErE,yDAAyD;YACzD,MAAM,sBAAsB,GAAG,iBAAiB,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACvF,IAAI,CAAC,mBAAmB,CAAC,sBAAsB,CAAC,CAAC;QACnD,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6DAA6D,CAAC,CAAC;IAClF,CAAC;IAED;;KAEC;IACO,KAAK,CAAC,QAAQ,CAAC,SAAoB;QACzC,MAAM,OAAO,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;QAE5D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,SAAS,CAAC,IAAI,KAAK,CAAC,CAAC;QAE/D,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC;YACnD,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,SAAS,CAAC,IAAI,8BAA8B,CAAC,CAAC;gBAC/F,OAAO;YACT,CAAC;YAED,6CAA6C;YAC7C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,WAAW,OAAO,OAAO,EAAE,CAAC,CAAC;YAErE,IAAA,wBAAQ,EAAC,WAAW,WAAW,EAAE,EAAE;gBACjC,GAAG,EAAE,OAAO;gBACZ,KAAK,EAAE,MAAM;gBACb,QAAQ,EAAE,OAAO;aAClB,CAAC,CAAC;YAEH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,SAAS,CAAC,IAAI,sBAAsB,CAAC,CAAC;QAEzE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,SAAS,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC,CAAC;YAC7E,MAAM,IAAI,wBAAQ,CAChB,gCAAgC,SAAS,CAAC,IAAI,KAAK,KAAK,EAAE,EAC1D,EAAE,IAAI,EAAE,yBAAS,CAAC,WAAW,EAAE,CAChC,CAAC;QACJ,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,UAAU;QACrB,MAAM,OAAO,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;QAE5C,IAAI,CAAC,IAAA,eAAU,EAAC,OAAO,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iDAAiD,CAAC,CAAC;YACrE,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAExC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;YAC9D,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACK,YAAY,CAAC,OAAe;QAClC,IAAI,CAAC;YACH,OAAO,IAAA,gBAAW,EAAC,OAAO,CAAC;iBACxB,GAAG,CAAC,IAAI,CAAC,EAAE;gBACV,MAAM,OAAO,GAAG,IAAA,WAAI,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;gBACpC,MAAM,WAAW,GAAG,IAAA,aAAQ,EAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC;gBAEpD,IAAI,CAAC,WAAW,EAAE,CAAC;oBACjB,OAAO,IAAI,CAAC;gBACd,CAAC;gBAED,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,OAAO,EAAE,eAAe,CAAC,CAAC;gBACvD,MAAM,UAAU,GAAG,IAAA,eAAU,EAAC,eAAe,CAAC,CAAC;gBAE/C,IAAI,CAAC,UAAU,EAAE,CAAC;oBAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,IAAI,0BAA0B,CAAC,CAAC;oBAC9D,OAAO,IAAI,CAAC;gBACd,CAAC;gBAED,IAAI,CAAC;oBACH,wCAAwC;oBACxC,MAAM,aAAa,GAAG,IAAA,iBAAY,EAAC,eAAe,EAAE,OAAO,CAAC,CAAC;oBAC7D,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;oBAEzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,IAAI,iBAAiB,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;oBAE7F,OAAO;wBACL,IAAI,EAAE,IAAI;wBACV,IAAI,EAAE,OAAO;wBACb,MAAM,EAAE,MAAM;qBACF,CAAC;gBAEjB,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,IAAI,KAAK,KAAK,EAAE,CAAC,CAAC;oBACzE,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC,CAAC;iBACD,MAAM,CAAC,CAAC,GAAG,EAAoB,EAAE,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC;QAErD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2BAA2B,KAAK,EAAE,CAAC,CAAC;YACtD,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,UAAU,CAAC,SAAoB;QAC3C,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC;QAE/B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,4CAA4C,SAAS,CAAC,IAAI,MAAM,CAAC,CAAC;QAEnF,IAAI,CAAC;YACH,+BAA+B;YAC/B,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,OAAO,EAAE,cAAc,CAAC,CAAC;YACtD,IAAI,CAAC,IAAA,eAAU,EAAC,eAAe,CAAC,EAAE,CAAC;gBACjC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,SAAS,CAAC,IAAI,aAAa,CAAC,CAAC;gBAC7E,OAAO;YACT,CAAC;YAED,2CAA2C;YAC3C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,OAAO,EAAE,CAAC,CAAC;YAE1D,IAAA,wBAAQ,EAAC,aAAa,EAAE;gBACtB,GAAG,EAAE,OAAO;gBACZ,KAAK,EAAE,MAAM;gBACb,QAAQ,EAAE,OAAO;aAClB,CAAC,CAAC;YAEH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAA,cAAK,EAAC,iCAAiC,SAAS,CAAC,IAAI,2BAA2B,CAAC,CAAC,CAAC;QAEtG,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uCAAuC,SAAS,CAAC,IAAI,MAAM,KAAK,EAAE,CAAC,CAAC;YACtF,MAAM,IAAI,wBAAQ,CAChB,oDAAoD,SAAS,CAAC,IAAI,MAAM,KAAK,EAAE,EAC/E,EAAE,IAAI,EAAE,yBAAS,CAAC,WAAW,EAAE,CAChC,CAAC;QACJ,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,IAAiB;QAGjD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yEAAyE,CAAC,CAAC;YAC7F,OAAO;QACT,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC7B,OAAO,EAAE,WAAW,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE;YAC5C,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,GAAG,EAAE,GAAG,CAAC,IAAI;SACd,CAAC,CAAC,CAAC;QACJ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;QAEzC,iBAAiB;QACjB,IAAA,sBAAY,EACV,KAAK,EACL;YACE,MAAM,EAAE,MAAM,EAAQ,oCAAoC;YAC1D,YAAY,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,wBAAwB;YAC9D,YAAY,EAAE,CAAC;SAChB,CACF,CAAC,MAAM,CAAC,IAAI,CACX,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,EACvD,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,6BAA6B,CAAC,CACnD,CAAC;IACJ,CAAC;IAEO,iBAAiB,CAAC,SAAoB,EAAE,IAAqB;QACnE,MAAM,oBAAoB,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC;QAEnE,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC1B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,SAAS,CAAC,IAAI,OAAO,IAAI,kBAAkB,CAAC,CAAC;YAC7F,OAAO;QACT,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,oBAAoB,CAAC,MAAM,wBAAwB,SAAS,CAAC,IAAI,OAAO,IAAI,OAAO,CAAC,CAAC;QAElH,yBAAyB;QACzB,KAAK,MAAM,MAAM,IAAI,oBAAoB,EAAE,CAAC;YAC1C,MAAM,OAAO,GAAG,IAAA,WAAI,EAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;YACpD,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;YAEzD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,OAAO,OAAO,QAAQ,EAAE,CAAC,CAAC;YAEzE,IAAI,CAAC;gBACH,yBAAyB;gBACzB,IAAI,CAAC,IAAA,eAAU,EAAC,OAAO,CAAC,EAAE,CAAC;oBACzB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+BAA+B,OAAO,aAAa,CAAC,CAAC;oBACtE,SAAS;gBACX,CAAC;gBAED,4DAA4D;gBAC5D,MAAM,QAAQ,GAAG,IAAA,aAAQ,EAAC,OAAO,CAAC,CAAC;gBAEnC,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;oBACtB,sBAAsB;oBACtB,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;gBACnC,CAAC;qBAAM,IAAI,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC;oBAClC,2BAA2B;oBAC3B,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;gBACxC,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yCAAyC,OAAO,aAAa,CAAC,CAAC;oBAChF,SAAS;gBACX,CAAC;gBAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,MAAM,CAAC,MAAM,OAAO,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;YACrF,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,MAAM,CAAC,MAAM,OAAO,MAAM,CAAC,WAAW,KAAK,KAAK,EAAE,CAAC,CAAC;gBACxF,MAAM,IAAI,wBAAQ,CAChB,mCAAmC,SAAS,CAAC,IAAI,KAAK,KAAK,EAAE,EAC7D,EAAE,IAAI,EAAE,yBAAS,CAAC,iBAAiB,EAAE,CACtC,CAAC;YACJ,CAAC;QACH,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;IAC1D,CAAC;IAED;;OAEG;IACK,QAAQ,CAAC,OAAe,EAAE,QAAgB;QAChD,sCAAsC;QACtC,MAAM,OAAO,GAAG,IAAA,cAAO,EAAC,QAAQ,CAAC,CAAC;QAClC,IAAI,CAAC,IAAA,eAAU,EAAC,OAAO,CAAC,EAAE,CAAC;YACzB,IAAA,cAAS,EAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACxC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,OAAO,EAAE,CAAC,CAAC;QACjE,CAAC;QAED,gBAAgB;QAChB,IAAA,iBAAY,EAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAChC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,OAAO,MAAM,QAAQ,EAAE,CAAC,CAAC;IAC7D,CAAC;IAED;;OAEG;IACK,aAAa,CAAC,OAAe,EAAE,QAAgB;QACrD,8CAA8C;QAC9C,IAAI,IAAA,eAAU,EAAC,QAAQ,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4CAA4C,QAAQ,EAAE,CAAC,CAAC;YAC1E,IAAA,WAAM,EAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACrD,CAAC;QAED,+BAA+B;QAC/B,IAAA,cAAS,EAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,QAAQ,EAAE,CAAC,CAAC;QAEhE,gCAAgC;QAChC,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAChD,CAAC;IAED;;OAEG;IACK,qBAAqB,CAAC,MAAc,EAAE,OAAe;QAC3D,MAAM,KAAK,GAAG,IAAA,gBAAW,EAAC,MAAM,CAAC,CAAC;QAElC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,WAAW,GAAG,IAAA,WAAI,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YACvC,MAAM,YAAY,GAAG,IAAA,WAAI,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACzC,MAAM,SAAS,GAAG,IAAA,aAAQ,EAAC,WAAW,CAAC,CAAC;YAExC,IAAI,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC;gBACvB,IAAA,iBAAY,EAAC,WAAW,EAAE,YAAY,CAAC,CAAC;gBACxC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,WAAW,MAAM,YAAY,EAAE,CAAC,CAAC;YACrE,CAAC;iBAAM,IAAI,SAAS,CAAC,WAAW,EAAE,EAAE,CAAC;gBACnC,IAAA,cAAS,EAAC,YAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC7C,IAAI,CAAC,qBAAqB,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;YACxD,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAED,kBAAe,IAAI,UAAU,EAAE,CAAC"}
|
|
@@ -35,7 +35,6 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.ConfigManager = void 0;
|
|
37
37
|
const fs = __importStar(require("fs"));
|
|
38
|
-
const path = __importStar(require("path"));
|
|
39
38
|
const deep_merge_1 = require("../../utils/deep.merge");
|
|
40
39
|
const path_1 = require("../../utils/path");
|
|
41
40
|
const path_2 = require("path");
|
|
@@ -65,7 +64,7 @@ class ConfigManager {
|
|
|
65
64
|
}
|
|
66
65
|
static saveComponents(newComponents) {
|
|
67
66
|
// read the current config to preserve other fields, do not expand env vars or anything else
|
|
68
|
-
const configPath =
|
|
67
|
+
const configPath = path_1.PathUtils.getCliConfigPath();
|
|
69
68
|
const configContent = fs.readFileSync(configPath, 'utf8');
|
|
70
69
|
const currentConfig = JSON.parse(configContent);
|
|
71
70
|
const updatedConfig = {
|
|
@@ -86,17 +85,10 @@ class ConfigManager {
|
|
|
86
85
|
process.env["npm_package_version"] = pacakge_json_helper_1.PackageJSONHelper.getPackageJson()?.version;
|
|
87
86
|
}
|
|
88
87
|
const defaultConfig = this.getDefaultConfig();
|
|
89
|
-
// Look for iocd.cli.config.json in the
|
|
90
|
-
|
|
88
|
+
// Look for iocd.cli.config.json in the config directory
|
|
89
|
+
const configPath = path_1.PathUtils.getCliConfigPath();
|
|
91
90
|
if (!fs.existsSync(configPath)) {
|
|
92
|
-
|
|
93
|
-
const configDir = path.join(path_1.PathUtils.getRootDir(), 'config');
|
|
94
|
-
if (fs.existsSync(configDir)) {
|
|
95
|
-
configPath = path.join(configDir, this.configName);
|
|
96
|
-
}
|
|
97
|
-
}
|
|
98
|
-
if (!fs.existsSync(configPath)) {
|
|
99
|
-
// console.warn(`${this.configName} not found at ${configPath}, using fallback configuration`);
|
|
91
|
+
console.debug(`${this.configName} not found at ${configPath}, using fallback configuration`);
|
|
100
92
|
return this.getDefaultConfig();
|
|
101
93
|
}
|
|
102
94
|
const configContent = fs.readFileSync(configPath, 'utf8');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.service.js","sourceRoot":"","sources":["../../../src/services/config/config.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;
|
|
1
|
+
{"version":3,"file":"config.service.js","sourceRoot":"","sources":["../../../src/services/config/config.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -304,11 +304,11 @@ class CreateService {
|
|
|
304
304
|
.replace(/^-|-$/g, '');
|
|
305
305
|
}
|
|
306
306
|
/**
|
|
307
|
-
* Generate license.key file with provided license JSON
|
|
307
|
+
* Generate iocd.license.key file with provided license JSON
|
|
308
308
|
*/
|
|
309
309
|
async generateLicenseFile(targetDirectory, license) {
|
|
310
310
|
try {
|
|
311
|
-
const licensePath = (0, node_path_1.join)(targetDirectory, 'license.key');
|
|
311
|
+
const licensePath = (0, node_path_1.join)(targetDirectory, 'config', 'iocd.license.key');
|
|
312
312
|
(0, node_fs_1.writeFileSync)(licensePath, license, 'utf-8');
|
|
313
313
|
this.logger.debug(`License file created at: ${licensePath}`);
|
|
314
314
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.service.js","sourceRoot":"","sources":["../../src/services/create.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"create.service.js","sourceRoot":"","sources":["../../src/services/create.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,16 +15,51 @@ const child_process_1 = require("child_process");
|
|
|
15
15
|
const error_handler_1 = require("../../utils/error.handler");
|
|
16
16
|
const logger = logger_1.Logger.getInstance();
|
|
17
17
|
async function createPackageWithElectronForge() {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
18
|
+
try {
|
|
19
|
+
logger.info('Creating build...');
|
|
20
|
+
// copy forge.config.js from config to root if exists
|
|
21
|
+
await copyForgeConfig();
|
|
22
|
+
// copy PathUtils.getIOCDDir() to PathUtils.getDistDir() in a folder called <name>-<platform>-<arch>/
|
|
23
|
+
const appPackageTempDir = await copyAppToDist();
|
|
24
|
+
// TODO review if need this at all, now that we are using electron forge
|
|
25
|
+
await ensureElectronVersionIsSet();
|
|
26
|
+
// If your app is already prepackaged & signed internally, tell Forge to skip packaging
|
|
27
|
+
const makeResults = await callForgeMake(appPackageTempDir);
|
|
28
|
+
await signArtifacts(makeResults);
|
|
29
|
+
const published = await callForgePublish(appPackageTempDir);
|
|
30
|
+
return { published };
|
|
31
|
+
}
|
|
32
|
+
catch (error) {
|
|
33
|
+
logger.error(`Failed to create package: ${error instanceof Error ? error.message : String(error)}`);
|
|
34
|
+
throw error;
|
|
35
|
+
}
|
|
36
|
+
finally {
|
|
37
|
+
// remove copied forge.config.js from root if it was copied
|
|
38
|
+
removeForgeConfig();
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
function removeForgeConfig() {
|
|
42
|
+
const forgeConfigDest = (0, path_2.join)(path_1.PathUtils.getRootDir(), 'forge.config.js');
|
|
43
|
+
if ((0, fs_extra_1.existsSync)(forgeConfigDest)) {
|
|
44
|
+
try {
|
|
45
|
+
(0, fs_1.rmSync)(forgeConfigDest);
|
|
46
|
+
logger.debug('Removed temporary forge.config.js from root directory');
|
|
47
|
+
}
|
|
48
|
+
catch (err) {
|
|
49
|
+
logger.warn(`Failed to remove temporary forge.config.js: ${err instanceof Error ? err.message : String(err)}`);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
async function copyForgeConfig() {
|
|
54
|
+
const forgeConfigSrc = path_1.PathUtils.getForgeConfigPath();
|
|
55
|
+
if (await file_1.FileUtils.exists(forgeConfigSrc)) {
|
|
56
|
+
const forgeConfigDest = (0, path_2.join)(path_1.PathUtils.getRootDir(), 'forge.config.js');
|
|
57
|
+
await (0, promises_1.cp)(forgeConfigSrc, forgeConfigDest);
|
|
58
|
+
logger.debug('Copied forge.config.js to root directory for packaging');
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
logger.warn('No forge.config.js found in config directory, using default configuration');
|
|
62
|
+
}
|
|
28
63
|
}
|
|
29
64
|
async function callForgeMake(appPackageTempDir) {
|
|
30
65
|
let makeTargets = getTargetsFromConfig();
|
|
@@ -150,11 +185,19 @@ async function signArtifacts(makeResults) {
|
|
|
150
185
|
logger.debug("Signed build files successfully!");
|
|
151
186
|
}
|
|
152
187
|
}
|
|
188
|
+
/** Helper function to find forge.config.js in config directory */
|
|
189
|
+
function getForgeConfigPath() {
|
|
190
|
+
const configPath = path_1.PathUtils.getForgeConfigPath();
|
|
191
|
+
if ((0, fs_extra_1.existsSync)(configPath)) {
|
|
192
|
+
return configPath;
|
|
193
|
+
}
|
|
194
|
+
return null;
|
|
195
|
+
}
|
|
153
196
|
/** Reads the target configurations from the forge.config.js file and enhances it with additional information */
|
|
154
197
|
function getTargetsFromConfig() {
|
|
155
|
-
const forgeConfigPath = (
|
|
198
|
+
const forgeConfigPath = getForgeConfigPath();
|
|
156
199
|
let overrideTargets = [];
|
|
157
|
-
if (!
|
|
200
|
+
if (!forgeConfigPath) {
|
|
158
201
|
return overrideTargets;
|
|
159
202
|
}
|
|
160
203
|
const forgeConfig = require(forgeConfigPath);
|
|
@@ -208,9 +251,9 @@ function getTargetsFromConfig() {
|
|
|
208
251
|
return overrideTargets;
|
|
209
252
|
}
|
|
210
253
|
function getPublishersFromConfig() {
|
|
211
|
-
const forgeConfigPath = (
|
|
254
|
+
const forgeConfigPath = getForgeConfigPath();
|
|
212
255
|
let overrideTargets = [];
|
|
213
|
-
if (!
|
|
256
|
+
if (!forgeConfigPath) {
|
|
214
257
|
return overrideTargets;
|
|
215
258
|
}
|
|
216
259
|
const forgeConfig = require(forgeConfigPath);
|
|
@@ -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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"}
|
|
@@ -8,7 +8,6 @@ const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
|
|
|
8
8
|
const logger_1 = require("../utils/logger");
|
|
9
9
|
const fs_1 = require("fs");
|
|
10
10
|
const path_1 = require("../utils/path");
|
|
11
|
-
const path_2 = require("path");
|
|
12
11
|
exports.prodPublicKey = `-----BEGIN PUBLIC KEY-----
|
|
13
12
|
MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAoaL0vbGVpI6fw/YY6vvf
|
|
14
13
|
QFHA097QBPIzLf+8LccaFaN7kz/pvX70V3clnmtE/vY5yhzGksypOX9CfcZpyH1/
|
|
@@ -29,25 +28,25 @@ class LicenseService {
|
|
|
29
28
|
publicKey = exports.prodPublicKey;
|
|
30
29
|
validateLicense(license) {
|
|
31
30
|
let licensePayload;
|
|
32
|
-
// argument -> env variable -> license.key file
|
|
31
|
+
// argument -> env variable -> iocd.license.key file
|
|
33
32
|
let licenseKeyString = license || process.env['IOCD_LICENSE_KEY'];
|
|
34
33
|
if (!licenseKeyString) {
|
|
35
|
-
this.logger.debug('No license key in environment variable, checking license.key file');
|
|
34
|
+
this.logger.debug('No license key in environment variable, checking iocd.license.key file');
|
|
36
35
|
try {
|
|
37
|
-
const
|
|
38
|
-
licenseKeyString = (0, fs_1.readFileSync)(
|
|
36
|
+
const licenseFilePath = path_1.PathUtils.getLicensePath();
|
|
37
|
+
licenseKeyString = (0, fs_1.readFileSync)(licenseFilePath, 'utf-8');
|
|
39
38
|
}
|
|
40
39
|
catch (error) {
|
|
41
|
-
this.logger.debug('Error reading license.key file', error);
|
|
40
|
+
this.logger.debug('Error reading iocd.license.key file from config directory', error);
|
|
42
41
|
}
|
|
43
42
|
}
|
|
44
43
|
if (!licenseKeyString) {
|
|
45
|
-
this.logger.debug('No license key found in environment variable or license.key file');
|
|
44
|
+
this.logger.debug('No license key found in environment variable or iocd.license.key file');
|
|
46
45
|
return {
|
|
47
46
|
status: "Invalid",
|
|
48
47
|
type: "Trial",
|
|
49
48
|
isExpired: true,
|
|
50
|
-
errorMessage: 'No license key found. Please set the `IOCD_LICENSE_KEY` environment variable or add a `license.key` file.\n' +
|
|
49
|
+
errorMessage: 'No license key found. Please set the `IOCD_LICENSE_KEY` environment variable or add a `iocd.license.key` file in the config folder.\n' +
|
|
51
50
|
'To acquire a valid license key, contact us at sales@interop.io'
|
|
52
51
|
};
|
|
53
52
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"license.service.js","sourceRoot":"","sources":["../../src/services/license.service.ts"],"names":[],"mappings":";;;;;;AAAA,gEAA+B;AAC/B,4CAAyC;AACzC,2BAAkC;AAClC,wCAA0C;
|
|
1
|
+
{"version":3,"file":"license.service.js","sourceRoot":"","sources":["../../src/services/license.service.ts"],"names":[],"mappings":"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"}
|