@interopio/iocd-cli 0.0.3 → 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.js +11 -0
- 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/components.service.d.ts +5 -0
- package/dist/services/components/components.service.d.ts.map +1 -1
- package/dist/services/components/components.service.js +64 -40
- 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 +5 -1
- 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 +29 -11
- 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/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/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":"s3.store.d.ts","sourceRoot":"","sources":["../../../../src/services/components/stores/s3.store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAkBpD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBAAa,iBAAkB,YAAW,eAAe;IACrD,OAAO,CAAC,MAAM,CAAwB;IACtC,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,WAAW,CAAqB;IACxC,OAAO,CAAC,eAAe,CAAqB;gBAEhC,MAAM,EAAE;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,eAAe,CAAC,EAAE,MAAM,CAAC;KAC5B;IAUD,OAAO,IAAI,MAAM;IAKX,MAAM,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAoBzC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,GAAG,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"s3.store.d.ts","sourceRoot":"","sources":["../../../../src/services/components/stores/s3.store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAkBpD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBAAa,iBAAkB,YAAW,eAAe;IACrD,OAAO,CAAC,MAAM,CAAwB;IACtC,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,WAAW,CAAqB;IACxC,OAAO,CAAC,eAAe,CAAqB;gBAEhC,MAAM,EAAE;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,eAAe,CAAC,EAAE,MAAM,CAAC;KAC5B;IAUD,OAAO,IAAI,MAAM;IAKX,MAAM,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAoBzC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,GAAG,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAE,CAAC;IA+C5H;;OAEG;IACH,OAAO,CAAC,qBAAqB;IA2B7B;;OAEG;YACW,cAAc;IAiB5B;;OAEG;YACW,aAAa;IA+B3B;;OAEG;YACW,cAAc;IAmB5B;;OAEG;YACW,mBAAmB;IA6CjC;;OAEG;IACH,OAAO,CAAC,0BAA0B;IAelC;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAqC7B;;OAEG;IACH,OAAO,CAAC,eAAe;IAQvB;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAO7B;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAI9B;;OAEG;IACH,OAAO,CAAC,aAAa;IAKrB;;OAEG;YACW,iBAAiB;IAyB/B;;OAEG;IACH,OAAO,CAAC,wBAAwB;CA6CnC"}
|
|
@@ -81,11 +81,12 @@ class S3ComponentsStore {
|
|
|
81
81
|
// Download the object
|
|
82
82
|
const data = await this.downloadObject(objectKey);
|
|
83
83
|
const filename = this.extractFilenameFromKey(objectKey);
|
|
84
|
-
this.logger.
|
|
84
|
+
this.logger.debug(`Downloaded ${name}@${version} (${filename}) from S3 successfully!`);
|
|
85
85
|
return {
|
|
86
86
|
name: name,
|
|
87
87
|
data: data,
|
|
88
|
-
filename: filename
|
|
88
|
+
filename: filename,
|
|
89
|
+
actualVersion: this.extractVersionFromKey(objectKey)
|
|
89
90
|
};
|
|
90
91
|
}
|
|
91
92
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"s3.store.js","sourceRoot":"","sources":["../../../../src/services/components/stores/s3.store.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"s3.store.js","sourceRoot":"","sources":["../../../../src/services/components/stores/s3.store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../../../src/services/components/stores/store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAEpD,MAAM,WAAW,eAAe;IAC5B,OAAO,IAAI,MAAM,CAAC;IAClB,MAAM,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAAC;IAC1C,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,GAAG,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../../../src/services/components/stores/store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAEpD,MAAM,WAAW,eAAe;IAC5B,OAAO,IAAI,MAAM,CAAC;IAClB,MAAM,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAAC;IAC1C,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,GAAG,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAC,CAAC,CAAC;CACxH"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.selector.d.ts","sourceRoot":"","sources":["../../../src/services/components/version.selector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAGnD,8FAA8F;AAC9F,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,GAAG,oBAAoB,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"version.selector.d.ts","sourceRoot":"","sources":["../../../src/services/components/version.selector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAGnD,8FAA8F;AAC9F,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,GAAG,oBAAoB,GAAG,IAAI,CA+C1H"}
|
|
@@ -27,11 +27,8 @@ function selectVersion(version, componentsToSelectFrom) {
|
|
|
27
27
|
return bNum - aNum; // descending order
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
|
-
// if
|
|
31
|
-
if
|
|
32
|
-
return a.prerelease ? 1 : -1; // stable (prerelease: false) comes before prerelease (prerelease: true)
|
|
33
|
-
}
|
|
34
|
-
// if both version are the same, compare by build number if present
|
|
30
|
+
// NOTE that we don't care if a release is stable or a prerelease, at this point - as pre-leases were allowed in the iocd config, meaning they should be considered valid
|
|
31
|
+
// if both version have the same version compare by build number if present
|
|
35
32
|
if (a.buildNumber !== undefined && b.buildNumber !== undefined) {
|
|
36
33
|
// If both have build numbers, sort by build number descending
|
|
37
34
|
return b.buildNumber - a.buildNumber;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.selector.js","sourceRoot":"","sources":["../../../src/services/components/version.selector.ts"],"names":[],"mappings":";;AAIA,
|
|
1
|
+
{"version":3,"file":"version.selector.js","sourceRoot":"","sources":["../../../src/services/components/version.selector.ts"],"names":[],"mappings":";;AAIA,sCA+CC;AAlDD,qDAA0D;AAE1D,8FAA8F;AAC9F,SAAgB,aAAa,CAAC,OAAe,EAAE,sBAA8C;IACzF,IAAI,sBAAsB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,8DAA8D;IAC9D,sBAAsB,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,uCAAsB,CAAC,sBAAsB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IACvH,IAAI,sBAAsB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,oDAAoD,uCAAsB,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;IACxH,CAAC;IAED,oBAAoB;IACpB,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;QACvB,sBAAsB,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC,IAA0B,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC;IACrH,CAAC;IAED,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACjC,iDAAiD;QACjD,MAAM,QAAQ,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAClD,MAAM,QAAQ,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAClD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAClE,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAC9B,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAC9B,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;gBAChB,OAAO,IAAI,GAAG,IAAI,CAAC,CAAC,mBAAmB;YAC3C,CAAC;QACL,CAAC;QAED,yKAAyK;QAEzK,2EAA2E;QAC3E,IAAI,CAAC,CAAC,WAAW,KAAK,SAAS,IAAI,CAAC,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YAC7D,8DAA8D;YAC9D,OAAO,CAAC,CAAC,WAAW,GAAG,CAAC,CAAC,WAAW,CAAC;QACzC,CAAC;aAAM,IAAI,CAAC,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YACrC,4EAA4E;YAC5E,OAAO,CAAC,CAAC;QACb,CAAC;aAAM,IAAI,CAAC,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YACrC,4EAA4E;YAC5E,OAAO,CAAC,CAAC,CAAC;QACd,CAAC;QAED,oBAAoB;QACpB,OAAO,CAAC,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,OAAO,sBAAsB,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;AAC7C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.config.d.ts","sourceRoot":"","sources":["../../../src/services/config/cli.config.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,SAAS;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE;QACR,KAAK,EAAE,QAAQ,GAAG,OAAO,GAAG,IAAI,CAAC;QACjC,MAAM,EAAE;YACJ,IAAI,EAAE,MAAM,CAAC;YACb,cAAc,CAAC,EAAE,OAAO,CAAC;SAC5B,CAAC;QACF,KAAK,EAAE;YACH,IAAI,EAAE,MAAM,CAAC;SAChB,CAAC;QACF,EAAE,EAAE;YACA,UAAU,EAAE,MAAM,CAAC;YACnB,MAAM,EAAE,MAAM,CAAC;YACf,MAAM,CAAC,EAAE,MAAM,CAAC;YAChB,WAAW,CAAC,EAAE,MAAM,CAAC;YACrB,eAAe,CAAC,EAAE,MAAM,CAAC;SAC5B,CAAC;QACF,IAAI,EAAE;YAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;SAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"cli.config.d.ts","sourceRoot":"","sources":["../../../src/services/config/cli.config.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,SAAS;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE;QACR,KAAK,EAAE,QAAQ,GAAG,OAAO,GAAG,IAAI,CAAC;QACjC,MAAM,EAAE;YACJ,IAAI,EAAE,MAAM,CAAC;YACb,cAAc,CAAC,EAAE,OAAO,CAAC;SAC5B,CAAC;QACF,KAAK,EAAE;YACH,IAAI,EAAE,MAAM,CAAC;SAChB,CAAC;QACF,EAAE,EAAE;YACA,UAAU,EAAE,MAAM,CAAC;YACnB,MAAM,EAAE,MAAM,CAAC;YACf,MAAM,CAAC,EAAE,MAAM,CAAC;YAChB,WAAW,CAAC,EAAE,MAAM,CAAC;YACrB,eAAe,CAAC,EAAE,MAAM,CAAC;SAC5B,CAAC;QACF,IAAI,EAAE;YAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;SAAE,CAAC;QAClC,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;KACnC,CAAA;IACD,GAAG,EAAE;QACD,GAAG,EAAE;YACD,OAAO,EAAE,MAAM,CAAC;YAChB,WAAW,EAAE,MAAM,CAAC;SACvB,CAAC;QACF,QAAQ,EAAE;YACN,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,OAAO,GAAG,OAAO,GAAG,QAAQ,GAAG,KAAK,CAAC;YAC/D,OAAO,CAAC,EAAE,MAAM,CAAC;YACjB,WAAW,CAAC,EAAE,MAAM,CAAC;YACrB,kBAAkB,CAAC,EAAE,MAAM,CAAC;YAC5B,oBAAoB,CAAC,EAAE,MAAM,CAAC;YAC9B,wBAAwB,CAAC,EAAE,MAAM,CAAC;YAClC,wBAAwB,CAAC,EAAE,MAAM,CAAC;YAClC,MAAM,CAAC,EAAE,MAAM,CAAC;SACnB,CAAA;KACJ,CAAC;IAEF,GAAG,EAAE;QAED,aAAa,EAAE,MAAM,CAAC;QACtB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE;YACN,IAAI,EAAE,UAAU,GAAG,QAAQ,GAAG,KAAK,CAAC;YACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;YAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;YAClB,wBAAwB,CAAC,EAAE,MAAM,CAAC;SACrC,CAAC;QACF,YAAY,EAAE;YACV,IAAI,EAAE,YAAY,GAAG,QAAQ,GAAG,KAAK,CAAC;YACtC,OAAO,CAAC,EAAE,MAAM,CAAC;YACjB,eAAe,CAAC,EAAE,MAAM,CAAC;YACzB,WAAW,CAAC,EAAE,MAAM,CAAC;YACrB,4BAA4B,CAAC,EAAE,MAAM,CAAC;SACzC,CAAA;KACJ,CAAA;CACJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.service.d.ts","sourceRoot":"","sources":["../../../src/services/config/config.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"config.service.d.ts","sourceRoot":"","sources":["../../../src/services/config/config.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAMzC,qBAAa,aAAa;IAEtB,OAAO,CAAC,MAAM,CAAC,YAAY,CAA0B;IACrD,OAAO,CAAC,MAAM,CAAC,UAAU,CAA0B;IAEnD,MAAM,KAAK,MAAM,IAAI,SAAS,CAK7B;WAEa,6BAA6B,IAAI,MAAM;WAevC,cAAc,CAAC,aAAa,EAAE;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,IAAI;IAiB9E,OAAO,CAAC,MAAM,CAAC,UAAU;IAsCzB,OAAO,CAAC,MAAM,CAAC,uBAAuB;IAUtC,OAAO,CAAC,MAAM,CAAC,gBAAgB;CAyDlC"}
|
|
@@ -39,6 +39,7 @@ const path = __importStar(require("path"));
|
|
|
39
39
|
const deep_merge_1 = require("../../utils/deep.merge");
|
|
40
40
|
const path_1 = require("../../utils/path");
|
|
41
41
|
const path_2 = require("path");
|
|
42
|
+
const pacakge_json_helper_1 = require("../../utils/pacakge.json.helper");
|
|
42
43
|
class ConfigManager {
|
|
43
44
|
static cachedConfig = null;
|
|
44
45
|
static configName = "iocd.cli.config.json";
|
|
@@ -74,13 +75,16 @@ class ConfigManager {
|
|
|
74
75
|
list: newComponents
|
|
75
76
|
}
|
|
76
77
|
};
|
|
77
|
-
fs.writeFileSync(configPath, JSON.stringify(updatedConfig, null,
|
|
78
|
+
fs.writeFileSync(configPath, JSON.stringify(updatedConfig, null, 4), 'utf-8');
|
|
78
79
|
// Invalidate cached config, so config is reloaded next time
|
|
79
80
|
this.cachedConfig = null;
|
|
80
81
|
}
|
|
81
82
|
static loadConfig() {
|
|
82
83
|
// Register some env variables that we can use in the config file
|
|
83
84
|
process.env["IOCD_COMPONENT_DIR"] = path_1.PathUtils.getComponentDir("iocd");
|
|
85
|
+
if (!process.env["npm_package_version"]) {
|
|
86
|
+
process.env["npm_package_version"] = pacakge_json_helper_1.PackageJSONHelper.getPackageJson()?.version;
|
|
87
|
+
}
|
|
84
88
|
const defaultConfig = this.getDefaultConfig();
|
|
85
89
|
// Look for iocd.cli.config.json in the current working directory first
|
|
86
90
|
let configPath = path.join(path_1.PathUtils.getRootDir(), this.configName);
|
|
@@ -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":"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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"}
|
|
@@ -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"}
|