piral-cli 0.15.0-beta.4808 → 0.15.0-beta.4813
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
CHANGED
|
@@ -16,7 +16,7 @@ const common_1 = require("../common");
|
|
|
16
16
|
exports.newPiletDefaults = {
|
|
17
17
|
target: '.',
|
|
18
18
|
registry: common_1.config.registry,
|
|
19
|
-
source:
|
|
19
|
+
source: undefined,
|
|
20
20
|
forceOverwrite: common_1.ForceOverwrite.no,
|
|
21
21
|
language: common_1.config.language,
|
|
22
22
|
install: true,
|
|
@@ -34,7 +34,6 @@ function newPilet(baseDir = process.cwd(), options = {}) {
|
|
|
34
34
|
const root = (0, path_1.resolve)(fullBase, target);
|
|
35
35
|
(0, common_1.setLogLevel)(logLevel);
|
|
36
36
|
(0, common_1.progress)('Preparing source and target ...');
|
|
37
|
-
const [sourceName, sourceVersion, hadVersion, type] = yield (0, common_1.dissectPackageName)(fullBase, source);
|
|
38
37
|
const success = yield (0, common_1.createDirectory)(root);
|
|
39
38
|
if (success) {
|
|
40
39
|
const npmClient = yield (0, common_1.determineNpmClient)(root, defaultNpmClient);
|
|
@@ -61,51 +60,63 @@ always-auth=true`, forceOverwrite);
|
|
|
61
60
|
yield (0, common_1.createFileIfNotExists)(root, 'pilet.json', JSON.stringify({
|
|
62
61
|
schemaVersion: 'v2',
|
|
63
62
|
}));
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
const
|
|
67
|
-
(
|
|
68
|
-
|
|
63
|
+
if (source) {
|
|
64
|
+
const [sourceName, sourceVersion, hadVersion, type] = yield (0, common_1.dissectPackageName)(fullBase, source);
|
|
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');
|
|
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
|
+
}
|
|
69
111
|
}
|
|
70
112
|
else {
|
|
71
|
-
(0, common_1.
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
if (preScaffold) {
|
|
79
|
-
(0, common_1.progress)(`Running preScaffold script ...`);
|
|
80
|
-
(0, common_1.log)('generalDebug_0003', `Run: ${preScaffold}`);
|
|
81
|
-
yield (0, common_1.runScript)(preScaffold, root);
|
|
82
|
-
}
|
|
83
|
-
(0, common_1.progress)(`Taking care of templating ...`);
|
|
84
|
-
const data = (0, common_1.getPiletScaffoldData)(language, root, packageName, variables);
|
|
85
|
-
const chosenTemplate = template || preSelectedTemplate || 'default';
|
|
86
|
-
yield (0, common_1.scaffoldPiletSourceFiles)(chosenTemplate, registry, data, forceOverwrite);
|
|
87
|
-
if (isEmulator) {
|
|
88
|
-
// in the emulator case we get the files (and files_once) from the contained tarballs
|
|
89
|
-
yield (0, common_1.copyPiralFiles)(root, packageName, piralInfo, common_1.ForceOverwrite.yes, data);
|
|
90
|
-
}
|
|
91
|
-
else {
|
|
92
|
-
// otherwise, we perform the same action as in the emulator creation
|
|
93
|
-
// just with a different target; not a created directory, but the root
|
|
94
|
-
const packageRoot = (0, common_1.getPiralPath)(root, packageName);
|
|
95
|
-
yield (0, common_1.copyScaffoldingFiles)(packageRoot, root, files, piralInfo, data);
|
|
96
|
-
}
|
|
97
|
-
yield (0, common_1.patchPiletPackage)(root, packageName, packageVersion, piralInfo, isEmulator, {
|
|
98
|
-
language,
|
|
99
|
-
bundler: bundlerName,
|
|
100
|
-
});
|
|
101
|
-
if (install) {
|
|
102
|
-
(0, common_1.progress)(`Installing dependencies ...`);
|
|
103
|
-
yield (0, common_1.installNpmDependencies)(npmClient, root);
|
|
104
|
-
}
|
|
105
|
-
if (postScaffold) {
|
|
106
|
-
(0, common_1.progress)(`Running postScaffold script ...`);
|
|
107
|
-
(0, common_1.log)('generalDebug_0003', `Run: ${postScaffold}`);
|
|
108
|
-
yield (0, common_1.runScript)(postScaffold, root);
|
|
113
|
+
const data = (0, common_1.getPiletScaffoldData)(language, root, undefined, variables);
|
|
114
|
+
const chosenTemplate = template || 'default';
|
|
115
|
+
yield (0, common_1.scaffoldPiletSourceFiles)(chosenTemplate, registry, data, forceOverwrite);
|
|
116
|
+
if (install) {
|
|
117
|
+
(0, common_1.progress)(`Installing dependencies ...`);
|
|
118
|
+
yield (0, common_1.installNpmDependencies)(npmClient, root);
|
|
119
|
+
}
|
|
109
120
|
}
|
|
110
121
|
(0, common_1.logDone)(`Pilet scaffolded successfully!`);
|
|
111
122
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"new-pilet.js","sourceRoot":"","sources":["../../src/apps/new-pilet.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAAyC;AACzC,oCAAoE;AACpE,sCA6BmB;AAoEN,QAAA,gBAAgB,GAAoB;IAC/C,MAAM,EAAE,GAAG;IACX,QAAQ,EAAE,eAAM,CAAC,QAAQ;IACzB,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"new-pilet.js","sourceRoot":"","sources":["../../src/apps/new-pilet.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,6 @@ const path_1 = require("path");
|
|
|
13
13
|
const common_1 = require("../common");
|
|
14
14
|
let handler;
|
|
15
15
|
function run(root, outFile, outDir, piralInstances, hmr, externals, publicUrl, entryFiles, logLevel, args) {
|
|
16
|
-
(0, common_1.progress)(`Preparing supplied Piral instance ...`);
|
|
17
16
|
(0, common_1.setStandardEnvs)({
|
|
18
17
|
piralInstances,
|
|
19
18
|
dependencies: externals,
|
|
@@ -51,7 +50,6 @@ process.on('message', (msg) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
51
50
|
const outDir = (0, path_1.resolve)(root, 'dist', 'app');
|
|
52
51
|
const bundler = yield run(root, msg.outFile, outDir, msg.piralInstances, true, msg.externals, msg.publicUrl, msg.entryFiles, msg.logLevel, msg);
|
|
53
52
|
const result = yield bundler.bundle();
|
|
54
|
-
(0, common_1.logReset)();
|
|
55
53
|
if (result) {
|
|
56
54
|
process.send({
|
|
57
55
|
type: 'done',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-debug-mono-piral.js","sourceRoot":"","sources":["../../src/build/run-debug-mono-piral.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+BAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"run-debug-mono-piral.js","sourceRoot":"","sources":["../../src/build/run-debug-mono-piral.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+BAA+B;AAC/B,sCAA4C;AAG5C,IAAI,OAA0B,CAAC;AAE/B,SAAS,GAAG,CACV,IAAY,EACZ,OAAe,EACf,MAAc,EACd,cAA6B,EAC7B,GAAY,EACZ,SAAwB,EACxB,SAAiB,EACjB,UAAkB,EAClB,QAAmB,EACnB,IAAS;IAET,IAAA,wBAAe,EAAC;QACd,cAAc;QACd,YAAY,EAAE,SAAS;QACvB,UAAU,EAAE,SAAS;QACrB,UAAU,EAAE,KAAK;QACjB,UAAU,EAAE,IAAI;QAChB,UAAU,EAAE,IAAI;QAChB,IAAI;KACL,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,MAAM,CAAC;QACpB,IAAI;QACJ,UAAU;QACV,OAAO;QACP,MAAM;QACN,SAAS;QACT,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,IAAI;QAChB,WAAW,EAAE,KAAK;QAClB,MAAM,EAAE,KAAK;QACb,SAAS;QACT,GAAG;QACH,QAAQ;QACR,KAAK,EAAE,IAAI;QACX,IAAI;KACL,CAAC,CAAC;AACL,CAAC;AAED,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAO,GAAG,EAAE,EAAE;IAClC,IAAI;QACF,QAAQ,GAAG,CAAC,IAAI,EAAE;YAChB,KAAK,MAAM;gBACT,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAC5B,MAAM;YACR,KAAK,OAAO;gBACV,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;gBAC3B,MAAM,MAAM,GAAG,IAAA,cAAO,EAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;gBAC5C,MAAM,OAAO,GAAG,MAAM,GAAG,CACvB,IAAI,EACJ,GAAG,CAAC,OAAO,EACX,MAAM,EACN,GAAG,CAAC,cAAc,EAClB,IAAI,EACJ,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,UAAU,EACd,GAAG,CAAC,QAAQ,EACZ,GAAG,CACJ,CAAC;gBACF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC;gBAEtC,IAAI,MAAM,EAAE;oBACV,OAAO,CAAC,IAAI,CAAC;wBACX,IAAI,EAAE,MAAM;wBACZ,MAAM,EAAE,MAAM,CAAC,MAAM;wBACrB,OAAO,EAAE,MAAM,CAAC,OAAO;qBACxB,CAAC,CAAC;iBACJ;gBAED,MAAM;SACT;KACF;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,IAAI,CAAC;YACX,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO;SACtB,CAAC,CAAC;KACJ;AACH,CAAC,CAAA,CAAC,CAAC"}
|
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.4813",
|
|
4
4
|
"description": "The standard CLI for creating and building a Piral instance or a Pilet.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"portal",
|
|
@@ -80,5 +80,5 @@
|
|
|
80
80
|
"typescript": "^4.7.3",
|
|
81
81
|
"yargs": "^15.4.1"
|
|
82
82
|
},
|
|
83
|
-
"gitHead": "
|
|
83
|
+
"gitHead": "2790199e9c9e3792899f3325f0584d97af77e795"
|
|
84
84
|
}
|
package/src/apps/new-pilet.ts
CHANGED
|
@@ -100,7 +100,7 @@ export interface NewPiletOptions {
|
|
|
100
100
|
export const newPiletDefaults: NewPiletOptions = {
|
|
101
101
|
target: '.',
|
|
102
102
|
registry: config.registry,
|
|
103
|
-
source:
|
|
103
|
+
source: undefined,
|
|
104
104
|
forceOverwrite: ForceOverwrite.no,
|
|
105
105
|
language: config.language,
|
|
106
106
|
install: true,
|
|
@@ -131,7 +131,6 @@ export async function newPilet(baseDir = process.cwd(), options: NewPiletOptions
|
|
|
131
131
|
const root = resolve(fullBase, target);
|
|
132
132
|
setLogLevel(logLevel);
|
|
133
133
|
progress('Preparing source and target ...');
|
|
134
|
-
const [sourceName, sourceVersion, hadVersion, type] = await dissectPackageName(fullBase, source);
|
|
135
134
|
const success = await createDirectory(root);
|
|
136
135
|
|
|
137
136
|
if (success) {
|
|
@@ -183,61 +182,73 @@ always-auth=true`,
|
|
|
183
182
|
}),
|
|
184
183
|
);
|
|
185
184
|
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
185
|
+
if (source) {
|
|
186
|
+
const [sourceName, sourceVersion, hadVersion, type] = await dissectPackageName(fullBase, source);
|
|
187
|
+
const isLocal = isLinkedPackage(sourceName, type, hadVersion);
|
|
188
|
+
|
|
189
|
+
if (!isLocal) {
|
|
190
|
+
const packageRef = combinePackageRef(sourceName, sourceVersion, type);
|
|
191
|
+
|
|
192
|
+
progress(`Installing npm package %s ...`, packageRef);
|
|
193
|
+
await installNpmPackage(npmClient, packageRef, root, '--save-dev', '--save-exact');
|
|
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
|
+
}
|
|
193
243
|
} else {
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
const { preScaffold, postScaffold, files, template: preSelectedTemplate } = getPiletsInfo(piralInfo);
|
|
204
|
-
|
|
205
|
-
if (preScaffold) {
|
|
206
|
-
progress(`Running preScaffold script ...`);
|
|
207
|
-
log('generalDebug_0003', `Run: ${preScaffold}`);
|
|
208
|
-
await runScript(preScaffold, root);
|
|
209
|
-
}
|
|
210
|
-
|
|
211
|
-
progress(`Taking care of templating ...`);
|
|
212
|
-
|
|
213
|
-
const data = getPiletScaffoldData(language, root, packageName, variables);
|
|
214
|
-
const chosenTemplate = template || preSelectedTemplate || 'default';
|
|
215
|
-
await scaffoldPiletSourceFiles(chosenTemplate, registry, data, forceOverwrite);
|
|
216
|
-
|
|
217
|
-
if (isEmulator) {
|
|
218
|
-
// in the emulator case we get the files (and files_once) from the contained tarballs
|
|
219
|
-
await copyPiralFiles(root, packageName, piralInfo, ForceOverwrite.yes, data);
|
|
220
|
-
} else {
|
|
221
|
-
// otherwise, we perform the same action as in the emulator creation
|
|
222
|
-
// just with a different target; not a created directory, but the root
|
|
223
|
-
const packageRoot = getPiralPath(root, packageName);
|
|
224
|
-
await copyScaffoldingFiles(packageRoot, root, files, piralInfo, data);
|
|
225
|
-
}
|
|
226
|
-
|
|
227
|
-
await patchPiletPackage(root, packageName, packageVersion, piralInfo, isEmulator, {
|
|
228
|
-
language,
|
|
229
|
-
bundler: bundlerName,
|
|
230
|
-
});
|
|
231
|
-
|
|
232
|
-
if (install) {
|
|
233
|
-
progress(`Installing dependencies ...`);
|
|
234
|
-
await installNpmDependencies(npmClient, root);
|
|
235
|
-
}
|
|
236
|
-
|
|
237
|
-
if (postScaffold) {
|
|
238
|
-
progress(`Running postScaffold script ...`);
|
|
239
|
-
log('generalDebug_0003', `Run: ${postScaffold}`);
|
|
240
|
-
await runScript(postScaffold, root);
|
|
244
|
+
const data = getPiletScaffoldData(language, root, undefined, variables);
|
|
245
|
+
const chosenTemplate = template || 'default';
|
|
246
|
+
await scaffoldPiletSourceFiles(chosenTemplate, registry, data, forceOverwrite);
|
|
247
|
+
|
|
248
|
+
if (install) {
|
|
249
|
+
progress(`Installing dependencies ...`);
|
|
250
|
+
await installNpmDependencies(npmClient, root);
|
|
251
|
+
}
|
|
241
252
|
}
|
|
242
253
|
|
|
243
254
|
logDone(`Pilet scaffolded successfully!`);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { resolve } from 'path';
|
|
2
|
-
import { setStandardEnvs
|
|
2
|
+
import { setStandardEnvs } from '../common';
|
|
3
3
|
import type { LogLevels, PiralBuildHandler } from '../types';
|
|
4
4
|
|
|
5
5
|
let handler: PiralBuildHandler;
|
|
@@ -16,8 +16,6 @@ function run(
|
|
|
16
16
|
logLevel: LogLevels,
|
|
17
17
|
args: any,
|
|
18
18
|
) {
|
|
19
|
-
progress(`Preparing supplied Piral instance ...`);
|
|
20
|
-
|
|
21
19
|
setStandardEnvs({
|
|
22
20
|
piralInstances,
|
|
23
21
|
dependencies: externals,
|
|
@@ -69,8 +67,6 @@ process.on('message', async (msg) => {
|
|
|
69
67
|
);
|
|
70
68
|
const result = await bundler.bundle();
|
|
71
69
|
|
|
72
|
-
logReset();
|
|
73
|
-
|
|
74
70
|
if (result) {
|
|
75
71
|
process.send({
|
|
76
72
|
type: 'done',
|