@interopio/iocd-cli 0.0.2 → 0.0.4
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/components.command.d.ts.map +1 -1
- package/dist/commands/components.command.js +32 -2
- 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 +7 -2
- package/dist/commands/setup.command.js.map +1 -1
- package/dist/services/app.service.d.ts +1 -1
- package/dist/services/app.service.d.ts.map +1 -1
- package/dist/services/app.service.js +16 -14
- package/dist/services/app.service.js.map +1 -1
- package/dist/services/components/component.config.js +1 -1
- package/dist/services/components/component.d.ts +6 -1
- package/dist/services/components/component.d.ts.map +1 -1
- package/dist/services/components/components.registry.d.ts.map +1 -1
- package/dist/services/components/components.registry.js +7 -0
- package/dist/services/components/components.registry.js.map +1 -1
- package/dist/services/components/components.service.d.ts +7 -5
- package/dist/services/components/components.service.d.ts.map +1 -1
- package/dist/services/components/components.service.js +72 -51
- package/dist/services/components/components.service.js.map +1 -1
- package/dist/services/components/file.helper.js +2 -2
- package/dist/services/components/file.helper.js.map +1 -1
- package/dist/services/components/platform.utils.d.ts +92 -15
- package/dist/services/components/platform.utils.d.ts.map +1 -1
- package/dist/services/components/platform.utils.js +221 -35
- package/dist/services/components/platform.utils.js.map +1 -1
- package/dist/services/components/stores/github.store.d.ts +8 -9
- package/dist/services/components/stores/github.store.d.ts.map +1 -1
- package/dist/services/components/stores/github.store.js +59 -54
- package/dist/services/components/stores/github.store.js.map +1 -1
- package/dist/services/components/stores/local.store.d.ts +3 -2
- package/dist/services/components/stores/local.store.d.ts.map +1 -1
- package/dist/services/components/stores/local.store.js +9 -4
- package/dist/services/components/stores/local.store.js.map +1 -1
- package/dist/services/components/stores/s3.store.d.ts +3 -2
- package/dist/services/components/stores/s3.store.d.ts.map +1 -1
- package/dist/services/components/stores/s3.store.js +6 -3
- package/dist/services/components/stores/s3.store.js.map +1 -1
- package/dist/services/components/stores/store.d.ts +3 -2
- package/dist/services/components/stores/store.d.ts.map +1 -1
- package/dist/services/components/version.selector.d.ts +4 -0
- package/dist/services/components/version.selector.d.ts.map +1 -0
- package/dist/services/components/version.selector.js +49 -0
- package/dist/services/components/version.selector.js.map +1 -0
- package/dist/services/config/cli.config.d.ts +9 -3
- 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 +12 -4
- package/dist/services/config/config.service.js.map +1 -1
- package/dist/services/create.service.d.ts.map +1 -1
- package/dist/services/create.service.js +2 -3
- package/dist/services/create.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 +29 -11
- package/dist/services/installer/installer.service.js.map +1 -1
- package/dist/services/installer/macOS.helper.js +10 -2
- package/dist/services/installer/macOS.helper.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 +70 -52
- package/dist/services/modifications/modifications.service.js.map +1 -1
- package/dist/services/template.service.js +1 -1
- package/dist/templates/ioconnect-desktop/forge.config.js +18 -5
- package/dist/templates/ioconnect-desktop/iocd.cli.config.json +13 -3
- 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 +0 -7
- 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/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/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":"config.service.js","sourceRoot":"","sources":["../../../src/services/config/config.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,2CAA6B;AAE7B,uDAAmD;AACnD,2CAA6C;AAC7C,+BAA4B;
|
|
1
|
+
{"version":3,"file":"config.service.js","sourceRoot":"","sources":["../../../src/services/config/config.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.service.d.ts","sourceRoot":"","sources":["../../src/services/create.service.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,WAAW;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;CAChC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAwB;IACtC,OAAO,CAAC,eAAe,CAAyB;IAEhD;;OAEG;IACU,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBtC;;OAEG;YACW,gBAAgB;
|
|
1
|
+
{"version":3,"file":"create.service.d.ts","sourceRoot":"","sources":["../../src/services/create.service.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,WAAW;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;CAChC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAwB;IACtC,OAAO,CAAC,eAAe,CAAyB;IAEhD;;OAEG;IACU,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBtC;;OAEG;YACW,gBAAgB;YAwFhB,iBAAiB;IA8B/B;;OAEG;YACW,2BAA2B;IAgDzC;;OAEG;YACW,gBAAgB;IA8D9B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAQ1B;;OAEG;YACW,mBAAmB;CAYlC"}
|
|
@@ -138,9 +138,8 @@ class CreateService {
|
|
|
138
138
|
throw hasLicense;
|
|
139
139
|
let licenseKey;
|
|
140
140
|
if (hasLicense) {
|
|
141
|
-
clack.note('You can paste your license here. Press Enter when done.', 'License Input');
|
|
142
141
|
const licenseInput = await clack.text({
|
|
143
|
-
message: 'Paste your license key here:',
|
|
142
|
+
message: 'Paste your license key here - press Enter when done:',
|
|
144
143
|
validate: (value) => {
|
|
145
144
|
if (!value.trim()) {
|
|
146
145
|
return 'License content is required if you have a license';
|
|
@@ -187,7 +186,7 @@ class CreateService {
|
|
|
187
186
|
const components = await clack.multiselect({
|
|
188
187
|
message: 'Select any components to include using space, and press enter to complete',
|
|
189
188
|
options: componentOptions,
|
|
190
|
-
initialValues: ["iocd"],
|
|
189
|
+
initialValues: ["iocd", "demos", "devTools"],
|
|
191
190
|
required: false,
|
|
192
191
|
});
|
|
193
192
|
if (clack.isCancel(components)) {
|
|
@@ -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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"}
|
|
@@ -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,CA8BrG"}
|
|
@@ -6,12 +6,14 @@ const modifications_service_1 = require("../modifications/modifications.service"
|
|
|
6
6
|
const os_1 = require("os");
|
|
7
7
|
const prerequisites_1 = require("./prerequisites");
|
|
8
8
|
const app_service_1 = require("../app.service");
|
|
9
|
+
const components_service_1 = require("../components/components.service");
|
|
9
10
|
const electronForge_1 = require("./electronForge");
|
|
10
11
|
const colors_1 = require("../../utils/colors");
|
|
11
12
|
const path_1 = require("../../utils/path");
|
|
12
13
|
const path_2 = require("path");
|
|
13
14
|
const promises_1 = require("fs/promises");
|
|
14
15
|
const fs_extra_1 = require("fs-extra");
|
|
16
|
+
const config_service_1 = require("../config/config.service");
|
|
15
17
|
// Conditionally import macOS helper only on macOS
|
|
16
18
|
let macOSInstallerHelper = null;
|
|
17
19
|
if (process.platform === 'darwin') {
|
|
@@ -35,18 +37,26 @@ if (process.platform === 'win32') {
|
|
|
35
37
|
const logger = logger_1.Logger.getInstance();
|
|
36
38
|
async function makeInstaller(_options) {
|
|
37
39
|
logger.info('Creating installer...');
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
40
|
+
if (_options.skipBuild) {
|
|
41
|
+
logger.info('Skipping build steps as per --skip-build option');
|
|
42
|
+
}
|
|
43
|
+
if (!_options.skipBuild) {
|
|
44
|
+
// Check prerequisites
|
|
45
|
+
await (0, prerequisites_1.validatePrerequisites)(['@electron-forge/core']);
|
|
46
|
+
// Reinstall components to ensure clean state (dev mode modifications might have altered components)
|
|
47
|
+
logger.info('Reinstalling components to ensure clean state for installer...');
|
|
48
|
+
await new components_service_1.ComponentsService().installComponents();
|
|
49
|
+
// Build all apps to ensure latest code; this must be done before applying modifications
|
|
50
|
+
await (new app_service_1.AppService()).buildAllApps();
|
|
51
|
+
// apply modifications before signing and packaging
|
|
52
|
+
await (0, modifications_service_1.applyModifications)("installer");
|
|
53
|
+
await moveComponentsToIOCDFolder();
|
|
54
|
+
// sign executables
|
|
55
|
+
await sign();
|
|
56
|
+
}
|
|
47
57
|
// Create package using electron-builder
|
|
48
|
-
await (0, electronForge_1.createPackageWithElectronForge)();
|
|
49
|
-
logger.info((0, colors_1.green)(
|
|
58
|
+
const { published } = await (0, electronForge_1.createPackageWithElectronForge)();
|
|
59
|
+
logger.info((0, colors_1.green)(`✨ Installer created ${published ? 'and published' : ''} successfully!`));
|
|
50
60
|
}
|
|
51
61
|
async function sign() {
|
|
52
62
|
if ((0, os_1.platform)() === 'darwin') {
|
|
@@ -72,6 +82,9 @@ async function moveComponentsToIOCDFolder() {
|
|
|
72
82
|
const iocdDir = path_1.PathUtils.getIOCDDir();
|
|
73
83
|
const iocdComponentsDir = (0, path_2.join)(iocdDir, 'components');
|
|
74
84
|
logger.debug(`Copying components from ${componentsDir} to ${iocdComponentsDir}`);
|
|
85
|
+
// Get list of components to exclude from installer
|
|
86
|
+
const excludeFromInstaller = config_service_1.ConfigManager.config.components.excludeFromInstaller || [];
|
|
87
|
+
logger.debug(`Components excluded from installer: ${excludeFromInstaller.join(', ')}`);
|
|
75
88
|
try {
|
|
76
89
|
// remove existing components folder if exists
|
|
77
90
|
if (await (0, fs_extra_1.pathExists)(iocdComponentsDir)) {
|
|
@@ -85,6 +98,11 @@ async function moveComponentsToIOCDFolder() {
|
|
|
85
98
|
if (item === 'iocd') {
|
|
86
99
|
continue; // skip iocd itself
|
|
87
100
|
}
|
|
101
|
+
// Skip components that are excluded from installer
|
|
102
|
+
if (excludeFromInstaller.includes(item)) {
|
|
103
|
+
logger.debug(`Skipping component '${item}' - excluded from installer`);
|
|
104
|
+
continue;
|
|
105
|
+
}
|
|
88
106
|
const srcPath = (0, path_2.join)(componentsDir, item);
|
|
89
107
|
const destPath = (0, path_2.join)(iocdComponentsDir, item);
|
|
90
108
|
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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"}
|
|
@@ -56,11 +56,13 @@ async function signWithKeychain(pathToSign) {
|
|
|
56
56
|
// things we don't need to sign
|
|
57
57
|
const IGNORE_EXT = [
|
|
58
58
|
".png", ".jpg", ".jpeg", ".gif", ".icns", ".ico", ".svg",
|
|
59
|
+
".js", ".css", "._js", "._css",
|
|
59
60
|
".ttf", ".otf", ".woff", ".woff2",
|
|
60
61
|
".pak", ".bin", ".dat", ".json", ".plist", ".md", ".txt", ".rtf",
|
|
61
62
|
".html", ".css", ".map",
|
|
62
63
|
".mp3", ".mp4", ".wav", ".webm", ".mov", ".ttf",
|
|
63
|
-
".asar",
|
|
64
|
+
".asar",
|
|
65
|
+
".DS_Store" // do not sign app.asar
|
|
64
66
|
];
|
|
65
67
|
// remove embedded.provisionprofile file if it is in the app bundle - it gets added by code-signing during dev builds
|
|
66
68
|
const embeddedProvisionProfilePath = (0, path_1.join)(path_2.PathUtils.getIOCDDir(), 'embedded.provisionprofile');
|
|
@@ -108,6 +110,8 @@ async function signWithKeychain(pathToSign) {
|
|
|
108
110
|
return true;
|
|
109
111
|
if (lower.endsWith("/contents/coderesources"))
|
|
110
112
|
return true;
|
|
113
|
+
if (lower.includes("/contents/components/"))
|
|
114
|
+
return true; // skip components folder in contents entirely
|
|
111
115
|
// otherwise let it sign
|
|
112
116
|
logger.debug(`Signing file: ${filePath}`);
|
|
113
117
|
return false;
|
|
@@ -189,8 +193,12 @@ async function notarizeOnMacOS(pathToNotarize) {
|
|
|
189
193
|
logger.info('Notarization completed successfully!');
|
|
190
194
|
}
|
|
191
195
|
async function notarizeWithNotarytool(pathToNotarize) {
|
|
192
|
-
logger.debug(
|
|
196
|
+
logger.debug(`Notarizing with notarytool, path is ${pathToNotarize}...`);
|
|
193
197
|
const notarizationConfig = config_service_1.ConfigManager.config.mac.notarization;
|
|
198
|
+
logger.debug('Notarization config:', notarizationConfig);
|
|
199
|
+
if (!notarizationConfig.appleId || !notarizationConfig.appleIdPassword || !notarizationConfig.appleTeamId) {
|
|
200
|
+
throw new Error('Notarization with notarytool requires appleId, appleIdPassword, and appleTeamId to be configured');
|
|
201
|
+
}
|
|
194
202
|
let config = {
|
|
195
203
|
appPath: pathToNotarize,
|
|
196
204
|
appleId: notarizationConfig.appleId ?? "",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"macOS.helper.js","sourceRoot":"","sources":["../../../src/services/installer/macOS.helper.ts"],"names":[],"mappings":";;;;;AAcA,oDAKC;AAGD,gCAoBC;AA1CD,iDAA0C;AAC1C,iDAA+D;AAC/D,+BAAqC;AACrC,2CAA6C;AAC7C,2BAAgC;AAChC,+CAA4C;AAC5C,wDAA0B;AAC1B,6DAAyD;AAEzD,MAAM,MAAM,GAAG,eAAM,CAAC,WAAW,EAAE,CAAC;AACpC,4BAA4B;AAC5B,6BAA6B;AAC7B,sCAAsC;AAE/B,KAAK,UAAU,oBAAoB;IACtC,MAAM,IAAI,GAAG,gBAAS,CAAC,oBAAoB,EAAE,CAAC;IAC9C,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC;IAEvB,MAAM,eAAe,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC;AAED,gDAAgD;AACzC,KAAK,UAAU,UAAU,CAAC,UAAkB;IAC/C,MAAM,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;IAEzD,MAAM,cAAc,GAAG,8BAAa,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAEzD,QAAQ,cAAc,CAAC,IAAI,EAAE,CAAC;QAC1B,KAAK,KAAK;YACN,MAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;YACpD,OAAO;QACX,KAAK,UAAU;YACX,MAAM,gBAAgB,CAAC,UAAU,CAAC,CAAC;YACnC,MAAM;QACV,KAAK,QAAQ;YACT,MAAM,oBAAoB,CAAC,UAAU,CAAC,CAAC;YACvC,MAAM;QACV;YACI,MAAM,IAAI,KAAK,CAAC,kCAAkC,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC;IACjF,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;AACxD,CAAC;AAED,KAAK,UAAU,gBAAgB,CAAC,UAAkB;IAC9C,MAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAEzC,MAAM,cAAc,GAAG,8BAAa,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAEzD,MAAM,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAC;IAClE,MAAM,iBAAiB,GAAG,IAAA,WAAI,EAAC,gBAAS,CAAC,UAAU,EAAE,EAAE,gBAAgB,CAAC,CAAC;IACzE,IAAI,IAAA,eAAU,EAAC,iBAAiB,CAAC,EAAE,CAAC;QAChC,kBAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;QACjC,MAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC9D,CAAC;SAAM,CAAC;QACJ,MAAM,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAC/D,CAAC;IAED,+BAA+B;IAC/B,MAAM,UAAU,GAAG;QACf,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM;QACxD,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ;QACjC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM;QAChE,OAAO,EAAE,MAAM,EAAE,MAAM;QACvB,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM;QAC/C,OAAO,
|
|
1
|
+
{"version":3,"file":"macOS.helper.js","sourceRoot":"","sources":["../../../src/services/installer/macOS.helper.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"}
|