xs-dev 0.27.4 → 0.28.0

package/build/toolbox/build/index.js

@@ -201,8 +201,16 @@ async function build({ listDevices, port, example, listExamples, log = false, pr
     Object.entries(config).forEach(([element, value]) => {
         configArgs.push(`${element}="${value}"`);
     });
+    const canUseMCPack = gluegun_1.system.which('mcpack') !== null &&
+        gluegun_1.filesystem.exists(gluegun_1.filesystem.resolve(projectPath, 'package.json')) ===
+            'file';
+    let rootCommand = 'mcconfig';
+    if (canUseMCPack) {
+        rootCommand = 'mcpack';
+        configArgs.unshift('mcconfig');
+    }
     if (log) {
-        const logOutput = (0, node_child_process_1.spawn)('mcconfig', configArgs, {
+        const logOutput = (0, node_child_process_1.spawn)(rootCommand, configArgs, {
             cwd: projectPath,
             stdio: 'inherit',
             shell: true,
@@ -218,7 +226,7 @@ async function build({ listDevices, port, example, listExamples, log = false, pr
             void gluegun_1.system.exec(`pkill serial2xsbug`);
         });
         try {
-            await gluegun_1.system.exec(`mcconfig ${configArgs.join(' ')}`, {
+            await gluegun_1.system.exec(`${rootCommand} ${configArgs.join(' ')}`, {
                 cwd: projectPath,
                 stdio: 'inherit',
                 shell: true,
@@ -251,4 +259,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/toolbox/setup/esp32.js

@@ -14,10 +14,12 @@ const windows_1 = require("./esp32/windows");
 const windows_2 = require("./windows");
 const exec_1 = require("../system/exec");
 async function default_1() {
+    var _a;
     const OS = (0, os_1.type)().toLowerCase();
     const isWindows = OS === 'windows_nt';
     const ESP_IDF_REPO = 'https://github.com/espressif/esp-idf.git';
-    const ESP_BRANCH = 'v4.4.3';
+    const ESP_BRANCH_V4 = 'v4.4.3';
+    const ESP_BRANCH_V5 = 'v5.1.1';
     const ESP32_DIR = gluegun_1.filesystem.resolve(constants_1.INSTALL_DIR, 'esp32');
     const IDF_PATH = gluegun_1.filesystem.resolve(ESP32_DIR, 'esp-idf');
     await (0, exec_1.sourceEnvironment)();
@@ -37,7 +39,12 @@ async function default_1() {
     // 2. clone esp-idf into ~/.local/share/esp32/esp-idf
     if (gluegun_1.filesystem.exists(IDF_PATH) === false) {
         spinner.start('Cloning esp-idf repo');
-        await gluegun_1.system.spawn(`git clone --depth 1 --single-branch -b ${ESP_BRANCH} --recursive ${ESP_IDF_REPO} ${IDF_PATH}`);
+        const moddableVersion = (_a = (await (0, moddable_1.getModdableVersion)())) !== null && _a !== void 0 ? _a : '';
+        const branch = moddableVersion.includes('branch') ||
+            gluegun_1.semver.satisfies(moddableVersion !== null && moddableVersion !== void 0 ? moddableVersion : '', '>= 4.2.x')
+            ? ESP_BRANCH_V5
+            : ESP_BRANCH_V4;
+        await gluegun_1.system.spawn(`git clone --depth 1 --single-branch -b ${branch} --recursive ${ESP_IDF_REPO} ${IDF_PATH}`);
         spinner.succeed();
     }
     // 3. Install build and run dependencies
@@ -96,4 +103,4 @@ async function default_1() {
   `);
 }
 exports.default = default_1;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXNwMzIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdG9vbGJveC9zZXR1cC9lc3AzMi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLHFDQUFtRDtBQUNuRCwyQkFBeUM7QUFDekMsMkNBQTREO0FBQzVELHlDQUEyQztBQUMzQyxnRUFBdUM7QUFDdkMscUNBQTJEO0FBQzNELHlDQUErRDtBQUMvRCw2Q0FBK0Q7QUFDL0QsdUNBQStEO0FBQy9ELHlDQUFrRDtBQUVuQyxLQUFLO0lBQ2xCLE1BQU0sRUFBRSxHQUFHLElBQUEsU0FBWSxHQUFFLENBQUMsV0FBVyxFQUFFLENBQUE7SUFDdkMsTUFBTSxTQUFTLEdBQUcsRUFBRSxLQUFLLFlBQVksQ0FBQTtJQUNyQyxNQUFNLFlBQVksR0FBRywwQ0FBMEMsQ0FBQTtJQUMvRCxNQUFNLFVBQVUsR0FBRyxRQUFRLENBQUE7SUFDM0IsTUFBTSxTQUFTLEdBQUcsb0JBQVUsQ0FBQyxPQUFPLENBQUMsdUJBQVcsRUFBRSxPQUFPLENBQUMsQ0FBQTtJQUMxRCxNQUFNLFFBQVEsR0FBRyxvQkFBVSxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsU0FBUyxDQUFDLENBQUE7SUFFekQsTUFBTSxJQUFBLHdCQUFpQixHQUFFLENBQUE7SUFFekIsTUFBTSxPQUFPLEdBQUcsZUFBSyxDQUFDLElBQUksRUFBRSxDQUFBO0lBQzVCLE9BQU8sQ0FBQyxLQUFLLENBQUMsd0JBQXdCLENBQUMsQ0FBQTtJQUV2Qyw0QkFBNEI7SUFDNUIsSUFBSSxDQUFDLElBQUEseUJBQWMsR0FBRSxFQUFFO1FBQ3JCLE9BQU8sQ0FBQyxJQUFJLENBQ1Ysb0VBQW9FLENBQ3JFLENBQUE7UUFDRCxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO0tBQ2hCO0lBRUQsSUFBSSxTQUFTLEVBQUU7UUFDYixNQUFNLElBQUEscUNBQTJCLEVBQUMsT0FBTyxDQUFDLENBQUE7S0FDM0M7SUFFRCwyQ0FB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXNwMzIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdG9vbGJveC9zZXR1cC9lc3AzMi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLHFDQUEyRDtBQUMzRCwyQkFBeUM7QUFDekMsMkNBQTREO0FBQzVELHlDQUErRDtBQUMvRCxnRUFBdUM7QUFDdkMscUNBQTJEO0FBQzNELHlDQUErRDtBQUMvRCw2Q0FBK0Q7QUFDL0QsdUNBQStEO0FBQy9ELHlDQUFrRDtBQUVuQyxLQUFLOztJQUNsQixNQUFNLEVBQUUsR0FBRyxJQUFBLFNBQVksR0FBRSxDQUFDLFdBQVcsRUFBRSxDQUFBO0lBQ3ZDLE1BQU0sU0FBUyxHQUFHLEVBQUUsS0FBSyxZQUFZLENBQUE7SUFDckMsTUFBTSxZQUFZLEdBQUcsMENBQTBDLENBQUE7SUFDL0QsTUFBTSxhQUFhLEdBQUcsUUFBUSxDQUFBO0lBQzlCLE1BQU0sYUFBYSxHQUFHLFFBQVEsQ0FBQTtJQUM5QixNQUFNLFNBQVMsR0FBRyxvQkFBVSxDQUFDLE9BQU8sQ0FBQyx1QkFBVyxFQUFFLE9BQU8sQ0FBQyxDQUFBO0lBQzFELE1BQU0sUUFBUSxHQUFHLG9CQUFVLENBQUMsT0FBTyxDQUFDLFNBQVMsRUFBRSxTQUFTLENBQUMsQ0FBQTtJQUV6RCxNQUFNLElBQUEsd0JBQWlCLEdBQUUsQ0FBQTtJQUV6QixNQUFNLE9BQU8sR0FBRyxlQUFLLENBQUMsSUFBSSxFQUFFLENBQUE7SUFDNUIsT0FBTyxDQUFDLEtBQUssQ0FBQyx3QkFBd0IsQ0FBQyxDQUFBO0lBRXZDLDRCQUE0QjtJQUM1QixJQUFJLENBQUMsSUFBQSx5QkFBYyxHQUFFLEVBQUU7UUFDckIsT0FBTyxDQUFDLElBQUksQ0FDVixvRUFBb0UsQ0FDckUsQ0FBQTtRQUNELE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7S0FDaEI7SUFFRCxJQUFJLFNBQVMsRUFBRTtRQUNiLE1BQU0sSUFBQSxxQ0FBMkIsRUFB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

package/build/toolbox/setup/nrf52.js

@@ -90,11 +90,10 @@ async function default_1() {
         const writer = isWindows
             ? (0, unzip_stream_1.Extract)({ path: NRF52_DIR })
             : (0, tar_fs_1.extract)(NRF52_DIR, { readable: true });
-        const unxz = createUnxz();
         const response = await axios_1.default.get(TOOLCHAIN_DOWNLOAD, {
             responseType: 'stream',
         });
-        const stream = isWindows ? response.data : response.data.pipe(unxz);
+        const stream = isWindows ? response.data : response.data.pipe(createUnxz());
         stream.pipe(writer);
         await finishedPromise(writer);
         spinner.succeed();
@@ -155,4 +154,4 @@ async function default_1() {
   `);
 }
 exports.default = default_1;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnJmNTIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdG9vbGJveC9zZXR1cC9ucmY1Mi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsa0RBQXlCO0FBQ3pCLDJCQUFzQztBQUN0QyxxQ0FBMkM7QUFDM0MsMkJBQStDO0FBQy9DLG1DQUFpQztBQUNqQyxtQ0FBZ0M7QUFDaEMsK0JBQWdDO0FBQ2hDLCtDQUFvRDtBQUVwRCwrQ0FBZ0Q7QUFDaEQseUNBQWdFO0FBQ2hFLDJDQUE0RDtBQUM1RCx5Q0FBMkM7QUFDM0MsdUNBQStEO0FBQy9ELGdFQUF1QztBQUN2Qyw2Q0FBK0M7QUFFL0MsTUFBTSxlQUFlLEdBQUcsSUFBQSxnQkFBUyxFQUFDLGlCQUFRLENBQUMsQ0FBQTtBQUUzQyxNQUFNLFVBQVUsR0FBMkI7SUFDekMsWUFBWSxFQUFFLGNBQWM7SUFDNUIsVUFBVSxFQUFFLGVBQWU7SUFDM0IsU0FBUyxFQUFFLFFBQVE7SUFDbkIsY0FBYyxFQUFFLGdCQUFnQjtDQUNqQyxDQUFBO0FBQ2MsS0FBSztJQUNsQixNQUFNLEVBQUUsR0FBRyxJQUFBLFNBQVksR0FBRSxDQUFDLFdBQVcsRUFBWSxDQUFBO0lBQ2pELE1BQU0sU0FBUyxHQUFHLEVBQUUsS0FBSyxZQUFZLENBQUE7SUFDckMsTUFBTSxTQUFTLEdBQUcsK0JBQ2hCLFVBQVUsQ0FBQyxHQUFHLEVBQUUsSUFBSSxJQUFBLFNBQUksR0FBRSxFQUFFLENBQzlCLGdCQUFnQixDQUFBO0lBQ2hCLE1BQU0sa0JBQWtCLEdBQUcsMEVBQTBFLFNBQVMsSUFDNUcsU0FBUyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLFFBQ3RCLEVBQUUsQ0FBQTtJQUNGLE1BQU0sMENBQTBDLEdBQzlDLGtGQUFrRixDQUFBO0lBQ3BGLE1BQU0sUUFBUSxHQUFHLHlCQUF5QixDQUFBO0lBQzFDLE1BQU0saUJBQWlCLEdBQUcseUVBQXlFLFFBQVEsVUFBVSxDQUFBO0lBQ3JILE1BQU0sU0FBUyxHQUFHLG9CQUFVLENBQUMsT0FBTyxDQUFDLHVCQUFXLEVBQUUsT0FBTyxDQUFDLENBQUE7SUFDMUQsTUFBTSxjQUFjLEdBQUcsb0JBQVUsQ0FBQyxPQUFPLENBQUMsU0FBUyxFQUFFLFNBQVMsQ0FBQyxDQUFBO0lBQy9ELE1BQU0sWUFBWSxHQUFHLG9CQUFVLENBQUMsT0FBTyxDQUFDLFNBQVMsRUFBRSxZQUFZLENBQUMsQ0FBQTtJQUNoRSxNQUFNLGFBQWEsR0FBRyxvQkFBVSxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsUUFBUSxDQUFDLENBQUE7SUFFN0QsTUFBTSxJQUFBLHdCQUFpQixHQUFFLENBQUE7SUFFekIsTUFBTSxPQUFPLEdBQUcsZUFBSyxDQUFDLElBQUksRUFBRSxDQUFBO0lBQzVCLE9BQU8sQ0FBQyxLQUFLLENBQUMsd0JBQXdCLENBQUMsQ0FBQTtJQUV2QyxJQUFJLENBQUMsSUFBQSx5QkFBYyxHQUFFLEVBQUU7UUFDckIsT0FBTyxDQUFDLElBQUksQ0FDVix5REFBeUQsc0JBQVksQ0FBQyxFQUFFLENBQUMsd0JBQXdCLENBQ2xHLENBQUE7UUFDRCxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO0tBQ2hCO0lBRUQsSUFBSSxTQUFTLEVBQUU7UUFDYixNQUFNLElBQUEscUNBQTJCLEVBQUMsT0FBTyxDQUFDLENBQUE7S0FDM0M7SUFFRCxJQUFJLFVBQWUsQ0FBQTtJQUNuQixJQUFJLENBQUMsU0FBUyxFQUFFO1FBQ2QsSUFBSTtZQUNGLHFFQUFxRTtZQUNyRSxhQUFhO1lBQ2IsQ0FBQztZQUFBLENBQUMsRUFBRSxVQUFVLEVBQUUsR0FBRyx3REFBYSxjQUFjLEdBQUMsQ0FBQyxDQUFBO1NBQ2pEO1FBQUMsT0FBTyxLQUFLLEVBQUU7WUFDZCxPQUFPLENBQUMsSUFBSSxDQUNWLHNQQUFzUCxDQUN2UCxDQUFBO1lBQ0QsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtTQUNoQjtLQUNGO0lBRUQsT0FBTyxDQUFDLElBQUksQ0FBQywwQkFBMEIsQ0FBQyxDQUFBO0lBQ3hDLG9CQUFVLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxDQUFBO0lBRXpCLElBQUksb0JBQVUsQ0FBQyxNQUFNLENBQUMsY0FBYyxDQUFDLEtBQUssS0FBSyxFQUFFO1FBQy9DLE9BQU8sQ0FBQyxLQUFLLENBQUMsd0NBQXdDLENBQUMsQ0FBQTtRQUV2RCxNQUFNLE1BQU0sR0FBRyxTQUFTO1lBQ3RCLENBQUMsQ0FBQyxJQUFBLHNCQUFVLEVBQUMsRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFFLENBQUM7WUFDakMsQ0FBQyxDQUFDLElBQUEsZ0JBQU8sRUFBQyxTQUFTLEVBQUUsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQTtRQUMxQyxNQUFNLElBQUksR0FBRyxVQUFVLEVBQUUsQ0FBQTtRQUN6QixNQUFNLFFBQVEsR0FBRyxNQUFNLGVBQUssQ0FBQyxHQUFHLENBQUMsa0JBQWtCLEVBQUU7WUFDbkQsWUFBWSxFQUFFLFFBQVE7U0FDdkIsQ0FBQyxDQUFBO1FBQ0YsTUFBTSxNQUFNLEdBQUcsU0FBUyxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQTtRQUNuRSxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFBO1FBQ25CLE1BQU0sZUFBZSxDQUFDLE1BQU0sQ0FBQyxDQUFBO1FBQzdCLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQTtLQUNsQjtJQUVELElBQUksb0JBQVUsQ0FBQyxNQUFNLENBQUMsWUFBWSxDQUFDLEtBQUssS0FBSyxFQUFFO1FBQzdDLE9BQU8sQ0FBQyxLQUFLLENBQUMsdUNBQXVDLENBQUMsQ0FBQTtRQUN0RCxNQUFNLE1BQU0sR0FBRyxJQUFBLHNCQUFpQixFQUFDLFlBQVksRUFBRSxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFBO1FBQy9ELE1BQU0sUUFBUSxHQUFHLE1BQU0sZUFBSyxDQUFDLEdBQUcsQ0FDOUIsMENBQTBDLEVBQzFDO1lBQ0UsWUFBWSxFQUFFLFFBQVE7U0FDdkIsQ0FDRixDQUFBO1FBQ0QsUUFBUSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUE7UUFDMUIsTUFBTSxlQUFlLENBQUMsTUFBTSxDQUFDLENBQUE7UUFDN0IsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFBO0tBQ2xCO0lBRUQsSUFBSSxvQkFBVSxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsS0FBSyxLQUFLLEVBQUU7UUFDOUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxzQkFBc0IsQ0FBQyxDQUFBO1FBQ3JDLE1BQU0sTUFBTSxHQUFHLElBQUEsc0JBQVUsRUFBQyxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFBO1FBQzlDLE1BQU0sUUFBUSxHQUFHLE1BQU0sZUFBSyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsRUFBRTtZQUNsRCxZQUFZLEVBQUUsUUFBUTtTQUN2QixDQUFDLENBQUE7UUFDRixRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQTtRQUMxQixNQUFNLGVBQWUsQ0FBQyxNQUFNLENBQUMsQ0FBQTtRQUM3QixPQUFPLENBQUMsT0FBTyxFQUFFLENBQUE7S0FDbEI7SUFFRCxJQUFJLEVBQUUsS0FBSyxRQUFRLElBQUksRUFBRSxLQUFLLE9BQU8sRUFBRTtRQUNyQyxJQUNFLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxLQUFLLFNBQVM7WUFDbEMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxXQUFXLEtBQUssU0FBUyxFQUNyQztZQUNBLE9BQU8sQ0FBQyxJQUFJLENBQUMsd0NBQXdDLENBQUMsQ0FBQTtZQUN0RCxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsR0FBRyxTQUFTLENBQUE7WUFDaEMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxXQUFXLEdBQUcsYUFBYSxDQUFBO1lBQ3ZDLE1BQU0sSUFBQSxnQkFBTSxFQUNWLDZCQUFpQixFQUNqQixtQkFBbUIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLHdCQUF3QixPQUFPLENBQUMsR0FBRyxDQUFDLFdBQVcsRUFBRSxDQUN6RixDQUFBO1NBQ0Y7S0FDRjtTQUFNO1FBQ0wsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLEdBQUcsU0FBUyxDQUFBO1FBQ2hDLE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxHQUFHLGFBQWEsQ0FBQTtRQUMxQyxNQUFNLElBQUEsZ0JBQU0sRUFBQyxVQUFVLEVBQUUsU0FBUyxDQUFDLENBQUE7UUFDbkMsTUFBTSxJQUFBLGdCQUFNLEVBQUMsZ0JBQWdCLEVBQUUsYUFBYSxDQUFDLENBQUE7UUFDN0MsSUFBSTtZQUNGLE1BQU0sSUFBQSx1QkFBYSxFQUFDLE9BQU8sQ0FBQyxDQUFBO1NBQzdCO1FBQUMsT0FBTyxLQUFLLEVBQUU7WUFDZCxnQ0FBZ0M7WUFDaEMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtTQUNoQjtLQUNGO0lBRUQsSUFBSSxFQUFFLEtBQUssT0FBTyxFQUFFO1FBQ2xCLElBQUk7WUFDRixNQUFNLElBQUEsbUJBQVksRUFBQyx1QkFBdUIsRUFBRSxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUE7U0FDekQ7UUFBQyxPQUFPLE1BQU0sRUFBRTtZQUNmLGVBQUssQ0FBQyxPQUFPLENBQ1gsNktBQTZLLENBQzlLLENBQUE7U0FDRjtLQUNGO0lBRUQsT0FBTyxDQUFDLE9BQU8sQ0FBQzs7eUNBR2QsU0FBUyxDQUFDLENBQUMsQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDLENBQUMsa0JBQzFDO0dBQ0MsQ0FBQyxDQUFBO0FBQ0osQ0FBQztBQXRJRCw0QkFzSUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnJmNTIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdG9vbGJveC9zZXR1cC9ucmY1Mi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsa0RBQXlCO0FBQ3pCLDJCQUFzQztBQUN0QyxxQ0FBMkM7QUFDM0MsMkJBQStDO0FBQy9DLG1DQUFpQztBQUNqQyxtQ0FBZ0M7QUFDaEMsK0JBQWdDO0FBQ2hDLCtDQUFvRDtBQUVwRCwrQ0FBZ0Q7QUFDaEQseUNBQWdFO0FBQ2hFLDJDQUE0RDtBQUM1RCx5Q0FBMkM7QUFDM0MsdUNBQStEO0FBQy9ELGdFQUF1QztBQUN2Qyw2Q0FBK0M7QUFFL0MsTUFBTSxlQUFlLEdBQUcsSUFBQSxnQkFBUyxFQUFDLGlCQUFRLENBQUMsQ0FBQTtBQUUzQyxNQUFNLFVBQVUsR0FBMkI7SUFDekMsWUFBWSxFQUFFLGNBQWM7SUFDNUIsVUFBVSxFQUFFLGVBQWU7SUFDM0IsU0FBUyxFQUFFLFFBQVE7SUFDbkIsY0FBYyxFQUFFLGdCQUFnQjtDQUNqQyxDQUFBO0FBQ2MsS0FBSztJQUNsQixNQUFNLEVBQUUsR0FBRyxJQUFBLFNBQVksR0FBRSxDQUFDLFdBQVcsRUFBWSxDQUFBO0lBQ2pELE1BQU0sU0FBUyxHQUFHLEVBQUUsS0FBSyxZQUFZLENBQUE7SUFDckMsTUFBTSxTQUFTLEdBQUcsK0JBQ2hCLFVBQVUsQ0FBQyxHQUFHLEVBQUUsSUFBSSxJQUFBLFNBQUksR0FBRSxFQUFFLENBQzlCLGdCQUFnQixDQUFBO0lBQ2hCLE1BQU0sa0JBQWtCLEdBQUcsMEVBQTBFLFNBQVMsSUFDNUcsU0FBUyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLFFBQ3RCLEVBQUUsQ0FBQTtJQUNGLE1BQU0sMENBQTBDLEdBQzlDLGtGQUFrRixDQUFBO0lBQ3BGLE1BQU0sUUFBUSxHQUFHLHlCQUF5QixDQUFBO0lBQzFDLE1BQU0saUJBQWlCLEdBQUcs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

package/build/toolbox/update/esp32.js

@@ -12,9 +12,10 @@ const mac_1 = require("../setup/esp32/mac");
 const linux_1 = require("../setup/esp32/linux");
 const exec_1 = require("../system/exec");
 async function default_1() {
-    var _a, _b;
+    var _a, _b, _c;
     const OS = (0, os_1.type)().toLowerCase();
-    const ESP_BRANCH = 'v4.4.3';
+    const ESP_BRANCH_V4 = 'v4.4.3';
+    const ESP_BRANCH_V5 = 'v5.1.1';
     const ESP32_DIR = gluegun_1.filesystem.resolve(constants_1.INSTALL_DIR, 'esp32');
     const IDF_PATH = gluegun_1.filesystem.resolve(ESP32_DIR, 'esp-idf');
     await (0, exec_1.sourceEnvironment)();
@@ -35,8 +36,13 @@ async function default_1() {
     // 2. update local esp-idf repo
     if (gluegun_1.filesystem.exists(IDF_PATH) === 'dir') {
         spinner.start('Updating esp-idf repo');
+        const moddableVersion = (_a = (await (0, moddable_1.getModdableVersion)())) !== null && _a !== void 0 ? _a : '';
+        const branch = moddableVersion.includes('branch') ||
+            gluegun_1.semver.satisfies(moddableVersion !== null && moddableVersion !== void 0 ? moddableVersion : '', '>= 4.2.x')
+            ? ESP_BRANCH_V5
+            : ESP_BRANCH_V4;
         await gluegun_1.system.spawn(`git fetch --all --tags`, { cwd: IDF_PATH });
-        await gluegun_1.system.spawn(`git checkout ${ESP_BRANCH}`, { cwd: IDF_PATH });
+        await gluegun_1.system.spawn(`git checkout ${branch}`, { cwd: IDF_PATH });
         await gluegun_1.system.spawn(`git submodule update --init --recursive`, {
             cwd: IDF_PATH,
         });
@@ -77,8 +83,8 @@ async function default_1() {
         shell: process.env.SHELL,
     });
     // 7. Remove existing build output directories
-    const BUILD_DIR = gluegun_1.filesystem.resolve((_a = process.env.MODDABLE) !== null && _a !== void 0 ? _a : '', 'build', 'bin', 'esp32');
-    const TMP_DIR = gluegun_1.filesystem.resolve((_b = process.env.MODDABLE) !== null && _b !== void 0 ? _b : '', 'build', 'tmp', 'esp32');
+    const BUILD_DIR = gluegun_1.filesystem.resolve((_b = process.env.MODDABLE) !== null && _b !== void 0 ? _b : '', 'build', 'bin', 'esp32');
+    const TMP_DIR = gluegun_1.filesystem.resolve((_c = process.env.MODDABLE) !== null && _c !== void 0 ? _c : '', 'build', 'tmp', 'esp32');
     gluegun_1.filesystem.remove(BUILD_DIR);
     gluegun_1.filesystem.remove(TMP_DIR);
     spinner.succeed(`
@@ -88,4 +94,4 @@ async function default_1() {
   `);
 }
 exports.default = default_1;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXNwMzIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdG9vbGJveC91cGRhdGUvZXNwMzIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxxQ0FBNkQ7QUFDN0QsMkJBQXlDO0FBQ3pDLGtEQUFtRTtBQUNuRSxnREFBa0Q7QUFDbEQsZ0VBQXVDO0FBQ3ZDLDRDQUFrRTtBQUNsRSxnREFBc0U7QUFDdEUseUNBQWtEO0FBRW5DLEtBQUs7O0lBQ2xCLE1BQU0sRUFBRSxHQUFHLElBQUEsU0FBWSxHQUFFLENBQUMsV0FBVyxFQUFFLENBQUE7SUFDdkMsTUFBTSxVQUFVLEdBQUcsUUFBUSxDQUFBO0lBQzNCLE1BQU0sU0FBUyxHQUFHLG9CQUFVLENBQUMsT0FBTyxDQUFDLHVCQUFXLEVBQUUsT0FBTyxDQUFDLENBQUE7SUFDMUQsTUFBTSxRQUFRLEdBQUcsb0JBQVUsQ0FBQyxPQUFPLENBQUMsU0FBUyxFQUFFLFNBQVMsQ0FBQyxDQUFBO0lBRXpELE1BQU0sSUFBQSx3QkFBaUIsR0FBRSxDQUFBO0lBRXpCLE1BQU0sT0FBTyxHQUFHLGVBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQTtJQUM1QixPQUFPLENBQUMsS0FBSyxDQUFDLHlCQUF5QixDQUFDLENBQUE7SUFFeEMsNEJBQTRCO0lBQzVCLElBQUksQ0FBQyxJQUFBLHlCQUFjLEdBQUUsRUFBRTtRQUNyQixPQUFPLENBQUMsSUFBSSxDQUNWLG9FQUFvRSxDQUNyRSxDQUFBO1FBQ0QsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtLQUNoQjtJQUVELDJDQUEyQztJQUMzQyxPQUFPLENBQUMsSUFBSSxDQUFDLGtDQUFrQyxDQUFDLENBQUE7SUFDaEQsSUFDRSxvQkFBVSxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsS0FBSyxLQUFLO1FBQ3RDLG9CQUFVLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxLQUFLLEtBQUssRUFDckM7UUFDQSxPQUFPLENBQUMs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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXNwMzIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdG9vbGJveC91cGRhdGUvZXNwMzIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxxQ0FBcUU7QUFDckUsMkJBQXlDO0FBQ3pDLGtEQUFtRTtBQUNuRSxnREFBc0U7QUFDdEUsZ0VBQXVDO0FBQ3ZDLDRDQUFrRTtBQUNsRSxnREFBc0U7QUFDdEUseUNBQWtEO0FBRW5DLEtBQUs7O0lBQ2xCLE1BQU0sRUFBRSxHQUFHLElBQUEsU0FBWSxHQUFFLENBQUMsV0FBVyxFQUFFLENBQUE7SUFDdkMsTUFBTSxhQUFhLEdBQUcsUUFBUSxDQUFBO0lBQzlCLE1BQU0sYUFBYSxHQUFHLFFBQVEsQ0FBQTtJQUM5QixNQUFNLFNBQVMsR0FBRyxvQkFBVSxDQUFDLE9BQU8sQ0FBQyx1QkFBVyxFQUFFLE9BQU8sQ0FBQyxDQUFBO0lBQzFELE1BQU0sUUFBUSxHQUFHLG9CQUFVLENBQUMsT0FBTyxDQUFDLFNBQVMsRUFBRSxTQUFTLENBQUMsQ0FBQTtJQUV6RCxNQUFNLElBQUEsd0JBQWlCLEdBQUUsQ0FBQTtJQUV6QixNQUFNLE9BQU8sR0FBRyxlQUFLLENBQUMsSUFBSSxFQUFFLENBQUE7SUFDNUIsT0FBTyxDQUFDLEtBQUssQ0FBQyx5QkFBeUIsQ0FBQyxDQUFBO0lBRXhDLDRCQUE0QjtJQUM1QixJQUFJLENBQUMsSUFBQSx5QkFBYyxHQUFFLEVBQUU7UUFDckIsT0FBTyxDQUFDLElBQUksQ0FDVixvRUFBb0UsQ0FDckUsQ0FBQTtRQUNELE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7S0FDaEI7SUFFRCwyQ0FBMkM7SUFDM0MsT0FBTyxDQUFDLElBQUksQ0FBQyxrQ0FBa0MsQ0FBQyxDQUFBO0lBQ2hELElBQ0Usb0JBQVUsQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLEtBQUssS0FBSztRQUN0QyxvQkFBVSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMs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

package/docs/src/content/docs/troubleshooting.md

@@ -11,7 +11,7 @@ Other error messages can include:
 
 If you encounter an error message related to lzma or node-lzma, this is likely due to a missing system dependency required to setup the tooling to program nrf52-based devices. This is only required on MacOS and Linux development environments.
 
-To resolve this, install the [XS Utils](https://tukaani.org/xz/) for your system.
+To resolve this, install the [XZ Utils](https://tukaani.org/xz/) for your system.
 
 On MacOS, [Homebrew](https://brew.sh) can be used:
 

package/package.json

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