piral-cli 0.14.21-beta.4074 → 0.14.22-beta.4103
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/lib/common/clients/npm.js +10 -4
- package/lib/common/clients/npm.js.map +1 -1
- package/lib/common/clients/pnpm.js +10 -4
- package/lib/common/clients/pnpm.js.map +1 -1
- package/lib/common/clients/yarn.js +10 -4
- package/lib/common/clients/yarn.js.map +1 -1
- package/lib/common/scaffold.js.map +1 -1
- package/lib/injectors/pilet.d.ts +1 -0
- package/lib/injectors/pilet.js +5 -5
- package/lib/injectors/pilet.js.map +1 -1
- package/package.json +2 -2
- package/src/common/clients/npm.ts +12 -4
- package/src/common/clients/pnpm.ts +12 -4
- package/src/common/clients/yarn.ts +12 -4
- package/src/common/scaffold.ts +1 -0
- package/src/injectors/pilet.ts +6 -5
|
@@ -39,10 +39,16 @@ function unpackPackage(packageRef, target = '.', ...flags) {
|
|
|
39
39
|
exports.unpackPackage = unpackPackage;
|
|
40
40
|
function installPackage(packageRef, target = '.', ...flags) {
|
|
41
41
|
return __awaiter(this, void 0, void 0, function* () {
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
42
|
+
try {
|
|
43
|
+
const ms = new MemoryStream_1.MemoryStream();
|
|
44
|
+
yield runNpmProcess(['install', packageRef, '--legacy-peer-deps', ...flags], target, ms);
|
|
45
|
+
(0, log_1.log)('generalDebug_0003', `npm install package result: ${ms.value}`);
|
|
46
|
+
return ms.value;
|
|
47
|
+
}
|
|
48
|
+
catch (ex) {
|
|
49
|
+
(0, log_1.log)('generalError_0002', `Could not install the package "${packageRef}" using npm. Make sure npm is correctly installed and accessible: ${ex}`);
|
|
50
|
+
throw ex;
|
|
51
|
+
}
|
|
46
52
|
});
|
|
47
53
|
}
|
|
48
54
|
exports.installPackage = installPackage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm.js","sourceRoot":"","sources":["../../../src/common/clients/npm.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAA+B;AAC/B,gCAA6B;AAC7B,wCAAwC;AACxC,kDAA+C;AAE/C,SAAS,aAAa,CAAC,IAAmB,EAAE,MAAc,EAAE,MAA8B;IACxF,IAAA,SAAG,EAAC,mBAAmB,EAAE,8BAA8B,CAAC,CAAC;IACzD,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;IAC3C,OAAO,IAAA,oBAAU,EAAC,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;AAC9C,CAAC;AAED,SAAsB,mBAAmB,CAAC,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;;QAC7E,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;QAC9B,MAAM,aAAa,CAAC,CAAC,SAAS,EAAE,oBAAoB,EAAE,GAAG,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QAC7E,IAAA,SAAG,EAAC,mBAAmB,EAAE,oCAAoC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;QACzE,OAAO,EAAE,CAAC,KAAK,CAAC;IAClB,CAAC;CAAA;AALD,kDAKC;AAED,SAAsB,aAAa,CAAC,UAAkB,EAAE,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;;QAC3F,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;QAC9B,MAAM,aAAa,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QAChE,IAAA,SAAG,EAAC,mBAAmB,EAAE,wBAAwB,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;QAC7D,OAAO,EAAE,CAAC,KAAK,CAAC;IAClB,CAAC;CAAA;AALD,sCAKC;AAED,SAAsB,cAAc,CAAC,UAAkB,EAAE,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;;QAC5F,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"npm.js","sourceRoot":"","sources":["../../../src/common/clients/npm.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,10 +41,16 @@ function installDependencies(target = '.', ...flags) {
|
|
|
41
41
|
exports.installDependencies = installDependencies;
|
|
42
42
|
function installPackage(packageRef, target = '.', ...flags) {
|
|
43
43
|
return __awaiter(this, void 0, void 0, function* () {
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
44
|
+
try {
|
|
45
|
+
const ms = new MemoryStream_1.MemoryStream();
|
|
46
|
+
yield runPnpmProcess(['add', packageRef, ...convert(flags)], target, ms);
|
|
47
|
+
(0, log_1.log)('generalDebug_0003', `Pnpm install package result: ${ms.value}`);
|
|
48
|
+
return ms.value;
|
|
49
|
+
}
|
|
50
|
+
catch (ex) {
|
|
51
|
+
(0, log_1.log)('generalError_0002', `Could not install the package "${packageRef}" using Pnpm. Make sure Pnpm is correctly installed and accessible: ${ex}`);
|
|
52
|
+
throw ex;
|
|
53
|
+
}
|
|
48
54
|
});
|
|
49
55
|
}
|
|
50
56
|
exports.installPackage = installPackage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pnpm.js","sourceRoot":"","sources":["../../../src/common/clients/pnpm.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAA+B;AAC/B,gCAA6B;AAC7B,wCAAwC;AACxC,kDAA+C;AAE/C,SAAS,cAAc,CAAC,IAAmB,EAAE,MAAc,EAAE,MAA8B;IACzF,IAAA,SAAG,EAAC,mBAAmB,EAAE,+BAA+B,CAAC,CAAC;IAC1D,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;IAC3C,OAAO,IAAA,oBAAU,EAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;AAC/C,CAAC;AAED,SAAS,OAAO,CAAC,KAAoB;IACnC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACxB,QAAQ,IAAI,EAAE;YACZ,KAAK,WAAW;gBACd,8DAA8D;gBAC9D,OAAO,EAAE,CAAC;YACZ;gBACE,OAAO,IAAI,CAAC;SACf;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAsB,mBAAmB,CAAC,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;;QAC7E,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;QAC9B,MAAM,cAAc,CAAC,CAAC,SAAS,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACjE,IAAA,SAAG,EAAC,mBAAmB,EAAE,qCAAqC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;QAC1E,OAAO,EAAE,CAAC,KAAK,CAAC;IAClB,CAAC;CAAA;AALD,kDAKC;AAED,SAAsB,cAAc,CAAC,UAAkB,EAAE,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;;QAC5F,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"pnpm.js","sourceRoot":"","sources":["../../../src/common/clients/pnpm.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAA+B;AAC/B,gCAA6B;AAC7B,wCAAwC;AACxC,kDAA+C;AAE/C,SAAS,cAAc,CAAC,IAAmB,EAAE,MAAc,EAAE,MAA8B;IACzF,IAAA,SAAG,EAAC,mBAAmB,EAAE,+BAA+B,CAAC,CAAC;IAC1D,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;IAC3C,OAAO,IAAA,oBAAU,EAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;AAC/C,CAAC;AAED,SAAS,OAAO,CAAC,KAAoB;IACnC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACxB,QAAQ,IAAI,EAAE;YACZ,KAAK,WAAW;gBACd,8DAA8D;gBAC9D,OAAO,EAAE,CAAC;YACZ;gBACE,OAAO,IAAI,CAAC;SACf;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAsB,mBAAmB,CAAC,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;;QAC7E,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;QAC9B,MAAM,cAAc,CAAC,CAAC,SAAS,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACjE,IAAA,SAAG,EAAC,mBAAmB,EAAE,qCAAqC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;QAC1E,OAAO,EAAE,CAAC,KAAK,CAAC;IAClB,CAAC;CAAA;AALD,kDAKC;AAED,SAAsB,cAAc,CAAC,UAAkB,EAAE,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;;QAC5F,IAAI;YACF,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;YAC9B,MAAM,cAAc,CAAC,CAAC,KAAK,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;YACzE,IAAA,SAAG,EAAC,mBAAmB,EAAE,gCAAgC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;YACrE,OAAO,EAAE,CAAC,KAAK,CAAC;SACjB;QAAC,OAAO,EAAE,EAAE;YACX,IAAA,SAAG,EACD,mBAAmB,EACnB,kCAAkC,UAAU,uEAAuE,EAAE,EAAE,CACxH,CAAC;YACF,MAAM,EAAE,CAAC;SACV;IACH,CAAC;CAAA;AAbD,wCAaC"}
|
|
@@ -45,10 +45,16 @@ function installDependencies(target = '.', ...flags) {
|
|
|
45
45
|
exports.installDependencies = installDependencies;
|
|
46
46
|
function installPackage(packageRef, target = '.', ...flags) {
|
|
47
47
|
return __awaiter(this, void 0, void 0, function* () {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
48
|
+
try {
|
|
49
|
+
const ms = new MemoryStream_1.MemoryStream();
|
|
50
|
+
yield runYarnProcess(['add', packageRef, ...convert(flags)], target, ms);
|
|
51
|
+
(0, log_1.log)('generalDebug_0003', `Yarn install package result: ${ms.value}`);
|
|
52
|
+
return ms.value;
|
|
53
|
+
}
|
|
54
|
+
catch (ex) {
|
|
55
|
+
(0, log_1.log)('generalError_0002', `Could not install the package "${packageRef}" using Yarn. Make sure Yarn@1 is correctly installed and accessible: ${ex}`);
|
|
56
|
+
throw ex;
|
|
57
|
+
}
|
|
52
58
|
});
|
|
53
59
|
}
|
|
54
60
|
exports.installPackage = installPackage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../src/common/clients/yarn.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAA+B;AAC/B,gCAA6B;AAC7B,wCAAwC;AACxC,kDAA+C;AAE/C,SAAS,cAAc,CAAC,IAAmB,EAAE,MAAc,EAAE,MAA8B;IACzF,IAAA,SAAG,EAAC,mBAAmB,EAAE,+BAA+B,CAAC,CAAC;IAC1D,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;IAC3C,OAAO,IAAA,oBAAU,EAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;AAC/C,CAAC;AAED,SAAS,OAAO,CAAC,KAAoB;IACnC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACxB,QAAQ,IAAI,EAAE;YACZ,KAAK,cAAc;gBACjB,OAAO,SAAS,CAAC;YACnB,KAAK,YAAY;gBACf,OAAO,OAAO,CAAC;YACjB,KAAK,WAAW;gBACd,iEAAiE;gBACjE,OAAO,EAAE,CAAC;YACZ;gBACE,OAAO,IAAI,CAAC;SACf;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAsB,mBAAmB,CAAC,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;;QAC7E,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;QAC9B,MAAM,cAAc,CAAC,CAAC,SAAS,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACjE,IAAA,SAAG,EAAC,mBAAmB,EAAE,qCAAqC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;QAC1E,OAAO,EAAE,CAAC,KAAK,CAAC;IAClB,CAAC;CAAA;AALD,kDAKC;AAED,SAAsB,cAAc,CAAC,UAAkB,EAAE,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;;QAC5F,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../src/common/clients/yarn.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAA+B;AAC/B,gCAA6B;AAC7B,wCAAwC;AACxC,kDAA+C;AAE/C,SAAS,cAAc,CAAC,IAAmB,EAAE,MAAc,EAAE,MAA8B;IACzF,IAAA,SAAG,EAAC,mBAAmB,EAAE,+BAA+B,CAAC,CAAC;IAC1D,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;IAC3C,OAAO,IAAA,oBAAU,EAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;AAC/C,CAAC;AAED,SAAS,OAAO,CAAC,KAAoB;IACnC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACxB,QAAQ,IAAI,EAAE;YACZ,KAAK,cAAc;gBACjB,OAAO,SAAS,CAAC;YACnB,KAAK,YAAY;gBACf,OAAO,OAAO,CAAC;YACjB,KAAK,WAAW;gBACd,iEAAiE;gBACjE,OAAO,EAAE,CAAC;YACZ;gBACE,OAAO,IAAI,CAAC;SACf;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAsB,mBAAmB,CAAC,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;;QAC7E,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;QAC9B,MAAM,cAAc,CAAC,CAAC,SAAS,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACjE,IAAA,SAAG,EAAC,mBAAmB,EAAE,qCAAqC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;QAC1E,OAAO,EAAE,CAAC,KAAK,CAAC;IAClB,CAAC;CAAA;AALD,kDAKC;AAED,SAAsB,cAAc,CAAC,UAAkB,EAAE,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;;QAC5F,IAAI;YACF,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;YAC9B,MAAM,cAAc,CAAC,CAAC,KAAK,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;YACzE,IAAA,SAAG,EAAC,mBAAmB,EAAE,gCAAgC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;YACrE,OAAO,EAAE,CAAC,KAAK,CAAC;SACjB;QAAC,OAAO,EAAE,EAAE;YACX,IAAA,SAAG,EACD,mBAAmB,EACnB,kCAAkC,UAAU,yEAAyE,EAAE,EAAE,CAC1H,CAAC;YACF,MAAM,EAAE,CAAC;SACV;IACH,CAAC;CAAA;AAbD,wCAaC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../../src/common/scaffold.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAAoE;AACpE,uCAA+C;AAC/C,mCAAyD;AACzD,6BAAkF;AAClF,+BAAkC;AAQlC,SAAS,kBAAkB,CAAC,mBAA2B;IACrD,MAAM,GAAG,GAAG,mBAAmB,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IAChD,MAAM,cAAc,GAClB,GAAG,GAAG,CAAC,IAAI,CAAC,IAAA,iBAAU,EAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC;IAE5G,IAAI;QACF,OAAO,OAAO,CAAC,cAAc,CAAC,CAAC;KAChC;IAAC,WAAM;QACN,IAAA,UAAI,EACF,mBAAmB,EACnB,sCAAsC,mBAAmB,eAAe,cAAc,0BAA0B,CACjH,CAAC;KACH;AACH,CAAC;AAED,SAAe,gBAAgB,CAC7B,mBAA2B,EAC3B,QAAgB,EAChB,IAAY,EACZ,IAAyB,EACzB,cAA8B;;QAE9B,6EAA6E;QAC7E,IAAI,mBAAmB,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YACvC,mBAAmB,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,mBAAmB,CAAC,CAAC;SACnE;aAAM;YACL,MAAM,IAAA,oBAAc,EAAC,mBAAmB,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;SAC9E;
|
|
1
|
+
{"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../../src/common/scaffold.ts"],"names":[],"mappings":"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"}
|
package/lib/injectors/pilet.d.ts
CHANGED
|
@@ -22,6 +22,7 @@ interface PiletMetadata {
|
|
|
22
22
|
export default class PiletInjector implements KrasInjector {
|
|
23
23
|
config: PiletInjectorConfig;
|
|
24
24
|
private piletApi;
|
|
25
|
+
private indexPath;
|
|
25
26
|
constructor(options: PiletInjectorConfig, config: KrasConfiguration, core: EventEmitter);
|
|
26
27
|
get active(): boolean;
|
|
27
28
|
set active(value: boolean);
|
package/lib/injectors/pilet.js
CHANGED
|
@@ -17,7 +17,6 @@ const spec_1 = require("../common/spec");
|
|
|
17
17
|
const config_1 = require("../common/config");
|
|
18
18
|
const external_1 = require("../external");
|
|
19
19
|
const { host } = config_1.config;
|
|
20
|
-
const indexPath = '/index.html';
|
|
21
20
|
function fillPiletMeta(pilet, basePath, metaFile) {
|
|
22
21
|
const { root, bundler } = pilet;
|
|
23
22
|
const metaPath = (0, path_1.join)(root, metaFile);
|
|
@@ -58,7 +57,8 @@ class PiletInjector {
|
|
|
58
57
|
this.piletApi = /^https?:/.test(options.api)
|
|
59
58
|
? options.api
|
|
60
59
|
: `${config.ssl ? 'https' : 'http'}://${host}:${config.port}${options.api}`;
|
|
61
|
-
const { pilets, api } = options;
|
|
60
|
+
const { pilets, api, publicUrl } = options;
|
|
61
|
+
this.indexPath = `${publicUrl}index.html`;
|
|
62
62
|
const cbs = {};
|
|
63
63
|
core.on('user-connected', (e) => {
|
|
64
64
|
if (e.target === '*' && e.url === api.substring(1)) {
|
|
@@ -175,15 +175,15 @@ class PiletInjector {
|
|
|
175
175
|
const path = req.url.substring(publicUrl.length).split('?')[0];
|
|
176
176
|
const target = (0, path_1.join)(app, path);
|
|
177
177
|
if ((0, fs_1.existsSync)(target) && (0, fs_1.statSync)(target).isFile()) {
|
|
178
|
-
if (req.url === indexPath) {
|
|
178
|
+
if (req.url === this.indexPath) {
|
|
179
179
|
return this.sendIndexFile(target, req.url);
|
|
180
180
|
}
|
|
181
181
|
else {
|
|
182
182
|
return this.sendFile(target, req.url);
|
|
183
183
|
}
|
|
184
184
|
}
|
|
185
|
-
else if (req.url !== indexPath) {
|
|
186
|
-
return this.handle(Object.assign(Object.assign({}, req), { url: indexPath }));
|
|
185
|
+
else if (req.url !== this.indexPath) {
|
|
186
|
+
return this.handle(Object.assign(Object.assign({}, req), { url: this.indexPath }));
|
|
187
187
|
}
|
|
188
188
|
}
|
|
189
189
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pilet.js","sourceRoot":"","sources":["../../src/injectors/pilet.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,6BAA0B;AAC1B,+BAA4B;AAE5B,2BAAwD;AAExD,uCAAoC;AACpC,yCAAkD;AAClD,6CAA0C;AAC1C,0CAA0C;AAG1C,MAAM,EAAE,IAAI,EAAE,GAAG,eAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"pilet.js","sourceRoot":"","sources":["../../src/injectors/pilet.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "piral-cli",
|
|
3
|
-
"version": "0.14.
|
|
3
|
+
"version": "0.14.22-beta.4103",
|
|
4
4
|
"description": "The standard CLI for creating and building a Piral instance or a Pilet.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"portal",
|
|
@@ -77,5 +77,5 @@
|
|
|
77
77
|
"typescript": "^4.0.2",
|
|
78
78
|
"yargs": "^15.4.1"
|
|
79
79
|
},
|
|
80
|
-
"gitHead": "
|
|
80
|
+
"gitHead": "0c44955d9c1d88a3b081bd779a2d60537ead1abc"
|
|
81
81
|
}
|
|
@@ -24,10 +24,18 @@ export async function unpackPackage(packageRef: string, target = '.', ...flags:
|
|
|
24
24
|
}
|
|
25
25
|
|
|
26
26
|
export async function installPackage(packageRef: string, target = '.', ...flags: Array<string>) {
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
27
|
+
try {
|
|
28
|
+
const ms = new MemoryStream();
|
|
29
|
+
await runNpmProcess(['install', packageRef, '--legacy-peer-deps', ...flags], target, ms);
|
|
30
|
+
log('generalDebug_0003', `npm install package result: ${ms.value}`);
|
|
31
|
+
return ms.value;
|
|
32
|
+
} catch (ex) {
|
|
33
|
+
log(
|
|
34
|
+
'generalError_0002',
|
|
35
|
+
`Could not install the package "${packageRef}" using npm. Make sure npm is correctly installed and accessible: ${ex}`,
|
|
36
|
+
);
|
|
37
|
+
throw ex;
|
|
38
|
+
}
|
|
31
39
|
}
|
|
32
40
|
|
|
33
41
|
export async function createPackage(target = '.', ...flags: Array<string>) {
|
|
@@ -29,8 +29,16 @@ export async function installDependencies(target = '.', ...flags: Array<string>)
|
|
|
29
29
|
}
|
|
30
30
|
|
|
31
31
|
export async function installPackage(packageRef: string, target = '.', ...flags: Array<string>) {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
32
|
+
try {
|
|
33
|
+
const ms = new MemoryStream();
|
|
34
|
+
await runPnpmProcess(['add', packageRef, ...convert(flags)], target, ms);
|
|
35
|
+
log('generalDebug_0003', `Pnpm install package result: ${ms.value}`);
|
|
36
|
+
return ms.value;
|
|
37
|
+
} catch (ex) {
|
|
38
|
+
log(
|
|
39
|
+
'generalError_0002',
|
|
40
|
+
`Could not install the package "${packageRef}" using Pnpm. Make sure Pnpm is correctly installed and accessible: ${ex}`,
|
|
41
|
+
);
|
|
42
|
+
throw ex;
|
|
43
|
+
}
|
|
36
44
|
}
|
|
@@ -33,8 +33,16 @@ export async function installDependencies(target = '.', ...flags: Array<string>)
|
|
|
33
33
|
}
|
|
34
34
|
|
|
35
35
|
export async function installPackage(packageRef: string, target = '.', ...flags: Array<string>) {
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
36
|
+
try {
|
|
37
|
+
const ms = new MemoryStream();
|
|
38
|
+
await runYarnProcess(['add', packageRef, ...convert(flags)], target, ms);
|
|
39
|
+
log('generalDebug_0003', `Yarn install package result: ${ms.value}`);
|
|
40
|
+
return ms.value;
|
|
41
|
+
} catch (ex) {
|
|
42
|
+
log(
|
|
43
|
+
'generalError_0002',
|
|
44
|
+
`Could not install the package "${packageRef}" using Yarn. Make sure Yarn@1 is correctly installed and accessible: ${ex}`,
|
|
45
|
+
);
|
|
46
|
+
throw ex;
|
|
47
|
+
}
|
|
40
48
|
}
|
package/src/common/scaffold.ts
CHANGED
package/src/injectors/pilet.ts
CHANGED
|
@@ -10,7 +10,6 @@ import { axios, mime } from '../external';
|
|
|
10
10
|
import { Bundler } from '../types';
|
|
11
11
|
|
|
12
12
|
const { host } = config;
|
|
13
|
-
const indexPath = '/index.html';
|
|
14
13
|
|
|
15
14
|
interface Pilet {
|
|
16
15
|
bundler: Bundler;
|
|
@@ -76,6 +75,7 @@ async function loadFeed(feed: string) {
|
|
|
76
75
|
export default class PiletInjector implements KrasInjector {
|
|
77
76
|
public config: PiletInjectorConfig;
|
|
78
77
|
private piletApi: string;
|
|
78
|
+
private indexPath: string;
|
|
79
79
|
|
|
80
80
|
constructor(options: PiletInjectorConfig, config: KrasConfiguration, core: EventEmitter) {
|
|
81
81
|
this.config = options;
|
|
@@ -84,7 +84,8 @@ export default class PiletInjector implements KrasInjector {
|
|
|
84
84
|
? options.api
|
|
85
85
|
: `${config.ssl ? 'https' : 'http'}://${host}:${config.port}${options.api}`;
|
|
86
86
|
|
|
87
|
-
const { pilets, api } = options;
|
|
87
|
+
const { pilets, api, publicUrl } = options;
|
|
88
|
+
this.indexPath = `${publicUrl}index.html`;
|
|
88
89
|
const cbs = {};
|
|
89
90
|
|
|
90
91
|
core.on('user-connected', (e) => {
|
|
@@ -220,15 +221,15 @@ export default class PiletInjector implements KrasInjector {
|
|
|
220
221
|
const target = join(app, path);
|
|
221
222
|
|
|
222
223
|
if (existsSync(target) && statSync(target).isFile()) {
|
|
223
|
-
if (req.url === indexPath) {
|
|
224
|
+
if (req.url === this.indexPath) {
|
|
224
225
|
return this.sendIndexFile(target, req.url);
|
|
225
226
|
} else {
|
|
226
227
|
return this.sendFile(target, req.url);
|
|
227
228
|
}
|
|
228
|
-
} else if (req.url !== indexPath) {
|
|
229
|
+
} else if (req.url !== this.indexPath) {
|
|
229
230
|
return this.handle({
|
|
230
231
|
...req,
|
|
231
|
-
url: indexPath,
|
|
232
|
+
url: this.indexPath,
|
|
232
233
|
});
|
|
233
234
|
}
|
|
234
235
|
}
|