@dcl/sdk 7.0.6-4086929545.commit-0292186 → 7.0.6-4087883663.commit-054d424
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cli/commands/build/helpers.d.ts +1 -5
- package/cli/commands/build/helpers.js +10 -10
- package/cli/commands/build/helpers.ts +9 -15
- package/cli/commands/build/index.d.ts +1 -1
- package/cli/commands/build/index.js +22 -17
- package/cli/commands/build/index.ts +19 -19
- package/cli/commands/init/index.d.ts +1 -1
- package/cli/commands/init/index.js +4 -4
- package/cli/commands/init/index.ts +2 -3
- package/cli/commands/preview/index.d.ts +3 -1
- package/cli/commands/preview/index.js +18 -18
- package/cli/commands/preview/index.ts +21 -19
- package/cli/commands/preview/types.d.ts +4 -0
- package/cli/commands/preview/types.js +1 -1
- package/cli/commands/preview/types.ts +6 -0
- package/cli/commands/preview/wire.d.ts +2 -14
- package/cli/commands/preview/wire.js +2 -4
- package/cli/commands/preview/wire.ts +2 -24
- package/cli/commands/start/index.d.ts +1 -1
- package/cli/commands/start/index.js +14 -9
- package/cli/commands/start/index.ts +21 -8
- package/cli/index.js +38 -13
- package/cli/index.ts +20 -10
- package/cli/utils/exec.d.ts +1 -1
- package/cli/utils/exec.js +5 -6
- package/cli/utils/exec.ts +9 -5
- package/cli/utils/log.d.ts +1 -9
- package/cli/utils/log.js +14 -16
- package/cli/utils/log.ts +26 -14
- package/package.json +9 -7
- package/cli/utils/handler.d.ts +0 -6
- package/cli/utils/handler.js +0 -19
- package/cli/utils/handler.ts +0 -23
@@ -16,4 +16,10 @@ export type PreviewComponents = {
|
|
16
16
|
ethereumProvider: HTTPProvider
|
17
17
|
rooms: RoomComponent
|
18
18
|
ws: WebSocketComponent
|
19
|
+
signaler: ISignalerComponent
|
20
|
+
}
|
21
|
+
|
22
|
+
export type ISignalerComponent = {
|
23
|
+
// programClosed resolves when the component is stopped
|
24
|
+
programClosed: Promise<void>
|
19
25
|
}
|
@@ -1,14 +1,2 @@
|
|
1
|
-
import {
|
2
|
-
|
3
|
-
import { RoomComponent } from '@dcl/mini-comms/dist/adapters/rooms';
|
4
|
-
import { WebSocketComponent } from './ws';
|
5
|
-
export type PreviewComponents = {
|
6
|
-
logs: ILoggerComponent;
|
7
|
-
server: IHttpServerComponent<PreviewComponents>;
|
8
|
-
config: IConfigComponent;
|
9
|
-
metrics: IMetricsComponent<any>;
|
10
|
-
ethereumProvider: HTTPProvider;
|
11
|
-
rooms: RoomComponent;
|
12
|
-
ws: WebSocketComponent;
|
13
|
-
};
|
14
|
-
export declare function wire(dir: string, components: PreviewComponents, watch?: boolean): Promise<void>;
|
1
|
+
import { PreviewComponents } from './types';
|
2
|
+
export declare function wire(dir: string, components: PreviewComponents): Promise<void>;
|
@@ -10,7 +10,7 @@ const bff_1 = require("./bff");
|
|
10
10
|
const http_server_1 = require("@well-known-components/http-server");
|
11
11
|
const endpoints_1 = require("./endpoints");
|
12
12
|
const error_1 = require("../../utils/error");
|
13
|
-
async function wire(dir, components
|
13
|
+
async function wire(dir, components) {
|
14
14
|
const npmModulesPath = path_1.default.resolve(dir, 'node_modules');
|
15
15
|
if (!fs_extra_1.default.pathExistsSync(npmModulesPath)) {
|
16
16
|
throw new error_1.CliError(`Couldn\'t find ${npmModulesPath}, please run: npm install`);
|
@@ -18,11 +18,9 @@ async function wire(dir, components, watch = false) {
|
|
18
18
|
const router = new http_server_1.Router();
|
19
19
|
await (0, bff_1.setupBffAndComms)(components, router);
|
20
20
|
(0, endpoints_1.setupEcs6Endpoints)(dir, router);
|
21
|
-
if (watch) {
|
22
|
-
}
|
23
21
|
components.server.setContext(components);
|
24
22
|
components.server.use(router.allowedMethods());
|
25
23
|
components.server.use(router.middleware());
|
26
24
|
}
|
27
25
|
exports.wire = wire;
|
28
|
-
//# sourceMappingURL=data:application/json;base64,
|
26
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2lyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIndpcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsZ0RBQXVCO0FBQ3ZCLHdEQUF5QjtBQUV6QiwrQkFBd0M7QUFDeEMsb0VBQTJEO0FBQzNELDJDQUFnRDtBQUNoRCw2Q0FBNEM7QUFHckMsS0FBSyxVQUFVLElBQUksQ0FBQyxHQUFXLEVBQUUsVUFBNkI7SUFDbkUsTUFBTSxjQUFjLEdBQUcsY0FBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsY0FBYyxDQUFDLENBQUE7SUFHeEQsSUFBSSxDQUFDLGtCQUFFLENBQUMsY0FBYyxDQUFDLGNBQWMsQ0FBQyxFQUFFO1FBQ3RDLE1BQU0sSUFBSSxnQkFBUSxDQUFDLGtCQUFrQixjQUFjLDJCQUEyQixDQUFDLENBQUE7S0FDaEY7SUFFRCxNQUFNLE1BQU0sR0FBRyxJQUFJLG9CQUFNLEVBQXFCLENBQUE7SUFFOUMsTUFBTSxJQUFBLHNCQUFnQixFQUFDLFVBQVUsRUFBRSxNQUFNLENBQUMsQ0FBQTtJQUMxQyxJQUFBLDhCQUFrQixFQUFDLEdBQUcsRUFBRSxNQUFNLENBQUMsQ0FBQTtJQUUvQixVQUFVLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsQ0FBQTtJQUN4QyxVQUFVLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsY0FBYyxFQUFFLENBQUMsQ0FBQTtJQUM5QyxVQUFVLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsVUFBVSxFQUFFLENBQUMsQ0FBQTtBQUM1QyxDQUFDO0FBaEJELG9CQWdCQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBwYXRoIGZyb20gJ3BhdGgnXG5pbXBvcnQgZnMgZnJvbSAnZnMtZXh0cmEnXG5cbmltcG9ydCB7IHNldHVwQmZmQW5kQ29tbXMgfSBmcm9tICcuL2JmZidcbmltcG9ydCB7IFJvdXRlciB9IGZyb20gJ0B3ZWxsLWtub3duLWNvbXBvbmVudHMvaHR0cC1zZXJ2ZXInXG5pbXBvcnQgeyBzZXR1cEVjczZFbmRwb2ludHMgfSBmcm9tICcuL2VuZHBvaW50cydcbmltcG9ydCB7IENsaUVycm9yIH0gZnJvbSAnLi4vLi4vdXRpbHMvZXJyb3InXG5pbXBvcnQgeyBQcmV2aWV3Q29tcG9uZW50cyB9IGZyb20gJy4vdHlwZXMnXG5cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiB3aXJlKGRpcjogc3RyaW5nLCBjb21wb25lbnRzOiBQcmV2aWV3Q29tcG9uZW50cykge1xuICBjb25zdCBucG1Nb2R1bGVzUGF0aCA9IHBhdGgucmVzb2x2ZShkaXIsICdub2RlX21vZHVsZXMnKVxuXG4gIC8vIFRPRE86IGRjbC5wcm9qZWN0Lm5lZWRzRGVwZW5kZW5jaWVzKCkgc2hvdWxkIGRvIHRoaXNcbiAgaWYgKCFmcy5wYXRoRXhpc3RzU3luYyhucG1Nb2R1bGVzUGF0aCkpIHtcbiAgICB0aHJvdyBuZXcgQ2xpRXJyb3IoYENvdWxkblxcJ3QgZmluZCAke25wbU1vZHVsZXNQYXRofSwgcGxlYXNlIHJ1bjogbnBtIGluc3RhbGxgKVxuICB9XG5cbiAgY29uc3Qgcm91dGVyID0gbmV3IFJvdXRlcjxQcmV2aWV3Q29tcG9uZW50cz4oKVxuXG4gIGF3YWl0IHNldHVwQmZmQW5kQ29tbXMoY29tcG9uZW50cywgcm91dGVyKVxuICBzZXR1cEVjczZFbmRwb2ludHMoZGlyLCByb3V0ZXIpXG5cbiAgY29tcG9uZW50cy5zZXJ2ZXIuc2V0Q29udGV4dChjb21wb25lbnRzKVxuICBjb21wb25lbnRzLnNlcnZlci51c2Uocm91dGVyLmFsbG93ZWRNZXRob2RzKCkpXG4gIGNvbXBvbmVudHMuc2VydmVyLnVzZShyb3V0ZXIubWlkZGxld2FyZSgpKVxufVxuIl19
|
@@ -2,30 +2,12 @@ import path from 'path'
|
|
2
2
|
import fs from 'fs-extra'
|
3
3
|
|
4
4
|
import { setupBffAndComms } from './bff'
|
5
|
-
import {
|
6
|
-
ILoggerComponent,
|
7
|
-
IMetricsComponent,
|
8
|
-
IHttpServerComponent,
|
9
|
-
IConfigComponent
|
10
|
-
} from '@well-known-components/interfaces'
|
11
|
-
import { HTTPProvider } from 'eth-connect'
|
12
|
-
import { RoomComponent } from '@dcl/mini-comms/dist/adapters/rooms'
|
13
5
|
import { Router } from '@well-known-components/http-server'
|
14
|
-
import { WebSocketComponent } from './ws'
|
15
6
|
import { setupEcs6Endpoints } from './endpoints'
|
16
7
|
import { CliError } from '../../utils/error'
|
8
|
+
import { PreviewComponents } from './types'
|
17
9
|
|
18
|
-
export
|
19
|
-
logs: ILoggerComponent
|
20
|
-
server: IHttpServerComponent<PreviewComponents>
|
21
|
-
config: IConfigComponent
|
22
|
-
metrics: IMetricsComponent<any>
|
23
|
-
ethereumProvider: HTTPProvider
|
24
|
-
rooms: RoomComponent
|
25
|
-
ws: WebSocketComponent
|
26
|
-
}
|
27
|
-
|
28
|
-
export async function wire(dir: string, components: PreviewComponents, watch: boolean = false) {
|
10
|
+
export async function wire(dir: string, components: PreviewComponents) {
|
29
11
|
const npmModulesPath = path.resolve(dir, 'node_modules')
|
30
12
|
|
31
13
|
// TODO: dcl.project.needsDependencies() should do this
|
@@ -37,10 +19,6 @@ export async function wire(dir: string, components: PreviewComponents, watch: bo
|
|
37
19
|
|
38
20
|
await setupBffAndComms(components, router)
|
39
21
|
setupEcs6Endpoints(dir, router)
|
40
|
-
if (watch) {
|
41
|
-
// add "watch"
|
42
|
-
// awai2t bindWatch(components, sceneUpdateClients)
|
43
|
-
}
|
44
22
|
|
45
23
|
components.server.setContext(components)
|
46
24
|
components.server.use(router.allowedMethods())
|
@@ -25,5 +25,5 @@ export declare const args: import("arg").Result<{
|
|
25
25
|
'--desktop-client': BooleanConstructor;
|
26
26
|
}>;
|
27
27
|
export declare function help(): string;
|
28
|
-
export declare
|
28
|
+
export declare function main(options: Options): Promise<void>;
|
29
29
|
export {};
|
@@ -11,7 +11,7 @@ const build_1 = require("../build");
|
|
11
11
|
const preview_1 = require("../preview");
|
12
12
|
const port_1 = require("../preview/port");
|
13
13
|
const args_1 = require("../../utils/args");
|
14
|
-
const
|
14
|
+
const helpers_1 = require("../build/helpers");
|
15
15
|
exports.args = (0, args_1.getArgs)({
|
16
16
|
'--dir': String,
|
17
17
|
'--help': Boolean,
|
@@ -58,29 +58,32 @@ function help() {
|
|
58
58
|
`;
|
59
59
|
}
|
60
60
|
exports.help = help;
|
61
|
-
|
61
|
+
async function main(options) {
|
62
62
|
const dir = (0, path_1.resolve)(process.cwd(), options.args['--dir'] || '.');
|
63
63
|
const isCi = exports.args['--ci'] || process.env.CI || false;
|
64
64
|
const debug = !exports.args['--no-debug'] && !isCi;
|
65
65
|
const openBrowser = !exports.args['--no-browser'] && !isCi;
|
66
66
|
const skipBuild = exports.args['--skip-build'];
|
67
|
-
const watch = !exports.args['--no-watch']
|
67
|
+
const watch = !exports.args['--no-watch'];
|
68
68
|
const enableWeb3 = exports.args['--web3'];
|
69
69
|
const port = parseInt(exports.args['--port'], 10) || (await (0, port_1.previewPort)());
|
70
70
|
const baseCoords = { x: 0, y: 0 };
|
71
71
|
const hasPortableExperience = false;
|
72
72
|
const comps = { components: options.components };
|
73
73
|
if (!skipBuild) {
|
74
|
+
await (0, helpers_1.npmRun)(dir, 'build');
|
75
|
+
}
|
76
|
+
if (watch) {
|
74
77
|
await (0, build_1.main)(Object.assign({ args: { '--dir': dir, '--watch': watch } }, comps));
|
75
78
|
}
|
76
|
-
await (0, preview_1.main)(Object.assign({ args: { '--dir': dir, '--port': port } }, comps));
|
77
|
-
const
|
79
|
+
const server = await (0, preview_1.main)(Object.assign({ args: { '--dir': dir, '--port': port } }, comps));
|
80
|
+
const networkInterfaces = os_1.default.networkInterfaces();
|
78
81
|
const availableURLs = [];
|
79
82
|
console.log(`\nPreview server is now running!`);
|
80
83
|
console.log('Available on:\n');
|
81
|
-
Object.keys(
|
84
|
+
Object.keys(networkInterfaces).forEach((dev) => {
|
82
85
|
;
|
83
|
-
(
|
86
|
+
(networkInterfaces[dev] || []).forEach((details) => {
|
84
87
|
if (details.family === 'IPv4') {
|
85
88
|
let addr = `http://${details.address}:${port}?position=${baseCoords.x}%2C${baseCoords.y}&ENABLE_ECS7`;
|
86
89
|
if (debug) {
|
@@ -117,5 +120,7 @@ exports.main = (0, handler_1.main)(async function main(options) {
|
|
117
120
|
console.log('Unable to open browser automatically.');
|
118
121
|
}
|
119
122
|
}
|
120
|
-
|
121
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AACnB,+BAA8B;AAC9B,gDAAuB;AAGvB,oCAAwC;AACxC,wCAA4C;AAC5C,0CAA6C;AAC7C,2CAA0C;AAC1C,iDAAqD;AAMxC,QAAA,IAAI,GAAG,IAAA,cAAO,EAAC;IAC1B,OAAO,EAAE,MAAM;IACf,QAAQ,EAAE,OAAO;IACjB,QAAQ,EAAE,MAAM;IAChB,YAAY,EAAE,OAAO;IACrB,cAAc,EAAE,OAAO;IACvB,YAAY,EAAE,OAAO;IACrB,MAAM,EAAE,OAAO;IACf,gBAAgB,EAAE,OAAO;IACzB,QAAQ,EAAE,OAAO;IACjB,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,YAAY;IAClB,IAAI,EAAE,cAAc;IACpB,IAAI,EAAE,YAAY;IAClB,cAAc,EAAE,OAAO;IACvB,kBAAkB,EAAE,OAAO;CAC5B,CAAC,CAAA;AAEF,SAAgB,IAAI;IAClB,OAAO;;;;;;;;;;;;;;;;;;;;;;;;CAwBR,CAAA;AACD,CAAC;AA1BD,oBA0BC;AAEY,QAAA,IAAI,GAAG,IAAA,cAAO,EAAC,KAAK,UAAU,IAAI,CAAC,OAAgB;IAC9D,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,CAAA;IAChE,MAAM,IAAI,GAAG,YAAI,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,KAAK,CAAA;IACpD,MAAM,KAAK,GAAG,CAAC,YAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAA;IAC1C,MAAM,WAAW,GAAG,CAAC,YAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAA;IAClD,MAAM,SAAS,GAAG,YAAI,CAAC,cAAc,CAAC,CAAA;IACtC,MAAM,KAAK,GAAG,CAAC,YAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS,CAAA;IACxD,MAAM,UAAU,GAAG,YAAI,CAAC,QAAQ,CAAC,CAAA;IACjC,MAAM,IAAI,GAAG,QAAQ,CAAC,YAAI,CAAC,QAAQ,CAAE,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,IAAA,kBAAW,GAAE,CAAC,CAAA;IACnE,MAAM,UAAU,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAA;IACjC,MAAM,qBAAqB,GAAG,KAAK,CAAA;IAEnC,MAAM,KAAK,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,CAAA;IAChD,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,IAAA,YAAK,kBAAG,IAAI,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,IAAK,KAAK,EAAG,CAAA;KACpE;IACD,MAAM,IAAA,cAAO,kBAAG,IAAI,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAK,KAAK,EAAG,CAAA;IAEnE,MAAM,MAAM,GAAG,YAAE,CAAC,iBAAiB,EAAE,CAAA;IACrC,MAAM,aAAa,GAAa,EAAE,CAAA;IAElC,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAA;IAC/C,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAA;IAE9B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAClC,CAAC;QAAA,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACvC,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE;gBAC7B,IAAI,IAAI,GAAG,UAAU,OAAO,CAAC,OAAO,IAAI,IAAI,aAAa,UAAU,CAAC,CAAC,MAAM,UAAU,CAAC,CAAC,cAAc,CAAA;gBACrG,IAAI,KAAK,EAAE;oBACT,IAAI,GAAG,GAAG,IAAI,oBAAoB,CAAA;iBACnC;gBACD,IAAI,UAAU,IAAI,qBAAqB,EAAE;oBACvC,IAAI,GAAG,GAAG,IAAI,cAAc,CAAA;iBAC7B;gBAED,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;aACzB;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAGF,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE;QAC9C,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAC3G,CAAC,CAAC,CAAA;IAEF,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE;QAC7B,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAA;KAC3B;IAED,IAAI,YAAI,CAAC,kBAAkB,CAAC,EAAE;QAC5B,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;QACpC,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE;YAC7B,MAAM,YAAY,GAAG,IAAI,eAAe,EAAE,CAAA;YAC1C,YAAY,CAAC,MAAM,CAAC,cAAc,EAAE,IAAI,CAAC,CAAA;YACzC,OAAO,CAAC,GAAG,CAAC,aAAa,YAAY,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAA;SACrD;KACF;IAED,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAA;IAC7B,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;IAGvC,IAAI,WAAW,IAAI,UAAU,CAAC,MAAM,IAAI,CAAC,YAAI,CAAC,kBAAkB,CAAC,EAAE;QACjE,IAAI;YACF,MAAM,IAAA,cAAI,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAA;SAC1B;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAA;SACrD;KACF;AACH,CAAC,CAAC,CAAA","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"]}
|
123
|
+
await server.components.signaler.programClosed;
|
124
|
+
}
|
125
|
+
exports.main = main;
|
126
|
+
//# 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  const server = 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  // this signal is resolved by: (wkc)program.stop(), SIGTERM, SIGHUP\n  await server.components.signaler.programClosed\n}\n"]}
|
@@ -7,7 +7,8 @@ import { main as build } from '../build'
|
|
7
7
|
import { main as preview } from '../preview'
|
8
8
|
import { previewPort } from '../preview/port'
|
9
9
|
import { getArgs } from '../../utils/args'
|
10
|
-
import {
|
10
|
+
import { npmRun } from '../build/helpers'
|
11
|
+
|
11
12
|
interface Options {
|
12
13
|
args: typeof args
|
13
14
|
components: Pick<CliComponents, 'fetch' | 'fs'>
|
@@ -60,32 +61,41 @@ export function help() {
|
|
60
61
|
`
|
61
62
|
}
|
62
63
|
|
63
|
-
export
|
64
|
+
export async function main(options: Options) {
|
64
65
|
const dir = resolve(process.cwd(), options.args['--dir'] || '.')
|
65
66
|
const isCi = args['--ci'] || process.env.CI || false
|
66
67
|
const debug = !args['--no-debug'] && !isCi
|
67
68
|
const openBrowser = !args['--no-browser'] && !isCi
|
68
69
|
const skipBuild = args['--skip-build']
|
69
|
-
const watch = !args['--no-watch']
|
70
|
+
const watch = !args['--no-watch']
|
70
71
|
const enableWeb3 = args['--web3']
|
71
72
|
const port = parseInt(args['--port']!, 10) || (await previewPort())
|
72
73
|
const baseCoords = { x: 0, y: 0 }
|
73
74
|
const hasPortableExperience = false
|
74
75
|
|
75
76
|
const comps = { components: options.components }
|
77
|
+
|
78
|
+
// first run `npm run build`, this can be disabled with --skip-build
|
76
79
|
if (!skipBuild) {
|
80
|
+
await npmRun(dir, 'build')
|
81
|
+
}
|
82
|
+
|
83
|
+
// then start the embedded compiler, this can be disabled with --no-watch
|
84
|
+
if (watch) {
|
77
85
|
await build({ args: { '--dir': dir, '--watch': watch }, ...comps })
|
78
86
|
}
|
79
|
-
await preview({ args: { '--dir': dir, '--port': port }, ...comps })
|
80
87
|
|
81
|
-
|
88
|
+
// after the watcher is running, start the server
|
89
|
+
const server = await preview({ args: { '--dir': dir, '--port': port }, ...comps })
|
90
|
+
|
91
|
+
const networkInterfaces = os.networkInterfaces()
|
82
92
|
const availableURLs: string[] = []
|
83
93
|
|
84
94
|
console.log(`\nPreview server is now running!`)
|
85
95
|
console.log('Available on:\n')
|
86
96
|
|
87
|
-
Object.keys(
|
88
|
-
;(
|
97
|
+
Object.keys(networkInterfaces).forEach((dev) => {
|
98
|
+
;(networkInterfaces[dev] || []).forEach((details) => {
|
89
99
|
if (details.family === 'IPv4') {
|
90
100
|
let addr = `http://${details.address}:${port}?position=${baseCoords.x}%2C${baseCoords.y}&ENABLE_ECS7`
|
91
101
|
if (debug) {
|
@@ -129,4 +139,7 @@ export const main = handler(async function main(options: Options) {
|
|
129
139
|
console.log('Unable to open browser automatically.')
|
130
140
|
}
|
131
141
|
}
|
132
|
-
|
142
|
+
|
143
|
+
// this signal is resolved by: (wkc)program.stop(), SIGTERM, SIGHUP
|
144
|
+
await server.components.signaler.programClosed
|
145
|
+
}
|
package/cli/index.js
CHANGED
@@ -1,22 +1,45 @@
|
|
1
1
|
#!/usr/bin/env node
|
2
2
|
"use strict";
|
3
|
-
var
|
4
|
-
|
3
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
4
|
+
if (k2 === undefined) k2 = k;
|
5
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
6
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
7
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
8
|
+
}
|
9
|
+
Object.defineProperty(o, k2, desc);
|
10
|
+
}) : (function(o, m, k, k2) {
|
11
|
+
if (k2 === undefined) k2 = k;
|
12
|
+
o[k2] = m[k];
|
13
|
+
}));
|
14
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
15
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
16
|
+
}) : function(o, v) {
|
17
|
+
o["default"] = v;
|
18
|
+
});
|
19
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
20
|
+
if (mod && mod.__esModule) return mod;
|
21
|
+
var result = {};
|
22
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
23
|
+
__setModuleDefault(result, mod);
|
24
|
+
return result;
|
5
25
|
};
|
6
26
|
Object.defineProperty(exports, "__esModule", { value: true });
|
7
27
|
const args_1 = require("./utils/args");
|
8
28
|
const out_messages_1 = require("./utils/out-messages");
|
9
|
-
const
|
29
|
+
const log = __importStar(require("./utils/log"));
|
10
30
|
const error_1 = require("./utils/error");
|
11
31
|
const commands_1 = require("./utils/commands");
|
12
32
|
const components_1 = require("./components");
|
13
33
|
const listCommandsStr = (commands) => (0, out_messages_1.toStringList)(commands.map(($) => `npx @dcl/sdk ${$}`));
|
14
34
|
const handleError = (err) => {
|
15
|
-
if (
|
16
|
-
|
35
|
+
if (err instanceof error_1.CliError) {
|
36
|
+
log.fail(err.message);
|
37
|
+
}
|
38
|
+
else {
|
39
|
+
console.error(err);
|
40
|
+
log.warn(`Developer: All errors thrown must be an instance of "CliError"`);
|
17
41
|
}
|
18
|
-
|
19
|
-
process.exit(1);
|
42
|
+
process.exitCode = 1;
|
20
43
|
};
|
21
44
|
const commandFnsAreValid = (fns) => {
|
22
45
|
const { help, main } = fns;
|
@@ -28,16 +51,16 @@ const commandFnsAreValid = (fns) => {
|
|
28
51
|
}
|
29
52
|
return true;
|
30
53
|
};
|
31
|
-
|
32
|
-
const helpMessage = (commands) => `Here is the list of commands:\n${listCommandsStr(commands)}`;
|
33
|
-
(
|
54
|
+
async function main() {
|
55
|
+
const helpMessage = (commands) => `Here is the list of commands:\n${listCommandsStr(commands)}`;
|
56
|
+
const args = (0, args_1.getArgs)();
|
34
57
|
const command = process.argv[2];
|
35
58
|
const needsHelp = args['--help'];
|
36
59
|
const components = (0, components_1.initComponents)();
|
37
60
|
const commands = await (0, commands_1.getCommands)(components);
|
38
61
|
if (!commands.includes(command)) {
|
39
62
|
if (needsHelp) {
|
40
|
-
|
63
|
+
log.info(helpMessage(commands));
|
41
64
|
return;
|
42
65
|
}
|
43
66
|
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
|
|
47
70
|
const options = { args: cmd.args, components };
|
48
71
|
needsHelp ? await cmd.help(options) : await cmd.main(options);
|
49
72
|
}
|
50
|
-
|
51
|
-
|
73
|
+
process.exit(process.exitCode || 0);
|
74
|
+
}
|
75
|
+
main().catch(handleError);
|
76
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQU9BLHVDQUFzQztBQUN0Qyx1REFBbUQ7QUFDbkQsaURBQWtDO0FBQ2xDLHlDQUF3QztBQUN4QywrQ0FBNkQ7QUFDN0QsNkNBQTREO0FBZ0I1RCxNQUFNLGVBQWUsR0FBRyxDQUFDLFFBQWtCLEVBQUUsRUFBRSxDQUFDLElBQUEsMkJBQVksRUFBQyxRQUFRLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFBO0FBRXRHLE1BQU0sV0FBVyxHQUFHLENBQUMsR0FBVSxFQUFFLEVBQUU7SUFDakMsSUFBSSxHQUFHLFlBQVksZ0JBQVEsRUFBRTtRQUMzQixHQUFHLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQTtLQUN0QjtTQUFNO1FBRUwsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUNsQixHQUFHLENBQUMsSUFBSSxDQUFDLGdFQUFnRSxDQUFDLENBQUE7S0FDM0U7SUFHRCxPQUFPLENBQUMsUUFBUSxHQUFHLENBQUMsQ0FBQTtBQUN0QixDQUFDLENBQUE7QUFFRCxNQUFNLGtCQUFrQixHQUFHLENBQUMsR0FBZ0IsRUFBZ0MsRUFBRTtJQUM1RSxNQUFNLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxHQUFHLEdBQUcsQ0FBQTtJQUMxQixJQUFJLENBQUMsSUFBSSxJQUFJLENBQUMsSUFBSSxFQUFFO1FBQ2xCLE1BQU0sSUFBSSxnQkFBUSxDQUFDOzs7S0FHbEIsQ0FBQyxDQUFBO0tBQ0g7SUFDRCxPQUFPLElBQUksQ0FBQTtBQUNiLENBQUMsQ0FBQTtBQUVELEtBQUssVUFBVSxJQUFJO0lBQ2pCLE1BQU0sV0FBVyxHQUFHLENBQUMsUUFBa0IsRUFBRSxFQUFFLENBQUMsa0NBQWtDLGVBQWUsQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFBO0lBQ3pHLE1BQU0sSUFBSSxHQUFHLElBQUEsY0FBTyxHQUFFLENBQUE7SUFDdEIsTUFBTSxPQUFPLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUMvQixNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUE7SUFDaEMsTUFBTSxVQUFVLEdBQWtCLElBQUEsMkJBQWMsR0FBRSxDQUFBO0lBRWxELE1BQU0sUUFBUSxHQUFHLE1BQU0sSUFBQSxzQkFBVyxFQUFDLFVBQVUsQ0FBQyxDQUFBO0lBRTlDLElBQUksQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxFQUFFO1FBQy9CLElBQUksU0FBUyxFQUFFO1lBQ2IsR0FBRyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQTtZQUMvQixPQUFNO1NBQ1A7UUFDRCxNQUFNLElBQUksZ0JBQVEsQ0FBQyxXQUFXLE9BQU8sZ0JBQWdCLFdBQVcsQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLENBQUE7S0FDOUU7SUFHRCxNQUFNLEdBQUcsR0FBRyxPQUFPLENBQUMsR0FBRyx3QkFBYSxJQUFJLE9BQU8sRUFBRSxDQUFDLENBQUE7SUFFbEQsSUFBSSxrQkFBa0IsQ0FBQyxHQUFHLENBQUMsRUFBRTtRQUMzQixNQUFNLE9BQU8sR0FBRyxFQUFFLElBQUksRUFBRSxHQUFHLENBQUMsSUFBSSxFQUFFLFVBQVUsRUFBRSxDQUFBO1FBQzlDLFNBQVMsQ0FBQyxDQUFDLENBQUMsTUFBTSxHQUFHLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUE7S0FDOUQ7SUFJRCxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxRQUFRLElBQUksQ0FBQyxDQUFDLENBQUE7QUFDckMsQ0FBQztBQUVELElBQUksRUFBRSxDQUFDLEtBQUssQ0FBQyxXQUFXLENBQUMsQ0FBQSIsInNvdXJjZXNDb250ZW50IjpbIiMhL3Vzci9iaW4vZW52IG5vZGVcblxuLypcbiAgaXN0YW5idWwgaWdub3JlIGZpbGVcbiAgRG9lc24ndCBtYWtlIHNlbnNlIHRvIHRlc3QgdGhpcyBmaWxlXG4qL1xuXG5pbXBvcnQgeyBnZXRBcmdzIH0gZnJvbSAnLi91dGlscy9hcmdzJ1xuaW1wb3J0IHsgdG9TdHJpbmdMaXN0IH0gZnJvbSAnLi91dGlscy9vdXQtbWVzc2FnZXMnXG5pbXBvcnQgKiBhcyBsb2cgZnJvbSAnLi91dGlscy9sb2cnXG5pbXBvcnQgeyBDbGlFcnJvciB9IGZyb20gJy4vdXRpbHMvZXJyb3InXG5pbXBvcnQgeyBDT01NQU5EU19QQVRILCBnZXRDb21tYW5kcyB9IGZyb20gJy4vdXRpbHMvY29tbWFuZHMnXG5pbXBvcnQgeyBDbGlDb21wb25lbnRzLCBpbml0Q29tcG9uZW50cyB9IGZyb20gJy4vY29tcG9uZW50cydcblxuZXhwb3J0IGludGVyZmFjZSBPcHRpb25zIHtcbiAgYXJnczogUmV0dXJuVHlwZTx0eXBlb2YgZ2V0QXJncz5cbiAgY29tcG9uZW50czogQ2xpQ29tcG9uZW50c1xufVxuXG4vLyBsZWF2aW5nIGFyZ3MgYXMgXCJhbnlcIiBzaW5jZSB3ZSBkb24ndCBrbm93IHlldCBpZiB3ZSB3aWxsIHVzZSB0aGVtXG50eXBlIEZpbGVGbiA9IChvcHRpb25zOiBPcHRpb25zKSA9PiBQcm9taXNlPHZvaWQ+XG5cbmludGVyZmFjZSBGaWxlRXhwb3J0cyB7XG4gIGhlbHA/OiBGaWxlRm5cbiAgbWFpbj86IEZpbGVGblxuICBhcmdzPzogUmV0dXJuVHlwZTx0eXBlb2YgZ2V0QXJncz5cbn1cblxuY29uc3QgbGlzdENvbW1hbmRzU3RyID0gKGNvbW1hbmRzOiBzdHJpbmdbXSkgPT4gdG9TdHJpbmdMaXN0KGNvbW1hbmRzLm1hcCgoJCkgPT4gYG5weCBAZGNsL3NkayAkeyR9YCkpXG5cbmNvbnN0IGhhbmRsZUVycm9yID0gKGVycjogRXJyb3IpID0+IHtcbiAgaWYgKGVyciBpbnN0YW5jZW9mIENsaUVycm9yKSB7XG4gICAgbG9nLmZhaWwoZXJyLm1lc3NhZ2UpXG4gIH0gZWxzZSB7XG4gICAgLy8gbG9nIHdpdGggY29uc29sZSB0byBzaG93IHN0YWNrdHJhY2UgYW5kIGRlYnVnIGluZm9ybWF0aW9uXG4gICAgY29uc29sZS5lcnJvcihlcnIpXG4gICAgbG9nLndhcm4oYERldmVsb3BlcjogQWxsIGVycm9ycyB0aHJvd24gbXVzdCBiZSBhbiBpbnN0YW5jZSBvZiBcIkNsaUVycm9yXCJgKVxuICB9XG5cbiAgLy8gc2V0IGFuIGV4aXQgY29kZSBidXQgbm90IGZpbmlzaCB0aGUgcHJvZ3JhbSBpbW1lZGlhdGVseSB0byBjbG9zZSBhbnkgcGVuZGluZyB3b3JrXG4gIHByb2Nlc3MuZXhpdENvZGUgPSAxXG59XG5cbmNvbnN0IGNvbW1hbmRGbnNBcmVWYWxpZCA9IChmbnM6IEZpbGVFeHBvcnRzKTogZm5zIGlzIFJlcXVpcmVkPEZpbGVFeHBvcnRzPiA9PiB7XG4gIGNvbnN0IHsgaGVscCwgbWFpbiB9ID0gZm5zXG4gIGlmICghaGVscCB8fCAhbWFpbikge1xuICAgIHRocm93IG5ldyBDbGlFcnJvcihgQ29tbWFuZCBkb2VzIG5vdCBmb2xsb3cgaW1wbGVtZW50YXRpb24gcnVsZXM6XG4gICAgICAqIFJlcXVpcmVzIGEgXCJoZWxwXCIgZnVuY3Rpb25cbiAgICAgICogUmVxdWlyZXMgYSBcIm1haW5cIiBmdW5jdGlvblxuICAgIGApXG4gIH1cbiAgcmV0dXJuIHRydWVcbn1cblxuYXN5bmMgZnVuY3Rpb24gbWFpbigpIHtcbiAgY29uc3QgaGVscE1lc3NhZ2UgPSAoY29tbWFuZHM6IHN0cmluZ1tdKSA9PiBgSGVyZSBpcyB0aGUgbGlzdCBvZiBjb21tYW5kczpcXG4ke2xpc3RDb21tYW5kc1N0cihjb21tYW5kcyl9YFxuICBjb25zdCBhcmdzID0gZ2V0QXJncygpXG4gIGNvbnN0IGNvbW1hbmQgPSBwcm9jZXNzLmFyZ3ZbMl1cbiAgY29uc3QgbmVlZHNIZWxwID0gYXJnc1snLS1oZWxwJ11cbiAgY29uc3QgY29tcG9uZW50czogQ2xpQ29tcG9uZW50cyA9IGluaXRDb21wb25lbnRzKClcblxuICBjb25zdCBjb21tYW5kcyA9IGF3YWl0IGdldENvbW1hbmRzKGNvbXBvbmVudHMpXG5cbiAgaWYgKCFjb21tYW5kcy5pbmNsdWRlcyhjb21tYW5kKSkge1xuICAgIGlmIChuZWVkc0hlbHApIHtcbiAgICAgIGxvZy5pbmZvKGhlbHBNZXNzYWdlKGNvbW1hbmRzKSlcbiAgICAgIHJldHVyblxuICAgIH1cbiAgICB0aHJvdyBuZXcgQ2xpRXJyb3IoYENvbW1hbmQgJHtjb21tYW5kfSBpcyBpbnZhbGlkLiAke2hlbHBNZXNzYWdlKGNvbW1hbmRzKX1gKVxuICB9XG5cbiAgLy8gZXNsaW50LWRpc2FibGUtbmV4dC1saW5lIEB0eXBlc2NyaXB0LWVzbGludC9uby12YXItcmVxdWlyZXNcbiAgY29uc3QgY21kID0gcmVxdWlyZShgJHtDT01NQU5EU19QQVRIfS8ke2NvbW1hbmR9YClcblxuICBpZiAoY29tbWFuZEZuc0FyZVZhbGlkKGNtZCkpIHtcbiAgICBjb25zdCBvcHRpb25zID0geyBhcmdzOiBjbWQuYXJncywgY29tcG9uZW50cyB9XG4gICAgbmVlZHNIZWxwID8gYXdhaXQgY21kLmhlbHAob3B0aW9ucykgOiBhd2FpdCBjbWQubWFpbihvcHRpb25zKVxuICB9XG5cbiAgLy8gcm9sbHVwIHdhdGNoZXIgbGVhdmVzIG1hbnkgb3BlbiBGU1dhdGNoZXIgZXZlbiBpbiBidWlsZCBtb2RlLiB3ZSBtdXN0IGNhbGxcbiAgLy8gcHJvY2Vzcy5leGl0IGF0IHRoaXMgcG9pbnQgdG8gcHJldmVudCB0aGUgcHJvZ3JhbSBoYWx0aW5nIGZvcmV2ZXJcbiAgcHJvY2Vzcy5leGl0KHByb2Nlc3MuZXhpdENvZGUgfHwgMClcbn1cblxubWFpbigpLmNhdGNoKGhhbmRsZUVycm9yKVxuIl19
|
package/cli/index.ts
CHANGED
@@ -7,7 +7,7 @@
|
|
7
7
|
|
8
8
|
import { getArgs } from './utils/args'
|
9
9
|
import { toStringList } from './utils/out-messages'
|
10
|
-
import log from './utils/log'
|
10
|
+
import * as log from './utils/log'
|
11
11
|
import { CliError } from './utils/error'
|
12
12
|
import { COMMANDS_PATH, getCommands } from './utils/commands'
|
13
13
|
import { CliComponents, initComponents } from './components'
|
@@ -28,12 +28,17 @@ interface FileExports {
|
|
28
28
|
|
29
29
|
const listCommandsStr = (commands: string[]) => toStringList(commands.map(($) => `npx @dcl/sdk ${$}`))
|
30
30
|
|
31
|
-
const handleError = (err:
|
32
|
-
if (
|
31
|
+
const handleError = (err: Error) => {
|
32
|
+
if (err instanceof CliError) {
|
33
|
+
log.fail(err.message)
|
34
|
+
} else {
|
35
|
+
// log with console to show stacktrace and debug information
|
36
|
+
console.error(err)
|
33
37
|
log.warn(`Developer: All errors thrown must be an instance of "CliError"`)
|
34
38
|
}
|
35
|
-
|
36
|
-
|
39
|
+
|
40
|
+
// set an exit code but not finish the program immediately to close any pending work
|
41
|
+
process.exitCode = 1
|
37
42
|
}
|
38
43
|
|
39
44
|
const commandFnsAreValid = (fns: FileExports): fns is Required<FileExports> => {
|
@@ -47,10 +52,9 @@ const commandFnsAreValid = (fns: FileExports): fns is Required<FileExports> => {
|
|
47
52
|
return true
|
48
53
|
}
|
49
54
|
|
50
|
-
|
51
|
-
const helpMessage = (commands: string[]) => `Here is the list of commands:\n${listCommandsStr(commands)}`
|
52
|
-
|
53
|
-
;(async () => {
|
55
|
+
async function main() {
|
56
|
+
const helpMessage = (commands: string[]) => `Here is the list of commands:\n${listCommandsStr(commands)}`
|
57
|
+
const args = getArgs()
|
54
58
|
const command = process.argv[2]
|
55
59
|
const needsHelp = args['--help']
|
56
60
|
const components: CliComponents = initComponents()
|
@@ -72,4 +76,10 @@ const helpMessage = (commands: string[]) => `Here is the list of commands:\n${li
|
|
72
76
|
const options = { args: cmd.args, components }
|
73
77
|
needsHelp ? await cmd.help(options) : await cmd.main(options)
|
74
78
|
}
|
75
|
-
|
79
|
+
|
80
|
+
// rollup watcher leaves many open FSWatcher even in build mode. we must call
|
81
|
+
// process.exit at this point to prevent the program halting forever
|
82
|
+
process.exit(process.exitCode || 0)
|
83
|
+
}
|
84
|
+
|
85
|
+
main().catch(handleError)
|
package/cli/utils/exec.d.ts
CHANGED
@@ -4,5 +4,5 @@ interface Options {
|
|
4
4
|
};
|
5
5
|
silent: boolean;
|
6
6
|
}
|
7
|
-
export declare function exec(cwd: string, command: string, { env, silent }?: Partial<Options>): Promise<void>;
|
7
|
+
export declare function exec(cwd: string, command: string, args: string[], { env, silent }?: Partial<Options>): Promise<void>;
|
8
8
|
export {};
|
package/cli/utils/exec.js
CHANGED
@@ -2,10 +2,9 @@
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.exec = void 0;
|
4
4
|
const child_process_1 = require("child_process");
|
5
|
-
function exec(cwd, command, { env, silent } = {}) {
|
5
|
+
function exec(cwd, command, args, { env, silent } = {}) {
|
6
6
|
return new Promise((resolve, reject) => {
|
7
|
-
const
|
8
|
-
const child = (0, child_process_1.spawn)(cmd, rest, {
|
7
|
+
const child = (0, child_process_1.spawn)(command, args, {
|
9
8
|
shell: true,
|
10
9
|
cwd,
|
11
10
|
env: Object.assign(Object.assign(Object.assign({}, process.env), { NODE_ENV: '' }), env)
|
@@ -21,8 +20,8 @@ function exec(cwd, command, { env, silent } = {}) {
|
|
21
20
|
});
|
22
21
|
child.on('close', (code) => {
|
23
22
|
if (code !== 0) {
|
24
|
-
const
|
25
|
-
reject(new Error(`Command "${
|
23
|
+
const _ = `${command} ${args.join(' ')}`;
|
24
|
+
reject(new Error(`Command "${_}" exited with code ${code}. Please try running the command manually`));
|
26
25
|
return;
|
27
26
|
}
|
28
27
|
resolve(undefined);
|
@@ -30,4 +29,4 @@ function exec(cwd, command, { env, silent } = {}) {
|
|
30
29
|
});
|
31
30
|
}
|
32
31
|
exports.exec = exec;
|
33
|
-
//# sourceMappingURL=data:application/json;base64,
|
32
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlYy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImV4ZWMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsaURBQXFDO0FBT3JDLFNBQWdCLElBQUksQ0FDbEIsR0FBVyxFQUNYLE9BQWUsRUFDZixJQUFjLEVBQ2QsRUFBRSxHQUFHLEVBQUUsTUFBTSxLQUF1QixFQUFFO0lBRXRDLE9BQU8sSUFBSSxPQUFPLENBQUMsQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUU7UUFDckMsTUFBTSxLQUFLLEdBQUcsSUFBQSxxQkFBSyxFQUFDLE9BQU8sRUFBRSxJQUFJLEVBQUU7WUFDakMsS0FBSyxFQUFFLElBQUk7WUFDWCxHQUFHO1lBQ0gsR0FBRyxnREFBTyxPQUFPLENBQUMsR0FBRyxLQUFFLFFBQVEsRUFBRSxFQUFFLEtBQUssR0FBRyxDQUFFO1NBQzlDLENBQUMsQ0FBQTtRQUVGLElBQUksQ0FBQyxNQUFNLEVBQUU7WUFDWCxLQUFLLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUE7WUFDakMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFBO1NBQ2xDO1FBRUQsS0FBSyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsSUFBSSxFQUFFLEVBQUU7WUFDL0IsSUFBSSxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUMsT0FBTyxDQUFDLDBDQUEwQyxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUU7Z0JBQzlFLE9BQU8sT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFBO2FBQzFCO1FBQ0gsQ0FBQyxDQUFDLENBQUE7UUFFRixLQUFLLENBQUMsRUFBRSxDQUFDLE9BQU8sRUFBRSxDQUFDLElBQVksRUFBRSxFQUFFO1lBQ2pDLElBQUksSUFBSSxLQUFLLENBQUMsRUFBRTtnQkFDZCxNQUFNLENBQUMsR0FBRyxHQUFHLE9BQU8sSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUE7Z0JBQ3hDLE1BQU0sQ0FBQyxJQUFJLEtBQUssQ0FBQyxZQUFZLENBQUMsc0JBQXNCLElBQUksMkNBQTJDLENBQUMsQ0FBQyxDQUFBO2dCQUNyRyxPQUFNO2FBQ1A7WUFFRCxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUE7UUFDcEIsQ0FBQyxDQUFDLENBQUE7SUFDSixDQUFDLENBQUMsQ0FBQTtBQUNKLENBQUM7QUFsQ0Qsb0JBa0NDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgc3Bhd24gfSBmcm9tICdjaGlsZF9wcm9jZXNzJ1xuXG5pbnRlcmZhY2UgT3B0aW9ucyB7XG4gIGVudjogeyBba2V5OiBzdHJpbmddOiBzdHJpbmcgfVxuICBzaWxlbnQ6IGJvb2xlYW5cbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGV4ZWMoXG4gIGN3ZDogc3RyaW5nLFxuICBjb21tYW5kOiBzdHJpbmcsXG4gIGFyZ3M6IHN0cmluZ1tdLFxuICB7IGVudiwgc2lsZW50IH06IFBhcnRpYWw8T3B0aW9ucz4gPSB7fVxuKTogUHJvbWlzZTx2b2lkPiB7XG4gIHJldHVybiBuZXcgUHJvbWlzZSgocmVzb2x2ZSwgcmVqZWN0KSA9PiB7XG4gICAgY29uc3QgY2hpbGQgPSBzcGF3bihjb21tYW5kLCBhcmdzLCB7XG4gICAgICBzaGVsbDogdHJ1ZSxcbiAgICAgIGN3ZCxcbiAgICAgIGVudjogeyAuLi5wcm9jZXNzLmVudiwgTk9ERV9FTlY6ICcnLCAuLi5lbnYgfVxuICAgIH0pXG5cbiAgICBpZiAoIXNpbGVudCkge1xuICAgICAgY2hpbGQuc3Rkb3V0LnBpcGUocHJvY2Vzcy5zdGRvdXQpXG4gICAgICBjaGlsZC5zdGRlcnIucGlwZShwcm9jZXNzLnN0ZGVycilcbiAgICB9XG5cbiAgICBjaGlsZC5zdGRvdXQub24oJ2RhdGEnLCAoZGF0YSkgPT4ge1xuICAgICAgaWYgKGRhdGEudG9TdHJpbmcoKS5pbmRleE9mKCdUaGUgY29tcGlsZXIgaXMgd2F0Y2hpbmcgZmlsZSBjaGFuZ2VzLi4uJykgIT09IC0xKSB7XG4gICAgICAgIHJldHVybiByZXNvbHZlKHVuZGVmaW5lZClcbiAgICAgIH1cbiAgICB9KVxuXG4gICAgY2hpbGQub24oJ2Nsb3NlJywgKGNvZGU6IG51bWJlcikgPT4ge1xuICAgICAgaWYgKGNvZGUgIT09IDApIHtcbiAgICAgICAgY29uc3QgXyA9IGAke2NvbW1hbmR9ICR7YXJncy5qb2luKCcgJyl9YFxuICAgICAgICByZWplY3QobmV3IEVycm9yKGBDb21tYW5kIFwiJHtffVwiIGV4aXRlZCB3aXRoIGNvZGUgJHtjb2RlfS4gUGxlYXNlIHRyeSBydW5uaW5nIHRoZSBjb21tYW5kIG1hbnVhbGx5YCkpXG4gICAgICAgIHJldHVyblxuICAgICAgfVxuXG4gICAgICByZXNvbHZlKHVuZGVmaW5lZClcbiAgICB9KVxuICB9KVxufVxuIl19
|
package/cli/utils/exec.ts
CHANGED
@@ -5,10 +5,14 @@ interface Options {
|
|
5
5
|
silent: boolean
|
6
6
|
}
|
7
7
|
|
8
|
-
export function exec(
|
8
|
+
export function exec(
|
9
|
+
cwd: string,
|
10
|
+
command: string,
|
11
|
+
args: string[],
|
12
|
+
{ env, silent }: Partial<Options> = {}
|
13
|
+
): Promise<void> {
|
9
14
|
return new Promise((resolve, reject) => {
|
10
|
-
const
|
11
|
-
const child = spawn(cmd, rest, {
|
15
|
+
const child = spawn(command, args, {
|
12
16
|
shell: true,
|
13
17
|
cwd,
|
14
18
|
env: { ...process.env, NODE_ENV: '', ...env }
|
@@ -27,8 +31,8 @@ export function exec(cwd: string, command: string, { env, silent }: Partial<Opti
|
|
27
31
|
|
28
32
|
child.on('close', (code: number) => {
|
29
33
|
if (code !== 0) {
|
30
|
-
const
|
31
|
-
reject(new Error(`Command "${
|
34
|
+
const _ = `${command} ${args.join(' ')}`
|
35
|
+
reject(new Error(`Command "${_}" exited with code ${code}. Please try running the command manually`))
|
32
36
|
return
|
33
37
|
}
|
34
38
|
|
package/cli/utils/log.d.ts
CHANGED
@@ -1,13 +1,5 @@
|
|
1
|
-
export declare function
|
1
|
+
export declare function log(message: string): void;
|
2
2
|
export declare function fail(message: string): void;
|
3
3
|
export declare function warn(message: string): void;
|
4
4
|
export declare function info(message: string): void;
|
5
5
|
export declare function succeed(message: string): void;
|
6
|
-
declare const _default: {
|
7
|
-
raw: typeof raw;
|
8
|
-
fail: typeof fail;
|
9
|
-
warn: typeof warn;
|
10
|
-
info: typeof info;
|
11
|
-
succeed: typeof succeed;
|
12
|
-
};
|
13
|
-
export default _default;
|
package/cli/utils/log.js
CHANGED
@@ -1,31 +1,29 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.succeed = exports.info = exports.warn = exports.fail = exports.
|
4
|
-
|
5
|
-
|
3
|
+
exports.succeed = exports.info = exports.warn = exports.fail = exports.log = void 0;
|
4
|
+
const colorette_1 = require("colorette");
|
5
|
+
const stderr = (...parameters) => process.stderr.write(`${parameters.join('')}\n`);
|
6
|
+
const colors = (0, colorette_1.createColors)({
|
7
|
+
useColor: process.env.FORCE_COLOR !== '0' && !process.env.NO_COLOR
|
8
|
+
});
|
9
|
+
function log(message) {
|
10
|
+
stderr(message);
|
6
11
|
}
|
7
|
-
exports.
|
12
|
+
exports.log = log;
|
8
13
|
function fail(message) {
|
9
|
-
|
14
|
+
stderr(colors.redBright(' Error: '), message);
|
10
15
|
}
|
11
16
|
exports.fail = fail;
|
12
17
|
function warn(message) {
|
13
|
-
|
18
|
+
stderr(colors.yellow('Warning: '), message);
|
14
19
|
}
|
15
20
|
exports.warn = warn;
|
16
21
|
function info(message) {
|
17
|
-
|
22
|
+
stderr(colors.blueBright(' Info: '), message);
|
18
23
|
}
|
19
24
|
exports.info = info;
|
20
25
|
function succeed(message) {
|
21
|
-
|
26
|
+
stderr(colors.green('Success: '), message);
|
22
27
|
}
|
23
28
|
exports.succeed = succeed;
|
24
|
-
|
25
|
-
raw,
|
26
|
-
fail,
|
27
|
-
warn,
|
28
|
-
info,
|
29
|
-
succeed
|
30
|
-
};
|
31
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsibG9nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLFNBQWdCLEdBQUcsQ0FBQyxPQUFlO0lBQ2pDLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUE7QUFDdEIsQ0FBQztBQUZELGtCQUVDO0FBRUQsU0FBZ0IsSUFBSSxDQUFDLE9BQWU7SUFDbEMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLE9BQU8sRUFBRSxDQUFDLENBQUE7QUFDOUIsQ0FBQztBQUZELG9CQUVDO0FBRUQsU0FBZ0IsSUFBSSxDQUFDLE9BQWU7SUFDbEMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLE9BQU8sRUFBRSxDQUFDLENBQUE7QUFDOUIsQ0FBQztBQUZELG9CQUVDO0FBRUQsU0FBZ0IsSUFBSSxDQUFDLE9BQWU7SUFDbEMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLE9BQU8sRUFBRSxDQUFDLENBQUE7QUFDOUIsQ0FBQztBQUZELG9CQUVDO0FBRUQsU0FBZ0IsT0FBTyxDQUFDLE9BQWU7SUFDckMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLE9BQU8sRUFBRSxDQUFDLENBQUE7QUFDOUIsQ0FBQztBQUZELDBCQUVDO0FBRUQsa0JBQWU7SUFDYixHQUFHO0lBQ0gsSUFBSTtJQUNKLElBQUk7SUFDSixJQUFJO0lBQ0osT0FBTztDQUNSLENBQUEiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgZnVuY3Rpb24gcmF3KG1lc3NhZ2U6IHN0cmluZykge1xuICBjb25zb2xlLmxvZyhtZXNzYWdlKVxufVxuXG5leHBvcnQgZnVuY3Rpb24gZmFpbChtZXNzYWdlOiBzdHJpbmcpIHtcbiAgY29uc29sZS5sb2coYPCflLQgJHttZXNzYWdlfWApXG59XG5cbmV4cG9ydCBmdW5jdGlvbiB3YXJuKG1lc3NhZ2U6IHN0cmluZykge1xuICBjb25zb2xlLmxvZyhg8J+foCAke21lc3NhZ2V9YClcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGluZm8obWVzc2FnZTogc3RyaW5nKSB7XG4gIGNvbnNvbGUubG9nKGDwn5S1ICR7bWVzc2FnZX1gKVxufVxuXG5leHBvcnQgZnVuY3Rpb24gc3VjY2VlZChtZXNzYWdlOiBzdHJpbmcpIHtcbiAgY29uc29sZS5sb2coYPCfn6IgJHttZXNzYWdlfWApXG59XG5cbmV4cG9ydCBkZWZhdWx0IHtcbiAgcmF3LFxuICBmYWlsLFxuICB3YXJuLFxuICBpbmZvLFxuICBzdWNjZWVkXG59XG4iXX0=
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsibG9nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHlDQUF3QztBQVl4QyxNQUFNLE1BQU0sR0FBRyxDQUFDLEdBQUcsVUFBOEIsRUFBRSxFQUFFLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQTtBQUl0RyxNQUFNLE1BQU0sR0FBRyxJQUFBLHdCQUFZLEVBQUM7SUFDMUIsUUFBUSxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVyxLQUFLLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUTtDQUNuRSxDQUFDLENBQUE7QUFFRixTQUFnQixHQUFHLENBQUMsT0FBZTtJQUNqQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUE7QUFDakIsQ0FBQztBQUZELGtCQUVDO0FBRUQsU0FBZ0IsSUFBSSxDQUFDLE9BQWU7SUFDbEMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsV0FBVyxDQUFDLEVBQUUsT0FBTyxDQUFDLENBQUE7QUFDaEQsQ0FBQztBQUZELG9CQUVDO0FBRUQsU0FBZ0IsSUFBSSxDQUFDLE9BQWU7SUFDbEMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLEVBQUUsT0FBTyxDQUFDLENBQUE7QUFDN0MsQ0FBQztBQUZELG9CQUVDO0FBRUQsU0FBZ0IsSUFBSSxDQUFDLE9BQWU7SUFDbEMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsV0FBVyxDQUFDLEVBQUUsT0FBTyxDQUFDLENBQUE7QUFDakQsQ0FBQztBQUZELG9CQUVDO0FBRUQsU0FBZ0IsT0FBTyxDQUFDLE9BQWU7SUFDckMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDLEVBQUUsT0FBTyxDQUFDLENBQUE7QUFDNUMsQ0FBQztBQUZELDBCQUVDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgY3JlYXRlQ29sb3JzIH0gZnJvbSAnY29sb3JldHRlJ1xuXG4vKipcbiAqIFRoaXMgZmlsZSBpbWl0YXRlcyBcImNhcmdvXCIgbG9ncy4gVGhlIHdvcmRzIGFyZSBhbGlnbmVkIHdpdGggdGhlIGNvbG9uIGxpa2UgdGhpczpcbiAqICAgICAgICBWXG4gKiAgIEVycm9yOiBzb21lIHRleHQgcHJvdmlkZWQgYXMgYXJndW1lblxuICogICAgSW5mbzogc29tZSB0ZXh0IHByb3ZpZGVkIGFzIGFyZ3VtZW5cbiAqIFN1Y2Nlc3M6IHNvbWUgdGV4dCBwcm92aWRlZCBhcyBhcmd1bWVuXG4gKiBXYXJuaW5nOiBzb21lIHRleHQgcHJvdmlkZWQgYXMgYXJndW1lblxuICogICAgICAgIF5cbiAqL1xuXG5jb25zdCBzdGRlcnIgPSAoLi4ucGFyYW1ldGVyczogcmVhZG9ubHkgdW5rbm93bltdKSA9PiBwcm9jZXNzLnN0ZGVyci53cml0ZShgJHtwYXJhbWV0ZXJzLmpvaW4oJycpfVxcbmApXG5cbi8vIEBzZWUgaHR0cHM6Ly9uby1jb2xvci5vcmdcbi8vIEBzZWUgaHR0cHM6Ly93d3cubnBtanMuY29tL3BhY2thZ2UvY2hhbGtcbmNvbnN0IGNvbG9ycyA9IGNyZWF0ZUNvbG9ycyh7XG4gIHVzZUNvbG9yOiBwcm9jZXNzLmVudi5GT1JDRV9DT0xPUiAhPT0gJzAnICYmICFwcm9jZXNzLmVudi5OT19DT0xPUlxufSlcblxuZXhwb3J0IGZ1bmN0aW9uIGxvZyhtZXNzYWdlOiBzdHJpbmcpIHtcbiAgc3RkZXJyKG1lc3NhZ2UpXG59XG5cbmV4cG9ydCBmdW5jdGlvbiBmYWlsKG1lc3NhZ2U6IHN0cmluZykge1xuICBzdGRlcnIoY29sb3JzLnJlZEJyaWdodCgnICBFcnJvcjogJyksIG1lc3NhZ2UpXG59XG5cbmV4cG9ydCBmdW5jdGlvbiB3YXJuKG1lc3NhZ2U6IHN0cmluZykge1xuICBzdGRlcnIoY29sb3JzLnllbGxvdygnV2FybmluZzogJyksIG1lc3NhZ2UpXG59XG5cbmV4cG9ydCBmdW5jdGlvbiBpbmZvKG1lc3NhZ2U6IHN0cmluZykge1xuICBzdGRlcnIoY29sb3JzLmJsdWVCcmlnaHQoJyAgIEluZm86ICcpLCBtZXNzYWdlKVxufVxuXG5leHBvcnQgZnVuY3Rpb24gc3VjY2VlZChtZXNzYWdlOiBzdHJpbmcpIHtcbiAgc3RkZXJyKGNvbG9ycy5ncmVlbignU3VjY2VzczogJyksIG1lc3NhZ2UpXG59XG4iXX0=
|