xs-dev 0.31.1 → 0.32.0

package/build/commands/clean.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const os_1 = require("os");
+const devices_1 = require("../toolbox/prompt/devices");
+const command = {
+    name: 'clean',
+    description: 'Remove build artifacts for project',
+    run: async ({ parameters, filesystem, build }) => {
+        var _a, _b, _c;
+        const currentPlatform = (0, os_1.type)().toLowerCase();
+        const { device = currentPlatform, example, listExamples = false, listDevices = false, mode = (_a = process.env.NODE_ENV) !== null && _a !== void 0 ? _a : 'development', output, config = {}, } = parameters.options;
+        const targetPlatform = (_b = devices_1.DEVICE_ALIAS[device]) !== null && _b !== void 0 ? _b : device;
+        const projectPath = filesystem.resolve((_c = parameters.first) !== null && _c !== void 0 ? _c : '.');
+        await build({
+            listExamples,
+            listDevices,
+            example,
+            targetPlatform,
+            projectPath,
+            mode,
+            deployStatus: 'clean',
+            outputDir: output,
+            config,
+        });
+    },
+};
+exports.default = command;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xlYW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29tbWFuZHMvY2xlYW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFDQSwyQkFBeUM7QUFFekMsdURBQXdEO0FBY3hELE1BQU0sT0FBTyxHQUFpQztJQUM1QyxJQUFJLEVBQUUsT0FBTztJQUNiLFdBQVcsRUFBRSxvQ0FBb0M7SUFDakQsR0FBRyxFQUFFLEtBQUssRUFBRSxFQUFFLFVBQVUsRUFBRSxVQUFVLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRTs7UUFDL0MsTUFBTSxlQUFlLEdBQVcsSUFBQSxTQUFZLEdBQUUsQ0FBQyxXQUFXLEVBQVksQ0FBQTtRQUN0RSxNQUFNLEVBQ0osTUFBTSxHQUFHLGVBQWUsRUFDeEIsT0FBTyxFQUNQLFlBQVksR0FBRyxLQUFLLEVBQ3BCLFdBQVcsR0FBRyxLQUFLLEVBQ25CLElBQUksR0FBRyxNQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBaUIsbUNBQUksYUFBYSxFQUN0RCxNQUFNLEVBQ04sTUFBTSxHQUFHLEVBQUUsR0FDWixHQUFpQixVQUFVLENBQUMsT0FBTyxDQUFBO1FBQ3BDLE1BQU0sY0FBYyxHQUFXLE1BQUEsc0JBQVksQ0FBQyxNQUFNLENBQUMsbUNBQUksTUFBTSxDQUFBO1FBQzdELE1BQU0sV0FBVyxHQUFHLFVBQVUsQ0FBQyxPQUFPLENBQUMsTUFBQSxVQUFVLENBQUMsS0FBSyxtQ0FBSSxHQUFHLENBQUMsQ0FBQTtRQUUvRCxNQUFNLEtBQUssQ0FBQztZQUNWLFlBQVk7WUFDWixXQUFXO1lBQ1gsT0FBTztZQUNQLGNBQWM7WUFDZCxXQUFXO1lBQ1gsSUFBSTtZQUNKLFlBQVksRUFBRSxPQUFPO1lBQ3JCLFNBQVMsRUFBRSxNQUFNO1lBQ2pCLE1BQU07U0FDUCxDQUFDLENBQUE7SUFDSixDQUFDO0NBQ0YsQ0FBQTtBQUVELGtCQUFlLE9BQU8sQ0FBQSJ9

package/build/commands/debug.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const os_1 = require("os");
+const devices_1 = require("../toolbox/prompt/devices");
+const command = {
+    name: 'debug',
+    description: 'Connect to running debugging session on target device or simulator',
+    run: async ({ parameters, filesystem, build }) => {
+        var _a, _b, _c;
+        const currentPlatform = (0, os_1.type)().toLowerCase();
+        const { device = currentPlatform, port, example, listExamples = false, listDevices = false, log = false, mode = (_a = process.env.NODE_ENV) !== null && _a !== void 0 ? _a : 'development', output, } = parameters.options;
+        const targetPlatform = (_b = devices_1.DEVICE_ALIAS[device]) !== null && _b !== void 0 ? _b : device;
+        const projectPath = filesystem.resolve((_c = parameters.first) !== null && _c !== void 0 ? _c : '.');
+        await build({
+            port,
+            listExamples,
+            listDevices,
+            log,
+            example,
+            targetPlatform,
+            projectPath,
+            mode,
+            deployStatus: 'debug',
+            outputDir: output,
+        });
+    },
+};
+exports.default = command;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVidWcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29tbWFuZHMvZGVidWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFDQSwyQkFBeUM7QUFFekMsdURBQXdEO0FBZXhELE1BQU0sT0FBTyxHQUFpQztJQUM1QyxJQUFJLEVBQUUsT0FBTztJQUNiLFdBQVcsRUFDVCxvRUFBb0U7SUFDdEUsR0FBRyxFQUFFLEtBQUssRUFBRSxFQUFFLFVBQVUsRUFBRSxVQUFVLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRTs7UUFDL0MsTUFBTSxlQUFlLEdBQVcsSUFBQSxTQUFZLEdBQUUsQ0FBQyxXQUFXLEVBQVksQ0FBQTtRQUN0RSxNQUFNLEVBQ0osTUFBTSxHQUFHLGVBQWUsRUFDeEIsSUFBSSxFQUNKLE9BQU8sRUFDUCxZQUFZLEdBQUcsS0FBSyxFQUNwQixXQUFXLEdBQUcsS0FBSyxFQUNuQixHQUFHLEdBQUcsS0FBSyxFQUNYLElBQUksR0FBRyxNQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBaUIsbUNBQUksYUFBYSxFQUN0RCxNQUFNLEdBQ1AsR0FBaUIsVUFBVSxDQUFDLE9BQU8sQ0FBQTtRQUNwQyxNQUFNLGNBQWMsR0FBVyxNQUFBLHNCQUFZLENBQUMsTUFBTSxDQUFDLG1DQUFJLE1BQU0sQ0FBQTtRQUM3RCxNQUFNLFdBQVcsR0FBRyxVQUFVLENBQUMsT0FBTyxDQUFDLE1BQUEsVUFBVSxDQUFDLEtBQUssbUNBQUksR0FBRyxDQUFDLENBQUE7UUFFL0QsTUFBTSxLQUFLLENBQUM7WUFDVixJQUFJO1lBQ0osWUFBWTtZQUNaLFdBQVc7WUFDWCxHQUFHO1lBQ0gsT0FBTztZQUNQLGNBQWM7WUFDZCxXQUFXO1lBQ1gsSUFBSTtZQUNKLFlBQVksRUFBRSxPQUFPO1lBQ3JCLFNBQVMsRUFBRSxNQUFNO1NBQ2xCLENBQUMsQ0FBQTtJQUNKLENBQUM7Q0FDRixDQUFBO0FBRUQsa0JBQWUsT0FBTyxDQUFBIn0=

package/build/commands/setup.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const os_1 = require("os");
-const fontbm_1 = __importDefault(require("../toolbox/setup/fontbm"));
 const ejectfix_1 = __importDefault(require("../toolbox/setup/ejectfix"));
 const devices_1 = require("../toolbox/prompt/devices");
 const constants_1 = require("../toolbox/setup/constants");
@@ -41,12 +40,10 @@ const command = {
             }
         }
         if (tool !== undefined) {
-            if (!['fontbm', 'ejectfix'].includes(tool)) {
+            if (!['ejectfix'].includes(tool)) {
                 print.warning(`Unknown tool ${tool}`);
                 process.exit(1);
             }
-            if (tool === 'fontbm')
-                await (0, fontbm_1.default)();
             if (tool === 'ejectfix')
                 await (0, ejectfix_1.default)();
             return;
@@ -68,4 +65,4 @@ const command = {
     },
 };
 exports.default = command;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29tbWFuZHMvc2V0dXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFDQSwyQkFBeUM7QUFFekMscUVBQWlEO0FBQ2pELHlFQUFxRDtBQUNyRCx1REFBd0Q7QUFDeEQsMERBQTBEO0FBVzFELE1BQU0sT0FBTyxHQUFpQztJQUM1QyxJQUFJLEVBQUUsT0FBTztJQUNiLFdBQVcsRUFDVCxrRUFBa0U7SUFDcEUsR0FBRyxFQUFFLEtBQUssRUFBRSxFQUFFLFVBQVUsRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUU7UUFDbEQsTUFBTSxlQUFlLEdBQVcsSUFBQSxTQUFZLEdBQUUsQ0FBQyxXQUFXLEVBQVksQ0FBQTtRQUN0RSxNQUFNLEVBQ0osTUFBTSxFQUNOLFdBQVcsR0FBRyxLQUFLLEVBQ25CLElBQUksRUFDSixZQUFZLEdBQUcsZ0JBQWdCLEVBQy9CLFVBQVUsR0FBRyx5QkFBYSxHQUMzQixHQUFpQixVQUFVLENBQUMsT0FBTyxDQUFBO1FBQ3BDLElBQUksTUFBTSxHQUFXLE1BQU0sYUFBTixNQUFNLGNBQU4sTUFBTSxHQUFJLGVBQWUsQ0FBQTtRQUU5QyxJQUFJLE1BQU0sS0FBSyxTQUFTLElBQUksV0FBVyxFQUFFO1lBQ3ZDLE1BQU0sT0FBTyxHQUFHO2dCQUNkLFNBQVM7Z0JBQ1QsT0FBTztnQkFDUCxNQUFNO2dCQUNOLE1BQU07Z0JBQ04sT0FBTztnQkFDUCxzQkFBWSxDQUFDLGVBQWUsQ0FBQzthQUM5QixDQUFBO1lBQ0QsTUFBTSxFQUFFLE1BQU0sRUFBRSxjQUFjLEVBQUUsR0FBRyxNQUFNLE1BQU0sQ0FBQyxHQUFHLENBQUM7Z0JBQ2xEO29CQUNFLElBQUksRUFBRSxjQUFjO29CQUNwQixJQUFJLEVBQUUsUUFBUTtvQkFDZCxPQUFPLEVBQUUsd0NBQXdDO29CQUNqRCxPQUFPO2lCQUNSO2FBQ0YsQ0FBQyxDQUFBO1lBRUYsSUFBSSxjQUFjLEtBQUssRUFBRSxJQUFJLGNBQWMsS0FBSyxTQUFTLEVBQUU7Z0JBQ3pELE1BQU0sR0FBRyxjQUF3QixDQUFBO2FBQ2xDO2lCQUFNO2dCQUNMLEtBQUssQ0FBQyxPQUFPLENBQUMsc0NBQXNDLENBQUMsQ0FBQTtnQkFDckQsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTthQUNoQjtTQUNGO1FBRUQsSUFBSSxJQUFJLEtBQUssU0FBUyxFQUFFO1lBQ3RCLElBQUksQ0FBQyxDQUFDLFFBQVEsRUFBRSxVQUFVLENBQUMsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEVBQUU7Z0JBQzFDLEtBQUssQ0FBQyxPQUFPLENBQUMsZ0JBQWdCLElBQUksRUFBRSxDQUFDLENBQUE7Z0JBQ3JDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7YUFDaEI7WUFDRCxJQUFJLElBQUksS0FBSyxRQUFRO2dCQUFFLE1BQU0sSUFBQSxnQkFBVyxHQUFFLENBQUE7WUFDMUMsSUFBSSxJQUFJLEtBQUssVUFBVTtnQkFBRSxNQUFNLElBQUEsa0JBQWEsR0FBRSxDQUFBO1lBQzlDLE9BQU07U0FDUDtRQUNELE1BQU0sZUFBZSxHQUFhO1lBQ2hDLEtBQUs7WUFDTCxRQUFRO1lBQ1IsWUFBWTtZQUNaLEtBQUs7WUFDTCxLQUFLO1lBQ0wsT0FBTztTQUNSLENBQUE7UUFDRCxJQUFJLGVBQWUsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLEVBQUU7WUFDcEMsTUFBTSxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUMsRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFFLENBQUMsQ0FBQTtTQUNsRDthQUFNO1lBQ0wsTUFBTSxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUMsRUFBRSxZQUFZLEVBQUUsQ0FBQyxDQUFBO1NBQ3RDO0lBQ0gsQ0FBQztDQUNGLENBQUE7QUFFRCxrQkFBZSxPQUFPLENBQUEifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29tbWFuZHMvc2V0dXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFDQSwyQkFBeUM7QUFFekMseUVBQXFEO0FBQ3JELHVEQUF3RDtBQUN4RCwwREFBMEQ7QUFXMUQsTUFBTSxPQUFPLEdBQWlDO0lBQzVDLElBQUksRUFBRSxPQUFPO0lBQ2IsV0FBVyxFQUNULGtFQUFrRTtJQUNwRSxHQUFHLEVBQUUsS0FBSyxFQUFFLEVBQUUsVUFBVSxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRTtRQUNsRCxNQUFNLGVBQWUsR0FBVyxJQUFBLFNBQVksR0FBRSxDQUFDLFdBQVcsRUFBWSxDQUFBO1FBQ3RFLE1BQU0sRUFDSixNQUFNLEVBQ04sV0FBVyxHQUFHLEtBQUssRUFDbkIsSUFBSSxFQUNKLFlBQVksR0FBRyxnQkFBZ0IsRUFDL0IsVUFBVSxHQUFHLHlCQUFhLEdBQzNCLEdBQWlCLFVBQVUsQ0FBQyxPQUFPLENBQUE7UUFDcEMsSUFBSSxNQUFNLEdBQVcsTUFBTSxhQUFOLE1BQU0sY0FBTixNQUFNLEdBQUksZUFBZSxDQUFBO1FBRTlDLElBQUksTUFBTSxLQUFLLFNBQVMsSUFBSSxXQUFXLEVBQUU7WUFDdkMsTUFBTSxPQUFPLEdBQUc7Z0JBQ2QsU0FBUztnQkFDVCxPQUFPO2dCQUNQLE1BQU07Z0JBQ04sTUFBTTtnQkFDTixPQUFPO2dCQUNQLHNCQUFZLENBQUMsZUFBZSxDQUFDO2FBQzlCLENBQUE7WUFDRCxNQUFNLEVBQUUsTUFBTSxFQUFFLGNBQWMsRUFBRSxHQUFHLE1BQU0sTUFBTSxDQUFDLEdBQUcsQ0FBQztnQkFDbEQ7b0JBQ0UsSUFBSSxFQUFFLGNBQWM7b0JBQ3BCLElBQUksRUFBRSxRQUFRO29CQUNkLE9BQU8sRUFBRSx3Q0FBd0M7b0JBQ2pELE9BQU87aUJBQ1I7YUFDRixDQUFDLENBQUE7WUFFRixJQUFJLGNBQWMsS0FBSyxFQUFFLElBQUksY0FBYyxLQUFLLFNBQVMsRUFBRTtnQkFDekQsTUFBTSxHQUFHLGNBQXdCLENBQUE7YUFDbEM7aUJBQU07Z0JBQ0wsS0FBSyxDQUFDLE9BQU8sQ0FBQyxzQ0FBc0MsQ0FBQyxDQUFBO2dCQUNyRCxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO2FBQ2hCO1NBQ0Y7UUFFRCxJQUFJLElBQUksS0FBSyxTQUFTLEVBQUU7WUFDdEIsSUFBSSxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxFQUFFO2dCQUNoQyxLQUFLLENBQUMsT0FBTyxDQUFDLGdCQUFnQixJQUFJLEVBQUUsQ0FBQyxDQUFBO2dCQUNyQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO2FBQ2hCO1lBQ0QsSUFBSSxJQUFJLEtBQUssVUFBVTtnQkFBRSxNQUFNLElBQUEsa0JBQWEsR0FBRSxDQUFBO1lBQzlDLE9BQU07U0FDUDtRQUNELE1BQU0sZUFBZSxHQUFhO1lBQ2hDLEtBQUs7WUFDTCxRQUFRO1lBQ1IsWUFBWTtZQUNaLEtBQUs7WUFDTCxLQUFLO1lBQ0wsT0FBTztTQUNSLENBQUE7UUFDRCxJQUFJLGVBQWUsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLEVBQUU7WUFDcEMsTUFBTSxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUMsRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFFLENBQUMsQ0FBQTtTQUNsRDthQUFNO1lBQ0wsTUFBTSxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUMsRUFBRSxZQUFZLEVBQUUsQ0FBQyxDQUFBO1NBQ3RDO0lBQ0gsQ0FBQztDQUNGLENBQUE7QUFFRCxrQkFBZSxPQUFPLENBQUEifQ==

package/build/toolbox/build/index.js

@@ -13,6 +13,13 @@ const choices_1 = require("../prompt/choices");
 const moddable_1 = require("../setup/moddable");
 const devices_1 = require("../prompt/devices");
 const exec_1 = require("../system/exec");
+const DEPLOY_TARGET = Object.freeze({
+    clean: 'clean',
+    debug: 'xsbug',
+    none: 'build',
+    push: 'build',
+    run: 'all',
+});
 async function build({ listDevices, port, example, listExamples, log = false, projectPath, targetPlatform, mode, deployStatus, outputDir, config = {}, }) {
     var _a, _b, _c, _d, _e, _f, _g;
     const OS = (0, node_os_1.type)().toLowerCase();
@@ -185,11 +192,20 @@ async function build({ listDevices, port, example, listExamples, log = false, pr
         process.env.UPLOAD_PORT = port;
     }
     const spinner = gluegun_1.print.spin();
-    spinner.start(`Building${deployStatus !== 'none' ? ' and deploying project' : ''} ${projectPath} on ${targetPlatform}\n`);
+    switch (deployStatus) {
+        case 'clean':
+            spinner.start(`Cleaning up build artifacts for project ${projectPath} on ${targetPlatform}\n`);
+            break;
+        case 'debug':
+            spinner.start(`Connecting to running debug session for ${projectPath} on ${targetPlatform}\n`);
+            break;
+        default:
+            spinner.start(`Building${deployStatus !== 'none' ? ' and deploying project' : ''} ${projectPath} on ${targetPlatform}\n`);
+    }
     const configArgs = [
         '-m',
         `-p ${targetPlatform}`,
-        `-t ${deployStatus === 'run' ? 'all' : 'build'}`,
+        `-t ${DEPLOY_TARGET[deployStatus]}`,
         `-o ${outputDir}`,
     ];
     if (mode === 'development')
@@ -259,4 +275,4 @@ async function build({ listDevices, port, example, listExamples, log = false, pr
     }
 }
 exports.build = build;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/toolbox/build/index.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/toolbox/build/index.ts"],"names":[],"mappings":"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"}

package/build/types/commands/clean.d.ts

@@ -0,0 +1,4 @@
+import type { GluegunCommand } from 'gluegun';
+import type { XSDevToolbox } from '../types';
+declare const command: GluegunCommand<XSDevToolbox>;
+export default command;

package/build/types/commands/debug.d.ts

@@ -0,0 +1,4 @@
+import type { GluegunCommand } from 'gluegun';
+import type { XSDevToolbox } from '../types';
+declare const command: GluegunCommand<XSDevToolbox>;
+export default command;

package/build/types/toolbox/build/index.d.ts

@@ -1,4 +1,4 @@
-export declare type DeployStatus = 'none' | 'run' | 'push';
+export declare type DeployStatus = 'none' | 'run' | 'push' | 'clean' | 'debug';
 export interface BuildArgs {
     port?: string;
     example?: string;

package/docs/src/content/docs/features/run.md

@@ -105,3 +105,37 @@ If you want to immediately deploy the release build, use the `--deploy` flag:
 ```
 xs-dev build --deploy --device esp32
 ```
+
+## Connect to running debugger sessions
+
+To conveniently restart a debugging session without redeploying the project, the `debug` command takes the same flags as the `run` command to invoke [`mcconfig`](https://github.com/Moddable-OpenSource/moddable/blob/public/documentation/tools/tools.md#mcconfig) to launch xsbug or the terminal debugger for the selected device or simulator.
+
+```
+xs-dev debug --device esp32
+```
+
+It even works with example projects:
+
+```
+xs-dev debug --example helloworld
+```
+
+The output directory can also be set using the `--output` flag, overriding the default path of `$MODDABLE/build`, where `$MODDABLE` is the location of the Moddable tooling repo on your local filesystem.
+
+```
+xs-dev debug --output ./dist --device esp32
+```
+
+## Cleaning up build artifacts
+
+The Moddable build tooling will do it's best to avoid repeating work to ensure quick incremental updates when recompiling programs or skipping compilation entirely if no changes have been made to the source code and config files. Whether it is to force a full recompile of your project or to make space on your development machine, the `clean` command is here to help! It takes the same flags as the `build` and `run` commands (except for "port" and "deploy") to invoke [`mcconfig`](https://github.com/Moddable-OpenSource/moddable/blob/public/documentation/tools/tools.md#mcconfig) with the required `clean` target.
+
+```
+xs-dev clean --device esp32
+```
+
+The output directory can also be set using the `--output` flag, overriding the default path of `$MODDABLE/build`, where `$MODDABLE` is the location of the Moddable tooling repo on your local filesystem.
+
+```
+xs-dev clean --output ./dist --device esp32
+```

package/docs/src/content/docs/features/setup.md

@@ -75,12 +75,6 @@ There are some utilities that are not included in the Moddable SDK or other plat
 
 **Supported tools:**
 
-[`fontbm`](https://github.com/vladimirgamalyan/fontbm): BMFont compatible, cross-platform (Linux/macOS/Windows) command line bitmap font generator (FreeType2 based render)
-
-```
-xs-dev setup --tool fontbm
-```
-
 `ejectfix`: not a downloadable tool, rather a environment preference to disable the `DISK NOT EJECTED PROPERLY` notification while working with the nrf52 on MacOS. This will automate the process described by [the Adafruit blog](https://blog.adafruit.com/2021/05/11/how-to-tone-down-macos-big-surs-circuitpy-eject-notifications/):
 
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xs-dev",
-  "version": "0.31.1",
+  "version": "0.32.0",
   "description": "CLI for automating the setup and usage of Moddable XS tools",
   "types": "build/types/types.d.ts",
   "bin": {

package/build/toolbox/setup/fontbm.js

@@ -1,97 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const gluegun_1 = require("gluegun");
-const constants_1 = require("./constants");
-const upsert_1 = __importDefault(require("../patching/upsert"));
-const os_1 = require("os");
-const process_1 = require("process");
-const exec_1 = require("../system/exec");
-const homebrew_1 = require("./homebrew");
-async function default_1() {
-    const spinner = gluegun_1.print.spin();
-    spinner.start('Beginning setup...');
-    const OS = (0, os_1.type)().toLowerCase();
-    if (OS !== 'darwin' && OS !== 'linux') {
-        gluegun_1.print.error(`OS "${OS}" not supported`);
-        (0, process_1.exit)(1);
-    }
-    const FONTBM_REPO = 'https://github.com/vladimirgamalyan/fontbm.git';
-    const FONTBM_DIR = gluegun_1.filesystem.resolve(constants_1.INSTALL_DIR, 'fontbm');
-    const FONTBM_TAG = 'v0.5.0';
-    // 1. install cmake
-    if (gluegun_1.system.which('cmake') === null) {
-        if (OS === 'darwin') {
-            try {
-                await (0, homebrew_1.ensureHomebrew)();
-            }
-            catch (error) {
-                if (error instanceof Error) {
-                    gluegun_1.print.info(`${error.message} cmake`);
-                    process.exit(1);
-                }
-            }
-            spinner.start('Cmake required, installing with Homebrew');
-            await gluegun_1.system.exec('brew install cmake', { shell: process.env.SHELL });
-            spinner.succeed();
-        }
-        if (OS === 'linux') {
-            spinner.start('CMake required, installing with apt');
-            await (0, exec_1.execWithSudo)('apt-get install --yes build-essential cmake', {
-                stdout: process.stdout,
-            });
-            spinner.succeed();
-        }
-    }
-    // 2. install freetype
-    if (OS === 'darwin') {
-        if (gluegun_1.system.which('freetype-config') === null) {
-            try {
-                await (0, homebrew_1.ensureHomebrew)();
-            }
-            catch (error) {
-                if (error instanceof Error) {
-                    gluegun_1.print.info(`${error.message} freetype-config`);
-                    process.exit(1);
-                }
-            }
-            spinner.start('FreeType required, installing with Homebrew');
-            await gluegun_1.system.exec('brew install freetype', { shell: process.env.SHELL });
-            spinner.succeed();
-        }
-    }
-    if (OS === 'linux') {
-        spinner.start('Installing libfreetype-dev');
-        await (0, exec_1.execWithSudo)('apt-get install --yes libfreetype-dev', {
-            stdout: process.stdout,
-        });
-        spinner.succeed();
-    }
-    // 3. clone fontbm
-    if (gluegun_1.filesystem.exists(FONTBM_DIR) === false) {
-        spinner.start(`Cloning fontbm repo (tag "${FONTBM_TAG}")`);
-        await gluegun_1.system.spawn(`git clone ${FONTBM_REPO} --depth 1 --single-branch --branch ${FONTBM_TAG} ${FONTBM_DIR}`);
-        spinner.succeed();
-    }
-    // 4. build fontbm
-    spinner.start('Building fontbm');
-    await gluegun_1.system.exec('cmake .', {
-        cwd: FONTBM_DIR,
-        stdout: process.stdout,
-    });
-    await gluegun_1.system.exec('make', {
-        cwd: FONTBM_DIR,
-        stdout: process.stdout,
-    });
-    spinner.succeed();
-    // 5. set FONTBM environment variable
-    if (process.env.FONTBM === undefined) {
-        process.env.FONTBM = `${FONTBM_DIR}/fontbm`;
-        await (0, upsert_1.default)(constants_1.EXPORTS_FILE_PATH, `export FONTBM=${process.env.FONTBM}`);
-    }
-    spinner.succeed('fontbm successfully set up!');
-}
-exports.default = default_1;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9udGJtLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3Rvb2xib3gvc2V0dXAvZm9udGJtLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEscUNBQW1EO0FBQ25ELDJDQUE0RDtBQUM1RCxnRUFBdUM7QUFDdkMsMkJBQXlDO0FBQ3pDLHFDQUE4QjtBQUM5Qix5Q0FBNkM7QUFDN0MseUNBQTJDO0FBRTVCLEtBQUs7SUFDbEIsTUFBTSxPQUFPLEdBQUcsZUFBSyxDQUFDLElBQUksRUFBRSxDQUFBO0lBQzVCLE9BQU8sQ0FBQyxLQUFLLENBQUMsb0JBQW9CLENBQUMsQ0FBQTtJQUVuQyxNQUFNLEVBQUUsR0FBRyxJQUFBLFNBQVksR0FBRSxDQUFDLFdBQVcsRUFBRSxDQUFBO0lBQ3ZDLElBQUksRUFBRSxLQUFLLFFBQVEsSUFBSSxFQUFFLEtBQUssT0FBTyxFQUFFO1FBQ3JDLGVBQUssQ0FBQyxLQUFLLENBQUMsT0FBTyxFQUFFLGlCQUFpQixDQUFDLENBQUE7UUFDdkMsSUFBQSxjQUFJLEVBQUMsQ0FBQyxDQUFDLENBQUE7S0FDUjtJQUVELE1BQU0sV0FBVyxHQUFHLGdEQUFnRCxDQUFBO0lBQ3BFLE1BQU0sVUFBVSxHQUFHLG9CQUFVLENBQUMsT0FBTyxDQUFDLHVCQUFXLEVBQUUsUUFBUSxDQUFDLENBQUE7SUFDNUQsTUFBTSxVQUFVLEdBQUcsUUFBUSxDQUFBO0lBRTNCLG1CQUFtQjtJQUNuQixJQUFJLGdCQUFNLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLElBQUksRUFBRTtRQUNsQyxJQUFJLEVBQUUsS0FBSyxRQUFRLEVBQUU7WUFDbkIsSUFBSTtnQkFDRixNQUFNLElBQUEseUJBQWMsR0FBRSxDQUFBO2FBQ3ZCO1lBQUMsT0FBTyxLQUFjLEVBQUU7Z0JBQ3ZCLElBQUksS0FBSyxZQUFZLEtBQUssRUFBRTtvQkFDMUIsZUFBSyxDQUFDLElBQUksQ0FBQyxHQUFHLEtBQUssQ0FBQyxPQUFPLFFBQVEsQ0FBQyxDQUFBO29CQUNwQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO2lCQUNoQjthQUNGO1lBRUQsT0FBTyxDQUFDLEtBQUssQ0FBQywwQ0FBMEMsQ0FBQyxDQUFBO1lBQ3pELE1BQU0sZ0JBQU0sQ0FBQyxJQUFJLENBQUMsb0JBQW9CLEVBQUUsRUFBRSxLQUFLLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFBO1lBQ3JFLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQTtTQUNsQjtRQUNELElBQUksRUFBRSxLQUFLLE9BQU8sRUFBRTtZQUNsQixPQUFPLENBQUMsS0FBSyxDQUFDLHFDQUFxQyxDQUFDLENBQUE7WUFDcEQsTUFBTSxJQUFBLG1CQUFZLEVBQUMsNkNBQTZDLEVBQUU7Z0JBQ2hFLE1BQU0sRUFBRSxPQUFPLENBQUMsTUFBTTthQUN2QixDQUFDLENBQUE7WUFDRixPQUFPLENBQUMsT0FBTyxFQUFFLENBQUE7U0FDbEI7S0FDRjtJQUVELHNCQUFzQjtJQUN0QixJQUFJLEVBQUUsS0FBSyxRQUFRLEVBQUU7UUFDbkIsSUFBSSxnQkFBTSxDQUFDLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLElBQUksRUFBRTtZQUM1QyxJQUFJO2dCQUNGLE1BQU0sSUFBQSx5QkFBYyxHQUFFLENBQUE7YUFDdkI7WUFBQyxPQUFPLEtBQWMsRUFBRTtnQkFDdkIsSUFBSSxLQUFLLFlBQVksS0FBSyxFQUFFO29CQUMxQixlQUFLLENBQUMsSUFBSSxDQUFDLEdBQUcsS0FBSyxDQUFDLE9BQU8sa0JBQWtCLENBQUMsQ0FBQTtvQkFDOUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtpQkFDaEI7YUFDRjtZQUVELE9BQU8sQ0FBQyxLQUFLLENBQUMsNkNBQTZDLENBQUMsQ0FBQTtZQUM1RCxNQUFNLGdCQUFNLENBQUMsSUFBSSxDQUFDLHVCQUF1QixFQUFFLEVBQUUsS0FBSyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsS0FBSyxFQUFFLENBQUMsQ0FBQTtZQUN4RSxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUE7U0FDbEI7S0FDRjtJQUNELElBQUksRUFBRSxLQUFLLE9BQU8sRUFBRTtRQUNsQixPQUFPLENBQUMsS0FBSyxDQUFDLDRCQUE0QixDQUFDLENBQUE7UUFDM0MsTUFBTSxJQUFBLG1CQUFZLEVBQUMsdUNBQXVDLEVBQUU7WUFDMUQsTUFBTSxFQUFFLE9BQU8sQ0FBQyxNQUFNO1NBQ3ZCLENBQUMsQ0FBQTtRQUNGLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQTtLQUNsQjtJQUVELGtCQUFrQjtJQUNsQixJQUFJLG9CQUFVLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxLQUFLLEtBQUssRUFBRTtRQUMzQyxPQUFPLENBQUMsS0FBSyxDQUFDLDZCQUE2QixVQUFVLElBQUksQ0FBQyxDQUFBO1FBQzFELE1BQU0sZ0JBQU0sQ0FBQyxLQUFLLENBQ2hCLGFBQWEsV0FBVyx1Q0FBdUMsVUFBVSxJQUFJLFVBQVUsRUFBRSxDQUMxRixDQUFBO1FBQ0QsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFBO0tBQ2xCO0lBRUQsa0JBQWtCO0lBQ2xCLE9BQU8sQ0FBQyxLQUFLLENBQUMsaUJBQWlCLENBQUMsQ0FBQTtJQUNoQyxNQUFNLGdCQUFNLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRTtRQUMzQixHQUFHLEVBQUUsVUFBVTtRQUNmLE1BQU0sRUFBRSxPQUFPLENBQUMsTUFBTTtLQUN2QixDQUFDLENBQUE7SUFDRixNQUFNLGdCQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRTtRQUN4QixHQUFHLEVBQUUsVUFBVTtRQUNmLE1BQU0sRUFBRSxPQUFPLENBQUMsTUFBTTtLQUN2QixDQUFDLENBQUE7SUFDRixPQUFPLENBQUMsT0FBTyxFQUFFLENBQUE7SUFFakIscUNBQXFDO0lBQ3JDLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLEtBQUssU0FBUyxFQUFFO1FBQ3BDLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxHQUFHLEdBQUcsVUFBVSxTQUFTLENBQUE7UUFDM0MsTUFBTSxJQUFBLGdCQUFNLEVBQUMsNkJBQWlCLEVBQUUsaUJBQWlCLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQTtLQUN2RTtJQUVELE9BQU8sQ0FBQyxPQUFPLENBQUMsNkJBQTZCLENBQUMsQ0FBQTtBQUNoRCxDQUFDO0FBNUZELDRCQTRGQyJ9

package/build/types/toolbox/setup/fontbm.d.ts

@@ -1 +0,0 @@
-export default function (): Promise<void>;