piral-cli 0.15.0-beta.4813 → 0.15.0-beta.4816
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/apps/new-pilet.js +46 -56
- package/lib/apps/new-pilet.js.map +1 -1
- package/lib/apps/new-piral.js +1 -1
- package/lib/apps/new-piral.js.map +1 -1
- package/lib/common/log.js +3 -2
- package/lib/common/log.js.map +1 -1
- package/package.json +3 -3
- package/src/apps/new-pilet.ts +64 -69
- package/src/apps/new-piral.ts +1 -1
- package/src/common/log.ts +3 -2
package/lib/apps/new-pilet.js
CHANGED
|
@@ -59,64 +59,54 @@ always-auth=true`, forceOverwrite);
|
|
|
59
59
|
}
|
|
60
60
|
yield (0, common_1.createFileIfNotExists)(root, 'pilet.json', JSON.stringify({
|
|
61
61
|
schemaVersion: 'v2',
|
|
62
|
-
}));
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
}
|
|
71
|
-
else {
|
|
72
|
-
(0, common_1.progress)(`Using locally available npm package %s ...`, sourceName);
|
|
73
|
-
}
|
|
74
|
-
const packageName = yield (0, common_1.getPackageName)(root, sourceName, type);
|
|
75
|
-
const packageVersion = (0, common_1.getPackageVersion)(hadVersion, sourceName, sourceVersion, type, root);
|
|
76
|
-
const piralInfo = yield (0, common_1.readPiralPackage)(root, packageName);
|
|
77
|
-
const isEmulator = (0, common_1.checkAppShellPackage)(piralInfo);
|
|
78
|
-
const { preScaffold, postScaffold, files, template: preSelectedTemplate } = (0, common_1.getPiletsInfo)(piralInfo);
|
|
79
|
-
if (preScaffold) {
|
|
80
|
-
(0, common_1.progress)(`Running preScaffold script ...`);
|
|
81
|
-
(0, common_1.log)('generalDebug_0003', `Run: ${preScaffold}`);
|
|
82
|
-
yield (0, common_1.runScript)(preScaffold, root);
|
|
83
|
-
}
|
|
84
|
-
(0, common_1.progress)(`Taking care of templating ...`);
|
|
85
|
-
const data = (0, common_1.getPiletScaffoldData)(language, root, packageName, variables);
|
|
86
|
-
const chosenTemplate = template || preSelectedTemplate || 'default';
|
|
87
|
-
yield (0, common_1.scaffoldPiletSourceFiles)(chosenTemplate, registry, data, forceOverwrite);
|
|
88
|
-
if (isEmulator) {
|
|
89
|
-
// in the emulator case we get the files (and files_once) from the contained tarballs
|
|
90
|
-
yield (0, common_1.copyPiralFiles)(root, packageName, piralInfo, common_1.ForceOverwrite.yes, data);
|
|
91
|
-
}
|
|
92
|
-
else {
|
|
93
|
-
// otherwise, we perform the same action as in the emulator creation
|
|
94
|
-
// just with a different target; not a created directory, but the root
|
|
95
|
-
const packageRoot = (0, common_1.getPiralPath)(root, packageName);
|
|
96
|
-
yield (0, common_1.copyScaffoldingFiles)(packageRoot, root, files, piralInfo, data);
|
|
97
|
-
}
|
|
98
|
-
yield (0, common_1.patchPiletPackage)(root, packageName, packageVersion, piralInfo, isEmulator, {
|
|
99
|
-
language,
|
|
100
|
-
bundler: bundlerName,
|
|
101
|
-
});
|
|
102
|
-
if (install) {
|
|
103
|
-
(0, common_1.progress)(`Installing dependencies ...`);
|
|
104
|
-
yield (0, common_1.installNpmDependencies)(npmClient, root);
|
|
105
|
-
}
|
|
106
|
-
if (postScaffold) {
|
|
107
|
-
(0, common_1.progress)(`Running postScaffold script ...`);
|
|
108
|
-
(0, common_1.log)('generalDebug_0003', `Run: ${postScaffold}`);
|
|
109
|
-
yield (0, common_1.runScript)(postScaffold, root);
|
|
110
|
-
}
|
|
62
|
+
}, undefined, 2));
|
|
63
|
+
const usedSource = source || `empty-piral@${common_1.cliVersion}`;
|
|
64
|
+
const [sourceName, sourceVersion, hadVersion, type] = yield (0, common_1.dissectPackageName)(fullBase, usedSource);
|
|
65
|
+
const isLocal = (0, common_1.isLinkedPackage)(sourceName, type, hadVersion);
|
|
66
|
+
if (!isLocal) {
|
|
67
|
+
const packageRef = (0, common_1.combinePackageRef)(sourceName, sourceVersion, type);
|
|
68
|
+
(0, common_1.progress)(`Installing npm package %s ...`, packageRef);
|
|
69
|
+
yield (0, common_1.installNpmPackage)(npmClient, packageRef, root, '--save-dev', '--save-exact');
|
|
111
70
|
}
|
|
112
71
|
else {
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
72
|
+
(0, common_1.progress)(`Using locally available npm package %s ...`, sourceName);
|
|
73
|
+
}
|
|
74
|
+
const packageName = yield (0, common_1.getPackageName)(root, sourceName, type);
|
|
75
|
+
const packageVersion = (0, common_1.getPackageVersion)(hadVersion, sourceName, sourceVersion, type, root);
|
|
76
|
+
const piralInfo = yield (0, common_1.readPiralPackage)(root, packageName);
|
|
77
|
+
const isEmulator = (0, common_1.checkAppShellPackage)(piralInfo);
|
|
78
|
+
const { preScaffold, postScaffold, files, template: preSelectedTemplate } = (0, common_1.getPiletsInfo)(piralInfo);
|
|
79
|
+
if (preScaffold) {
|
|
80
|
+
(0, common_1.progress)(`Running preScaffold script ...`);
|
|
81
|
+
(0, common_1.log)('generalDebug_0003', `Run: ${preScaffold}`);
|
|
82
|
+
yield (0, common_1.runScript)(preScaffold, root);
|
|
83
|
+
}
|
|
84
|
+
(0, common_1.progress)(`Taking care of templating ...`);
|
|
85
|
+
const data = (0, common_1.getPiletScaffoldData)(language, root, packageName, variables);
|
|
86
|
+
const chosenTemplate = template || preSelectedTemplate || 'default';
|
|
87
|
+
yield (0, common_1.scaffoldPiletSourceFiles)(chosenTemplate, registry, data, forceOverwrite);
|
|
88
|
+
if (isEmulator) {
|
|
89
|
+
// in the emulator case we get the files (and files_once) from the contained tarballs
|
|
90
|
+
yield (0, common_1.copyPiralFiles)(root, packageName, piralInfo, common_1.ForceOverwrite.yes, data);
|
|
91
|
+
}
|
|
92
|
+
else {
|
|
93
|
+
// otherwise, we perform the same action as in the emulator creation
|
|
94
|
+
// just with a different target; not a created directory, but the root
|
|
95
|
+
const packageRoot = (0, common_1.getPiralPath)(root, packageName);
|
|
96
|
+
yield (0, common_1.copyScaffoldingFiles)(packageRoot, root, files, piralInfo, data);
|
|
97
|
+
}
|
|
98
|
+
yield (0, common_1.patchPiletPackage)(root, packageName, packageVersion, piralInfo, isEmulator, {
|
|
99
|
+
language,
|
|
100
|
+
bundler: bundlerName,
|
|
101
|
+
});
|
|
102
|
+
if (install) {
|
|
103
|
+
(0, common_1.progress)(`Installing dependencies ...`);
|
|
104
|
+
yield (0, common_1.installNpmDependencies)(npmClient, root);
|
|
105
|
+
}
|
|
106
|
+
if (postScaffold) {
|
|
107
|
+
(0, common_1.progress)(`Running postScaffold script ...`);
|
|
108
|
+
(0, common_1.log)('generalDebug_0003', `Run: ${postScaffold}`);
|
|
109
|
+
yield (0, common_1.runScript)(postScaffold, root);
|
|
120
110
|
}
|
|
121
111
|
(0, common_1.logDone)(`Pilet scaffolded successfully!`);
|
|
122
112
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"new-pilet.js","sourceRoot":"","sources":["../../src/apps/new-pilet.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAAyC;AACzC,oCAAoE;AACpE,
|
|
1
|
+
{"version":3,"file":"new-pilet.js","sourceRoot":"","sources":["../../src/apps/new-pilet.ts"],"names":[],"mappings":"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"}
|
package/lib/apps/new-piral.js
CHANGED
|
@@ -60,7 +60,7 @@ function newPiral(baseDir = process.cwd(), options = {}) {
|
|
|
60
60
|
yield (0, common_1.createFileIfNotExists)(root, '.npmrc', `registry=${registry}
|
|
61
61
|
always-auth=true`, forceOverwrite);
|
|
62
62
|
}
|
|
63
|
-
yield (0, common_1.createFileIfNotExists)(root, 'piral.json', JSON.stringify({}));
|
|
63
|
+
yield (0, common_1.createFileIfNotExists)(root, 'piral.json', JSON.stringify({}, undefined, 2));
|
|
64
64
|
(0, common_1.progress)(`Installing npm package ${packageRef} ...`);
|
|
65
65
|
yield (0, common_1.installNpmPackage)(npmClient, packageRef, root, '--save-exact');
|
|
66
66
|
(0, common_1.progress)(`Taking care of templating ...`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"new-piral.js","sourceRoot":"","sources":["../../src/apps/new-piral.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"new-piral.js","sourceRoot":"","sources":["../../src/apps/new-piral.ts"],"names":[],"mappings":"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"}
|
package/lib/common/log.js
CHANGED
|
@@ -57,8 +57,9 @@ function logFail(message, ...args) {
|
|
|
57
57
|
}
|
|
58
58
|
exports.logFail = logFail;
|
|
59
59
|
function progress(message, ...args) {
|
|
60
|
-
|
|
61
|
-
instance.start(
|
|
60
|
+
const msg = (0, util_1.format)(message, ...args);
|
|
61
|
+
instance.start(msg);
|
|
62
|
+
currentProgress = msg;
|
|
62
63
|
}
|
|
63
64
|
exports.progress = progress;
|
|
64
65
|
function logReset() {
|
package/lib/common/log.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../src/common/log.ts"],"names":[],"mappings":";;;AAAA,wCAAwC;AACxC,+BAA8B;AAC9B,0CAAkC;AAClC,oCAAmD;AAInD,IAAI,eAAe,GAAW,SAAS,CAAC;AACxC,IAAI,QAAQ,GAAG,iBAAS,CAAC,IAAI,CAAC;AAC9B,IAAI,QAAQ,GAAG,IAAA,cAAG,GAAE,CAAC;AAErB,SAAgB,WAAW;IACzB,OAAO,QAAQ,CAAC;AAClB,CAAC;AAFD,kCAEC;AAED,SAAgB,WAAW,CAAC,KAAgB;IAC1C,QAAQ,GAAG,KAAK,CAAC;AACnB,CAAC;AAFD,kCAEC;AAED,SAAgB,OAAO,CAAC,OAAe,EAAE,GAAG,IAAsC;IAChF,MAAM,GAAG,GAAG,IAAA,aAAM,EAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IACrC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACnB,OAAO,GAAG,CAAC;AACb,CAAC;AAJD,0BAIC;AAED,SAAgB,QAAQ,CAAC,OAAe,EAAE,GAAG,IAAsC;IACjF,MAAM,GAAG,GAAG,IAAA,aAAM,EAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IAErC,IAAI,QAAQ,IAAI,iBAAS,CAAC,KAAK,EAAE;QAC/B,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KACpB;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AARD,4BAQC;AAED,SAAgB,UAAU,CAAC,OAAe,EAAE,GAAG,IAAsC;IACnF,MAAM,GAAG,GAAG,IAAA,aAAM,EAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IAErC,IAAI,QAAQ,IAAI,iBAAS,CAAC,OAAO,EAAE;QACjC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KACpB;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AARD,gCAQC;AAED,SAAgB,OAAO,CAAC,OAAe,EAAE,GAAG,IAAsC;IAChF,MAAM,GAAG,GAAG,IAAA,aAAM,EAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IACrC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACtB,OAAO,GAAG,CAAC;AACb,CAAC;AAJD,0BAIC;AAED,SAAgB,OAAO,CAAC,OAAe,EAAE,GAAG,IAAsC;IAChF,MAAM,GAAG,GAAG,IAAA,aAAM,EAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IACrC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACnB,OAAO,GAAG,CAAC;AACb,CAAC;AAJD,0BAIC;AAED,SAAgB,OAAO,CAAC,OAAe,EAAE,GAAG,IAAsC;IAChF,MAAM,GAAG,GAAG,IAAA,aAAM,EAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IACrC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACnB,OAAO,GAAG,CAAC;AACb,CAAC;AAJD,0BAIC;AAED,SAAgB,QAAQ,CAAC,OAAe,EAAE,GAAG,IAAsC;IACjF,
|
|
1
|
+
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../src/common/log.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.15.0-beta.
|
|
3
|
+
"version": "0.15.0-beta.4816",
|
|
4
4
|
"description": "The standard CLI for creating and building a Piral instance or a Pilet.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"portal",
|
|
@@ -74,11 +74,11 @@
|
|
|
74
74
|
"tar": "^4.4.8"
|
|
75
75
|
},
|
|
76
76
|
"dependencies": {
|
|
77
|
-
"dets": "^0.12.
|
|
77
|
+
"dets": "^0.12.1",
|
|
78
78
|
"kras": "^0.15.2",
|
|
79
79
|
"rimraf": "^3.0.0",
|
|
80
80
|
"typescript": "^4.7.3",
|
|
81
81
|
"yargs": "^15.4.1"
|
|
82
82
|
},
|
|
83
|
-
"gitHead": "
|
|
83
|
+
"gitHead": "f6af0640e919d26b25a5dc51d6559c9201728ccd"
|
|
84
84
|
}
|
package/src/apps/new-pilet.ts
CHANGED
|
@@ -29,6 +29,7 @@ import {
|
|
|
29
29
|
getPiletScaffoldData,
|
|
30
30
|
config,
|
|
31
31
|
initNpmProject,
|
|
32
|
+
cliVersion,
|
|
32
33
|
} from '../common';
|
|
33
34
|
|
|
34
35
|
export interface NewPiletOptions {
|
|
@@ -177,78 +178,72 @@ always-auth=true`,
|
|
|
177
178
|
await createFileIfNotExists(
|
|
178
179
|
root,
|
|
179
180
|
'pilet.json',
|
|
180
|
-
JSON.stringify(
|
|
181
|
-
|
|
182
|
-
|
|
181
|
+
JSON.stringify(
|
|
182
|
+
{
|
|
183
|
+
schemaVersion: 'v2',
|
|
184
|
+
},
|
|
185
|
+
undefined,
|
|
186
|
+
2,
|
|
187
|
+
),
|
|
183
188
|
);
|
|
184
189
|
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
} else {
|
|
195
|
-
progress(`Using locally available npm package %s ...`, sourceName);
|
|
196
|
-
}
|
|
197
|
-
|
|
198
|
-
const packageName = await getPackageName(root, sourceName, type);
|
|
199
|
-
const packageVersion = getPackageVersion(hadVersion, sourceName, sourceVersion, type, root);
|
|
200
|
-
const piralInfo = await readPiralPackage(root, packageName);
|
|
201
|
-
|
|
202
|
-
const isEmulator = checkAppShellPackage(piralInfo);
|
|
203
|
-
|
|
204
|
-
const { preScaffold, postScaffold, files, template: preSelectedTemplate } = getPiletsInfo(piralInfo);
|
|
205
|
-
|
|
206
|
-
if (preScaffold) {
|
|
207
|
-
progress(`Running preScaffold script ...`);
|
|
208
|
-
log('generalDebug_0003', `Run: ${preScaffold}`);
|
|
209
|
-
await runScript(preScaffold, root);
|
|
210
|
-
}
|
|
211
|
-
|
|
212
|
-
progress(`Taking care of templating ...`);
|
|
213
|
-
|
|
214
|
-
const data = getPiletScaffoldData(language, root, packageName, variables);
|
|
215
|
-
const chosenTemplate = template || preSelectedTemplate || 'default';
|
|
216
|
-
await scaffoldPiletSourceFiles(chosenTemplate, registry, data, forceOverwrite);
|
|
217
|
-
|
|
218
|
-
if (isEmulator) {
|
|
219
|
-
// in the emulator case we get the files (and files_once) from the contained tarballs
|
|
220
|
-
await copyPiralFiles(root, packageName, piralInfo, ForceOverwrite.yes, data);
|
|
221
|
-
} else {
|
|
222
|
-
// otherwise, we perform the same action as in the emulator creation
|
|
223
|
-
// just with a different target; not a created directory, but the root
|
|
224
|
-
const packageRoot = getPiralPath(root, packageName);
|
|
225
|
-
await copyScaffoldingFiles(packageRoot, root, files, piralInfo, data);
|
|
226
|
-
}
|
|
227
|
-
|
|
228
|
-
await patchPiletPackage(root, packageName, packageVersion, piralInfo, isEmulator, {
|
|
229
|
-
language,
|
|
230
|
-
bundler: bundlerName,
|
|
231
|
-
});
|
|
232
|
-
|
|
233
|
-
if (install) {
|
|
234
|
-
progress(`Installing dependencies ...`);
|
|
235
|
-
await installNpmDependencies(npmClient, root);
|
|
236
|
-
}
|
|
237
|
-
|
|
238
|
-
if (postScaffold) {
|
|
239
|
-
progress(`Running postScaffold script ...`);
|
|
240
|
-
log('generalDebug_0003', `Run: ${postScaffold}`);
|
|
241
|
-
await runScript(postScaffold, root);
|
|
242
|
-
}
|
|
190
|
+
const usedSource = source || `empty-piral@${cliVersion}`;
|
|
191
|
+
const [sourceName, sourceVersion, hadVersion, type] = await dissectPackageName(fullBase, usedSource);
|
|
192
|
+
const isLocal = isLinkedPackage(sourceName, type, hadVersion);
|
|
193
|
+
|
|
194
|
+
if (!isLocal) {
|
|
195
|
+
const packageRef = combinePackageRef(sourceName, sourceVersion, type);
|
|
196
|
+
|
|
197
|
+
progress(`Installing npm package %s ...`, packageRef);
|
|
198
|
+
await installNpmPackage(npmClient, packageRef, root, '--save-dev', '--save-exact');
|
|
243
199
|
} else {
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
200
|
+
progress(`Using locally available npm package %s ...`, sourceName);
|
|
201
|
+
}
|
|
202
|
+
|
|
203
|
+
const packageName = await getPackageName(root, sourceName, type);
|
|
204
|
+
const packageVersion = getPackageVersion(hadVersion, sourceName, sourceVersion, type, root);
|
|
205
|
+
const piralInfo = await readPiralPackage(root, packageName);
|
|
206
|
+
|
|
207
|
+
const isEmulator = checkAppShellPackage(piralInfo);
|
|
208
|
+
|
|
209
|
+
const { preScaffold, postScaffold, files, template: preSelectedTemplate } = getPiletsInfo(piralInfo);
|
|
210
|
+
|
|
211
|
+
if (preScaffold) {
|
|
212
|
+
progress(`Running preScaffold script ...`);
|
|
213
|
+
log('generalDebug_0003', `Run: ${preScaffold}`);
|
|
214
|
+
await runScript(preScaffold, root);
|
|
215
|
+
}
|
|
216
|
+
|
|
217
|
+
progress(`Taking care of templating ...`);
|
|
218
|
+
|
|
219
|
+
const data = getPiletScaffoldData(language, root, packageName, variables);
|
|
220
|
+
const chosenTemplate = template || preSelectedTemplate || 'default';
|
|
221
|
+
await scaffoldPiletSourceFiles(chosenTemplate, registry, data, forceOverwrite);
|
|
222
|
+
|
|
223
|
+
if (isEmulator) {
|
|
224
|
+
// in the emulator case we get the files (and files_once) from the contained tarballs
|
|
225
|
+
await copyPiralFiles(root, packageName, piralInfo, ForceOverwrite.yes, data);
|
|
226
|
+
} else {
|
|
227
|
+
// otherwise, we perform the same action as in the emulator creation
|
|
228
|
+
// just with a different target; not a created directory, but the root
|
|
229
|
+
const packageRoot = getPiralPath(root, packageName);
|
|
230
|
+
await copyScaffoldingFiles(packageRoot, root, files, piralInfo, data);
|
|
231
|
+
}
|
|
232
|
+
|
|
233
|
+
await patchPiletPackage(root, packageName, packageVersion, piralInfo, isEmulator, {
|
|
234
|
+
language,
|
|
235
|
+
bundler: bundlerName,
|
|
236
|
+
});
|
|
237
|
+
|
|
238
|
+
if (install) {
|
|
239
|
+
progress(`Installing dependencies ...`);
|
|
240
|
+
await installNpmDependencies(npmClient, root);
|
|
241
|
+
}
|
|
242
|
+
|
|
243
|
+
if (postScaffold) {
|
|
244
|
+
progress(`Running postScaffold script ...`);
|
|
245
|
+
log('generalDebug_0003', `Run: ${postScaffold}`);
|
|
246
|
+
await runScript(postScaffold, root);
|
|
252
247
|
}
|
|
253
248
|
|
|
254
249
|
logDone(`Pilet scaffolded successfully!`);
|
package/src/apps/new-piral.ts
CHANGED
|
@@ -177,7 +177,7 @@ always-auth=true`,
|
|
|
177
177
|
);
|
|
178
178
|
}
|
|
179
179
|
|
|
180
|
-
await createFileIfNotExists(root, 'piral.json', JSON.stringify({}));
|
|
180
|
+
await createFileIfNotExists(root, 'piral.json', JSON.stringify({}, undefined, 2));
|
|
181
181
|
|
|
182
182
|
progress(`Installing npm package ${packageRef} ...`);
|
|
183
183
|
|
package/src/common/log.ts
CHANGED
|
@@ -62,8 +62,9 @@ export function logFail(message: string, ...args: Array<string | number | boolea
|
|
|
62
62
|
}
|
|
63
63
|
|
|
64
64
|
export function progress(message: string, ...args: Array<string | number | boolean>) {
|
|
65
|
-
|
|
66
|
-
instance.start(
|
|
65
|
+
const msg = format(message, ...args)
|
|
66
|
+
instance.start(msg);
|
|
67
|
+
currentProgress = msg;
|
|
67
68
|
}
|
|
68
69
|
|
|
69
70
|
export function logReset() {
|