@dcl/sdk 7.0.6-4086929545.commit-0292186 → 7.0.6-4087611163.commit-4735f5b

package/cli/commands/build/helpers.d.ts

@@ -18,8 +18,4 @@ export declare const needsDependencies: (components: {
 }, dir: string) => Promise<boolean>;
 export declare const npm: string;
 export declare function installDependencies(dir: string): Promise<void>;
-export declare const buildTypescript: ({ dir, watch, production }: {
-    dir: string;
-    watch: boolean;
-    production: boolean;
-}) => Promise<void>;
+export declare function npmRun(cwd: string, command: string, ...args: string[]): Promise<void>;

package/cli/commands/build/helpers.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildTypescript = exports.installDependencies = exports.npm = exports.needsDependencies = exports.validatePackageJson = exports.validateProjectStructure = exports.getProjectStructure = exports.REQUIRED_PACKAGE_JSON = exports.REQUIRED_FILES = void 0;
+exports.npmRun = exports.installDependencies = exports.npm = exports.needsDependencies = exports.validatePackageJson = exports.validateProjectStructure = exports.getProjectStructure = exports.REQUIRED_PACKAGE_JSON = exports.REQUIRED_FILES = void 0;
 const path_1 = require("path");
 const exec_1 = require("../../utils/exec");
+const log_1 = require("../../utils/log");
 const object_1 = require("../../utils/object");
 exports.REQUIRED_FILES = {
     PACKAGE_JSON: 'package.json',
@@ -37,14 +38,13 @@ const needsDependencies = async (components, dir) => {
 exports.needsDependencies = needsDependencies;
 exports.npm = /^win/.test(process.platform) ? 'npm.cmd' : 'npm';
 async function installDependencies(dir) {
-    await (0, exec_1.exec)(dir, `${exports.npm} install`);
+    (0, log_1.info)('Installing dependencies...');
+    await (0, exec_1.exec)(dir, exports.npm, ['install']);
+    (0, log_1.succeed)('Dependencies installed');
 }
 exports.installDependencies = installDependencies;
-const buildTypescript = async ({ dir, watch, production }) => {
-    const command = watch ? 'watch' : 'build';
-    await (0, exec_1.exec)(dir, `${exports.npm} run ${command}`, {
-        env: { NODE_ENV: production ? 'production' : '' }
-    });
-};
-exports.buildTypescript = buildTypescript;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImhlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsK0JBQThCO0FBRzlCLDJDQUF1QztBQUN2QywrQ0FBMkQ7QUFLOUMsUUFBQSxjQUFjLEdBQUc7SUFDNUIsWUFBWSxFQUFFLGNBQWM7SUFDNUIsY0FBYyxFQUFFLGVBQWU7SUFDL0IsVUFBVSxFQUFFLFlBQVk7Q0FDekIsQ0FBQTtBQUtZLFFBQUEscUJBQXFCLEdBQUcsRUFBRSxDQUFBO0FBS2hDLE1BQU0sbUJBQW1CLEdBQUcsR0FBRyxFQUFFLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxzQkFBYyxDQUFDLENBQUE7QUFBekQsUUFBQSxtQkFBbUIsdUJBQXNDO0FBSy9ELE1BQU0sd0JBQXdCLEdBQUcsS0FBSyxFQUMzQyxVQUF3QyxFQUN4QyxHQUFXLEVBQ1gsUUFBa0IsRUFDQSxFQUFFO0lBQ3BCLE1BQU0sS0FBSyxHQUFHLE1BQU0sVUFBVSxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDOUMsTUFBTSxhQUFhLEdBQUcsSUFBSSxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUE7SUFFdkMsS0FBSyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLEtBQUssQ0FBQyxNQUFNLElBQUksYUFBYSxDQUFDLElBQUksR0FBRyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUU7UUFDL0QsSUFBSSxhQUFhLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFO1lBQy9CLGFBQWEsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUE7U0FDL0I7S0FDRjtJQUVELE9BQU8sYUFBYSxDQUFDLElBQUksS0FBSyxDQUFDLENBQUE7QUFDakMsQ0FBQyxDQUFBO0FBZlksUUFBQSx3QkFBd0IsNEJBZXBDO0FBS00sTUFBTSxtQkFBbUIsR0FBRyxLQUFLLEVBQ3RDLFVBQXdDLEVBQ3hDLEdBQVcsRUFDWCxJQUFVLEVBQ1EsRUFBRTtJQUNwQixNQUFNLFdBQVcsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sVUFBVSxDQUFDLEVBQUUsQ0FBQyxRQUFRLENBQUMsSUFBQSxjQUFPLEVBQUMsR0FBRyxFQUFFLHNCQUFjLENBQUMsWUFBWSxDQUFDLEVBQUUsT0FBTyxDQUFDLENBQUMsQ0FBQTtJQUNoSCxPQUFPLElBQUEseUJBQWdCLEVBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxDQUFBO0FBQzVDLENBQUMsQ0FBQTtBQVBZLFFBQUEsbUJBQW1CLHVCQU8vQjtBQUtNLE1BQU0saUJBQWlCLEdBQUcsS0FBSyxFQUFFLFVBQXdDLEVBQUUsR0FBVyxFQUFvQixFQUFFO0lBQ2pILE1BQU0sZUFBZSxHQUFHLElBQUEsY0FBTyxFQUFDLEdBQUcsRUFBRSxjQUFjLENBQUMsQ0FBQTtJQUNwRCxNQUFNLG9CQUFvQixHQUFHLE1BQU0sVUFBVSxDQUFDLEVBQUUsQ0FBQyxTQUFTLENBQUMsZUFBZSxDQUFDLENBQUE7SUFDM0UsTUFBTSxrQkFBa0IsR0FBRyxvQkFBb0IsSUFBSSxDQUFDLE1BQU0sVUFBVSxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUMsQ0FBQyxNQUFNLEtBQUssQ0FBQyxDQUFBO0lBRTlHLE9BQU8sQ0FBQyxvQkFBb0IsSUFBSSxrQkFBa0IsQ0FBQTtBQUNwRCxDQUFDLENBQUE7QUFOWSxRQUFBLGlCQUFpQixxQkFNN0I7QUFHWSxRQUFBLEdBQUcsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUE7QUFLN0QsS0FBSyxVQUFVLG1CQUFtQixDQUFDLEdBQVc7SUFDbkQsTUFBTSxJQUFBLFdBQUksRUFBQyxHQUFHLEVBQUUsR0FBRyxXQUFHLFVBQVUsQ0FBQyxDQUFBO0FBQ25DLENBQUM7QUFGRCxrREFFQztBQUtNLE1BQU0sZUFBZSxHQUFHLEtBQUssRUFBRSxFQUNwQyxHQUFHLEVBQ0gsS0FBSyxFQUNMLFVBQVUsRUFLWCxFQUFpQixFQUFFO0lBQ2xCLE1BQU0sT0FBTyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUE7SUFDekMsTUFBTSxJQUFBLFdBQUksRUFBQyxHQUFHLEVBQUUsR0FBRyxXQUFHLFFBQVEsT0FBTyxFQUFFLEVBQUU7UUFDdkMsR0FBRyxFQUFFLEVBQUUsUUFBUSxFQUFFLFVBQVUsQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUU7S0FDbEQsQ0FBQyxDQUFBO0FBQ0osQ0FBQyxDQUFBO0FBYlksUUFBQSxlQUFlLG1CQWEzQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IHJlc29sdmUgfSBmcm9tICdwYXRoJ1xuXG5pbXBvcnQgeyBJRmlsZVN5c3RlbUNvbXBvbmVudCB9IGZyb20gJy4uLy4uL2NvbXBvbmVudHMvZnMnXG5pbXBvcnQgeyBleGVjIH0gZnJvbSAnLi4vLi4vdXRpbHMvZXhlYydcbmltcG9ydCB7IERpY3QsIGhhc1ByaW1pdGl2ZUtleXMgfSBmcm9tICcuLi8uLi91dGlscy9vYmplY3QnXG5cbi8qKlxuICogUmVxdWlyZWQgcHJvamVjdCBkaXJzL2ZpbGVzXG4gKi9cbmV4cG9ydCBjb25zdCBSRVFVSVJFRF9GSUxFUyA9IHtcbiAgUEFDS0FHRV9KU09OOiAncGFja2FnZS5qc29uJyxcbiAgVFNfQ09ORklHX0pTT046ICd0c2NvbmZpZy5qc29uJyxcbiAgU0NFTkVfSlNPTjogJ3NjZW5lLmpzb24nXG59XG5cbi8qKlxuICogUmVxdWlyZWQgXCJwYWNrYWdlLmpzb25cIiBzdHJ1Y3R1cmVcbiAqL1xuZXhwb3J0IGNvbnN0IFJFUVVJUkVEX1BBQ0tBR0VfSlNPTiA9IHt9XG5cbi8qKlxuICogUmV0dXJucyB0aGUgcmVxdWlyZWQgZmlsZXMgZm9yIGEgcHJvamVjdFxuICovXG5leHBvcnQgY29uc3QgZ2V0UHJvamVjdFN0cnVjdHVyZSA9ICgpID0+IE9iamVjdC52YWx1ZXMoUkVRVUlSRURfRklMRVMpXG5cbi8qKlxuICogUmV0dXJucyB0cnVlIGlmIHRoZSBwcm9qZWN0IGZvbGxvd3MgYSB2YWxpZCBzY2VuZSBzdHJ1Y3R1cmVcbiAqL1xuZXhwb3J0IGNvbnN0IHZhbGlkYXRlUHJvamVjdFN0cnVjdHVyZSA9IGFzeW5jIChcbiAgY29tcG9uZW50czogeyBmczogSUZpbGVTeXN0ZW1Db21wb25lbnQgfSxcbiAgZGlyOiBzdHJpbmcsXG4gIGZpbGVMaXN0OiBzdHJpbmdbXVxuKTogUHJvbWlzZTxib29sZWFuPiA9PiB7XG4gIGNvbnN0IGZpbGVzID0gYXdhaXQgY29tcG9uZW50cy5mcy5yZWFkZGlyKGRpcilcbiAgY29uc3QgcmVxdWlyZWRGaWxlcyA9IG5ldyBTZXQoZmlsZUxpc3QpXG5cbiAgZm9yIChsZXQgaSA9IDA7IGkgPCBmaWxlcy5sZW5ndGggJiYgcmVxdWlyZWRGaWxlcy5zaXplID4gMDsgaSsrKSB7XG4gICAgaWYgKHJlcXVpcmVkRmlsZXMuaGFzKGZpbGVzW2ldKSkge1xuICAgICAgcmVxdWlyZWRGaWxlcy5kZWxldGUoZmlsZXNbaV0pXG4gICAgfVxuICB9XG5cbiAgcmV0dXJuIHJlcXVpcmVkRmlsZXMuc2l6ZSA9PT0gMFxufVxuXG4vKipcbiAqIFJldHVybnMgdHJ1ZSBpZiB0aGUgcHJvamVjdCdzIFwicGFja2FnZS5qc29uXCIgaXMgdmFsaWRcbiAqL1xuZXhwb3J0IGNvbnN0IHZhbGlkYXRlUGFja2FnZUpzb24gPSBhc3luYyAoXG4gIGNvbXBvbmVudHM6IHsgZnM6IElGaWxlU3lzdGVtQ29tcG9uZW50IH0sXG4gIGRpcjogc3RyaW5nLFxuICBkZXBzOiBEaWN0XG4pOiBQcm9taXNlPGJvb2xlYW4+ID0+IHtcbiAgY29uc3QgcGFja2FnZUpzb24gPSBKU09OLnBhcnNlKGF3YWl0IGNvbXBvbmVudHMuZnMucmVhZEZpbGUocmVzb2x2ZShkaXIsIFJFUVVJUkVEX0ZJTEVTLlBBQ0tBR0VfSlNPTiksICd1dGYtOCcpKVxuICByZXR1cm4gaGFzUHJpbWl0aXZlS2V5cyhwYWNrYWdlSnNvbiwgZGVwcylcbn1cblxuLypcbiAqIFJldHVybnMgdHJ1ZSBpZiB0aGUgcHJvamVjdCBjb250YWlucyBhbiBlbXB0eSBub2RlX21vZHVsZXMgZm9sZGVyXG4gKi9cbmV4cG9ydCBjb25zdCBuZWVkc0RlcGVuZGVuY2llcyA9IGFzeW5jIChjb21wb25lbnRzOiB7IGZzOiBJRmlsZVN5c3RlbUNvbXBvbmVudCB9LCBkaXI6IHN0cmluZyk6IFByb21pc2U8Ym9vbGVhbj4gPT4ge1xuICBjb25zdCBub2RlTW9kdWxlc1BhdGggPSByZXNvbHZlKGRpciwgJ25vZGVfbW9kdWxlcycpXG4gIGNvbnN0IGhhc05vZGVNb2R1bGVzRm9sZGVyID0gYXdhaXQgY29tcG9uZW50cy5mcy5leGlzdFBhdGgobm9kZU1vZHVsZXNQYXRoKVxuICBjb25zdCBpc05vZGVNb2R1bGVzRW1wdHkgPSBoYXNOb2RlTW9kdWxlc0ZvbGRlciAmJiAoYXdhaXQgY29tcG9uZW50cy5mcy5yZWFkZGlyKG5vZGVNb2R1bGVzUGF0aCkpLmxlbmd0aCA9PT0gMFxuXG4gIHJldHVybiAhaGFzTm9kZU1vZHVsZXNGb2xkZXIgfHwgaXNOb2RlTW9kdWxlc0VtcHR5XG59XG5cbi8qIGlzdGFuYnVsIGlnbm9yZSBuZXh0ICovXG5leHBvcnQgY29uc3QgbnBtID0gL153aW4vLnRlc3QocHJvY2Vzcy5wbGF0Zm9ybSkgPyAnbnBtLmNtZCcgOiAnbnBtJ1xuXG4vKlxuICogUnVucyBcIm5wbSBpbnN0YWxsXCIgZm9yIGRlc2lyZWQgcHJvamVjdFxuICovXG5leHBvcnQgYXN5bmMgZnVuY3Rpb24gaW5zdGFsbERlcGVuZGVuY2llcyhkaXI6IHN0cmluZyk6IFByb21pc2U8dm9pZD4ge1xuICBhd2FpdCBleGVjKGRpciwgYCR7bnBtfSBpbnN0YWxsYClcbn1cblxuLyoqXG4gKiBCdWlsZCdzIFR5cGVzY3JpcHQgdXNpbmcgXCJ0c2NvbmZpZy5qc29uXCIgZmlsZVxuICovXG5leHBvcnQgY29uc3QgYnVpbGRUeXBlc2NyaXB0ID0gYXN5bmMgKHtcbiAgZGlyLFxuICB3YXRjaCxcbiAgcHJvZHVjdGlvblxufToge1xuICBkaXI6IHN0cmluZ1xuICB3YXRjaDogYm9vbGVhblxuICBwcm9kdWN0aW9uOiBib29sZWFuXG59KTogUHJvbWlzZTx2b2lkPiA9PiB7XG4gIGNvbnN0IGNvbW1hbmQgPSB3YXRjaCA/ICd3YXRjaCcgOiAnYnVpbGQnXG4gIGF3YWl0IGV4ZWMoZGlyLCBgJHtucG19IHJ1biAke2NvbW1hbmR9YCwge1xuICAgIGVudjogeyBOT0RFX0VOVjogcHJvZHVjdGlvbiA/ICdwcm9kdWN0aW9uJyA6ICcnIH1cbiAgfSlcbn1cbiJdfQ==
+async function npmRun(cwd, command, ...args) {
+    await (0, exec_1.exec)(cwd, exports.npm, ['run', command, '--silent', '--', ...args], { env: process.env });
+}
+exports.npmRun = npmRun;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImhlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsK0JBQThCO0FBRzlCLDJDQUF1QztBQUN2Qyx5Q0FBK0M7QUFDL0MsK0NBQTJEO0FBSzlDLFFBQUEsY0FBYyxHQUFHO0lBQzVCLFlBQVksRUFBRSxjQUFjO0lBQzVCLGNBQWMsRUFBRSxlQUFlO0lBQy9CLFVBQVUsRUFBRSxZQUFZO0NBQ3pCLENBQUE7QUFLWSxRQUFBLHFCQUFxQixHQUFHLEVBQUUsQ0FBQTtBQUtoQyxNQUFNLG1CQUFtQixHQUFHLEdBQUcsRUFBRSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsc0JBQWMsQ0FBQyxDQUFBO0FBQXpELFFBQUEsbUJBQW1CLHVCQUFzQztBQUsvRCxNQUFNLHdCQUF3QixHQUFHLEtBQUssRUFDM0MsVUFBd0MsRUFDeEMsR0FBVyxFQUNYLFFBQWtCLEVBQ0EsRUFBRTtJQUNwQixNQUFNLEtBQUssR0FBRyxNQUFNLFVBQVUsQ0FBQyxFQUFFLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQzlDLE1BQU0sYUFBYSxHQUFHLElBQUksR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFBO0lBRXZDLEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxLQUFLLENBQUMsTUFBTSxJQUFJLGFBQWEsQ0FBQyxJQUFJLEdBQUcsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFO1FBQy9ELElBQUksYUFBYSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRTtZQUMvQixhQUFhLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO1NBQy9CO0tBQ0Y7SUFFRCxPQUFPLGFBQWEsQ0FBQyxJQUFJLEtBQUssQ0FBQyxDQUFBO0FBQ2pDLENBQUMsQ0FBQTtBQWZZLFFBQUEsd0JBQXdCLDRCQWVwQztBQUtNLE1BQU0sbUJBQW1CLEdBQUcsS0FBSyxFQUN0QyxVQUF3QyxFQUN4QyxHQUFXLEVBQ1gsSUFBVSxFQUNRLEVBQUU7SUFDcEIsTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLFVBQVUsQ0FBQyxFQUFFLENBQUMsUUFBUSxDQUFDLElBQUEsY0FBTyxFQUFDLEdBQUcsRUFBRSxzQkFBYyxDQUFDLFlBQVksQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUE7SUFDaEgsT0FBTyxJQUFBLHlCQUFnQixFQUFDLFdBQVcsRUFBRSxJQUFJLENBQUMsQ0FBQTtBQUM1QyxDQUFDLENBQUE7QUFQWSxRQUFBLG1CQUFtQix1QkFPL0I7QUFLTSxNQUFNLGlCQUFpQixHQUFHLEtBQUssRUFBRSxVQUF3QyxFQUFFLEdBQVcsRUFBb0IsRUFBRTtJQUNqSCxNQUFNLGVBQWUsR0FBRyxJQUFBLGNBQU8sRUFBQyxHQUFHLEVBQUUsY0FBYyxDQUFDLENBQUE7SUFDcEQsTUFBTSxvQkFBb0IsR0FBRyxNQUFNLFVBQVUsQ0FBQyxFQUFFLENBQUMsU0FBUyxDQUFDLGVBQWUsQ0FBQyxDQUFBO0lBQzNFLE1BQU0sa0JBQWtCLEdBQUcsb0JBQW9CLElBQUksQ0FBQyxNQUFNLFVBQVUsQ0FBQyxFQUFFLENBQUMsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUMsTUFBTSxLQUFLLENBQUMsQ0FBQTtJQUU5RyxPQUFPLENBQUMsb0JBQW9CLElBQUksa0JBQWtCLENBQUE7QUFDcEQsQ0FBQyxDQUFBO0FBTlksUUFBQSxpQkFBaUIscUJBTTdCO0FBR1ksUUFBQSxHQUFHLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFBO0FBSzdELEtBQUssVUFBVSxtQkFBbUIsQ0FBQyxHQUFXO0lBQ25ELElBQUEsVUFBSSxFQUFDLDRCQUE0QixDQUFDLENBQUE7SUFFbEMsTUFBTSxJQUFBLFdBQUksRUFBQyxHQUFHLEVBQUUsV0FBRyxFQUFFLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQTtJQUNqQyxJQUFBLGFBQU8sRUFBQyx3QkFBd0IsQ0FBQyxDQUFBO0FBQ25DLENBQUM7QUFMRCxrREFLQztBQUtNLEtBQUssVUFBVSxNQUFNLENBQUMsR0FBVyxFQUFFLE9BQWUsRUFBRSxHQUFHLElBQWM7SUFFMUUsTUFBTSxJQUFBLFdBQUksRUFBQyxHQUFHLEVBQUUsV0FBRyxFQUFFLENBQUMsS0FBSyxFQUFFLE9BQU8sRUFBRSxVQUFVLEVBQUUsSUFBSSxFQUFFLEdBQUcsSUFBSSxDQUFDLEVBQUUsRUFBRSxHQUFHLEVBQUUsT0FBTyxDQUFDLEdBQVUsRUFBRSxDQUFDLENBQUE7QUFDaEcsQ0FBQztBQUhELHdCQUdDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgcmVzb2x2ZSB9IGZyb20gJ3BhdGgnXG5cbmltcG9ydCB7IElGaWxlU3lzdGVtQ29tcG9uZW50IH0gZnJvbSAnLi4vLi4vY29tcG9uZW50cy9mcydcbmltcG9ydCB7IGV4ZWMgfSBmcm9tICcuLi8uLi91dGlscy9leGVjJ1xuaW1wb3J0IHsgaW5mbywgc3VjY2VlZCB9IGZyb20gJy4uLy4uL3V0aWxzL2xvZydcbmltcG9ydCB7IERpY3QsIGhhc1ByaW1pdGl2ZUtleXMgfSBmcm9tICcuLi8uLi91dGlscy9vYmplY3QnXG5cbi8qKlxuICogUmVxdWlyZWQgcHJvamVjdCBkaXJzL2ZpbGVzXG4gKi9cbmV4cG9ydCBjb25zdCBSRVFVSVJFRF9GSUxFUyA9IHtcbiAgUEFDS0FHRV9KU09OOiAncGFja2FnZS5qc29uJyxcbiAgVFNfQ09ORklHX0pTT046ICd0c2NvbmZpZy5qc29uJyxcbiAgU0NFTkVfSlNPTjogJ3NjZW5lLmpzb24nXG59XG5cbi8qKlxuICogUmVxdWlyZWQgXCJwYWNrYWdlLmpzb25cIiBzdHJ1Y3R1cmVcbiAqL1xuZXhwb3J0IGNvbnN0IFJFUVVJUkVEX1BBQ0tBR0VfSlNPTiA9IHt9XG5cbi8qKlxuICogUmV0dXJucyB0aGUgcmVxdWlyZWQgZmlsZXMgZm9yIGEgcHJvamVjdFxuICovXG5leHBvcnQgY29uc3QgZ2V0UHJvamVjdFN0cnVjdHVyZSA9ICgpID0+IE9iamVjdC52YWx1ZXMoUkVRVUlSRURfRklMRVMpXG5cbi8qKlxuICogUmV0dXJucyB0cnVlIGlmIHRoZSBwcm9qZWN0IGZvbGxvd3MgYSB2YWxpZCBzY2VuZSBzdHJ1Y3R1cmVcbiAqL1xuZXhwb3J0IGNvbnN0IHZhbGlkYXRlUHJvamVjdFN0cnVjdHVyZSA9IGFzeW5jIChcbiAgY29tcG9uZW50czogeyBmczogSUZpbGVTeXN0ZW1Db21wb25lbnQgfSxcbiAgZGlyOiBzdHJpbmcsXG4gIGZpbGVMaXN0OiBzdHJpbmdbXVxuKTogUHJvbWlzZTxib29sZWFuPiA9PiB7XG4gIGNvbnN0IGZpbGVzID0gYXdhaXQgY29tcG9uZW50cy5mcy5yZWFkZGlyKGRpcilcbiAgY29uc3QgcmVxdWlyZWRGaWxlcyA9IG5ldyBTZXQoZmlsZUxpc3QpXG5cbiAgZm9yIChsZXQgaSA9IDA7IGkgPCBmaWxlcy5sZW5ndGggJiYgcmVxdWlyZWRGaWxlcy5zaXplID4gMDsgaSsrKSB7XG4gICAgaWYgKHJlcXVpcmVkRmlsZXMuaGFzKGZpbGVzW2ldKSkge1xuICAgICAgcmVxdWlyZWRGaWxlcy5kZWxldGUoZmlsZXNbaV0pXG4gICAgfVxuICB9XG5cbiAgcmV0dXJuIHJlcXVpcmVkRmlsZXMuc2l6ZSA9PT0gMFxufVxuXG4vKipcbiAqIFJldHVybnMgdHJ1ZSBpZiB0aGUgcHJvamVjdCdzIFwicGFja2FnZS5qc29uXCIgaXMgdmFsaWRcbiAqL1xuZXhwb3J0IGNvbnN0IHZhbGlkYXRlUGFja2FnZUpzb24gPSBhc3luYyAoXG4gIGNvbXBvbmVudHM6IHsgZnM6IElGaWxlU3lzdGVtQ29tcG9uZW50IH0sXG4gIGRpcjogc3RyaW5nLFxuICBkZXBzOiBEaWN0XG4pOiBQcm9taXNlPGJvb2xlYW4+ID0+IHtcbiAgY29uc3QgcGFja2FnZUpzb24gPSBKU09OLnBhcnNlKGF3YWl0IGNvbXBvbmVudHMuZnMucmVhZEZpbGUocmVzb2x2ZShkaXIsIFJFUVVJUkVEX0ZJTEVTLlBBQ0tBR0VfSlNPTiksICd1dGYtOCcpKVxuICByZXR1cm4gaGFzUHJpbWl0aXZlS2V5cyhwYWNrYWdlSnNvbiwgZGVwcylcbn1cblxuLypcbiAqIFJldHVybnMgdHJ1ZSBpZiB0aGUgcHJvamVjdCBjb250YWlucyBhbiBlbXB0eSBub2RlX21vZHVsZXMgZm9sZGVyXG4gKi9cbmV4cG9ydCBjb25zdCBuZWVkc0RlcGVuZGVuY2llcyA9IGFzeW5jIChjb21wb25lbnRzOiB7IGZzOiBJRmlsZVN5c3RlbUNvbXBvbmVudCB9LCBkaXI6IHN0cmluZyk6IFByb21pc2U8Ym9vbGVhbj4gPT4ge1xuICBjb25zdCBub2RlTW9kdWxlc1BhdGggPSByZXNvbHZlKGRpciwgJ25vZGVfbW9kdWxlcycpXG4gIGNvbnN0IGhhc05vZGVNb2R1bGVzRm9sZGVyID0gYXdhaXQgY29tcG9uZW50cy5mcy5leGlzdFBhdGgobm9kZU1vZHVsZXNQYXRoKVxuICBjb25zdCBpc05vZGVNb2R1bGVzRW1wdHkgPSBoYXNOb2RlTW9kdWxlc0ZvbGRlciAmJiAoYXdhaXQgY29tcG9uZW50cy5mcy5yZWFkZGlyKG5vZGVNb2R1bGVzUGF0aCkpLmxlbmd0aCA9PT0gMFxuXG4gIHJldHVybiAhaGFzTm9kZU1vZHVsZXNGb2xkZXIgfHwgaXNOb2RlTW9kdWxlc0VtcHR5XG59XG5cbi8qIGlzdGFuYnVsIGlnbm9yZSBuZXh0ICovXG5leHBvcnQgY29uc3QgbnBtID0gL153aW4vLnRlc3QocHJvY2Vzcy5wbGF0Zm9ybSkgPyAnbnBtLmNtZCcgOiAnbnBtJ1xuXG4vKlxuICogUnVucyBcIm5wbSBpbnN0YWxsXCIgZm9yIGRlc2lyZWQgcHJvamVjdFxuICovXG5leHBvcnQgYXN5bmMgZnVuY3Rpb24gaW5zdGFsbERlcGVuZGVuY2llcyhkaXI6IHN0cmluZyk6IFByb21pc2U8dm9pZD4ge1xuICBpbmZvKCdJbnN0YWxsaW5nIGRlcGVuZGVuY2llcy4uLicpXG4gIC8vIFRPRE86IHRlc3QgaW4gd2luZG93c1xuICBhd2FpdCBleGVjKGRpciwgbnBtLCBbJ2luc3RhbGwnXSlcbiAgc3VjY2VlZCgnRGVwZW5kZW5jaWVzIGluc3RhbGxlZCcpXG59XG5cbi8qKlxuICogUnVuIE5QTSBjb21tYW5kc1xuICovXG5leHBvcnQgYXN5bmMgZnVuY3Rpb24gbnBtUnVuKGN3ZDogc3RyaW5nLCBjb21tYW5kOiBzdHJpbmcsIC4uLmFyZ3M6IHN0cmluZ1tdKTogUHJvbWlzZTx2b2lkPiB7XG4gIC8vIFRPRE86IHRlc3QgaW4gd2luZG93c1xuICBhd2FpdCBleGVjKGN3ZCwgbnBtLCBbJ3J1bicsIGNvbW1hbmQsICctLXNpbGVudCcsICctLScsIC4uLmFyZ3NdLCB7IGVudjogcHJvY2Vzcy5lbnYgYXMgYW55IH0pXG59XG4iXX0=

package/cli/commands/build/helpers.ts

@@ -2,6 +2,7 @@ import { resolve } from 'path'
 
 import { IFileSystemComponent } from '../../components/fs'
 import { exec } from '../../utils/exec'
+import { info, succeed } from '../../utils/log'
 import { Dict, hasPrimitiveKeys } from '../../utils/object'
 
 /**
@@ -73,23 +74,16 @@ export const npm = /^win/.test(process.platform) ? 'npm.cmd' : 'npm'
  * Runs "npm install" for desired project
  */
 export async function installDependencies(dir: string): Promise<void> {
-  await exec(dir, `${npm} install`)
+  info('Installing dependencies...')
+  // TODO: test in windows
+  await exec(dir, npm, ['install'])
+  succeed('Dependencies installed')
 }
 
 /**
- * Build's Typescript using "tsconfig.json" file
+ * Run NPM commands
  */
-export const buildTypescript = async ({
-  dir,
-  watch,
-  production
-}: {
-  dir: string
-  watch: boolean
-  production: boolean
-}): Promise<void> => {
-  const command = watch ? 'watch' : 'build'
-  await exec(dir, `${npm} run ${command}`, {
-    env: { NODE_ENV: production ? 'production' : '' }
-  })
+export async function npmRun(cwd: string, command: string, ...args: string[]): Promise<void> {
+  // TODO: test in windows
+  await exec(cwd, npm, ['run', command, '--silent', '--', ...args], { env: process.env as any })
 }

package/cli/commands/build/index.d.ts

@@ -15,5 +15,5 @@ export declare const args: import("arg").Result<{
     '--dir': StringConstructor;
 }>;
 export declare function help(): string;
-export declare const main: (args: Options) => Promise<void>;
+export declare function main(options: Options): Promise<void>;
 export {};

package/cli/commands/build/index.js

@@ -1,14 +1,16 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.main = exports.help = exports.args = void 0;
 const path_1 = require("path");
 const out_messages_1 = require("../../utils/out-messages");
-const log_1 = require("../../utils/log");
 const args_1 = require("../../utils/args");
 const error_1 = require("../../utils/error");
+const compile_1 = require("@dcl/dcl-rollup/compile");
+const fp_future_1 = __importDefault(require("fp-future"));
 const helpers_1 = require("./helpers");
-const handler_1 = require("../../utils/handler");
-const console_1 = require("console");
 exports.args = (0, args_1.getArgs)({
     '--watch': Boolean,
     '-w': '--watch',
@@ -19,7 +21,7 @@ exports.args = (0, args_1.getArgs)({
 });
 function help() {
     return `
-  Usage: 'dcl build [options]'
+  Usage: 'dcl-commands build [options]'
     Options:'
       -h, --help                Displays complete help
       -w, --watch               Watch for file changes and build on change
@@ -29,11 +31,11 @@ function help() {
 
     Example:
     - Build your scene:
-      '$ dcl build'
+      '$ dcl-commands build'
   `;
 }
 exports.help = help;
-exports.main = (0, handler_1.main)(async function main(options) {
+async function main(options) {
     const dir = (0, path_1.resolve)(process.cwd(), options.args['--dir'] || '.');
     const projectStructure = (0, helpers_1.getProjectStructure)();
     const hasValidProjectStructure = await (0, helpers_1.validateProjectStructure)(options.components, dir, projectStructure);
@@ -41,24 +43,27 @@ exports.main = (0, handler_1.main)(async function main(options) {
         throw new error_1.CliError(`Invalid scene structure found. Required files:
       ${(0, out_messages_1.toStringList)(projectStructure)}`);
     }
-    (0, log_1.succeed)('Project has a valid structure');
     const hasValidPackageJson = await (0, helpers_1.validatePackageJson)(options.components, dir, helpers_1.REQUIRED_PACKAGE_JSON);
     if (!hasValidPackageJson) {
         throw new error_1.CliError(`Invalid "package.json" file. Structure required:
       ${JSON.stringify(helpers_1.REQUIRED_PACKAGE_JSON, null, 2)}`);
     }
-    (0, log_1.succeed)('Project has a valid "package.json"');
     const shouldInstallDeps = await (0, helpers_1.needsDependencies)(options.components, dir);
     if (shouldInstallDeps && !options.args['--skip-install']) {
-        (0, console_1.info)('Installing dependencies...');
         await (0, helpers_1.installDependencies)(dir);
     }
-    (0, log_1.succeed)('Dependencies installed');
-    await (0, helpers_1.buildTypescript)({
-        dir,
-        watch: !!options.args['--watch'],
-        production: !!options.args['--production']
+    const watch = !!options.args['--watch'];
+    const watchingFuture = (0, fp_future_1.default)();
+    await (0, compile_1.compile)({
+        project: dir,
+        watch,
+        production: !!options.args['--production'],
+        watchingFuture
     });
-    (0, log_1.succeed)('Project built successfully!');
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwrQkFBOEI7QUFHOUIsMkRBQXVEO0FBQ3ZELHlDQUF5QztBQUN6QywyQ0FBMEM7QUFDMUMsNkNBQTRDO0FBQzVDLHVDQVFrQjtBQUNsQixpREFBcUQ7QUFDckQscUNBQThCO0FBT2pCLFFBQUEsSUFBSSxHQUFHLElBQUEsY0FBTyxFQUFDO0lBQzFCLFNBQVMsRUFBRSxPQUFPO0lBQ2xCLElBQUksRUFBRSxTQUFTO0lBQ2YsY0FBYyxFQUFFLE9BQU87SUFDdkIsSUFBSSxFQUFFLGNBQWM7SUFDcEIsZ0JBQWdCLEVBQUUsT0FBTztJQUN6QixPQUFPLEVBQUUsTUFBTTtDQUNoQixDQUFDLENBQUE7QUFFRixTQUFnQixJQUFJO0lBQ2xCLE9BQU87Ozs7Ozs7Ozs7OztHQVlOLENBQUE7QUFDSCxDQUFDO0FBZEQsb0JBY0M7QUFFWSxRQUFBLElBQUksR0FBRyxJQUFBLGNBQU8sRUFBQyxLQUFLLFVBQVUsSUFBSSxDQUFDLE9BQWdCO0lBQzlELE1BQU0sR0FBRyxHQUFHLElBQUEsY0FBTyxFQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBRSxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEdBQUcsQ0FBQyxDQUFBO0lBQ2hFLE1BQU0sZ0JBQWdCLEdBQUcsSUFBQSw2QkFBbUIsR0FBRSxDQUFBO0lBRTlDLE1BQU0sd0JBQXdCLEdBQUcsTUFBTSxJQUFBLGtDQUF3QixFQUFDLE9BQU8sQ0FBQyxVQUFVLEVBQUUsR0FBRyxFQUFFLGdCQUFnQixDQUFDLENBQUE7SUFFMUcsSUFBSSxDQUFDLHdCQUF3QixFQUFFO1FBQzdCLE1BQU0sSUFBSSxnQkFBUSxDQUFDO1FBQ2YsSUFBQSwyQkFBWSxFQUFDLGdCQUFnQixDQUFDLEVBQUUsQ0FBQyxDQUFBO0tBQ3RDO0lBRUQsSUFBQSxhQUFPLEVBQUMsK0JBQStCLENBQUMsQ0FBQTtJQUV4QyxNQUFNLG1CQUFtQixHQUFHLE1BQU0sSUFBQSw2QkFBbUIsRUFBQyxPQUFPLENBQUMsVUFBVSxFQUFFLEdBQUcsRUFBRSwrQkFBcUIsQ0FBQyxDQUFBO0lBRXJHLElBQUksQ0FBQyxtQkFBbUIsRUFBRTtRQUN4QixNQUFNLElBQUksZ0JBQVEsQ0FBQztRQUNmLElBQUksQ0FBQyxTQUFTLENBQUMsK0JBQXFCLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQTtLQUN0RDtJQUVELElBQUEsYUFBTyxFQUFDLG9DQUFvQyxDQUFDLENBQUE7SUFFN0MsTUFBTSxpQkFBaUIsR0FBRyxNQUFNLElBQUEsMkJBQWlCLEVBQUMsT0FBTyxDQUFDLFVBQVUsRUFBRSxHQUFHLENBQUMsQ0FBQTtJQUUxRSxJQUFJLGlCQUFpQixJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFO1FBQ3hELElBQUEsY0FBSSxFQUFDLDRCQUE0QixDQUFDLENBQUE7UUFDbEMsTUFBTSxJQUFBLDZCQUFtQixFQUFDLEdBQUcsQ0FBQyxDQUFBO0tBQy9CO0lBRUQsSUFBQSxhQUFPLEVBQUMsd0JBQXdCLENBQUMsQ0FBQTtJQUVqQyxNQUFNLElBQUEseUJBQWUsRUFBQztRQUNwQixHQUFHO1FBQ0gsS0FBSyxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQztRQUNoQyxVQUFVLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDO0tBQzNDLENBQUMsQ0FBQTtJQUVGLElBQUEsYUFBTyxFQUFDLDZCQUE2QixDQUFDLENBQUE7QUFJeEMsQ0FBQyxDQUFDLENBQUEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyByZXNvbHZlIH0gZnJvbSAncGF0aCdcblxuaW1wb3J0IHsgQ2xpQ29tcG9uZW50cyB9IGZyb20gJy4uLy4uL2NvbXBvbmVudHMnXG5pbXBvcnQgeyB0b1N0cmluZ0xpc3QgfSBmcm9tICcuLi8uLi91dGlscy9vdXQtbWVzc2FnZXMnXG5pbXBvcnQgeyBzdWNjZWVkIH0gZnJvbSAnLi4vLi4vdXRpbHMvbG9nJ1xuaW1wb3J0IHsgZ2V0QXJncyB9IGZyb20gJy4uLy4uL3V0aWxzL2FyZ3MnXG5pbXBvcnQgeyBDbGlFcnJvciB9IGZyb20gJy4uLy4uL3V0aWxzL2Vycm9yJ1xuaW1wb3J0IHtcbiAgZ2V0UHJvamVjdFN0cnVjdHVyZSxcbiAgYnVpbGRUeXBlc2NyaXB0LFxuICBpbnN0YWxsRGVwZW5kZW5jaWVzLFxuICBuZWVkc0RlcGVuZGVuY2llcyxcbiAgdmFsaWRhdGVQcm9qZWN0U3RydWN0dXJlLFxuICB2YWxpZGF0ZVBhY2thZ2VKc29uLFxuICBSRVFVSVJFRF9QQUNLQUdFX0pTT05cbn0gZnJvbSAnLi9oZWxwZXJzJ1xuaW1wb3J0IHsgbWFpbiBhcyBoYW5kbGVyIH0gZnJvbSAnLi4vLi4vdXRpbHMvaGFuZGxlcidcbmltcG9ydCB7IGluZm8gfSBmcm9tICdjb25zb2xlJ1xuXG5pbnRlcmZhY2UgT3B0aW9ucyB7XG4gIGFyZ3M6IE9taXQ8dHlwZW9mIGFyZ3MsICdfJz5cbiAgY29tcG9uZW50czogUGljazxDbGlDb21wb25lbnRzLCAnZnMnPlxufVxuXG5leHBvcnQgY29uc3QgYXJncyA9IGdldEFyZ3Moe1xuICAnLS13YXRjaCc6IEJvb2xlYW4sXG4gICctdyc6ICctLXdhdGNoJyxcbiAgJy0tcHJvZHVjdGlvbic6IEJvb2xlYW4sXG4gICctcCc6ICctLXByb2R1Y3Rpb24nLFxuICAnLS1za2lwLWluc3RhbGwnOiBCb29sZWFuLFxuICAnLS1kaXInOiBTdHJpbmdcbn0pXG5cbmV4cG9ydCBmdW5jdGlvbiBoZWxwKCkge1xuICByZXR1cm4gYFxuICBVc2FnZTogJ2RjbCBidWlsZCBbb3B0aW9uc10nXG4gICAgT3B0aW9uczonXG4gICAgICAtaCwgLS1oZWxwICAgICAgICAgICAgICAgIERpc3BsYXlzIGNvbXBsZXRlIGhlbHBcbiAgICAgIC13LCAtLXdhdGNoICAgICAgICAgICAgICAgV2F0Y2ggZm9yIGZpbGUgY2hhbmdlcyBhbmQgYnVpbGQgb24gY2hhbmdlXG4gICAgICAtcCwgLS1wcm9kdWN0aW9uICAgICAgICAgIEJ1aWxkIHdpdGhvdXQgc291cmNlbWFwc1xuICAgICAgLS1za2lwLWluc3RhbGwgICAgICAgICAgICBTa2lwIGluc3RhbGxpbmcgZGVwZW5kZW5jaWVzXG4gICAgICAtLWRpciAgICAgICAgICAgICAgICAgICAgIFBhdGggdG8gZGlyZWN0b3J5IHRvIGJ1aWxkXG5cbiAgICBFeGFtcGxlOlxuICAgIC0gQnVpbGQgeW91ciBzY2VuZTpcbiAgICAgICckIGRjbCBidWlsZCdcbiAgYFxufVxuXG5leHBvcnQgY29uc3QgbWFpbiA9IGhhbmRsZXIoYXN5bmMgZnVuY3Rpb24gbWFpbihvcHRpb25zOiBPcHRpb25zKSB7XG4gIGNvbnN0IGRpciA9IHJlc29sdmUocHJvY2Vzcy5jd2QoKSwgb3B0aW9ucy5hcmdzWyctLWRpciddIHx8ICcuJylcbiAgY29uc3QgcHJvamVjdFN0cnVjdHVyZSA9IGdldFByb2plY3RTdHJ1Y3R1cmUoKVxuXG4gIGNvbnN0IGhhc1ZhbGlkUHJvamVjdFN0cnVjdHVyZSA9IGF3YWl0IHZhbGlkYXRlUHJvamVjdFN0cnVjdHVyZShvcHRpb25zLmNvbXBvbmVudHMsIGRpciwgcHJvamVjdFN0cnVjdHVyZSlcblxuICBpZiAoIWhhc1ZhbGlkUHJvamVjdFN0cnVjdHVyZSkge1xuICAgIHRocm93IG5ldyBDbGlFcnJvcihgSW52YWxpZCBzY2VuZSBzdHJ1Y3R1cmUgZm91bmQuIFJlcXVpcmVkIGZpbGVzOlxuICAgICAgJHt0b1N0cmluZ0xpc3QocHJvamVjdFN0cnVjdHVyZSl9YClcbiAgfVxuXG4gIHN1Y2NlZWQoJ1Byb2plY3QgaGFzIGEgdmFsaWQgc3RydWN0dXJlJylcblxuICBjb25zdCBoYXNWYWxpZFBhY2thZ2VKc29uID0gYXdhaXQgdmFsaWRhdGVQYWNrYWdlSnNvbihvcHRpb25zLmNvbXBvbmVudHMsIGRpciwgUkVRVUlSRURfUEFDS0FHRV9KU09OKVxuXG4gIGlmICghaGFzVmFsaWRQYWNrYWdlSnNvbikge1xuICAgIHRocm93IG5ldyBDbGlFcnJvcihgSW52YWxpZCBcInBhY2thZ2UuanNvblwiIGZpbGUuIFN0cnVjdHVyZSByZXF1aXJlZDpcbiAgICAgICR7SlNPTi5zdHJpbmdpZnkoUkVRVUlSRURfUEFDS0FHRV9KU09OLCBudWxsLCAyKX1gKVxuICB9XG5cbiAgc3VjY2VlZCgnUHJvamVjdCBoYXMgYSB2YWxpZCBcInBhY2thZ2UuanNvblwiJylcblxuICBjb25zdCBzaG91bGRJbnN0YWxsRGVwcyA9IGF3YWl0IG5lZWRzRGVwZW5kZW5jaWVzKG9wdGlvbnMuY29tcG9uZW50cywgZGlyKVxuXG4gIGlmIChzaG91bGRJbnN0YWxsRGVwcyAmJiAhb3B0aW9ucy5hcmdzWyctLXNraXAtaW5zdGFsbCddKSB7XG4gICAgaW5mbygnSW5zdGFsbGluZyBkZXBlbmRlbmNpZXMuLi4nKVxuICAgIGF3YWl0IGluc3RhbGxEZXBlbmRlbmNpZXMoZGlyKVxuICB9XG5cbiAgc3VjY2VlZCgnRGVwZW5kZW5jaWVzIGluc3RhbGxlZCcpXG5cbiAgYXdhaXQgYnVpbGRUeXBlc2NyaXB0KHtcbiAgICBkaXIsXG4gICAgd2F0Y2g6ICEhb3B0aW9ucy5hcmdzWyctLXdhdGNoJ10sXG4gICAgcHJvZHVjdGlvbjogISFvcHRpb25zLmFyZ3NbJy0tcHJvZHVjdGlvbiddXG4gIH0pXG5cbiAgc3VjY2VlZCgnUHJvamVjdCBidWlsdCBzdWNjZXNzZnVsbHkhJylcblxuICAvLyB0cmFjayBzdHVmZi4uLlxuICAvLyBodHRwczovL2dpdGh1Yi5jb20vZGVjZW50cmFsYW5kL2NsaS9ibG9iL21haW4vc3JjL2NvbW1hbmRzL2J1aWxkLnRzXG59KVxuIl19
+    if (!watch) {
+        watchingFuture.resolve(null);
+    }
+    await watchingFuture;
+}
+exports.main = main;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSwrQkFBOEI7QUFHOUIsMkRBQXVEO0FBQ3ZELDJDQUEwQztBQUMxQyw2Q0FBNEM7QUFDNUMscURBQWlEO0FBQ2pELDBEQUE4QjtBQUM5Qix1Q0FPa0I7QUFPTCxRQUFBLElBQUksR0FBRyxJQUFBLGNBQU8sRUFBQztJQUMxQixTQUFTLEVBQUUsT0FBTztJQUNsQixJQUFJLEVBQUUsU0FBUztJQUNmLGNBQWMsRUFBRSxPQUFPO0lBQ3ZCLElBQUksRUFBRSxjQUFjO0lBQ3BCLGdCQUFnQixFQUFFLE9BQU87SUFDekIsT0FBTyxFQUFFLE1BQU07Q0FDaEIsQ0FBQyxDQUFBO0FBRUYsU0FBZ0IsSUFBSTtJQUNsQixPQUFPOzs7Ozs7Ozs7Ozs7R0FZTixDQUFBO0FBQ0gsQ0FBQztBQWRELG9CQWNDO0FBRU0sS0FBSyxVQUFVLElBQUksQ0FBQyxPQUFnQjtJQUN6QyxNQUFNLEdBQUcsR0FBRyxJQUFBLGNBQU8sRUFBQyxPQUFPLENBQUMsR0FBRyxFQUFFLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxHQUFHLENBQUMsQ0FBQTtJQUNoRSxNQUFNLGdCQUFnQixHQUFHLElBQUEsNkJBQW1CLEdBQUUsQ0FBQTtJQUU5QyxNQUFNLHdCQUF3QixHQUFHLE1BQU0sSUFBQSxrQ0FBd0IsRUFBQyxPQUFPLENBQUMsVUFBVSxFQUFFLEdBQUcsRUFBRSxnQkFBZ0IsQ0FBQyxDQUFBO0lBRTFHLElBQUksQ0FBQyx3QkFBd0IsRUFBRTtRQUM3QixNQUFNLElBQUksZ0JBQVEsQ0FBQztRQUNmLElBQUEsMkJBQVksRUFBQyxnQkFBZ0IsQ0FBQyxFQUFFLENBQUMsQ0FBQTtLQUN0QztJQUVELE1BQU0sbUJBQW1CLEdBQUcsTUFBTSxJQUFBLDZCQUFtQixFQUFDLE9BQU8sQ0FBQyxVQUFVLEVBQUUsR0FBRyxFQUFFLCtCQUFxQixDQUFDLENBQUE7SUFFckcsSUFBSSxDQUFDLG1CQUFtQixFQUFFO1FBQ3hCLE1BQU0sSUFBSSxnQkFBUSxDQUFDO1FBQ2YsSUFBSSxDQUFDLFNBQVMsQ0FBQywrQkFBcUIsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFBO0tBQ3REO0lBRUQsTUFBTSxpQkFBaUIsR0FBRyxNQUFNLElBQUEsMkJBQWlCLEVBQUMsT0FBTyxDQUFDLFVBQVUsRUFBRSxHQUFHLENBQUMsQ0FBQTtJQUUxRSxJQUFJLGlCQUFpQixJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFO1FBQ3hELE1BQU0sSUFBQSw2QkFBbUIsRUFBQyxHQUFHLENBQUMsQ0FBQTtLQUMvQjtJQUVELE1BQU0sS0FBSyxHQUFHLENBQUMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFBO0lBRXZDLE1BQU0sY0FBYyxHQUFHLElBQUEsbUJBQU0sR0FBTyxDQUFBO0lBRXBDLE1BQU0sSUFBQSxpQkFBTyxFQUFDO1FBQ1osT0FBTyxFQUFFLEdBQUc7UUFDWixLQUFLO1FBQ0wsVUFBVSxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQztRQUMxQyxjQUFjO0tBQ2YsQ0FBQyxDQUFBO0lBRUYsSUFBSSxDQUFDLEtBQUssRUFBRTtRQUNWLGNBQWMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUE7S0FDN0I7SUFFRCxNQUFNLGNBQWMsQ0FBQTtBQUl0QixDQUFDO0FBM0NELG9CQTJDQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IHJlc29sdmUgfSBmcm9tICdwYXRoJ1xuXG5pbXBvcnQgeyBDbGlDb21wb25lbnRzIH0gZnJvbSAnLi4vLi4vY29tcG9uZW50cydcbmltcG9ydCB7IHRvU3RyaW5nTGlzdCB9IGZyb20gJy4uLy4uL3V0aWxzL291dC1tZXNzYWdlcydcbmltcG9ydCB7IGdldEFyZ3MgfSBmcm9tICcuLi8uLi91dGlscy9hcmdzJ1xuaW1wb3J0IHsgQ2xpRXJyb3IgfSBmcm9tICcuLi8uLi91dGlscy9lcnJvcidcbmltcG9ydCB7IGNvbXBpbGUgfSBmcm9tICdAZGNsL2RjbC1yb2xsdXAvY29tcGlsZSdcbmltcG9ydCBmdXR1cmUgZnJvbSAnZnAtZnV0dXJlJ1xuaW1wb3J0IHtcbiAgZ2V0UHJvamVjdFN0cnVjdHVyZSxcbiAgaW5zdGFsbERlcGVuZGVuY2llcyxcbiAgbmVlZHNEZXBlbmRlbmNpZXMsXG4gIHZhbGlkYXRlUHJvamVjdFN0cnVjdHVyZSxcbiAgdmFsaWRhdGVQYWNrYWdlSnNvbixcbiAgUkVRVUlSRURfUEFDS0FHRV9KU09OXG59IGZyb20gJy4vaGVscGVycydcblxuaW50ZXJmYWNlIE9wdGlvbnMge1xuICBhcmdzOiBPbWl0PHR5cGVvZiBhcmdzLCAnXyc+XG4gIGNvbXBvbmVudHM6IFBpY2s8Q2xpQ29tcG9uZW50cywgJ2ZzJz5cbn1cblxuZXhwb3J0IGNvbnN0IGFyZ3MgPSBnZXRBcmdzKHtcbiAgJy0td2F0Y2gnOiBCb29sZWFuLFxuICAnLXcnOiAnLS13YXRjaCcsXG4gICctLXByb2R1Y3Rpb24nOiBCb29sZWFuLFxuICAnLXAnOiAnLS1wcm9kdWN0aW9uJyxcbiAgJy0tc2tpcC1pbnN0YWxsJzogQm9vbGVhbixcbiAgJy0tZGlyJzogU3RyaW5nXG59KVxuXG5leHBvcnQgZnVuY3Rpb24gaGVscCgpIHtcbiAgcmV0dXJuIGBcbiAgVXNhZ2U6ICdkY2wtY29tbWFuZHMgYnVpbGQgW29wdGlvbnNdJ1xuICAgIE9wdGlvbnM6J1xuICAgICAgLWgsIC0taGVscCAgICAgICAgICAgICAgICBEaXNwbGF5cyBjb21wbGV0ZSBoZWxwXG4gICAgICAtdywgLS13YXRjaCAgICAgICAgICAgICAgIFdhdGNoIGZvciBmaWxlIGNoYW5nZXMgYW5kIGJ1aWxkIG9uIGNoYW5nZVxuICAgICAgLXAsIC0tcHJvZHVjdGlvbiAgICAgICAgICBCdWlsZCB3aXRob3V0IHNvdXJjZW1hcHNcbiAgICAgIC0tc2tpcC1pbnN0YWxsICAgICAgICAgICAgU2tpcCBpbnN0YWxsaW5nIGRlcGVuZGVuY2llc1xuICAgICAgLS1kaXIgICAgICAgICAgICAgICAgICAgICBQYXRoIHRvIGRpcmVjdG9yeSB0byBidWlsZFxuXG4gICAgRXhhbXBsZTpcbiAgICAtIEJ1aWxkIHlvdXIgc2NlbmU6XG4gICAgICAnJCBkY2wtY29tbWFuZHMgYnVpbGQnXG4gIGBcbn1cblxuZXhwb3J0IGFzeW5jIGZ1bmN0aW9uIG1haW4ob3B0aW9uczogT3B0aW9ucykge1xuICBjb25zdCBkaXIgPSByZXNvbHZlKHByb2Nlc3MuY3dkKCksIG9wdGlvbnMuYXJnc1snLS1kaXInXSB8fCAnLicpXG4gIGNvbnN0IHByb2plY3RTdHJ1Y3R1cmUgPSBnZXRQcm9qZWN0U3RydWN0dXJlKClcblxuICBjb25zdCBoYXNWYWxpZFByb2plY3RTdHJ1Y3R1cmUgPSBhd2FpdCB2YWxpZGF0ZVByb2plY3RTdHJ1Y3R1cmUob3B0aW9ucy5jb21wb25lbnRzLCBkaXIsIHByb2plY3RTdHJ1Y3R1cmUpXG5cbiAgaWYgKCFoYXNWYWxpZFByb2plY3RTdHJ1Y3R1cmUpIHtcbiAgICB0aHJvdyBuZXcgQ2xpRXJyb3IoYEludmFsaWQgc2NlbmUgc3RydWN0dXJlIGZvdW5kLiBSZXF1aXJlZCBmaWxlczpcbiAgICAgICR7dG9TdHJpbmdMaXN0KHByb2plY3RTdHJ1Y3R1cmUpfWApXG4gIH1cblxuICBjb25zdCBoYXNWYWxpZFBhY2thZ2VKc29uID0gYXdhaXQgdmFsaWRhdGVQYWNrYWdlSnNvbihvcHRpb25zLmNvbXBvbmVudHMsIGRpciwgUkVRVUlSRURfUEFDS0FHRV9KU09OKVxuXG4gIGlmICghaGFzVmFsaWRQYWNrYWdlSnNvbikge1xuICAgIHRocm93IG5ldyBDbGlFcnJvcihgSW52YWxpZCBcInBhY2thZ2UuanNvblwiIGZpbGUuIFN0cnVjdHVyZSByZXF1aXJlZDpcbiAgICAgICR7SlNPTi5zdHJpbmdpZnkoUkVRVUlSRURfUEFDS0FHRV9KU09OLCBudWxsLCAyKX1gKVxuICB9XG5cbiAgY29uc3Qgc2hvdWxkSW5zdGFsbERlcHMgPSBhd2FpdCBuZWVkc0RlcGVuZGVuY2llcyhvcHRpb25zLmNvbXBvbmVudHMsIGRpcilcblxuICBpZiAoc2hvdWxkSW5zdGFsbERlcHMgJiYgIW9wdGlvbnMuYXJnc1snLS1za2lwLWluc3RhbGwnXSkge1xuICAgIGF3YWl0IGluc3RhbGxEZXBlbmRlbmNpZXMoZGlyKVxuICB9XG5cbiAgY29uc3Qgd2F0Y2ggPSAhIW9wdGlvbnMuYXJnc1snLS13YXRjaCddXG5cbiAgY29uc3Qgd2F0Y2hpbmdGdXR1cmUgPSBmdXR1cmU8YW55PigpXG5cbiAgYXdhaXQgY29tcGlsZSh7XG4gICAgcHJvamVjdDogZGlyLFxuICAgIHdhdGNoLFxuICAgIHByb2R1Y3Rpb246ICEhb3B0aW9ucy5hcmdzWyctLXByb2R1Y3Rpb24nXSxcbiAgICB3YXRjaGluZ0Z1dHVyZVxuICB9KVxuXG4gIGlmICghd2F0Y2gpIHtcbiAgICB3YXRjaGluZ0Z1dHVyZS5yZXNvbHZlKG51bGwpXG4gIH1cblxuICBhd2FpdCB3YXRjaGluZ0Z1dHVyZVxuXG4gIC8vIHRyYWNrIHN0dWZmLi4uXG4gIC8vIGh0dHBzOi8vZ2l0aHViLmNvbS9kZWNlbnRyYWxhbmQvY2xpL2Jsb2IvbWFpbi9zcmMvY29tbWFuZHMvYnVpbGQudHNcbn1cbiJdfQ==

package/cli/commands/build/index.ts

@@ -2,20 +2,18 @@ import { resolve } from 'path'
 
 import { CliComponents } from '../../components'
 import { toStringList } from '../../utils/out-messages'
-import { succeed } from '../../utils/log'
 import { getArgs } from '../../utils/args'
 import { CliError } from '../../utils/error'
+import { compile } from '@dcl/dcl-rollup/compile'
+import future from 'fp-future'
 import {
   getProjectStructure,
-  buildTypescript,
   installDependencies,
   needsDependencies,
   validateProjectStructure,
   validatePackageJson,
   REQUIRED_PACKAGE_JSON
 } from './helpers'
-import { main as handler } from '../../utils/handler'
-import { info } from 'console'
 
 interface Options {
   args: Omit<typeof args, '_'>
@@ -33,7 +31,7 @@ export const args = getArgs({
 
 export function help() {
   return `
-  Usage: 'dcl build [options]'
+  Usage: 'dcl-commands build [options]'
     Options:'
       -h, --help                Displays complete help
       -w, --watch               Watch for file changes and build on change
@@ -43,11 +41,11 @@ export function help() {
 
     Example:
     - Build your scene:
-      '$ dcl build'
+      '$ dcl-commands build'
   `
 }
 
-export const main = handler(async function main(options: Options) {
+export async function main(options: Options) {
   const dir = resolve(process.cwd(), options.args['--dir'] || '.')
   const projectStructure = getProjectStructure()
 
@@ -58,8 +56,6 @@ export const main = handler(async function main(options: Options) {
       ${toStringList(projectStructure)}`)
   }
 
-  succeed('Project has a valid structure')
-
   const hasValidPackageJson = await validatePackageJson(options.components, dir, REQUIRED_PACKAGE_JSON)
 
   if (!hasValidPackageJson) {
@@ -67,25 +63,29 @@ export const main = handler(async function main(options: Options) {
       ${JSON.stringify(REQUIRED_PACKAGE_JSON, null, 2)}`)
   }
 
-  succeed('Project has a valid "package.json"')
-
   const shouldInstallDeps = await needsDependencies(options.components, dir)
 
   if (shouldInstallDeps && !options.args['--skip-install']) {
-    info('Installing dependencies...')
     await installDependencies(dir)
   }
 
-  succeed('Dependencies installed')
+  const watch = !!options.args['--watch']
 
-  await buildTypescript({
-    dir,
-    watch: !!options.args['--watch'],
-    production: !!options.args['--production']
+  const watchingFuture = future<any>()
+
+  await compile({
+    project: dir,
+    watch,
+    production: !!options.args['--production'],
+    watchingFuture
   })
 
-  succeed('Project built successfully!')
+  if (!watch) {
+    watchingFuture.resolve(null)
+  }
+
+  await watchingFuture
 
   // track stuff...
   // https://github.com/decentraland/cli/blob/main/src/commands/build.ts
-})
+}

package/cli/commands/init/index.d.ts

@@ -12,5 +12,5 @@ export declare const args: import("arg").Result<{
     '--dir': StringConstructor;
 }>;
 export declare function help(): Promise<void>;
-export declare const main: (args: Options) => Promise<void>;
+export declare function main(options: Options): Promise<void>;
 export {};

package/cli/commands/init/index.js

@@ -6,7 +6,6 @@ const args_1 = require("../../utils/args");
 const prompt_1 = require("../../utils/prompt");
 const fs_1 = require("../../utils/fs");
 const repos_1 = require("./repos");
-const handler_1 = require("../../utils/handler");
 exports.args = (0, args_1.getArgs)({
     '--yes': Boolean,
     '-y': '--yes',
@@ -14,7 +13,7 @@ exports.args = (0, args_1.getArgs)({
 });
 async function help() { }
 exports.help = help;
-exports.main = (0, handler_1.main)(async function main(options) {
+async function main(options) {
     const dir = (0, path_1.resolve)(process.cwd(), options.args['--dir'] || '.');
     const isEmpty = await (0, fs_1.isDirectoryEmpty)(options.components, dir);
     const yes = options.args['--yes'];
@@ -29,7 +28,8 @@ exports.main = (0, handler_1.main)(async function main(options) {
     await (0, fs_1.extract)(zip, dir);
     await options.components.fs.unlink(zip);
     await moveFilesFromDirs(options.components, dir, contentFolders);
-});
+}
+exports.main = main;
 const moveFilesFromDir = async (components, dir, folder) => {
     const files = await components.fs.readdir(folder);
     await Promise.all(files.map(($) => {
@@ -44,4 +44,4 @@ const moveFilesFromDirs = async (components, dir, folders) => {
         return moveFilesFromDir(components, dir, folderPath);
     }));
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwrQkFBb0M7QUFFcEMsMkNBQTBDO0FBQzFDLCtDQUE0QztBQUU1Qyx1Q0FBb0U7QUFFcEUsbUNBQXdDO0FBQ3hDLGlEQUFxRDtBQU94QyxRQUFBLElBQUksR0FBRyxJQUFBLGNBQU8sRUFBQztJQUMxQixPQUFPLEVBQUUsT0FBTztJQUNoQixJQUFJLEVBQUUsT0FBTztJQUNiLE9BQU8sRUFBRSxNQUFNO0NBQ2hCLENBQUMsQ0FBQTtBQUVLLEtBQUssVUFBVSxJQUFJLEtBQUksQ0FBQztBQUEvQixvQkFBK0I7QUFFbEIsUUFBQSxJQUFJLEdBQUcsSUFBQSxjQUFPLEVBQUMsS0FBSyxVQUFVLElBQUksQ0FBQyxPQUFnQjtJQUM5RCxNQUFNLEdBQUcsR0FBRyxJQUFBLGNBQU8sRUFBQyxPQUFPLENBQUMsR0FBRyxFQUFFLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxHQUFHLENBQUMsQ0FBQTtJQUNoRSxNQUFNLE9BQU8sR0FBRyxNQUFNLElBQUEscUJBQWdCLEVBQUMsT0FBTyxDQUFDLFVBQVUsRUFBRSxHQUFHLENBQUMsQ0FBQTtJQUMvRCxNQUFNLEdBQUcsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBRWpDLElBQUksQ0FBQyxPQUFPLElBQUksQ0FBQyxHQUFHLEVBQUU7UUFDcEIsTUFBTSxNQUFNLEdBQUcsTUFBTSxJQUFBLGdCQUFPLEVBQUMscURBQXFELENBQUMsQ0FBQTtRQUVuRixJQUFJLENBQUMsTUFBTTtZQUFFLE9BQU07S0FDcEI7SUFFRCxNQUFNLEtBQUssR0FBRyxnQkFBZ0IsQ0FBQTtJQUM5QixNQUFNLEVBQUUsR0FBRyxFQUFFLGNBQWMsRUFBRSxHQUFHLElBQUEsV0FBTyxFQUFDLEtBQUssQ0FBQyxDQUFBO0lBQzlDLE1BQU0sR0FBRyxHQUFHLE1BQU0sSUFBQSxhQUFRLEVBQUMsT0FBTyxDQUFDLFVBQVUsRUFBRSxHQUFHLEVBQUUsSUFBQSxXQUFJLEVBQUMsR0FBRyxFQUFFLEdBQUcsS0FBSyxNQUFNLENBQUMsQ0FBQyxDQUFBO0lBQzlFLE1BQU0sSUFBQSxZQUFPLEVBQUMsR0FBRyxFQUFFLEdBQUcsQ0FBQyxDQUFBO0lBQ3ZCLE1BQU0sT0FBTyxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQ3ZDLE1BQU0saUJBQWlCLENBQUMsT0FBTyxDQUFDLFVBQVUsRUFBRSxHQUFHLEVBQUUsY0FBYyxDQUFDLENBQUE7QUFDbEUsQ0FBQyxDQUFDLENBQUE7QUFFRixNQUFNLGdCQUFnQixHQUFHLEtBQUssRUFBRSxVQUFxQyxFQUFFLEdBQVcsRUFBRSxNQUFjLEVBQUUsRUFBRTtJQUNwRyxNQUFNLEtBQUssR0FBRyxNQUFNLFVBQVUsQ0FBQyxFQUFFLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBQ2pELE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FDZixLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUU7UUFDZCxNQUFNLFFBQVEsR0FBRyxJQUFBLGNBQU8sRUFBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDbkMsT0FBTyxVQUFVLENBQUMsRUFBRSxDQUFDLE1BQU0sQ0FBQyxRQUFRLEVBQUUsSUFBQSxjQUFPLEVBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDeEQsQ0FBQyxDQUFDLENBQ0gsQ0FBQTtJQUNELE1BQU0sVUFBVSxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUE7QUFDbkMsQ0FBQyxDQUFBO0FBRUQsTUFBTSxpQkFBaUIsR0FBRyxLQUFLLEVBQUUsVUFBcUMsRUFBRSxHQUFXLEVBQUUsT0FBaUIsRUFBRSxFQUFFO0lBQ3hHLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FDZixPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUU7UUFDaEIsTUFBTSxVQUFVLEdBQUcsSUFBQSxjQUFPLEVBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFBO1FBQ2xDLE9BQU8sZ0JBQWdCLENBQUMsVUFBVSxFQUFFLEdBQUcsRUFBRSxVQUFVLENBQUMsQ0FBQTtJQUN0RCxDQUFDLENBQUMsQ0FDSCxDQUFBO0FBQ0gsQ0FBQyxDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgam9pbiwgcmVzb2x2ZSB9IGZyb20gJ3BhdGgnXG5cbmltcG9ydCB7IGdldEFyZ3MgfSBmcm9tICcuLi8uLi91dGlscy9hcmdzJ1xuaW1wb3J0IHsgY29uZmlybSB9IGZyb20gJy4uLy4uL3V0aWxzL3Byb21wdCdcbmltcG9ydCB7IENsaUNvbXBvbmVudHMgfSBmcm9tICcuLi8uLi9jb21wb25lbnRzJ1xuaW1wb3J0IHsgaXNEaXJlY3RvcnlFbXB0eSwgZG93bmxvYWQsIGV4dHJhY3QgfSBmcm9tICcuLi8uLi91dGlscy9mcydcblxuaW1wb3J0IHsgZ2V0IGFzIGdldFJlcG8gfSBmcm9tICcuL3JlcG9zJ1xuaW1wb3J0IHsgbWFpbiBhcyBoYW5kbGVyIH0gZnJvbSAnLi4vLi4vdXRpbHMvaGFuZGxlcidcblxuaW50ZXJmYWNlIE9wdGlvbnMge1xuICBhcmdzOiB0eXBlb2YgYXJnc1xuICBjb21wb25lbnRzOiBQaWNrPENsaUNvbXBvbmVudHMsICdmZXRjaCcgfCAnZnMnPlxufVxuXG5leHBvcnQgY29uc3QgYXJncyA9IGdldEFyZ3Moe1xuICAnLS15ZXMnOiBCb29sZWFuLFxuICAnLXknOiAnLS15ZXMnLFxuICAnLS1kaXInOiBTdHJpbmdcbn0pXG5cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiBoZWxwKCkge31cblxuZXhwb3J0IGNvbnN0IG1haW4gPSBoYW5kbGVyKGFzeW5jIGZ1bmN0aW9uIG1haW4ob3B0aW9uczogT3B0aW9ucykge1xuICBjb25zdCBkaXIgPSByZXNvbHZlKHByb2Nlc3MuY3dkKCksIG9wdGlvbnMuYXJnc1snLS1kaXInXSB8fCAnLicpXG4gIGNvbnN0IGlzRW1wdHkgPSBhd2FpdCBpc0RpcmVjdG9yeUVtcHR5KG9wdGlvbnMuY29tcG9uZW50cywgZGlyKVxuICBjb25zdCB5ZXMgPSBvcHRpb25zLmFyZ3NbJy0teWVzJ11cblxuICBpZiAoIWlzRW1wdHkgJiYgIXllcykge1xuICAgIGNvbnN0IGFuc3dlciA9IGF3YWl0IGNvbmZpcm0oJ1RoZSBmb2xkZXIgc3BlY2lmaWVkIGlzIG5vdCBlbXB0eSwgY29udGludWUgYW55d2F5PycpXG5cbiAgICBpZiAoIWFuc3dlcikgcmV0dXJuXG4gIH1cblxuICBjb25zdCBzY2VuZSA9ICdzY2VuZS10ZW1wbGF0ZSdcbiAgY29uc3QgeyB1cmwsIGNvbnRlbnRGb2xkZXJzIH0gPSBnZXRSZXBvKHNjZW5lKVxuICBjb25zdCB6aXAgPSBhd2FpdCBkb3dubG9hZChvcHRpb25zLmNvbXBvbmVudHMsIHVybCwgam9pbihkaXIsIGAke3NjZW5lfS56aXBgKSlcbiAgYXdhaXQgZXh0cmFjdCh6aXAsIGRpcilcbiAgYXdhaXQgb3B0aW9ucy5jb21wb25lbnRzLmZzLnVubGluayh6aXApXG4gIGF3YWl0IG1vdmVGaWxlc0Zyb21EaXJzKG9wdGlvbnMuY29tcG9uZW50cywgZGlyLCBjb250ZW50Rm9sZGVycylcbn0pXG5cbmNvbnN0IG1vdmVGaWxlc0Zyb21EaXIgPSBhc3luYyAoY29tcG9uZW50czogUGljazxDbGlDb21wb25lbnRzLCAnZnMnPiwgZGlyOiBzdHJpbmcsIGZvbGRlcjogc3RyaW5nKSA9PiB7XG4gIGNvbnN0IGZpbGVzID0gYXdhaXQgY29tcG9uZW50cy5mcy5yZWFkZGlyKGZvbGRlcilcbiAgYXdhaXQgUHJvbWlzZS5hbGwoXG4gICAgZmlsZXMubWFwKCgkKSA9PiB7XG4gICAgICBjb25zdCBmaWxlUGF0aCA9IHJlc29sdmUoZm9sZGVyLCAkKVxuICAgICAgcmV0dXJuIGNvbXBvbmVudHMuZnMucmVuYW1lKGZpbGVQYXRoLCByZXNvbHZlKGRpciwgJCkpXG4gICAgfSlcbiAgKVxuICBhd2FpdCBjb21wb25lbnRzLmZzLnJtZGlyKGZvbGRlcilcbn1cblxuY29uc3QgbW92ZUZpbGVzRnJvbURpcnMgPSBhc3luYyAoY29tcG9uZW50czogUGljazxDbGlDb21wb25lbnRzLCAnZnMnPiwgZGlyOiBzdHJpbmcsIGZvbGRlcnM6IHN0cmluZ1tdKSA9PiB7XG4gIGF3YWl0IFByb21pc2UuYWxsKFxuICAgIGZvbGRlcnMubWFwKCgkKSA9PiB7XG4gICAgICBjb25zdCBmb2xkZXJQYXRoID0gcmVzb2x2ZShkaXIsICQpXG4gICAgICByZXR1cm4gbW92ZUZpbGVzRnJvbURpcihjb21wb25lbnRzLCBkaXIsIGZvbGRlclBhdGgpXG4gICAgfSlcbiAgKVxufVxuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwrQkFBb0M7QUFFcEMsMkNBQTBDO0FBQzFDLCtDQUE0QztBQUU1Qyx1Q0FBb0U7QUFFcEUsbUNBQXdDO0FBTzNCLFFBQUEsSUFBSSxHQUFHLElBQUEsY0FBTyxFQUFDO0lBQzFCLE9BQU8sRUFBRSxPQUFPO0lBQ2hCLElBQUksRUFBRSxPQUFPO0lBQ2IsT0FBTyxFQUFFLE1BQU07Q0FDaEIsQ0FBQyxDQUFBO0FBRUssS0FBSyxVQUFVLElBQUksS0FBSSxDQUFDO0FBQS9CLG9CQUErQjtBQUV4QixLQUFLLFVBQVUsSUFBSSxDQUFDLE9BQWdCO0lBQ3pDLE1BQU0sR0FBRyxHQUFHLElBQUEsY0FBTyxFQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBRSxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEdBQUcsQ0FBQyxDQUFBO0lBQ2hFLE1BQU0sT0FBTyxHQUFHLE1BQU0sSUFBQSxxQkFBZ0IsRUFBQyxPQUFPLENBQUMsVUFBVSxFQUFFLEdBQUcsQ0FBQyxDQUFBO0lBQy9ELE1BQU0sR0FBRyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUE7SUFFakMsSUFBSSxDQUFDLE9BQU8sSUFBSSxDQUFDLEdBQUcsRUFBRTtRQUNwQixNQUFNLE1BQU0sR0FBRyxNQUFNLElBQUEsZ0JBQU8sRUFBQyxxREFBcUQsQ0FBQyxDQUFBO1FBRW5GLElBQUksQ0FBQyxNQUFNO1lBQUUsT0FBTTtLQUNwQjtJQUVELE1BQU0sS0FBSyxHQUFHLGdCQUFnQixDQUFBO0lBQzlCLE1BQU0sRUFBRSxHQUFHLEVBQUUsY0FBYyxFQUFFLEdBQUcsSUFBQSxXQUFPLEVBQUMsS0FBSyxDQUFDLENBQUE7SUFDOUMsTUFBTSxHQUFHLEdBQUcsTUFBTSxJQUFBLGFBQVEsRUFBQyxPQUFPLENBQUMsVUFBVSxFQUFFLEdBQUcsRUFBRSxJQUFBLFdBQUksRUFBQyxHQUFHLEVBQUUsR0FBRyxLQUFLLE1BQU0sQ0FBQyxDQUFDLENBQUE7SUFDOUUsTUFBTSxJQUFBLFlBQU8sRUFBQyxHQUFHLEVBQUUsR0FBRyxDQUFDLENBQUE7SUFDdkIsTUFBTSxPQUFPLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDdkMsTUFBTSxpQkFBaUIsQ0FBQyxPQUFPLENBQUMsVUFBVSxFQUFFLEdBQUcsRUFBRSxjQUFjLENBQUMsQ0FBQTtBQUNsRSxDQUFDO0FBakJELG9CQWlCQztBQUVELE1BQU0sZ0JBQWdCLEdBQUcsS0FBSyxFQUFFLFVBQXFDLEVBQUUsR0FBVyxFQUFFLE1BQWMsRUFBRSxFQUFFO0lBQ3BHLE1BQU0sS0FBSyxHQUFHLE1BQU0sVUFBVSxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUE7SUFDakQsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUNmLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtRQUNkLE1BQU0sUUFBUSxHQUFHLElBQUEsY0FBTyxFQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQTtRQUNuQyxPQUFPLFVBQVUsQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLFFBQVEsRUFBRSxJQUFBLGNBQU8sRUFBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUN4RCxDQUFDLENBQUMsQ0FDSCxDQUFBO0lBQ0QsTUFBTSxVQUFVLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQTtBQUNuQyxDQUFDLENBQUE7QUFFRCxNQUFNLGlCQUFpQixHQUFHLEtBQUssRUFBRSxVQUFxQyxFQUFFLEdBQVcsRUFBRSxPQUFpQixFQUFFLEVBQUU7SUFDeEcsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUNmLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtRQUNoQixNQUFNLFVBQVUsR0FBRyxJQUFBLGNBQU8sRUFBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDbEMsT0FBTyxnQkFBZ0IsQ0FBQyxVQUFVLEVBQUUsR0FBRyxFQUFFLFVBQVUsQ0FBQyxDQUFBO0lBQ3RELENBQUMsQ0FBQyxDQUNILENBQUE7QUFDSCxDQUFDLENBQUEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBqb2luLCByZXNvbHZlIH0gZnJvbSAncGF0aCdcblxuaW1wb3J0IHsgZ2V0QXJncyB9IGZyb20gJy4uLy4uL3V0aWxzL2FyZ3MnXG5pbXBvcnQgeyBjb25maXJtIH0gZnJvbSAnLi4vLi4vdXRpbHMvcHJvbXB0J1xuaW1wb3J0IHsgQ2xpQ29tcG9uZW50cyB9IGZyb20gJy4uLy4uL2NvbXBvbmVudHMnXG5pbXBvcnQgeyBpc0RpcmVjdG9yeUVtcHR5LCBkb3dubG9hZCwgZXh0cmFjdCB9IGZyb20gJy4uLy4uL3V0aWxzL2ZzJ1xuXG5pbXBvcnQgeyBnZXQgYXMgZ2V0UmVwbyB9IGZyb20gJy4vcmVwb3MnXG5cbmludGVyZmFjZSBPcHRpb25zIHtcbiAgYXJnczogdHlwZW9mIGFyZ3NcbiAgY29tcG9uZW50czogUGljazxDbGlDb21wb25lbnRzLCAnZmV0Y2gnIHwgJ2ZzJz5cbn1cblxuZXhwb3J0IGNvbnN0IGFyZ3MgPSBnZXRBcmdzKHtcbiAgJy0teWVzJzogQm9vbGVhbixcbiAgJy15JzogJy0teWVzJyxcbiAgJy0tZGlyJzogU3RyaW5nXG59KVxuXG5leHBvcnQgYXN5bmMgZnVuY3Rpb24gaGVscCgpIHt9XG5cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiBtYWluKG9wdGlvbnM6IE9wdGlvbnMpIHtcbiAgY29uc3QgZGlyID0gcmVzb2x2ZShwcm9jZXNzLmN3ZCgpLCBvcHRpb25zLmFyZ3NbJy0tZGlyJ10gfHwgJy4nKVxuICBjb25zdCBpc0VtcHR5ID0gYXdhaXQgaXNEaXJlY3RvcnlFbXB0eShvcHRpb25zLmNvbXBvbmVudHMsIGRpcilcbiAgY29uc3QgeWVzID0gb3B0aW9ucy5hcmdzWyctLXllcyddXG5cbiAgaWYgKCFpc0VtcHR5ICYmICF5ZXMpIHtcbiAgICBjb25zdCBhbnN3ZXIgPSBhd2FpdCBjb25maXJtKCdUaGUgZm9sZGVyIHNwZWNpZmllZCBpcyBub3QgZW1wdHksIGNvbnRpbnVlIGFueXdheT8nKVxuXG4gICAgaWYgKCFhbnN3ZXIpIHJldHVyblxuICB9XG5cbiAgY29uc3Qgc2NlbmUgPSAnc2NlbmUtdGVtcGxhdGUnXG4gIGNvbnN0IHsgdXJsLCBjb250ZW50Rm9sZGVycyB9ID0gZ2V0UmVwbyhzY2VuZSlcbiAgY29uc3QgemlwID0gYXdhaXQgZG93bmxvYWQob3B0aW9ucy5jb21wb25lbnRzLCB1cmwsIGpvaW4oZGlyLCBgJHtzY2VuZX0uemlwYCkpXG4gIGF3YWl0IGV4dHJhY3QoemlwLCBkaXIpXG4gIGF3YWl0IG9wdGlvbnMuY29tcG9uZW50cy5mcy51bmxpbmsoemlwKVxuICBhd2FpdCBtb3ZlRmlsZXNGcm9tRGlycyhvcHRpb25zLmNvbXBvbmVudHMsIGRpciwgY29udGVudEZvbGRlcnMpXG59XG5cbmNvbnN0IG1vdmVGaWxlc0Zyb21EaXIgPSBhc3luYyAoY29tcG9uZW50czogUGljazxDbGlDb21wb25lbnRzLCAnZnMnPiwgZGlyOiBzdHJpbmcsIGZvbGRlcjogc3RyaW5nKSA9PiB7XG4gIGNvbnN0IGZpbGVzID0gYXdhaXQgY29tcG9uZW50cy5mcy5yZWFkZGlyKGZvbGRlcilcbiAgYXdhaXQgUHJvbWlzZS5hbGwoXG4gICAgZmlsZXMubWFwKCgkKSA9PiB7XG4gICAgICBjb25zdCBmaWxlUGF0aCA9IHJlc29sdmUoZm9sZGVyLCAkKVxuICAgICAgcmV0dXJuIGNvbXBvbmVudHMuZnMucmVuYW1lKGZpbGVQYXRoLCByZXNvbHZlKGRpciwgJCkpXG4gICAgfSlcbiAgKVxuICBhd2FpdCBjb21wb25lbnRzLmZzLnJtZGlyKGZvbGRlcilcbn1cblxuY29uc3QgbW92ZUZpbGVzRnJvbURpcnMgPSBhc3luYyAoY29tcG9uZW50czogUGljazxDbGlDb21wb25lbnRzLCAnZnMnPiwgZGlyOiBzdHJpbmcsIGZvbGRlcnM6IHN0cmluZ1tdKSA9PiB7XG4gIGF3YWl0IFByb21pc2UuYWxsKFxuICAgIGZvbGRlcnMubWFwKCgkKSA9PiB7XG4gICAgICBjb25zdCBmb2xkZXJQYXRoID0gcmVzb2x2ZShkaXIsICQpXG4gICAgICByZXR1cm4gbW92ZUZpbGVzRnJvbURpcihjb21wb25lbnRzLCBkaXIsIGZvbGRlclBhdGgpXG4gICAgfSlcbiAgKVxufVxuIl19

package/cli/commands/init/index.ts

@@ -6,7 +6,6 @@ import { CliComponents } from '../../components'
 import { isDirectoryEmpty, download, extract } from '../../utils/fs'
 
 import { get as getRepo } from './repos'
-import { main as handler } from '../../utils/handler'
 
 interface Options {
   args: typeof args
@@ -21,7 +20,7 @@ export const args = getArgs({
 
 export async function help() {}
 
-export const main = handler(async function main(options: Options) {
+export async function main(options: Options) {
   const dir = resolve(process.cwd(), options.args['--dir'] || '.')
   const isEmpty = await isDirectoryEmpty(options.components, dir)
   const yes = options.args['--yes']
@@ -38,7 +37,7 @@ export const main = handler(async function main(options: Options) {
   await extract(zip, dir)
   await options.components.fs.unlink(zip)
   await moveFilesFromDirs(options.components, dir, contentFolders)
-})
+}
 
 const moveFilesFromDir = async (components: Pick<CliComponents, 'fs'>, dir: string, folder: string) => {
   const files = await components.fs.readdir(folder)

package/cli/commands/preview/index.d.ts

@@ -14,5 +14,5 @@ export declare const args: import("arg").Result<{
     '--port': NumberConstructor;
     '-p': string;
 }>;
-export declare const main: (args: Options) => Promise<void>;
+export declare function main(options: Options): Promise<void>;
 export {};

package/cli/commands/preview/index.js

@@ -14,7 +14,6 @@ const metrics_1 = require("@well-known-components/metrics");
 const ws_1 = require("./ws");
 const fp_future_1 = __importDefault(require("fp-future"));
 const args_1 = require("../../utils/args");
-const handler_1 = require("../../utils/handler");
 const project_1 = require("./project");
 const port_1 = require("./port");
 const eth_1 = require("./eth");
@@ -30,7 +29,7 @@ exports.args = (0, args_1.getArgs)({
     '--port': Number,
     '-p': '--port'
 });
-exports.main = (0, handler_1.main)(async function main(options) {
+async function main(options) {
     const dir = (0, path_1.resolve)(process.cwd(), options.args['--dir'] || '.');
     await (0, project_1.validateExistingProject)(options.components, dir);
     await (0, project_1.validateSceneOptions)(options.components, dir);
@@ -70,6 +69,8 @@ exports.main = (0, handler_1.main)(async function main(options) {
             }
         }
     });
+    await startedFuture;
     return;
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSwrQkFBOEI7QUFDOUIsa0VBQTZEO0FBQzdELCtEQUF3RjtBQUN4RixvRkFBd0Y7QUFDeEYsb0VBQTBFO0FBQzFFLDBEQUF5RTtBQUN6RSw0REFBMkU7QUFDM0UsNkJBQXdDO0FBQ3hDLDBEQUE4QjtBQUc5QiwyQ0FBMEM7QUFDMUMsaURBQXFEO0FBRXJELHVDQUF5RTtBQUN6RSxpQ0FBb0M7QUFDcEMsK0JBQXdDO0FBQ3hDLGlDQUE2QjtBQUU3QixTQUFnQixJQUFJO0lBQ2xCLE9BQU8sRUFBRSxDQUFBO0FBQ1gsQ0FBQztBQUZELG9CQUVDO0FBT1ksUUFBQSxJQUFJLEdBQUcsSUFBQSxjQUFPLEVBQUM7SUFDMUIsU0FBUyxFQUFFLE9BQU87SUFDbEIsSUFBSSxFQUFFLFNBQVM7SUFDZixPQUFPLEVBQUUsTUFBTTtJQUNmLFFBQVEsRUFBRSxNQUFNO0lBQ2hCLElBQUksRUFBRSxRQUFRO0NBQ2YsQ0FBQyxDQUFBO0FBSVcsUUFBQSxJQUFJLEdBQUcsSUFBQSxjQUFPLEVBQUMsS0FBSyxVQUFVLElBQUksQ0FBQyxPQUFnQjtJQUM5RCxNQUFNLEdBQUcsR0FBRyxJQUFBLGNBQU8sRUFBQyxPQUFPLENBQUMsR0FBRyxFQUFFLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxHQUFHLENBQUMsQ0FBQTtJQUNoRSxNQUFNLElBQUEsaUNBQXVCLEVBQUMsT0FBTyxDQUFDLFVBQVUsRUFBRSxHQUFHLENBQUMsQ0FBQTtJQUN0RCxNQUFNLElBQUEsOEJBQW9CLEVBQUMsT0FBTyxDQUFDLFVBQVUsRUFBRSxHQUFHLENBQUMsQ0FBQTtJQUVuRCxNQUFNLElBQUksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsTUFBTSxJQUFBLGtCQUFXLEdBQUUsQ0FBQyxDQUFBO0lBQzVELE1BQU0sYUFBYSxHQUFHLElBQUEsbUJBQU0sR0FBUSxDQUFBO0lBRXBDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLElBQUksS0FBSyxDQUFDLCtCQUErQixDQUFDLENBQUMsRUFBRSxJQUFJLENBQUMsQ0FBQTtJQUV4RixNQUFNLHNCQUFTLENBQUMsR0FBRyxDQUFvQjtRQUNyQyxLQUFLLENBQUMsY0FBYztZQUNsQixNQUFNLE9BQU8sR0FBRyxJQUFBLG9DQUEwQixFQUFDLG9CQUFZLENBQUMsQ0FBQTtZQUN4RCxNQUFNLE1BQU0sR0FBRyxJQUFBLGlEQUEyQixrQkFDeEMsZ0JBQWdCLEVBQUUsSUFBSSxDQUFDLFFBQVEsRUFBRSxFQUNqQyxnQkFBZ0IsRUFBRSxTQUFTLElBQ3hCLE9BQU8sQ0FBQyxHQUFHLEVBQ2QsQ0FBQTtZQUNGLE1BQU0sSUFBSSxHQUFHLE1BQU0sSUFBQSxrQ0FBeUIsRUFBQyxFQUFFLENBQUMsQ0FBQTtZQUNoRCxNQUFNLEVBQUUsR0FBRyxNQUFNLElBQUEsc0JBQWlCLEVBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFBO1lBQzVDLE1BQU0sTUFBTSxHQUFHLE1BQU0sSUFBQSxtQ0FBcUIsRUFBb0IsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxFQUFFLENBQUMsRUFBRSxFQUFFLEVBQUUsRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQTtZQUN4RyxNQUFNLEtBQUssR0FBRyxNQUFNLElBQUEsNEJBQW9CLEVBQUM7Z0JBQ3ZDLE9BQU87Z0JBQ1AsSUFBSTtnQkFDSixNQUFNO2FBQ1AsQ0FBQyxDQUFBO1lBRUYsT0FBTztnQkFDTCxJQUFJO2dCQUNKLGdCQUFnQixFQUFFLHNCQUFnQjtnQkFDbEMsS0FBSztnQkFDTCxNQUFNO2dCQUNOLE9BQU87Z0JBQ1AsTUFBTTtnQkFDTixFQUFFO2FBQ0gsQ0FBQTtRQUNILENBQUM7UUFDRCxLQUFLLENBQUMsSUFBSSxDQUFDLEVBQUUsVUFBVSxFQUFFLGVBQWUsRUFBRTtZQUN4QyxJQUFJO2dCQUNGLE1BQU0sSUFBQSxXQUFJLEVBQUMsR0FBRyxFQUFFLFVBQVUsRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFBO2dCQUN0RCxNQUFNLGVBQWUsRUFBRSxDQUFBO2dCQUN2QixhQUFhLENBQUMsT0FBTyxFQUFFLENBQUE7YUFDeEI7WUFBQyxPQUFPLEdBQVEsRUFBRTtnQkFDakIsYUFBYSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQTthQUMxQjtRQUNILENBQUM7S0FDRixDQUFDLENBQUE7SUFFRixPQUFNO0FBQ1IsQ0FBQyxDQUFDLENBQUEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyByZXNvbHZlIH0gZnJvbSAncGF0aCdcbmltcG9ydCB7IExpZmVjeWNsZSB9IGZyb20gJ0B3ZWxsLWtub3duLWNvbXBvbmVudHMvaW50ZXJmYWNlcydcbmltcG9ydCB7IHJvb21zTWV0cmljcywgY3JlYXRlUm9vbXNDb21wb25lbnQgfSBmcm9tICdAZGNsL21pbmktY29tbXMvZGlzdC9hZGFwdGVycy9yb29tcydcbmltcG9ydCB7IGNyZWF0ZVJlY29yZENvbmZpZ0NvbXBvbmVudCB9IGZyb20gJ0B3ZWxsLWtub3duLWNvbXBvbmVudHMvZW52LWNvbmZpZy1wcm92aWRlcidcbmltcG9ydCB7IGNyZWF0ZVNlcnZlckNvbXBvbmVudCB9IGZyb20gJ0B3ZWxsLWtub3duLWNvbXBvbmVudHMvaHR0cC1zZXJ2ZXInXG5pbXBvcnQgeyBjcmVhdGVDb25zb2xlTG9nQ29tcG9uZW50IH0gZnJvbSAnQHdlbGwta25vd24tY29tcG9uZW50cy9sb2dnZXInXG5pbXBvcnQgeyBjcmVhdGVUZXN0TWV0cmljc0NvbXBvbmVudCB9IGZyb20gJ0B3ZWxsLWtub3duLWNvbXBvbmVudHMvbWV0cmljcydcbmltcG9ydCB7IGNyZWF0ZVdzQ29tcG9uZW50IH0gZnJvbSAnLi93cydcbmltcG9ydCBmdXR1cmUgZnJvbSAnZnAtZnV0dXJlJ1xuXG5pbXBvcnQgeyBDbGlDb21wb25lbnRzIH0gZnJvbSAnLi4vLi4vY29tcG9uZW50cydcbmltcG9ydCB7IGdldEFyZ3MgfSBmcm9tICcuLi8uLi91dGlscy9hcmdzJ1xuaW1wb3J0IHsgbWFpbiBhcyBoYW5kbGVyIH0gZnJvbSAnLi4vLi4vdXRpbHMvaGFuZGxlcidcbmltcG9ydCB7IFByZXZpZXdDb21wb25lbnRzIH0gZnJvbSAnLi90eXBlcydcbmltcG9ydCB7IHZhbGlkYXRlRXhpc3RpbmdQcm9qZWN0LCB2YWxpZGF0ZVNjZW5lT3B0aW9ucyB9IGZyb20gJy4vcHJvamVjdCdcbmltcG9ydCB7IHByZXZpZXdQb3J0IH0gZnJvbSAnLi9wb3J0J1xuaW1wb3J0IHsgcHJvdmlkZXJJbnN0YW5jZSB9IGZyb20gJy4vZXRoJ1xuaW1wb3J0IHsgd2lyZSB9IGZyb20gJy4vd2lyZSdcblxuZXhwb3J0IGZ1bmN0aW9uIGhlbHAoKSB7XG4gIHJldHVybiBgYFxufVxuXG5pbnRlcmZhY2UgT3B0aW9ucyB7XG4gIGFyZ3M6IE9taXQ8dHlwZW9mIGFyZ3MsICdfJz5cbiAgY29tcG9uZW50czogUGljazxDbGlDb21wb25lbnRzLCAnZmV0Y2gnIHwgJ2ZzJz5cbn1cblxuZXhwb3J0IGNvbnN0IGFyZ3MgPSBnZXRBcmdzKHtcbiAgJy0td2F0Y2gnOiBCb29sZWFuLFxuICAnLXcnOiAnLS13YXRjaCcsXG4gICctLWRpcic6IFN0cmluZyxcbiAgJy0tcG9ydCc6IE51bWJlcixcbiAgJy1wJzogJy0tcG9ydCdcbn0pXG5cbi8vIGNvcHkvcGFzdGUgZnJvbSBodHRwczovL2dpdGh1Yi5jb20vZGVjZW50cmFsYW5kL2NsaS9ibG9iLzMyZGU5NmJjZmM0ZWYxYzI2YzU1ODBjNzc2N2FkNmM4Y2FjM2IzNjcvc3JjL2xpYi9EZWNlbnRyYWxhbmQudHNcbi8vIFRPRE86IHJlZmFjdG9yIHRoaXMgc3R1ZmYgY29tcGxldGVseVxuZXhwb3J0IGNvbnN0IG1haW4gPSBoYW5kbGVyKGFzeW5jIGZ1bmN0aW9uIG1haW4ob3B0aW9uczogT3B0aW9ucykge1xuICBjb25zdCBkaXIgPSByZXNvbHZlKHByb2Nlc3MuY3dkKCksIG9wdGlvbnMuYXJnc1snLS1kaXInXSB8fCAnLicpXG4gIGF3YWl0IHZhbGlkYXRlRXhpc3RpbmdQcm9qZWN0KG9wdGlvbnMuY29tcG9uZW50cywgZGlyKVxuICBhd2FpdCB2YWxpZGF0ZVNjZW5lT3B0aW9ucyhvcHRpb25zLmNvbXBvbmVudHMsIGRpcilcblxuICBjb25zdCBwb3J0ID0gb3B0aW9ucy5hcmdzWyctLXBvcnQnXSB8fCAoYXdhaXQgcHJldmlld1BvcnQoKSlcbiAgY29uc3Qgc3RhcnRlZEZ1dHVyZSA9IGZ1dHVyZTx2b2lkPigpXG5cbiAgc2V0VGltZW91dCgoKSA9PiBzdGFydGVkRnV0dXJlLnJlamVjdChuZXcgRXJyb3IoJ1RpbWVkIG91dCBzdGFydGluZyB0aGUgc2VydmVyJykpLCAzMDAwKVxuXG4gIGF3YWl0IExpZmVjeWNsZS5ydW48UHJldmlld0NvbXBvbmVudHM+KHtcbiAgICBhc3luYyBpbml0Q29tcG9uZW50cygpIHtcbiAgICAgIGNvbnN0IG1ldHJpY3MgPSBjcmVhdGVUZXN0TWV0cmljc0NvbXBvbmVudChyb29tc01ldHJpY3MpXG4gICAgICBjb25zdCBjb25maWcgPSBjcmVhdGVSZWNvcmRDb25maWdDb21wb25lbnQoe1xuICAgICAgICBIVFRQX1NFUlZFUl9QT1JUOiBwb3J0LnRvU3RyaW5nKCksXG4gICAgICAgIEhUVFBfU0VSVkVSX0hPU1Q6ICcwLjAuMC4wJyxcbiAgICAgICAgLi4ucHJvY2Vzcy5lbnZcbiAgICAgIH0pXG4gICAgICBjb25zdCBsb2dzID0gYXdhaXQgY3JlYXRlQ29uc29sZUxvZ0NvbXBvbmVudCh7fSlcbiAgICAgIGNvbnN0IHdzID0gYXdhaXQgY3JlYXRlV3NDb21wb25lbnQoeyBsb2dzIH0pXG4gICAgICBjb25zdCBzZXJ2ZXIgPSBhd2FpdCBjcmVhdGVTZXJ2ZXJDb21wb25lbnQ8UHJldmlld0NvbXBvbmVudHM+KHsgY29uZmlnLCBsb2dzLCB3czogd3Mud3MgfSwgeyBjb3JzOiB7fSB9KVxuICAgICAgY29uc3Qgcm9vbXMgPSBhd2FpdCBjcmVhdGVSb29tc0NvbXBvbmVudCh7XG4gICAgICAgIG1ldHJpY3MsXG4gICAgICAgIGxvZ3MsXG4gICAgICAgIGNvbmZpZ1xuICAgICAgfSlcblxuICAgICAgcmV0dXJuIHtcbiAgICAgICAgbG9ncyxcbiAgICAgICAgZXRoZXJldW1Qcm92aWRlcjogcHJvdmlkZXJJbnN0YW5jZSxcbiAgICAgICAgcm9vbXMsXG4gICAgICAgIGNvbmZpZyxcbiAgICAgICAgbWV0cmljcyxcbiAgICAgICAgc2VydmVyLFxuICAgICAgICB3c1xuICAgICAgfVxuICAgIH0sXG4gICAgYXN5bmMgbWFpbih7IGNvbXBvbmVudHMsIHN0YXJ0Q29tcG9uZW50cyB9KSB7XG4gICAgICB0cnkge1xuICAgICAgICBhd2FpdCB3aXJlKGRpciwgY29tcG9uZW50cywgISFvcHRpb25zLmFyZ3NbJy0td2F0Y2gnXSlcbiAgICAgICAgYXdhaXQgc3RhcnRDb21wb25lbnRzKClcbiAgICAgICAgc3RhcnRlZEZ1dHVyZS5yZXNvbHZlKClcbiAgICAgIH0gY2F0Y2ggKGVycjogYW55KSB7XG4gICAgICAgIHN0YXJ0ZWRGdXR1cmUucmVqZWN0KGVycilcbiAgICAgIH1cbiAgICB9XG4gIH0pXG5cbiAgcmV0dXJuXG59KVxuIl19
+}
+exports.main = main;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSwrQkFBOEI7QUFDOUIsa0VBQTZEO0FBQzdELCtEQUF3RjtBQUN4RixvRkFBd0Y7QUFDeEYsb0VBQTBFO0FBQzFFLDBEQUF5RTtBQUN6RSw0REFBMkU7QUFDM0UsNkJBQXdDO0FBQ3hDLDBEQUE4QjtBQUc5QiwyQ0FBMEM7QUFFMUMsdUNBQXlFO0FBQ3pFLGlDQUFvQztBQUNwQywrQkFBd0M7QUFDeEMsaUNBQTZCO0FBRTdCLFNBQWdCLElBQUk7SUFDbEIsT0FBTyxFQUFFLENBQUE7QUFDWCxDQUFDO0FBRkQsb0JBRUM7QUFPWSxRQUFBLElBQUksR0FBRyxJQUFBLGNBQU8sRUFBQztJQUMxQixTQUFTLEVBQUUsT0FBTztJQUNsQixJQUFJLEVBQUUsU0FBUztJQUNmLE9BQU8sRUFBRSxNQUFNO0lBQ2YsUUFBUSxFQUFFLE1BQU07SUFDaEIsSUFBSSxFQUFFLFFBQVE7Q0FDZixDQUFDLENBQUE7QUFJSyxLQUFLLFVBQVUsSUFBSSxDQUFDLE9BQWdCO0lBQ3pDLE1BQU0sR0FBRyxHQUFHLElBQUEsY0FBTyxFQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBRSxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEdBQUcsQ0FBQyxDQUFBO0lBQ2hFLE1BQU0sSUFBQSxpQ0FBdUIsRUFBQyxPQUFPLENBQUMsVUFBVSxFQUFFLEdBQUcsQ0FBQyxDQUFBO0lBQ3RELE1BQU0sSUFBQSw4QkFBb0IsRUFBQyxPQUFPLENBQUMsVUFBVSxFQUFFLEdBQUcsQ0FBQyxDQUFBO0lBRW5ELE1BQU0sSUFBSSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxNQUFNLElBQUEsa0JBQVcsR0FBRSxDQUFDLENBQUE7SUFDNUQsTUFBTSxhQUFhLEdBQUcsSUFBQSxtQkFBTSxHQUFRLENBQUE7SUFFcEMsVUFBVSxDQUFDLEdBQUcsRUFBRSxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsSUFBSSxLQUFLLENBQUMsK0JBQStCLENBQUMsQ0FBQyxFQUFFLElBQUksQ0FBQyxDQUFBO0lBRXhGLE1BQU0sc0JBQVMsQ0FBQyxHQUFHLENBQW9CO1FBQ3JDLEtBQUssQ0FBQyxjQUFjO1lBQ2xCLE1BQU0sT0FBTyxHQUFHLElBQUEsb0NBQTBCLEVBQUMsb0JBQVksQ0FBQyxDQUFBO1lBQ3hELE1BQU0sTUFBTSxHQUFHLElBQUEsaURBQTJCLGtCQUN4QyxnQkFBZ0IsRUFBRSxJQUFJLENBQUMsUUFBUSxFQUFFLEVBQ2pDLGdCQUFnQixFQUFFLFNBQVMsSUFDeEIsT0FBTyxDQUFDLEdBQUcsRUFDZCxDQUFBO1lBQ0YsTUFBTSxJQUFJLEdBQUcsTUFBTSxJQUFBLGtDQUF5QixFQUFDLEVBQUUsQ0FBQyxDQUFBO1lBQ2hELE1BQU0sRUFBRSxHQUFHLE1BQU0sSUFBQSxzQkFBaUIsRUFBQyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUE7WUFDNUMsTUFBTSxNQUFNLEdBQUcsTUFBTSxJQUFBLG1DQUFxQixFQUFvQixFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLEVBQUUsQ0FBQyxFQUFFLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFBO1lBQ3hHLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBQSw0QkFBb0IsRUFBQztnQkFDdkMsT0FBTztnQkFDUCxJQUFJO2dCQUNKLE1BQU07YUFDUCxDQUFDLENBQUE7WUFFRixPQUFPO2dCQUNMLElBQUk7Z0JBQ0osZ0JBQWdCLEVBQUUsc0JBQWdCO2dCQUNsQyxLQUFLO2dCQUNMLE1BQU07Z0JBQ04sT0FBTztnQkFDUCxNQUFNO2dCQUNOLEVBQUU7YUFDSCxDQUFBO1FBQ0gsQ0FBQztRQUNELEtBQUssQ0FBQyxJQUFJLENBQUMsRUFBRSxVQUFVLEVBQUUsZUFBZSxFQUFFO1lBQ3hDLElBQUk7Z0JBQ0YsTUFBTSxJQUFBLFdBQUksRUFBQyxHQUFHLEVBQUUsVUFBVSxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUE7Z0JBQ3RELE1BQU0sZUFBZSxFQUFFLENBQUE7Z0JBQ3ZCLGFBQWEsQ0FBQyxPQUFPLEVBQUUsQ0FBQTthQUN4QjtZQUFDLE9BQU8sR0FBUSxFQUFFO2dCQUNqQixhQUFhLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFBO2FBQzFCO1FBQ0gsQ0FBQztLQUNGLENBQUMsQ0FBQTtJQUdGLE1BQU0sYUFBYSxDQUFBO0lBRW5CLE9BQU07QUFDUixDQUFDO0FBcERELG9CQW9EQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IHJlc29sdmUgfSBmcm9tICdwYXRoJ1xuaW1wb3J0IHsgTGlmZWN5Y2xlIH0gZnJvbSAnQHdlbGwta25vd24tY29tcG9uZW50cy9pbnRlcmZhY2VzJ1xuaW1wb3J0IHsgcm9vbXNNZXRyaWNzLCBjcmVhdGVSb29tc0NvbXBvbmVudCB9IGZyb20gJ0BkY2wvbWluaS1jb21tcy9kaXN0L2FkYXB0ZXJzL3Jvb21zJ1xuaW1wb3J0IHsgY3JlYXRlUmVjb3JkQ29uZmlnQ29tcG9uZW50IH0gZnJvbSAnQHdlbGwta25vd24tY29tcG9uZW50cy9lbnYtY29uZmlnLXByb3ZpZGVyJ1xuaW1wb3J0IHsgY3JlYXRlU2VydmVyQ29tcG9uZW50IH0gZnJvbSAnQHdlbGwta25vd24tY29tcG9uZW50cy9odHRwLXNlcnZlcidcbmltcG9ydCB7IGNyZWF0ZUNvbnNvbGVMb2dDb21wb25lbnQgfSBmcm9tICdAd2VsbC1rbm93bi1jb21wb25lbnRzL2xvZ2dlcidcbmltcG9ydCB7IGNyZWF0ZVRlc3RNZXRyaWNzQ29tcG9uZW50IH0gZnJvbSAnQHdlbGwta25vd24tY29tcG9uZW50cy9tZXRyaWNzJ1xuaW1wb3J0IHsgY3JlYXRlV3NDb21wb25lbnQgfSBmcm9tICcuL3dzJ1xuaW1wb3J0IGZ1dHVyZSBmcm9tICdmcC1mdXR1cmUnXG5cbmltcG9ydCB7IENsaUNvbXBvbmVudHMgfSBmcm9tICcuLi8uLi9jb21wb25lbnRzJ1xuaW1wb3J0IHsgZ2V0QXJncyB9IGZyb20gJy4uLy4uL3V0aWxzL2FyZ3MnXG5pbXBvcnQgeyBQcmV2aWV3Q29tcG9uZW50cyB9IGZyb20gJy4vdHlwZXMnXG5pbXBvcnQgeyB2YWxpZGF0ZUV4aXN0aW5nUHJvamVjdCwgdmFsaWRhdGVTY2VuZU9wdGlvbnMgfSBmcm9tICcuL3Byb2plY3QnXG5pbXBvcnQgeyBwcmV2aWV3UG9ydCB9IGZyb20gJy4vcG9ydCdcbmltcG9ydCB7IHByb3ZpZGVySW5zdGFuY2UgfSBmcm9tICcuL2V0aCdcbmltcG9ydCB7IHdpcmUgfSBmcm9tICcuL3dpcmUnXG5cbmV4cG9ydCBmdW5jdGlvbiBoZWxwKCkge1xuICByZXR1cm4gYGBcbn1cblxuaW50ZXJmYWNlIE9wdGlvbnMge1xuICBhcmdzOiBPbWl0PHR5cGVvZiBhcmdzLCAnXyc+XG4gIGNvbXBvbmVudHM6IFBpY2s8Q2xpQ29tcG9uZW50cywgJ2ZldGNoJyB8ICdmcyc+XG59XG5cbmV4cG9ydCBjb25zdCBhcmdzID0gZ2V0QXJncyh7XG4gICctLXdhdGNoJzogQm9vbGVhbixcbiAgJy13JzogJy0td2F0Y2gnLFxuICAnLS1kaXInOiBTdHJpbmcsXG4gICctLXBvcnQnOiBOdW1iZXIsXG4gICctcCc6ICctLXBvcnQnXG59KVxuXG4vLyBjb3B5L3Bhc3RlIGZyb20gaHR0cHM6Ly9naXRodWIuY29tL2RlY2VudHJhbGFuZC9jbGkvYmxvYi8zMmRlOTZiY2ZjNGVmMWMyNmM1NTgwYzc3NjdhZDZjOGNhYzNiMzY3L3NyYy9saWIvRGVjZW50cmFsYW5kLnRzXG4vLyBUT0RPOiByZWZhY3RvciB0aGlzIHN0dWZmIGNvbXBsZXRlbHlcbmV4cG9ydCBhc3luYyBmdW5jdGlvbiBtYWluKG9wdGlvbnM6IE9wdGlvbnMpIHtcbiAgY29uc3QgZGlyID0gcmVzb2x2ZShwcm9jZXNzLmN3ZCgpLCBvcHRpb25zLmFyZ3NbJy0tZGlyJ10gfHwgJy4nKVxuICBhd2FpdCB2YWxpZGF0ZUV4aXN0aW5nUHJvamVjdChvcHRpb25zLmNvbXBvbmVudHMsIGRpcilcbiAgYXdhaXQgdmFsaWRhdGVTY2VuZU9wdGlvbnMob3B0aW9ucy5jb21wb25lbnRzLCBkaXIpXG5cbiAgY29uc3QgcG9ydCA9IG9wdGlvbnMuYXJnc1snLS1wb3J0J10gfHwgKGF3YWl0IHByZXZpZXdQb3J0KCkpXG4gIGNvbnN0IHN0YXJ0ZWRGdXR1cmUgPSBmdXR1cmU8dm9pZD4oKVxuXG4gIHNldFRpbWVvdXQoKCkgPT4gc3RhcnRlZEZ1dHVyZS5yZWplY3QobmV3IEVycm9yKCdUaW1lZCBvdXQgc3RhcnRpbmcgdGhlIHNlcnZlcicpKSwgMzAwMClcblxuICBhd2FpdCBMaWZlY3ljbGUucnVuPFByZXZpZXdDb21wb25lbnRzPih7XG4gICAgYXN5bmMgaW5pdENvbXBvbmVudHMoKSB7XG4gICAgICBjb25zdCBtZXRyaWNzID0gY3JlYXRlVGVzdE1ldHJpY3NDb21wb25lbnQocm9vbXNNZXRyaWNzKVxuICAgICAgY29uc3QgY29uZmlnID0gY3JlYXRlUmVjb3JkQ29uZmlnQ29tcG9uZW50KHtcbiAgICAgICAgSFRUUF9TRVJWRVJfUE9SVDogcG9ydC50b1N0cmluZygpLFxuICAgICAgICBIVFRQX1NFUlZFUl9IT1NUOiAnMC4wLjAuMCcsXG4gICAgICAgIC4uLnByb2Nlc3MuZW52XG4gICAgICB9KVxuICAgICAgY29uc3QgbG9ncyA9IGF3YWl0IGNyZWF0ZUNvbnNvbGVMb2dDb21wb25lbnQoe30pXG4gICAgICBjb25zdCB3cyA9IGF3YWl0IGNyZWF0ZVdzQ29tcG9uZW50KHsgbG9ncyB9KVxuICAgICAgY29uc3Qgc2VydmVyID0gYXdhaXQgY3JlYXRlU2VydmVyQ29tcG9uZW50PFByZXZpZXdDb21wb25lbnRzPih7IGNvbmZpZywgbG9ncywgd3M6IHdzLndzIH0sIHsgY29yczoge30gfSlcbiAgICAgIGNvbnN0IHJvb21zID0gYXdhaXQgY3JlYXRlUm9vbXNDb21wb25lbnQoe1xuICAgICAgICBtZXRyaWNzLFxuICAgICAgICBsb2dzLFxuICAgICAgICBjb25maWdcbiAgICAgIH0pXG5cbiAgICAgIHJldHVybiB7XG4gICAgICAgIGxvZ3MsXG4gICAgICAgIGV0aGVyZXVtUHJvdmlkZXI6IHByb3ZpZGVySW5zdGFuY2UsXG4gICAgICAgIHJvb21zLFxuICAgICAgICBjb25maWcsXG4gICAgICAgIG1ldHJpY3MsXG4gICAgICAgIHNlcnZlcixcbiAgICAgICAgd3NcbiAgICAgIH1cbiAgICB9LFxuICAgIGFzeW5jIG1haW4oeyBjb21wb25lbnRzLCBzdGFydENvbXBvbmVudHMgfSkge1xuICAgICAgdHJ5IHtcbiAgICAgICAgYXdhaXQgd2lyZShkaXIsIGNvbXBvbmVudHMsICEhb3B0aW9ucy5hcmdzWyctLXdhdGNoJ10pXG4gICAgICAgIGF3YWl0IHN0YXJ0Q29tcG9uZW50cygpXG4gICAgICAgIHN0YXJ0ZWRGdXR1cmUucmVzb2x2ZSgpXG4gICAgICB9IGNhdGNoIChlcnI6IGFueSkge1xuICAgICAgICBzdGFydGVkRnV0dXJlLnJlamVjdChlcnIpXG4gICAgICB9XG4gICAgfVxuICB9KVxuXG4gIC8vIGJ1YmJsZSB1cCB0aGUgZXhjZXB0aW9uIGlmIHN0YXJ0ZWRGdXR1cmUgd2FzIHJlamVjdGVkXG4gIGF3YWl0IHN0YXJ0ZWRGdXR1cmVcblxuICByZXR1cm5cbn1cbiJdfQ==

package/cli/commands/preview/index.ts

@@ -10,7 +10,6 @@ import future from 'fp-future'
 
 import { CliComponents } from '../../components'
 import { getArgs } from '../../utils/args'
-import { main as handler } from '../../utils/handler'
 import { PreviewComponents } from './types'
 import { validateExistingProject, validateSceneOptions } from './project'
 import { previewPort } from './port'
@@ -36,7 +35,7 @@ export const args = getArgs({
 
 // copy/paste from https://github.com/decentraland/cli/blob/32de96bcfc4ef1c26c5580c7767ad6c8cac3b367/src/lib/Decentraland.ts
 // TODO: refactor this stuff completely
-export const main = handler(async function main(options: Options) {
+export async function main(options: Options) {
   const dir = resolve(process.cwd(), options.args['--dir'] || '.')
   await validateExistingProject(options.components, dir)
   await validateSceneOptions(options.components, dir)
@@ -84,5 +83,8 @@ export const main = handler(async function main(options: Options) {
     }
   })
 
+  // bubble up the exception if startedFuture was rejected
+  await startedFuture
+
   return
-})
+}

package/cli/commands/start/index.d.ts

@@ -25,5 +25,5 @@ export declare const args: import("arg").Result<{
     '--desktop-client': BooleanConstructor;
 }>;
 export declare function help(): string;
-export declare const main: (args: Options) => Promise<void>;
+export declare function main(options: Options): Promise<void>;
 export {};

package/cli/commands/start/index.js

@@ -11,7 +11,7 @@ const build_1 = require("../build");
 const preview_1 = require("../preview");
 const port_1 = require("../preview/port");
 const args_1 = require("../../utils/args");
-const handler_1 = require("../../utils/handler");
+const helpers_1 = require("../build/helpers");
 exports.args = (0, args_1.getArgs)({
     '--dir': String,
     '--help': Boolean,
@@ -58,29 +58,32 @@ function help() {
 `;
 }
 exports.help = help;
-exports.main = (0, handler_1.main)(async function main(options) {
+async function main(options) {
     const dir = (0, path_1.resolve)(process.cwd(), options.args['--dir'] || '.');
     const isCi = exports.args['--ci'] || process.env.CI || false;
     const debug = !exports.args['--no-debug'] && !isCi;
     const openBrowser = !exports.args['--no-browser'] && !isCi;
     const skipBuild = exports.args['--skip-build'];
-    const watch = !exports.args['--no-watch'] && !isCi && !skipBuild;
+    const watch = !exports.args['--no-watch'];
     const enableWeb3 = exports.args['--web3'];
     const port = parseInt(exports.args['--port'], 10) || (await (0, port_1.previewPort)());
     const baseCoords = { x: 0, y: 0 };
     const hasPortableExperience = false;
     const comps = { components: options.components };
     if (!skipBuild) {
+        await (0, helpers_1.npmRun)(dir, 'build');
+    }
+    if (watch) {
         await (0, build_1.main)(Object.assign({ args: { '--dir': dir, '--watch': watch } }, comps));
     }
     await (0, preview_1.main)(Object.assign({ args: { '--dir': dir, '--port': port } }, comps));
-    const ifaces = os_1.default.networkInterfaces();
+    const networkInterfaces = os_1.default.networkInterfaces();
     const availableURLs = [];
     console.log(`\nPreview server is now running!`);
     console.log('Available on:\n');
-    Object.keys(ifaces).forEach((dev) => {
+    Object.keys(networkInterfaces).forEach((dev) => {
         ;
-        (ifaces[dev] || []).forEach((details) => {
+        (networkInterfaces[dev] || []).forEach((details) => {
             if (details.family === 'IPv4') {
                 let addr = `http://${details.address}:${port}?position=${baseCoords.x}%2C${baseCoords.y}&ENABLE_ECS7`;
                 if (debug) {
@@ -117,5 +120,6 @@ exports.main = (0, handler_1.main)(async function main(options) {
             console.log('Unable to open browser automatically.');
         }
     }
-});
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["import os from 'os'\nimport { resolve } from 'path'\nimport open from 'open'\n\nimport { CliComponents } from '../../components'\nimport { main as build } from '../build'\nimport { main as preview } from '../preview'\nimport { previewPort } from '../preview/port'\nimport { getArgs } from '../../utils/args'\nimport { main as handler } from '../../utils/handler'\ninterface Options {\n  args: typeof args\n  components: Pick<CliComponents, 'fetch' | 'fs'>\n}\n\nexport const args = getArgs({\n  '--dir': String,\n  '--help': Boolean,\n  '--port': String,\n  '--no-debug': Boolean,\n  '--no-browser': Boolean,\n  '--no-watch': Boolean,\n  '--ci': Boolean,\n  '--skip-install': Boolean,\n  '--web3': Boolean,\n  '-h': '--help',\n  '-p': '--port',\n  '-d': '--no-debug',\n  '-b': '--no-browser',\n  '-w': '--no-watch',\n  '--skip-build': Boolean,\n  '--desktop-client': Boolean\n})\n\nexport function help() {\n  return `\n  Usage: dcl start [options]\n\n    Options:\n\n      -h, --help                Displays complete help\n      -p, --port        [port]  Select a custom port for the development server\n      -d, --no-debug            Disable debugging panel\n      -b, --no-browser          Do not open a new browser window\n      -w, --no-watch            Do not open watch for filesystem changes\n      -c, --ci                  Run the parcel previewer on a remote unix server\n      --web3                    Connects preview to browser wallet to use the associated avatar and account\n      --skip-build              Skip build and only serve the files in preview mode\n      --desktop-client          Show URL to launch preview in the desktop client (BETA)\n\n    Examples:\n\n    - Start a local development server for a Decentraland Scene at port 3500\n\n      $ dcl start -p 3500\n\n    - Start a local development server for a Decentraland Scene at a docker container\n\n      $ dcl start --ci\n`\n}\n\nexport const main = handler(async function main(options: Options) {\n  const dir = resolve(process.cwd(), options.args['--dir'] || '.')\n  const isCi = args['--ci'] || process.env.CI || false\n  const debug = !args['--no-debug'] && !isCi\n  const openBrowser = !args['--no-browser'] && !isCi\n  const skipBuild = args['--skip-build']\n  const watch = !args['--no-watch'] && !isCi && !skipBuild\n  const enableWeb3 = args['--web3']\n  const port = parseInt(args['--port']!, 10) || (await previewPort())\n  const baseCoords = { x: 0, y: 0 }\n  const hasPortableExperience = false\n\n  const comps = { components: options.components }\n  if (!skipBuild) {\n    await build({ args: { '--dir': dir, '--watch': watch }, ...comps })\n  }\n  await preview({ args: { '--dir': dir, '--port': port }, ...comps })\n\n  const ifaces = os.networkInterfaces()\n  const availableURLs: string[] = []\n\n  console.log(`\\nPreview server is now running!`)\n  console.log('Available on:\\n')\n\n  Object.keys(ifaces).forEach((dev) => {\n    ;(ifaces[dev] || []).forEach((details) => {\n      if (details.family === 'IPv4') {\n        let addr = `http://${details.address}:${port}?position=${baseCoords.x}%2C${baseCoords.y}&ENABLE_ECS7`\n        if (debug) {\n          addr = `${addr}&SCENE_DEBUG_PANEL`\n        }\n        if (enableWeb3 || hasPortableExperience) {\n          addr = `${addr}&ENABLE_WEB3`\n        }\n\n        availableURLs.push(addr)\n      }\n    })\n  })\n\n  // Push localhost and 127.0.0.1 at top\n  const sortedURLs = availableURLs.sort((a, _b) => {\n    return a.toLowerCase().includes('localhost') || a.includes('127.0.0.1') || a.includes('0.0.0.0') ? -1 : 1\n  })\n\n  for (const addr of sortedURLs) {\n    console.log(`    ${addr}`)\n  }\n\n  if (args['--desktop-client']) {\n    console.log('\\n  Desktop client:\\n')\n    for (const addr of sortedURLs) {\n      const searchParams = new URLSearchParams()\n      searchParams.append('PREVIEW-MODE', addr)\n      console.log(`    dcl://${searchParams.toString()}&`)\n    }\n  }\n\n  console.log('\\n  Details:\\n')\n  console.log('\\nPress CTRL+C to exit\\n')\n\n  // Open preferably localhost/127.0.0.1\n  if (openBrowser && sortedURLs.length && !args['--desktop-client']) {\n    try {\n      await open(sortedURLs[0])\n    } catch (_) {\n      console.log('Unable to open browser automatically.')\n    }\n  }\n})\n"]}
+}
+exports.main = main;
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["import os from 'os'\nimport { resolve } from 'path'\nimport open from 'open'\n\nimport { CliComponents } from '../../components'\nimport { main as build } from '../build'\nimport { main as preview } from '../preview'\nimport { previewPort } from '../preview/port'\nimport { getArgs } from '../../utils/args'\nimport { npmRun } from '../build/helpers'\n\ninterface Options {\n  args: typeof args\n  components: Pick<CliComponents, 'fetch' | 'fs'>\n}\n\nexport const args = getArgs({\n  '--dir': String,\n  '--help': Boolean,\n  '--port': String,\n  '--no-debug': Boolean,\n  '--no-browser': Boolean,\n  '--no-watch': Boolean,\n  '--ci': Boolean,\n  '--skip-install': Boolean,\n  '--web3': Boolean,\n  '-h': '--help',\n  '-p': '--port',\n  '-d': '--no-debug',\n  '-b': '--no-browser',\n  '-w': '--no-watch',\n  '--skip-build': Boolean,\n  '--desktop-client': Boolean\n})\n\nexport function help() {\n  return `\n  Usage: dcl start [options]\n\n    Options:\n\n      -h, --help                Displays complete help\n      -p, --port        [port]  Select a custom port for the development server\n      -d, --no-debug            Disable debugging panel\n      -b, --no-browser          Do not open a new browser window\n      -w, --no-watch            Do not open watch for filesystem changes\n      -c, --ci                  Run the parcel previewer on a remote unix server\n      --web3                    Connects preview to browser wallet to use the associated avatar and account\n      --skip-build              Skip build and only serve the files in preview mode\n      --desktop-client          Show URL to launch preview in the desktop client (BETA)\n\n    Examples:\n\n    - Start a local development server for a Decentraland Scene at port 3500\n\n      $ dcl start -p 3500\n\n    - Start a local development server for a Decentraland Scene at a docker container\n\n      $ dcl start --ci\n`\n}\n\nexport async function main(options: Options) {\n  const dir = resolve(process.cwd(), options.args['--dir'] || '.')\n  const isCi = args['--ci'] || process.env.CI || false\n  const debug = !args['--no-debug'] && !isCi\n  const openBrowser = !args['--no-browser'] && !isCi\n  const skipBuild = args['--skip-build']\n  const watch = !args['--no-watch']\n  const enableWeb3 = args['--web3']\n  const port = parseInt(args['--port']!, 10) || (await previewPort())\n  const baseCoords = { x: 0, y: 0 }\n  const hasPortableExperience = false\n\n  const comps = { components: options.components }\n\n  // first run `npm run build`, this can be disabled with --skip-build\n  if (!skipBuild) {\n    await npmRun(dir, 'build')\n  }\n\n  // then start the embedded compiler, this can be disabled with --no-watch\n  if (watch) {\n    await build({ args: { '--dir': dir, '--watch': watch }, ...comps })\n  }\n\n  // after the watcher is running, start the server\n  await preview({ args: { '--dir': dir, '--port': port }, ...comps })\n\n  const networkInterfaces = os.networkInterfaces()\n  const availableURLs: string[] = []\n\n  console.log(`\\nPreview server is now running!`)\n  console.log('Available on:\\n')\n\n  Object.keys(networkInterfaces).forEach((dev) => {\n    ;(networkInterfaces[dev] || []).forEach((details) => {\n      if (details.family === 'IPv4') {\n        let addr = `http://${details.address}:${port}?position=${baseCoords.x}%2C${baseCoords.y}&ENABLE_ECS7`\n        if (debug) {\n          addr = `${addr}&SCENE_DEBUG_PANEL`\n        }\n        if (enableWeb3 || hasPortableExperience) {\n          addr = `${addr}&ENABLE_WEB3`\n        }\n\n        availableURLs.push(addr)\n      }\n    })\n  })\n\n  // Push localhost and 127.0.0.1 at top\n  const sortedURLs = availableURLs.sort((a, _b) => {\n    return a.toLowerCase().includes('localhost') || a.includes('127.0.0.1') || a.includes('0.0.0.0') ? -1 : 1\n  })\n\n  for (const addr of sortedURLs) {\n    console.log(`    ${addr}`)\n  }\n\n  if (args['--desktop-client']) {\n    console.log('\\n  Desktop client:\\n')\n    for (const addr of sortedURLs) {\n      const searchParams = new URLSearchParams()\n      searchParams.append('PREVIEW-MODE', addr)\n      console.log(`    dcl://${searchParams.toString()}&`)\n    }\n  }\n\n  console.log('\\n  Details:\\n')\n  console.log('\\nPress CTRL+C to exit\\n')\n\n  // Open preferably localhost/127.0.0.1\n  if (openBrowser && sortedURLs.length && !args['--desktop-client']) {\n    try {\n      await open(sortedURLs[0])\n    } catch (_) {\n      console.log('Unable to open browser automatically.')\n    }\n  }\n}\n"]}

package/cli/commands/start/index.ts

@@ -7,7 +7,8 @@ import { main as build } from '../build'
 import { main as preview } from '../preview'
 import { previewPort } from '../preview/port'
 import { getArgs } from '../../utils/args'
-import { main as handler } from '../../utils/handler'
+import { npmRun } from '../build/helpers'
+
 interface Options {
   args: typeof args
   components: Pick<CliComponents, 'fetch' | 'fs'>
@@ -60,32 +61,41 @@ export function help() {
 `
 }
 
-export const main = handler(async function main(options: Options) {
+export async function main(options: Options) {
   const dir = resolve(process.cwd(), options.args['--dir'] || '.')
   const isCi = args['--ci'] || process.env.CI || false
   const debug = !args['--no-debug'] && !isCi
   const openBrowser = !args['--no-browser'] && !isCi
   const skipBuild = args['--skip-build']
-  const watch = !args['--no-watch'] && !isCi && !skipBuild
+  const watch = !args['--no-watch']
   const enableWeb3 = args['--web3']
   const port = parseInt(args['--port']!, 10) || (await previewPort())
   const baseCoords = { x: 0, y: 0 }
   const hasPortableExperience = false
 
   const comps = { components: options.components }
+
+  // first run `npm run build`, this can be disabled with --skip-build
   if (!skipBuild) {
+    await npmRun(dir, 'build')
+  }
+
+  // then start the embedded compiler, this can be disabled with --no-watch
+  if (watch) {
     await build({ args: { '--dir': dir, '--watch': watch }, ...comps })
   }
+
+  // after the watcher is running, start the server
   await preview({ args: { '--dir': dir, '--port': port }, ...comps })
 
-  const ifaces = os.networkInterfaces()
+  const networkInterfaces = os.networkInterfaces()
   const availableURLs: string[] = []
 
   console.log(`\nPreview server is now running!`)
   console.log('Available on:\n')
 
-  Object.keys(ifaces).forEach((dev) => {
-    ;(ifaces[dev] || []).forEach((details) => {
+  Object.keys(networkInterfaces).forEach((dev) => {
+    ;(networkInterfaces[dev] || []).forEach((details) => {
       if (details.family === 'IPv4') {
         let addr = `http://${details.address}:${port}?position=${baseCoords.x}%2C${baseCoords.y}&ENABLE_ECS7`
         if (debug) {
@@ -129,4 +139,4 @@ export const main = handler(async function main(options: Options) {
       console.log('Unable to open browser automatically.')
     }
   }
-})
+}

package/cli/index.js

@@ -1,22 +1,45 @@
 #!/usr/bin/env node
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const args_1 = require("./utils/args");
 const out_messages_1 = require("./utils/out-messages");
-const log_1 = __importDefault(require("./utils/log"));
+const log = __importStar(require("./utils/log"));
 const error_1 = require("./utils/error");
 const commands_1 = require("./utils/commands");
 const components_1 = require("./components");
 const listCommandsStr = (commands) => (0, out_messages_1.toStringList)(commands.map(($) => `npx @dcl/sdk ${$}`));
 const handleError = (err) => {
-    if (!(err instanceof error_1.CliError)) {
-        log_1.default.warn(`Developer: All errors thrown must be an instance of "CliError"`);
+    if (err instanceof error_1.CliError) {
+        log.fail(err.message);
+    }
+    else {
+        console.error(err);
+        log.warn(`Developer: All errors thrown must be an instance of "CliError"`);
     }
-    log_1.default.fail(err.message);
-    process.exit(1);
+    process.exitCode = 1;
 };
 const commandFnsAreValid = (fns) => {
     const { help, main } = fns;
@@ -28,16 +51,16 @@ const commandFnsAreValid = (fns) => {
     }
     return true;
 };
-const args = (0, args_1.getArgs)();
-const helpMessage = (commands) => `Here is the list of commands:\n${listCommandsStr(commands)}`;
-(async () => {
+async function main() {
+    const helpMessage = (commands) => `Here is the list of commands:\n${listCommandsStr(commands)}`;
+    const args = (0, args_1.getArgs)();
     const command = process.argv[2];
     const needsHelp = args['--help'];
     const components = (0, components_1.initComponents)();
     const commands = await (0, commands_1.getCommands)(components);
     if (!commands.includes(command)) {
         if (needsHelp) {
-            log_1.default.info(helpMessage(commands));
+            log.info(helpMessage(commands));
             return;
         }
         throw new error_1.CliError(`Command ${command} is invalid. ${helpMessage(commands)}`);
@@ -47,5 +70,7 @@ const helpMessage = (commands) => `Here is the list of commands:\n${listCommands
         const options = { args: cmd.args, components };
         needsHelp ? await cmd.help(options) : await cmd.main(options);
     }
-})().catch(handleError);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFPQSx1Q0FBc0M7QUFDdEMsdURBQW1EO0FBQ25ELHNEQUE2QjtBQUM3Qix5Q0FBd0M7QUFDeEMsK0NBQTZEO0FBQzdELDZDQUE0RDtBQWdCNUQsTUFBTSxlQUFlLEdBQUcsQ0FBQyxRQUFrQixFQUFFLEVBQUUsQ0FBQyxJQUFBLDJCQUFZLEVBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsZ0JBQWdCLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQTtBQUV0RyxNQUFNLFdBQVcsR0FBRyxDQUFDLEdBQWEsRUFBRSxFQUFFO0lBQ3BDLElBQUksQ0FBQyxDQUFDLEdBQUcsWUFBWSxnQkFBUSxDQUFDLEVBQUU7UUFDOUIsYUFBRyxDQUFDLElBQUksQ0FBQyxnRUFBZ0UsQ0FBQyxDQUFBO0tBQzNFO0lBQ0QsYUFBRyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUE7SUFDckIsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtBQUNqQixDQUFDLENBQUE7QUFFRCxNQUFNLGtCQUFrQixHQUFHLENBQUMsR0FBZ0IsRUFBZ0MsRUFBRTtJQUM1RSxNQUFNLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxHQUFHLEdBQUcsQ0FBQTtJQUMxQixJQUFJLENBQUMsSUFBSSxJQUFJLENBQUMsSUFBSSxFQUFFO1FBQ2xCLE1BQU0sSUFBSSxnQkFBUSxDQUFDOzs7S0FHbEIsQ0FBQyxDQUFBO0tBQ0g7SUFDRCxPQUFPLElBQUksQ0FBQTtBQUNiLENBQUMsQ0FBQTtBQUVELE1BQU0sSUFBSSxHQUFHLElBQUEsY0FBTyxHQUFFLENBQUE7QUFDdEIsTUFBTSxXQUFXLEdBQUcsQ0FBQyxRQUFrQixFQUFFLEVBQUUsQ0FBQyxrQ0FBa0MsZUFBZSxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBRXhHO0FBQUEsQ0FBQyxLQUFLLElBQUksRUFBRTtJQUNYLE1BQU0sT0FBTyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDL0IsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFBO0lBQ2hDLE1BQU0sVUFBVSxHQUFrQixJQUFBLDJCQUFjLEdBQUUsQ0FBQTtJQUVsRCxNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUEsc0JBQVcsRUFBQyxVQUFVLENBQUMsQ0FBQTtJQUU5QyxJQUFJLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsRUFBRTtRQUMvQixJQUFJLFNBQVMsRUFBRTtZQUNiLGFBQUcsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUE7WUFDL0IsT0FBTTtTQUNQO1FBQ0QsTUFBTSxJQUFJLGdCQUFRLENBQUMsV0FBVyxPQUFPLGdCQUFnQixXQUFXLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxDQUFBO0tBQzlFO0lBR0QsTUFBTSxHQUFHLEdBQUcsT0FBTyxDQUFDLEdBQUcsd0JBQWEsSUFBSSxPQUFPLEVBQUUsQ0FBQyxDQUFBO0lBRWxELElBQUksa0JBQWtCLENBQUMsR0FBRyxDQUFDLEVBQUU7UUFDM0IsTUFBTSxPQUFPLEdBQUcsRUFBRSxJQUFJLEVBQUUsR0FBRyxDQUFDLElBQUksRUFBRSxVQUFVLEVBQUUsQ0FBQTtRQUM5QyxTQUFTLENBQUMsQ0FBQyxDQUFDLE1BQU0sR0FBRyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxHQUFHLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFBO0tBQzlEO0FBQ0gsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDLENBQUEiLCJzb3VyY2VzQ29udGVudCI6WyIjIS91c3IvYmluL2VudiBub2RlXG5cbi8qXG4gIGlzdGFuYnVsIGlnbm9yZSBmaWxlXG4gIERvZXNuJ3QgbWFrZSBzZW5zZSB0byB0ZXN0IHRoaXMgZmlsZVxuKi9cblxuaW1wb3J0IHsgZ2V0QXJncyB9IGZyb20gJy4vdXRpbHMvYXJncydcbmltcG9ydCB7IHRvU3RyaW5nTGlzdCB9IGZyb20gJy4vdXRpbHMvb3V0LW1lc3NhZ2VzJ1xuaW1wb3J0IGxvZyBmcm9tICcuL3V0aWxzL2xvZydcbmltcG9ydCB7IENsaUVycm9yIH0gZnJvbSAnLi91dGlscy9lcnJvcidcbmltcG9ydCB7IENPTU1BTkRTX1BBVEgsIGdldENvbW1hbmRzIH0gZnJvbSAnLi91dGlscy9jb21tYW5kcydcbmltcG9ydCB7IENsaUNvbXBvbmVudHMsIGluaXRDb21wb25lbnRzIH0gZnJvbSAnLi9jb21wb25lbnRzJ1xuXG5leHBvcnQgaW50ZXJmYWNlIE9wdGlvbnMge1xuICBhcmdzOiBSZXR1cm5UeXBlPHR5cGVvZiBnZXRBcmdzPlxuICBjb21wb25lbnRzOiBDbGlDb21wb25lbnRzXG59XG5cbi8vIGxlYXZpbmcgYXJncyBhcyBcImFueVwiIHNpbmNlIHdlIGRvbid0IGtub3cgeWV0IGlmIHdlIHdpbGwgdXNlIHRoZW1cbnR5cGUgRmlsZUZuID0gKG9wdGlvbnM6IE9wdGlvbnMpID0+IFByb21pc2U8dm9pZD5cblxuaW50ZXJmYWNlIEZpbGVFeHBvcnRzIHtcbiAgaGVscD86IEZpbGVGblxuICBtYWluPzogRmlsZUZuXG4gIGFyZ3M/OiBSZXR1cm5UeXBlPHR5cGVvZiBnZXRBcmdzPlxufVxuXG5jb25zdCBsaXN0Q29tbWFuZHNTdHIgPSAoY29tbWFuZHM6IHN0cmluZ1tdKSA9PiB0b1N0cmluZ0xpc3QoY29tbWFuZHMubWFwKCgkKSA9PiBgbnB4IEBkY2wvc2RrICR7JH1gKSlcblxuY29uc3QgaGFuZGxlRXJyb3IgPSAoZXJyOiBDbGlFcnJvcikgPT4ge1xuICBpZiAoIShlcnIgaW5zdGFuY2VvZiBDbGlFcnJvcikpIHtcbiAgICBsb2cud2FybihgRGV2ZWxvcGVyOiBBbGwgZXJyb3JzIHRocm93biBtdXN0IGJlIGFuIGluc3RhbmNlIG9mIFwiQ2xpRXJyb3JcImApXG4gIH1cbiAgbG9nLmZhaWwoZXJyLm1lc3NhZ2UpXG4gIHByb2Nlc3MuZXhpdCgxKVxufVxuXG5jb25zdCBjb21tYW5kRm5zQXJlVmFsaWQgPSAoZm5zOiBGaWxlRXhwb3J0cyk6IGZucyBpcyBSZXF1aXJlZDxGaWxlRXhwb3J0cz4gPT4ge1xuICBjb25zdCB7IGhlbHAsIG1haW4gfSA9IGZuc1xuICBpZiAoIWhlbHAgfHwgIW1haW4pIHtcbiAgICB0aHJvdyBuZXcgQ2xpRXJyb3IoYENvbW1hbmQgZG9lcyBub3QgZm9sbG93IGltcGxlbWVudGF0aW9uIHJ1bGVzOlxuICAgICAgKiBSZXF1aXJlcyBhIFwiaGVscFwiIGZ1bmN0aW9uXG4gICAgICAqIFJlcXVpcmVzIGEgXCJtYWluXCIgZnVuY3Rpb25cbiAgICBgKVxuICB9XG4gIHJldHVybiB0cnVlXG59XG5cbmNvbnN0IGFyZ3MgPSBnZXRBcmdzKClcbmNvbnN0IGhlbHBNZXNzYWdlID0gKGNvbW1hbmRzOiBzdHJpbmdbXSkgPT4gYEhlcmUgaXMgdGhlIGxpc3Qgb2YgY29tbWFuZHM6XFxuJHtsaXN0Q29tbWFuZHNTdHIoY29tbWFuZHMpfWBcblxuOyhhc3luYyAoKSA9PiB7XG4gIGNvbnN0IGNvbW1hbmQgPSBwcm9jZXNzLmFyZ3ZbMl1cbiAgY29uc3QgbmVlZHNIZWxwID0gYXJnc1snLS1oZWxwJ11cbiAgY29uc3QgY29tcG9uZW50czogQ2xpQ29tcG9uZW50cyA9IGluaXRDb21wb25lbnRzKClcblxuICBjb25zdCBjb21tYW5kcyA9IGF3YWl0IGdldENvbW1hbmRzKGNvbXBvbmVudHMpXG5cbiAgaWYgKCFjb21tYW5kcy5pbmNsdWRlcyhjb21tYW5kKSkge1xuICAgIGlmIChuZWVkc0hlbHApIHtcbiAgICAgIGxvZy5pbmZvKGhlbHBNZXNzYWdlKGNvbW1hbmRzKSlcbiAgICAgIHJldHVyblxuICAgIH1cbiAgICB0aHJvdyBuZXcgQ2xpRXJyb3IoYENvbW1hbmQgJHtjb21tYW5kfSBpcyBpbnZhbGlkLiAke2hlbHBNZXNzYWdlKGNvbW1hbmRzKX1gKVxuICB9XG5cbiAgLy8gZXNsaW50LWRpc2FibGUtbmV4dC1saW5lIEB0eXBlc2NyaXB0LWVzbGludC9uby12YXItcmVxdWlyZXNcbiAgY29uc3QgY21kID0gcmVxdWlyZShgJHtDT01NQU5EU19QQVRIfS8ke2NvbW1hbmR9YClcblxuICBpZiAoY29tbWFuZEZuc0FyZVZhbGlkKGNtZCkpIHtcbiAgICBjb25zdCBvcHRpb25zID0geyBhcmdzOiBjbWQuYXJncywgY29tcG9uZW50cyB9XG4gICAgbmVlZHNIZWxwID8gYXdhaXQgY21kLmhlbHAob3B0aW9ucykgOiBhd2FpdCBjbWQubWFpbihvcHRpb25zKVxuICB9XG59KSgpLmNhdGNoKGhhbmRsZUVycm9yKVxuIl19
+    process.exit(process.exitCode || 0);
+}
+main().catch(handleError);
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQU9BLHVDQUFzQztBQUN0Qyx1REFBbUQ7QUFDbkQsaURBQWtDO0FBQ2xDLHlDQUF3QztBQUN4QywrQ0FBNkQ7QUFDN0QsNkNBQTREO0FBZ0I1RCxNQUFNLGVBQWUsR0FBRyxDQUFDLFFBQWtCLEVBQUUsRUFBRSxDQUFDLElBQUEsMkJBQVksRUFBQyxRQUFRLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFBO0FBRXRHLE1BQU0sV0FBVyxHQUFHLENBQUMsR0FBVSxFQUFFLEVBQUU7SUFDakMsSUFBSSxHQUFHLFlBQVksZ0JBQVEsRUFBRTtRQUMzQixHQUFHLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQTtLQUN0QjtTQUFNO1FBRUwsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUNsQixHQUFHLENBQUMsSUFBSSxDQUFDLGdFQUFnRSxDQUFDLENBQUE7S0FDM0U7SUFHRCxPQUFPLENBQUMsUUFBUSxHQUFHLENBQUMsQ0FBQTtBQUN0QixDQUFDLENBQUE7QUFFRCxNQUFNLGtCQUFrQixHQUFHLENBQUMsR0FBZ0IsRUFBZ0MsRUFBRTtJQUM1RSxNQUFNLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxHQUFHLEdBQUcsQ0FBQTtJQUMxQixJQUFJLENBQUMsSUFBSSxJQUFJLENBQUMsSUFBSSxFQUFFO1FBQ2xCLE1BQU0sSUFBSSxnQkFBUSxDQUFDOzs7S0FHbEIsQ0FBQyxDQUFBO0tBQ0g7SUFDRCxPQUFPLElBQUksQ0FBQTtBQUNiLENBQUMsQ0FBQTtBQUVELEtBQUssVUFBVSxJQUFJO0lBQ2pCLE1BQU0sV0FBVyxHQUFHLENBQUMsUUFBa0IsRUFBRSxFQUFFLENBQUMsa0NBQWtDLGVBQWUsQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFBO0lBQ3pHLE1BQU0sSUFBSSxHQUFHLElBQUEsY0FBTyxHQUFFLENBQUE7SUFDdEIsTUFBTSxPQUFPLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUMvQixNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUE7SUFDaEMsTUFBTSxVQUFVLEdBQWtCLElBQUEsMkJBQWMsR0FBRSxDQUFBO0lBRWxELE1BQU0sUUFBUSxHQUFHLE1BQU0sSUFBQSxzQkFBVyxFQUFDLFVBQVUsQ0FBQyxDQUFBO0lBRTlDLElBQUksQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxFQUFFO1FBQy9CLElBQUksU0FBUyxFQUFFO1lBQ2IsR0FBRyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQTtZQUMvQixPQUFNO1NBQ1A7UUFDRCxNQUFNLElBQUksZ0JBQVEsQ0FBQyxXQUFXLE9BQU8sZ0JBQWdCLFdBQVcsQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLENBQUE7S0FDOUU7SUFHRCxNQUFNLEdBQUcsR0FBRyxPQUFPLENBQUMsR0FBRyx3QkFBYSxJQUFJLE9BQU8sRUFBRSxDQUFDLENBQUE7SUFFbEQsSUFBSSxrQkFBa0IsQ0FBQyxHQUFHLENBQUMsRUFBRTtRQUMzQixNQUFNLE9BQU8sR0FBRyxFQUFFLElBQUksRUFBRSxHQUFHLENBQUMsSUFBSSxFQUFFLFVBQVUsRUFBRSxDQUFBO1FBQzlDLFNBQVMsQ0FBQyxDQUFDLENBQUMsTUFBTSxHQUFHLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUE7S0FDOUQ7SUFJRCxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxRQUFRLElBQUksQ0FBQyxDQUFDLENBQUE7QUFDckMsQ0FBQztBQUVELElBQUksRUFBRSxDQUFDLEtBQUssQ0FBQyxXQUFXLENBQUMsQ0FBQSIsInNvdXJjZXNDb250ZW50IjpbIiMhL3Vzci9iaW4vZW52IG5vZGVcblxuLypcbiAgaXN0YW5idWwgaWdub3JlIGZpbGVcbiAgRG9lc24ndCBtYWtlIHNlbnNlIHRvIHRlc3QgdGhpcyBmaWxlXG4qL1xuXG5pbXBvcnQgeyBnZXRBcmdzIH0gZnJvbSAnLi91dGlscy9hcmdzJ1xuaW1wb3J0IHsgdG9TdHJpbmdMaXN0IH0gZnJvbSAnLi91dGlscy9vdXQtbWVzc2FnZXMnXG5pbXBvcnQgKiBhcyBsb2cgZnJvbSAnLi91dGlscy9sb2cnXG5pbXBvcnQgeyBDbGlFcnJvciB9IGZyb20gJy4vdXRpbHMvZXJyb3InXG5pbXBvcnQgeyBDT01NQU5EU19QQVRILCBnZXRDb21tYW5kcyB9IGZyb20gJy4vdXRpbHMvY29tbWFuZHMnXG5pbXBvcnQgeyBDbGlDb21wb25lbnRzLCBpbml0Q29tcG9uZW50cyB9IGZyb20gJy4vY29tcG9uZW50cydcblxuZXhwb3J0IGludGVyZmFjZSBPcHRpb25zIHtcbiAgYXJnczogUmV0dXJuVHlwZTx0eXBlb2YgZ2V0QXJncz5cbiAgY29tcG9uZW50czogQ2xpQ29tcG9uZW50c1xufVxuXG4vLyBsZWF2aW5nIGFyZ3MgYXMgXCJhbnlcIiBzaW5jZSB3ZSBkb24ndCBrbm93IHlldCBpZiB3ZSB3aWxsIHVzZSB0aGVtXG50eXBlIEZpbGVGbiA9IChvcHRpb25zOiBPcHRpb25zKSA9PiBQcm9taXNlPHZvaWQ+XG5cbmludGVyZmFjZSBGaWxlRXhwb3J0cyB7XG4gIGhlbHA/OiBGaWxlRm5cbiAgbWFpbj86IEZpbGVGblxuICBhcmdzPzogUmV0dXJuVHlwZTx0eXBlb2YgZ2V0QXJncz5cbn1cblxuY29uc3QgbGlzdENvbW1hbmRzU3RyID0gKGNvbW1hbmRzOiBzdHJpbmdbXSkgPT4gdG9TdHJpbmdMaXN0KGNvbW1hbmRzLm1hcCgoJCkgPT4gYG5weCBAZGNsL3NkayAkeyR9YCkpXG5cbmNvbnN0IGhhbmRsZUVycm9yID0gKGVycjogRXJyb3IpID0+IHtcbiAgaWYgKGVyciBpbnN0YW5jZW9mIENsaUVycm9yKSB7XG4gICAgbG9nLmZhaWwoZXJyLm1lc3NhZ2UpXG4gIH0gZWxzZSB7XG4gICAgLy8gbG9nIHdpdGggY29uc29sZSB0byBzaG93IHN0YWNrdHJhY2UgYW5kIGRlYnVnIGluZm9ybWF0aW9uXG4gICAgY29uc29sZS5lcnJvcihlcnIpXG4gICAgbG9nLndhcm4oYERldmVsb3BlcjogQWxsIGVycm9ycyB0aHJvd24gbXVzdCBiZSBhbiBpbnN0YW5jZSBvZiBcIkNsaUVycm9yXCJgKVxuICB9XG5cbiAgLy8gc2V0IGFuIGV4aXQgY29kZSBidXQgbm90IGZpbmlzaCB0aGUgcHJvZ3JhbSBpbW1lZGlhdGVseSB0byBjbG9zZSBhbnkgcGVuZGluZyB3b3JrXG4gIHByb2Nlc3MuZXhpdENvZGUgPSAxXG59XG5cbmNvbnN0IGNvbW1hbmRGbnNBcmVWYWxpZCA9IChmbnM6IEZpbGVFeHBvcnRzKTogZm5zIGlzIFJlcXVpcmVkPEZpbGVFeHBvcnRzPiA9PiB7XG4gIGNvbnN0IHsgaGVscCwgbWFpbiB9ID0gZm5zXG4gIGlmICghaGVscCB8fCAhbWFpbikge1xuICAgIHRocm93IG5ldyBDbGlFcnJvcihgQ29tbWFuZCBkb2VzIG5vdCBmb2xsb3cgaW1wbGVtZW50YXRpb24gcnVsZXM6XG4gICAgICAqIFJlcXVpcmVzIGEgXCJoZWxwXCIgZnVuY3Rpb25cbiAgICAgICogUmVxdWlyZXMgYSBcIm1haW5cIiBmdW5jdGlvblxuICAgIGApXG4gIH1cbiAgcmV0dXJuIHRydWVcbn1cblxuYXN5bmMgZnVuY3Rpb24gbWFpbigpIHtcbiAgY29uc3QgaGVscE1lc3NhZ2UgPSAoY29tbWFuZHM6IHN0cmluZ1tdKSA9PiBgSGVyZSBpcyB0aGUgbGlzdCBvZiBjb21tYW5kczpcXG4ke2xpc3RDb21tYW5kc1N0cihjb21tYW5kcyl9YFxuICBjb25zdCBhcmdzID0gZ2V0QXJncygpXG4gIGNvbnN0IGNvbW1hbmQgPSBwcm9jZXNzLmFyZ3ZbMl1cbiAgY29uc3QgbmVlZHNIZWxwID0gYXJnc1snLS1oZWxwJ11cbiAgY29uc3QgY29tcG9uZW50czogQ2xpQ29tcG9uZW50cyA9IGluaXRDb21wb25lbnRzKClcblxuICBjb25zdCBjb21tYW5kcyA9IGF3YWl0IGdldENvbW1hbmRzKGNvbXBvbmVudHMpXG5cbiAgaWYgKCFjb21tYW5kcy5pbmNsdWRlcyhjb21tYW5kKSkge1xuICAgIGlmIChuZWVkc0hlbHApIHtcbiAgICAgIGxvZy5pbmZvKGhlbHBNZXNzYWdlKGNvbW1hbmRzKSlcbiAgICAgIHJldHVyblxuICAgIH1cbiAgICB0aHJvdyBuZXcgQ2xpRXJyb3IoYENvbW1hbmQgJHtjb21tYW5kfSBpcyBpbnZhbGlkLiAke2hlbHBNZXNzYWdlKGNvbW1hbmRzKX1gKVxuICB9XG5cbiAgLy8gZXNsaW50LWRpc2FibGUtbmV4dC1saW5lIEB0eXBlc2NyaXB0LWVzbGludC9uby12YXItcmVxdWlyZXNcbiAgY29uc3QgY21kID0gcmVxdWlyZShgJHtDT01NQU5EU19QQVRIfS8ke2NvbW1hbmR9YClcblxuICBpZiAoY29tbWFuZEZuc0FyZVZhbGlkKGNtZCkpIHtcbiAgICBjb25zdCBvcHRpb25zID0geyBhcmdzOiBjbWQuYXJncywgY29tcG9uZW50cyB9XG4gICAgbmVlZHNIZWxwID8gYXdhaXQgY21kLmhlbHAob3B0aW9ucykgOiBhd2FpdCBjbWQubWFpbihvcHRpb25zKVxuICB9XG5cbiAgLy8gcm9sbHVwIHdhdGNoZXIgbGVhdmVzIG1hbnkgb3BlbiBGU1dhdGNoZXIgZXZlbiBpbiBidWlsZCBtb2RlLiB3ZSBtdXN0IGNhbGxcbiAgLy8gcHJvY2Vzcy5leGl0IGF0IHRoaXMgcG9pbnQgdG8gcHJldmVudCB0aGUgcHJvZ3JhbSBoYWx0aW5nIGZvcmV2ZXJcbiAgcHJvY2Vzcy5leGl0KHByb2Nlc3MuZXhpdENvZGUgfHwgMClcbn1cblxubWFpbigpLmNhdGNoKGhhbmRsZUVycm9yKVxuIl19

package/cli/index.ts

@@ -7,7 +7,7 @@
 
 import { getArgs } from './utils/args'
 import { toStringList } from './utils/out-messages'
-import log from './utils/log'
+import * as log from './utils/log'
 import { CliError } from './utils/error'
 import { COMMANDS_PATH, getCommands } from './utils/commands'
 import { CliComponents, initComponents } from './components'
@@ -28,12 +28,17 @@ interface FileExports {
 
 const listCommandsStr = (commands: string[]) => toStringList(commands.map(($) => `npx @dcl/sdk ${$}`))
 
-const handleError = (err: CliError) => {
-  if (!(err instanceof CliError)) {
+const handleError = (err: Error) => {
+  if (err instanceof CliError) {
+    log.fail(err.message)
+  } else {
+    // log with console to show stacktrace and debug information
+    console.error(err)
     log.warn(`Developer: All errors thrown must be an instance of "CliError"`)
   }
-  log.fail(err.message)
-  process.exit(1)
+
+  // set an exit code but not finish the program immediately to close any pending work
+  process.exitCode = 1
 }
 
 const commandFnsAreValid = (fns: FileExports): fns is Required<FileExports> => {
@@ -47,10 +52,9 @@ const commandFnsAreValid = (fns: FileExports): fns is Required<FileExports> => {
   return true
 }
 
-const args = getArgs()
-const helpMessage = (commands: string[]) => `Here is the list of commands:\n${listCommandsStr(commands)}`
-
-;(async () => {
+async function main() {
+  const helpMessage = (commands: string[]) => `Here is the list of commands:\n${listCommandsStr(commands)}`
+  const args = getArgs()
   const command = process.argv[2]
   const needsHelp = args['--help']
   const components: CliComponents = initComponents()
@@ -72,4 +76,10 @@ const helpMessage = (commands: string[]) => `Here is the list of commands:\n${li
     const options = { args: cmd.args, components }
     needsHelp ? await cmd.help(options) : await cmd.main(options)
   }
-})().catch(handleError)
+
+  // rollup watcher leaves many open FSWatcher even in build mode. we must call
+  // process.exit at this point to prevent the program halting forever
+  process.exit(process.exitCode || 0)
+}
+
+main().catch(handleError)

package/cli/utils/exec.d.ts

@@ -4,5 +4,5 @@ interface Options {
     };
     silent: boolean;
 }
-export declare function exec(cwd: string, command: string, { env, silent }?: Partial<Options>): Promise<void>;
+export declare function exec(cwd: string, command: string, args: string[], { env, silent }?: Partial<Options>): Promise<void>;
 export {};

package/cli/utils/exec.js

@@ -2,10 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.exec = void 0;
 const child_process_1 = require("child_process");
-function exec(cwd, command, { env, silent } = {}) {
+function exec(cwd, command, args, { env, silent } = {}) {
     return new Promise((resolve, reject) => {
-        const [cmd, ...rest] = command.split(' ');
-        const child = (0, child_process_1.spawn)(cmd, rest, {
+        const child = (0, child_process_1.spawn)(command, args, {
             shell: true,
             cwd,
             env: Object.assign(Object.assign(Object.assign({}, process.env), { NODE_ENV: '' }), env)
@@ -21,8 +20,8 @@ function exec(cwd, command, { env, silent } = {}) {
         });
         child.on('close', (code) => {
             if (code !== 0) {
-                const command = `${cmd} ${rest.join(' ')}`;
-                reject(new Error(`Command "${command}" exited with code ${code}. Please try running the command manually`));
+                const _ = `${command} ${args.join(' ')}`;
+                reject(new Error(`Command "${_}" exited with code ${code}. Please try running the command manually`));
                 return;
             }
             resolve(undefined);
@@ -30,4 +29,4 @@ function exec(cwd, command, { env, silent } = {}) {
     });
 }
 exports.exec = exec;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlYy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImV4ZWMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsaURBQXFDO0FBT3JDLFNBQWdCLElBQUksQ0FBQyxHQUFXLEVBQUUsT0FBZSxFQUFFLEVBQUUsR0FBRyxFQUFFLE1BQU0sS0FBdUIsRUFBRTtJQUN2RixPQUFPLElBQUksT0FBTyxDQUFDLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFO1FBQ3JDLE1BQU0sQ0FBQyxHQUFHLEVBQUUsR0FBRyxJQUFJLENBQUMsR0FBRyxPQUFPLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBQ3pDLE1BQU0sS0FBSyxHQUFHLElBQUEscUJBQUssRUFBQyxHQUFHLEVBQUUsSUFBSSxFQUFFO1lBQzdCLEtBQUssRUFBRSxJQUFJO1lBQ1gsR0FBRztZQUNILEdBQUcsZ0RBQU8sT0FBTyxDQUFDLEdBQUcsS0FBRSxRQUFRLEVBQUUsRUFBRSxLQUFLLEdBQUcsQ0FBRTtTQUM5QyxDQUFDLENBQUE7UUFFRixJQUFJLENBQUMsTUFBTSxFQUFFO1lBQ1gsS0FBSyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFBO1lBQ2pDLEtBQUssQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQTtTQUNsQztRQUVELEtBQUssQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLE1BQU0sRUFBRSxDQUFDLElBQUksRUFBRSxFQUFFO1lBQy9CLElBQUksSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDLE9BQU8sQ0FBQywwQ0FBMEMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFO2dCQUM5RSxPQUFPLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQTthQUMxQjtRQUNILENBQUMsQ0FBQyxDQUFBO1FBRUYsS0FBSyxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxJQUFZLEVBQUUsRUFBRTtZQUNqQyxJQUFJLElBQUksS0FBSyxDQUFDLEVBQUU7Z0JBQ2QsTUFBTSxPQUFPLEdBQUcsR0FBRyxHQUFHLElBQUksSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFBO2dCQUMxQyxNQUFNLENBQUMsSUFBSSxLQUFLLENBQUMsWUFBWSxPQUFPLHNCQUFzQixJQUFJLDJDQUEyQyxDQUFDLENBQUMsQ0FBQTtnQkFDM0csT0FBTTthQUNQO1lBRUQsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFBO1FBQ3BCLENBQUMsQ0FBQyxDQUFBO0lBQ0osQ0FBQyxDQUFDLENBQUE7QUFDSixDQUFDO0FBOUJELG9CQThCQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IHNwYXduIH0gZnJvbSAnY2hpbGRfcHJvY2VzcydcblxuaW50ZXJmYWNlIE9wdGlvbnMge1xuICBlbnY6IHsgW2tleTogc3RyaW5nXTogc3RyaW5nIH1cbiAgc2lsZW50OiBib29sZWFuXG59XG5cbmV4cG9ydCBmdW5jdGlvbiBleGVjKGN3ZDogc3RyaW5nLCBjb21tYW5kOiBzdHJpbmcsIHsgZW52LCBzaWxlbnQgfTogUGFydGlhbDxPcHRpb25zPiA9IHt9KTogUHJvbWlzZTx2b2lkPiB7XG4gIHJldHVybiBuZXcgUHJvbWlzZSgocmVzb2x2ZSwgcmVqZWN0KSA9PiB7XG4gICAgY29uc3QgW2NtZCwgLi4ucmVzdF0gPSBjb21tYW5kLnNwbGl0KCcgJylcbiAgICBjb25zdCBjaGlsZCA9IHNwYXduKGNtZCwgcmVzdCwge1xuICAgICAgc2hlbGw6IHRydWUsXG4gICAgICBjd2QsXG4gICAgICBlbnY6IHsgLi4ucHJvY2Vzcy5lbnYsIE5PREVfRU5WOiAnJywgLi4uZW52IH1cbiAgICB9KVxuXG4gICAgaWYgKCFzaWxlbnQpIHtcbiAgICAgIGNoaWxkLnN0ZG91dC5waXBlKHByb2Nlc3Muc3Rkb3V0KVxuICAgICAgY2hpbGQuc3RkZXJyLnBpcGUocHJvY2Vzcy5zdGRlcnIpXG4gICAgfVxuXG4gICAgY2hpbGQuc3Rkb3V0Lm9uKCdkYXRhJywgKGRhdGEpID0+IHtcbiAgICAgIGlmIChkYXRhLnRvU3RyaW5nKCkuaW5kZXhPZignVGhlIGNvbXBpbGVyIGlzIHdhdGNoaW5nIGZpbGUgY2hhbmdlcy4uLicpICE9PSAtMSkge1xuICAgICAgICByZXR1cm4gcmVzb2x2ZSh1bmRlZmluZWQpXG4gICAgICB9XG4gICAgfSlcblxuICAgIGNoaWxkLm9uKCdjbG9zZScsIChjb2RlOiBudW1iZXIpID0+IHtcbiAgICAgIGlmIChjb2RlICE9PSAwKSB7XG4gICAgICAgIGNvbnN0IGNvbW1hbmQgPSBgJHtjbWR9ICR7cmVzdC5qb2luKCcgJyl9YFxuICAgICAgICByZWplY3QobmV3IEVycm9yKGBDb21tYW5kIFwiJHtjb21tYW5kfVwiIGV4aXRlZCB3aXRoIGNvZGUgJHtjb2RlfS4gUGxlYXNlIHRyeSBydW5uaW5nIHRoZSBjb21tYW5kIG1hbnVhbGx5YCkpXG4gICAgICAgIHJldHVyblxuICAgICAgfVxuXG4gICAgICByZXNvbHZlKHVuZGVmaW5lZClcbiAgICB9KVxuICB9KVxufVxuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlYy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImV4ZWMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsaURBQXFDO0FBT3JDLFNBQWdCLElBQUksQ0FDbEIsR0FBVyxFQUNYLE9BQWUsRUFDZixJQUFjLEVBQ2QsRUFBRSxHQUFHLEVBQUUsTUFBTSxLQUF1QixFQUFFO0lBRXRDLE9BQU8sSUFBSSxPQUFPLENBQUMsQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUU7UUFDckMsTUFBTSxLQUFLLEdBQUcsSUFBQSxxQkFBSyxFQUFDLE9BQU8sRUFBRSxJQUFJLEVBQUU7WUFDakMsS0FBSyxFQUFFLElBQUk7WUFDWCxHQUFHO1lBQ0gsR0FBRyxnREFBTyxPQUFPLENBQUMsR0FBRyxLQUFFLFFBQVEsRUFBRSxFQUFFLEtBQUssR0FBRyxDQUFFO1NBQzlDLENBQUMsQ0FBQTtRQUVGLElBQUksQ0FBQyxNQUFNLEVBQUU7WUFDWCxLQUFLLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUE7WUFDakMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFBO1NBQ2xDO1FBRUQsS0FBSyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsSUFBSSxFQUFFLEVBQUU7WUFDL0IsSUFBSSxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUMsT0FBTyxDQUFDLDBDQUEwQyxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUU7Z0JBQzlFLE9BQU8sT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFBO2FBQzFCO1FBQ0gsQ0FBQyxDQUFDLENBQUE7UUFFRixLQUFLLENBQUMsRUFBRSxDQUFDLE9BQU8sRUFBRSxDQUFDLElBQVksRUFBRSxFQUFFO1lBQ2pDLElBQUksSUFBSSxLQUFLLENBQUMsRUFBRTtnQkFDZCxNQUFNLENBQUMsR0FBRyxHQUFHLE9BQU8sSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUE7Z0JBQ3hDLE1BQU0sQ0FBQyxJQUFJLEtBQUssQ0FBQyxZQUFZLENBQUMsc0JBQXNCLElBQUksMkNBQTJDLENBQUMsQ0FBQyxDQUFBO2dCQUNyRyxPQUFNO2FBQ1A7WUFFRCxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUE7UUFDcEIsQ0FBQyxDQUFDLENBQUE7SUFDSixDQUFDLENBQUMsQ0FBQTtBQUNKLENBQUM7QUFsQ0Qsb0JBa0NDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgc3Bhd24gfSBmcm9tICdjaGlsZF9wcm9jZXNzJ1xuXG5pbnRlcmZhY2UgT3B0aW9ucyB7XG4gIGVudjogeyBba2V5OiBzdHJpbmddOiBzdHJpbmcgfVxuICBzaWxlbnQ6IGJvb2xlYW5cbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGV4ZWMoXG4gIGN3ZDogc3RyaW5nLFxuICBjb21tYW5kOiBzdHJpbmcsXG4gIGFyZ3M6IHN0cmluZ1tdLFxuICB7IGVudiwgc2lsZW50IH06IFBhcnRpYWw8T3B0aW9ucz4gPSB7fVxuKTogUHJvbWlzZTx2b2lkPiB7XG4gIHJldHVybiBuZXcgUHJvbWlzZSgocmVzb2x2ZSwgcmVqZWN0KSA9PiB7XG4gICAgY29uc3QgY2hpbGQgPSBzcGF3bihjb21tYW5kLCBhcmdzLCB7XG4gICAgICBzaGVsbDogdHJ1ZSxcbiAgICAgIGN3ZCxcbiAgICAgIGVudjogeyAuLi5wcm9jZXNzLmVudiwgTk9ERV9FTlY6ICcnLCAuLi5lbnYgfVxuICAgIH0pXG5cbiAgICBpZiAoIXNpbGVudCkge1xuICAgICAgY2hpbGQuc3Rkb3V0LnBpcGUocHJvY2Vzcy5zdGRvdXQpXG4gICAgICBjaGlsZC5zdGRlcnIucGlwZShwcm9jZXNzLnN0ZGVycilcbiAgICB9XG5cbiAgICBjaGlsZC5zdGRvdXQub24oJ2RhdGEnLCAoZGF0YSkgPT4ge1xuICAgICAgaWYgKGRhdGEudG9TdHJpbmcoKS5pbmRleE9mKCdUaGUgY29tcGlsZXIgaXMgd2F0Y2hpbmcgZmlsZSBjaGFuZ2VzLi4uJykgIT09IC0xKSB7XG4gICAgICAgIHJldHVybiByZXNvbHZlKHVuZGVmaW5lZClcbiAgICAgIH1cbiAgICB9KVxuXG4gICAgY2hpbGQub24oJ2Nsb3NlJywgKGNvZGU6IG51bWJlcikgPT4ge1xuICAgICAgaWYgKGNvZGUgIT09IDApIHtcbiAgICAgICAgY29uc3QgXyA9IGAke2NvbW1hbmR9ICR7YXJncy5qb2luKCcgJyl9YFxuICAgICAgICByZWplY3QobmV3IEVycm9yKGBDb21tYW5kIFwiJHtffVwiIGV4aXRlZCB3aXRoIGNvZGUgJHtjb2RlfS4gUGxlYXNlIHRyeSBydW5uaW5nIHRoZSBjb21tYW5kIG1hbnVhbGx5YCkpXG4gICAgICAgIHJldHVyblxuICAgICAgfVxuXG4gICAgICByZXNvbHZlKHVuZGVmaW5lZClcbiAgICB9KVxuICB9KVxufVxuIl19

package/cli/utils/exec.ts

@@ -5,10 +5,14 @@ interface Options {
   silent: boolean
 }
 
-export function exec(cwd: string, command: string, { env, silent }: Partial<Options> = {}): Promise<void> {
+export function exec(
+  cwd: string,
+  command: string,
+  args: string[],
+  { env, silent }: Partial<Options> = {}
+): Promise<void> {
   return new Promise((resolve, reject) => {
-    const [cmd, ...rest] = command.split(' ')
-    const child = spawn(cmd, rest, {
+    const child = spawn(command, args, {
       shell: true,
       cwd,
       env: { ...process.env, NODE_ENV: '', ...env }
@@ -27,8 +31,8 @@ export function exec(cwd: string, command: string, { env, silent }: Partial<Opti
 
     child.on('close', (code: number) => {
       if (code !== 0) {
-        const command = `${cmd} ${rest.join(' ')}`
-        reject(new Error(`Command "${command}" exited with code ${code}. Please try running the command manually`))
+        const _ = `${command} ${args.join(' ')}`
+        reject(new Error(`Command "${_}" exited with code ${code}. Please try running the command manually`))
         return
       }
 

package/cli/utils/log.d.ts

@@ -1,13 +1,5 @@
-export declare function raw(message: string): void;
+export declare function log(message: string): void;
 export declare function fail(message: string): void;
 export declare function warn(message: string): void;
 export declare function info(message: string): void;
 export declare function succeed(message: string): void;
-declare const _default: {
-    raw: typeof raw;
-    fail: typeof fail;
-    warn: typeof warn;
-    info: typeof info;
-    succeed: typeof succeed;
-};
-export default _default;

package/cli/utils/log.js

@@ -1,31 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.succeed = exports.info = exports.warn = exports.fail = exports.raw = void 0;
-function raw(message) {
-    console.log(message);
+exports.succeed = exports.info = exports.warn = exports.fail = exports.log = void 0;
+const colorette_1 = require("colorette");
+const stderr = (...parameters) => process.stderr.write(`${parameters.join('')}\n`);
+const colors = (0, colorette_1.createColors)({
+    useColor: process.env.FORCE_COLOR !== '0' && !process.env.NO_COLOR
+});
+function log(message) {
+    stderr(message);
 }
-exports.raw = raw;
+exports.log = log;
 function fail(message) {
-    console.log(`🔴 ${message}`);
+    stderr(colors.redBright('  Error: '), message);
 }
 exports.fail = fail;
 function warn(message) {
-    console.log(`🟠 ${message}`);
+    stderr(colors.yellow('Warning: '), message);
 }
 exports.warn = warn;
 function info(message) {
-    console.log(`🔵 ${message}`);
+    stderr(colors.blueBright('   Info: '), message);
 }
 exports.info = info;
 function succeed(message) {
-    console.log(`🟢 ${message}`);
+    stderr(colors.green('Success: '), message);
 }
 exports.succeed = succeed;
-exports.default = {
-    raw,
-    fail,
-    warn,
-    info,
-    succeed
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsibG9nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLFNBQWdCLEdBQUcsQ0FBQyxPQUFlO0lBQ2pDLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUE7QUFDdEIsQ0FBQztBQUZELGtCQUVDO0FBRUQsU0FBZ0IsSUFBSSxDQUFDLE9BQWU7SUFDbEMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLE9BQU8sRUFBRSxDQUFDLENBQUE7QUFDOUIsQ0FBQztBQUZELG9CQUVDO0FBRUQsU0FBZ0IsSUFBSSxDQUFDLE9BQWU7SUFDbEMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLE9BQU8sRUFBRSxDQUFDLENBQUE7QUFDOUIsQ0FBQztBQUZELG9CQUVDO0FBRUQsU0FBZ0IsSUFBSSxDQUFDLE9BQWU7SUFDbEMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLE9BQU8sRUFBRSxDQUFDLENBQUE7QUFDOUIsQ0FBQztBQUZELG9CQUVDO0FBRUQsU0FBZ0IsT0FBTyxDQUFDLE9BQWU7SUFDckMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLE9BQU8sRUFBRSxDQUFDLENBQUE7QUFDOUIsQ0FBQztBQUZELDBCQUVDO0FBRUQsa0JBQWU7SUFDYixHQUFHO0lBQ0gsSUFBSTtJQUNKLElBQUk7SUFDSixJQUFJO0lBQ0osT0FBTztDQUNSLENBQUEiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgZnVuY3Rpb24gcmF3KG1lc3NhZ2U6IHN0cmluZykge1xuICBjb25zb2xlLmxvZyhtZXNzYWdlKVxufVxuXG5leHBvcnQgZnVuY3Rpb24gZmFpbChtZXNzYWdlOiBzdHJpbmcpIHtcbiAgY29uc29sZS5sb2coYPCflLQgJHttZXNzYWdlfWApXG59XG5cbmV4cG9ydCBmdW5jdGlvbiB3YXJuKG1lc3NhZ2U6IHN0cmluZykge1xuICBjb25zb2xlLmxvZyhg8J+foCAke21lc3NhZ2V9YClcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGluZm8obWVzc2FnZTogc3RyaW5nKSB7XG4gIGNvbnNvbGUubG9nKGDwn5S1ICR7bWVzc2FnZX1gKVxufVxuXG5leHBvcnQgZnVuY3Rpb24gc3VjY2VlZChtZXNzYWdlOiBzdHJpbmcpIHtcbiAgY29uc29sZS5sb2coYPCfn6IgJHttZXNzYWdlfWApXG59XG5cbmV4cG9ydCBkZWZhdWx0IHtcbiAgcmF3LFxuICBmYWlsLFxuICB3YXJuLFxuICBpbmZvLFxuICBzdWNjZWVkXG59XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsibG9nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHlDQUF3QztBQVl4QyxNQUFNLE1BQU0sR0FBRyxDQUFDLEdBQUcsVUFBOEIsRUFBRSxFQUFFLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQTtBQUl0RyxNQUFNLE1BQU0sR0FBRyxJQUFBLHdCQUFZLEVBQUM7SUFDMUIsUUFBUSxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVyxLQUFLLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUTtDQUNuRSxDQUFDLENBQUE7QUFFRixTQUFnQixHQUFHLENBQUMsT0FBZTtJQUNqQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUE7QUFDakIsQ0FBQztBQUZELGtCQUVDO0FBRUQsU0FBZ0IsSUFBSSxDQUFDLE9BQWU7SUFDbEMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsV0FBVyxDQUFDLEVBQUUsT0FBTyxDQUFDLENBQUE7QUFDaEQsQ0FBQztBQUZELG9CQUVDO0FBRUQsU0FBZ0IsSUFBSSxDQUFDLE9BQWU7SUFDbEMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLEVBQUUsT0FBTyxDQUFDLENBQUE7QUFDN0MsQ0FBQztBQUZELG9CQUVDO0FBRUQsU0FBZ0IsSUFBSSxDQUFDLE9BQWU7SUFDbEMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsV0FBVyxDQUFDLEVBQUUsT0FBTyxDQUFDLENBQUE7QUFDakQsQ0FBQztBQUZELG9CQUVDO0FBRUQsU0FBZ0IsT0FBTyxDQUFDLE9BQWU7SUFDckMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDLEVBQUUsT0FBTyxDQUFDLENBQUE7QUFDNUMsQ0FBQztBQUZELDBCQUVDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgY3JlYXRlQ29sb3JzIH0gZnJvbSAnY29sb3JldHRlJ1xuXG4vKipcbiAqIFRoaXMgZmlsZSBpbWl0YXRlcyBcImNhcmdvXCIgbG9ncy4gVGhlIHdvcmRzIGFyZSBhbGlnbmVkIHdpdGggdGhlIGNvbG9uIGxpa2UgdGhpczpcbiAqICAgICAgICBWXG4gKiAgIEVycm9yOiBzb21lIHRleHQgcHJvdmlkZWQgYXMgYXJndW1lblxuICogICAgSW5mbzogc29tZSB0ZXh0IHByb3ZpZGVkIGFzIGFyZ3VtZW5cbiAqIFN1Y2Nlc3M6IHNvbWUgdGV4dCBwcm92aWRlZCBhcyBhcmd1bWVuXG4gKiBXYXJuaW5nOiBzb21lIHRleHQgcHJvdmlkZWQgYXMgYXJndW1lblxuICogICAgICAgIF5cbiAqL1xuXG5jb25zdCBzdGRlcnIgPSAoLi4ucGFyYW1ldGVyczogcmVhZG9ubHkgdW5rbm93bltdKSA9PiBwcm9jZXNzLnN0ZGVyci53cml0ZShgJHtwYXJhbWV0ZXJzLmpvaW4oJycpfVxcbmApXG5cbi8vIEBzZWUgaHR0cHM6Ly9uby1jb2xvci5vcmdcbi8vIEBzZWUgaHR0cHM6Ly93d3cubnBtanMuY29tL3BhY2thZ2UvY2hhbGtcbmNvbnN0IGNvbG9ycyA9IGNyZWF0ZUNvbG9ycyh7XG4gIHVzZUNvbG9yOiBwcm9jZXNzLmVudi5GT1JDRV9DT0xPUiAhPT0gJzAnICYmICFwcm9jZXNzLmVudi5OT19DT0xPUlxufSlcblxuZXhwb3J0IGZ1bmN0aW9uIGxvZyhtZXNzYWdlOiBzdHJpbmcpIHtcbiAgc3RkZXJyKG1lc3NhZ2UpXG59XG5cbmV4cG9ydCBmdW5jdGlvbiBmYWlsKG1lc3NhZ2U6IHN0cmluZykge1xuICBzdGRlcnIoY29sb3JzLnJlZEJyaWdodCgnICBFcnJvcjogJyksIG1lc3NhZ2UpXG59XG5cbmV4cG9ydCBmdW5jdGlvbiB3YXJuKG1lc3NhZ2U6IHN0cmluZykge1xuICBzdGRlcnIoY29sb3JzLnllbGxvdygnV2FybmluZzogJyksIG1lc3NhZ2UpXG59XG5cbmV4cG9ydCBmdW5jdGlvbiBpbmZvKG1lc3NhZ2U6IHN0cmluZykge1xuICBzdGRlcnIoY29sb3JzLmJsdWVCcmlnaHQoJyAgIEluZm86ICcpLCBtZXNzYWdlKVxufVxuXG5leHBvcnQgZnVuY3Rpb24gc3VjY2VlZChtZXNzYWdlOiBzdHJpbmcpIHtcbiAgc3RkZXJyKGNvbG9ycy5ncmVlbignU3VjY2VzczogJyksIG1lc3NhZ2UpXG59XG4iXX0=

package/cli/utils/log.ts

@@ -1,27 +1,39 @@
-export function raw(message: string) {
-  console.log(message)
+import { createColors } from 'colorette'
+
+/**
+ * This file imitates "cargo" logs. The words are aligned with the colon like this:
+ *        V
+ *   Error: some text provided as argumen
+ *    Info: some text provided as argumen
+ * Success: some text provided as argumen
+ * Warning: some text provided as argumen
+ *        ^
+ */
+
+const stderr = (...parameters: readonly unknown[]) => process.stderr.write(`${parameters.join('')}\n`)
+
+// @see https://no-color.org
+// @see https://www.npmjs.com/package/chalk
+const colors = createColors({
+  useColor: process.env.FORCE_COLOR !== '0' && !process.env.NO_COLOR
+})
+
+export function log(message: string) {
+  stderr(message)
 }
 
 export function fail(message: string) {
-  console.log(`🔴 ${message}`)
+  stderr(colors.redBright('  Error: '), message)
 }
 
 export function warn(message: string) {
-  console.log(`🟠 ${message}`)
+  stderr(colors.yellow('Warning: '), message)
 }
 
 export function info(message: string) {
-  console.log(`🔵 ${message}`)
+  stderr(colors.blueBright('   Info: '), message)
 }
 
 export function succeed(message: string) {
-  console.log(`🟢 ${message}`)
-}
-
-export default {
-  raw,
-  fail,
-  warn,
-  info,
-  succeed
+  stderr(colors.green('Success: '), message)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcl/sdk",
-  "version": "7.0.6-4086929545.commit-0292186",
+  "version": "7.0.6-4087611163.commit-4735f5b",
   "description": "",
   "main": "./index.js",
   "typings": "./index.d.ts",
@@ -20,13 +20,13 @@
   "author": "Decentraland",
   "license": "Apache-2.0",
   "dependencies": {
-    "@dcl/dcl-rollup": "7.0.6-4086929545.commit-0292186",
-    "@dcl/ecs": "7.0.6-4086929545.commit-0292186",
+    "@dcl/dcl-rollup": "7.0.6-4087611163.commit-4735f5b",
+    "@dcl/ecs": "7.0.6-4087611163.commit-4735f5b",
     "@dcl/ecs-math": "2.0.1-20221129185242.commit-40495c1",
-    "@dcl/explorer": "1.0.74928-20230130201703.commit-6da8317",
-    "@dcl/js-runtime": "7.0.6-4086929545.commit-0292186",
+    "@dcl/explorer": "1.0.76945-20230203192753.commit-55553af",
+    "@dcl/js-runtime": "7.0.6-4087611163.commit-4735f5b",
     "@dcl/mini-comms": "1.0.0",
-    "@dcl/react-ecs": "7.0.6-4086929545.commit-0292186",
+    "@dcl/react-ecs": "7.0.6-4087611163.commit-4735f5b",
     "@dcl/schemas": "6.6.0",
     "@types/inquirer": "^8.2.5",
     "@well-known-components/env-config-provider": "^1.1.2-20220801195549.commit-101c273",
@@ -34,7 +34,9 @@
     "@well-known-components/logger": "^3.0.0",
     "@well-known-components/metrics": "^2.0.1-20220909150423.commit-8f7e5bc",
     "arg": "5.0.2",
+    "colorette": "^2.0.19",
     "extract-zip": "2.0.1",
+    "ignore": "^5.2.4",
     "inquirer": "^8.2.5",
     "node-fetch": "^2.6.8",
     "open": "^8.4.0",
@@ -53,5 +55,5 @@
     "displayName": "SDK",
     "tsconfig": "./tsconfig.json"
   },
-  "commit": "029218605ffb8e959701a4f954189e04d9851089"
+  "commit": "4735f5b60e904595e174bab3edec3a5fd117f838"
 }

package/cli/utils/handler.d.ts

@@ -1,6 +0,0 @@
-import { CliError } from './error';
-type Args = {
-    [key: string]: any;
-};
-export declare function main<T extends Args>(handlerFn: (args: T) => Promise<void>, errorFn?: (error: CliError) => Promise<void>): (args: T) => Promise<void>;
-export {};

package/cli/utils/handler.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.main = void 0;
-const error_1 = require("./error");
-function main(handlerFn, errorFn) {
-    return async function handler(args) {
-        try {
-            await handlerFn(args);
-        }
-        catch (e) {
-            if (typeof errorFn === 'function') {
-                await errorFn(e);
-            }
-            throw new error_1.CliError(e.message);
-        }
-    };
-}
-exports.main = main;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGFuZGxlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImhhbmRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsbUNBQWtDO0FBSWxDLFNBQWdCLElBQUksQ0FDbEIsU0FBcUMsRUFDckMsT0FBNEM7SUFFNUMsT0FBTyxLQUFLLFVBQVUsT0FBTyxDQUFDLElBQU87UUFDbkMsSUFBSTtZQUNGLE1BQU0sU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFBO1NBQ3RCO1FBQUMsT0FBTyxDQUFNLEVBQUU7WUFFZixJQUFJLE9BQU8sT0FBTyxLQUFLLFVBQVUsRUFBRTtnQkFDakMsTUFBTSxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUE7YUFDakI7WUFJRCxNQUFNLElBQUksZ0JBQVEsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUE7U0FDOUI7SUFDSCxDQUFDLENBQUE7QUFDSCxDQUFDO0FBbEJELG9CQWtCQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENsaUVycm9yIH0gZnJvbSAnLi9lcnJvcidcblxudHlwZSBBcmdzID0geyBba2V5OiBzdHJpbmddOiBhbnkgfVxuXG5leHBvcnQgZnVuY3Rpb24gbWFpbjxUIGV4dGVuZHMgQXJncz4oXG4gIGhhbmRsZXJGbjogKGFyZ3M6IFQpID0+IFByb21pc2U8dm9pZD4sXG4gIGVycm9yRm4/OiAoZXJyb3I6IENsaUVycm9yKSA9PiBQcm9taXNlPHZvaWQ+XG4pIHtcbiAgcmV0dXJuIGFzeW5jIGZ1bmN0aW9uIGhhbmRsZXIoYXJnczogVCkge1xuICAgIHRyeSB7XG4gICAgICBhd2FpdCBoYW5kbGVyRm4oYXJncylcbiAgICB9IGNhdGNoIChlOiBhbnkpIHtcbiAgICAgIC8vIGRvIHNvbWUgc3R1ZmYgd2l0aCB0aGUgQ2xpRXJyb3IgY2xhc3MuLi5cbiAgICAgIGlmICh0eXBlb2YgZXJyb3JGbiA9PT0gJ2Z1bmN0aW9uJykge1xuICAgICAgICBhd2FpdCBlcnJvckZuKGUpXG4gICAgICB9XG5cbiAgICAgIC8vIHRyYWNrIHNvbWV0aGluZz9cblxuICAgICAgdGhyb3cgbmV3IENsaUVycm9yKGUubWVzc2FnZSlcbiAgICB9XG4gIH1cbn1cbiJdfQ==

package/cli/utils/handler.ts

@@ -1,23 +0,0 @@
-import { CliError } from './error'
-
-type Args = { [key: string]: any }
-
-export function main<T extends Args>(
-  handlerFn: (args: T) => Promise<void>,
-  errorFn?: (error: CliError) => Promise<void>
-) {
-  return async function handler(args: T) {
-    try {
-      await handlerFn(args)
-    } catch (e: any) {
-      // do some stuff with the CliError class...
-      if (typeof errorFn === 'function') {
-        await errorFn(e)
-      }
-
-      // track something?
-
-      throw new CliError(e.message)
-    }
-  }
-}