xs-dev 0.30.2 → 0.30.4
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/build/commands/doctor.js
CHANGED
|
@@ -13,7 +13,7 @@ const command = {
|
|
|
13
13
|
alias: ['dr', 'info'],
|
|
14
14
|
description: 'Display the current environment setup information, including valid target devices.',
|
|
15
15
|
run: async ({ print, meta, filesystem, system }) => {
|
|
16
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
|
|
16
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
|
|
17
17
|
await (0, exec_1.sourceEnvironment)();
|
|
18
18
|
const supportedDevices = [];
|
|
19
19
|
if ((0, moddable_1.moddableExists)()) {
|
|
@@ -42,6 +42,14 @@ const command = {
|
|
|
42
42
|
filesystem.exists((_e = process.env.PIOASM) !== null && _e !== void 0 ? _e : '') === 'file') {
|
|
43
43
|
supportedDevices.push('pico');
|
|
44
44
|
}
|
|
45
|
+
if (typeof process.env.NRF_ROOT === 'string' &&
|
|
46
|
+
filesystem.exists(process.env.NRF_ROOT) === 'dir' &&
|
|
47
|
+
((typeof process.env.NRF_SDK_DIR === 'string' &&
|
|
48
|
+
filesystem.exists(process.env.NRF_SDK_DIR) === 'dir') ||
|
|
49
|
+
(typeof process.env.NRF52_SDK_PATH === 'string' &&
|
|
50
|
+
filesystem.exists(process.env.NRF52_SDK_PATH) === 'dir'))) {
|
|
51
|
+
supportedDevices.push('nrf52');
|
|
52
|
+
}
|
|
45
53
|
const pythonVersion = (_f = (await (0, python_1.getPythonVersion)())) !== null && _f !== void 0 ? _f : 'Unavailable';
|
|
46
54
|
const pythonPath = (_h = system.which((_g = (0, python_1.detectPython)()) !== null && _g !== void 0 ? _g : '')) !== null && _h !== void 0 ? _h : 'n/a';
|
|
47
55
|
const moddableVersion = (_j = (await (0, moddable_1.getModdableVersion)())) !== null && _j !== void 0 ? _j : 'Not found';
|
|
@@ -74,9 +82,15 @@ const command = {
|
|
|
74
82
|
supportedDevices.includes('pico')
|
|
75
83
|
? ['Pico SDK Directory', String(process.env.PICO_SDK_PATH)]
|
|
76
84
|
: [],
|
|
85
|
+
supportedDevices.includes('nrf52')
|
|
86
|
+
? [
|
|
87
|
+
'NRF52 SDK Directory',
|
|
88
|
+
String((_o = process.env.NRF_SDK_DIR) !== null && _o !== void 0 ? _o : process.env.NRF52_SDK_PATH),
|
|
89
|
+
]
|
|
90
|
+
: [],
|
|
77
91
|
].filter((tuple) => tuple.length !== 0));
|
|
78
92
|
print.highlight(`\nIf this is related to an error when using the CLI, please create an issue at "https://github.com/hipsterbrown/xs-dev/issues/new" with the above info.`);
|
|
79
93
|
},
|
|
80
94
|
};
|
|
81
95
|
exports.default = command;
|
|
82
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
96
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG9jdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbW1hbmRzL2RvY3Rvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUNBLDRDQUFtQjtBQUNuQix1REFBd0Q7QUFDeEQsd0RBQThFO0FBQzlFLGlEQUEwRDtBQUMxRCxxREFBeUU7QUFHekUsTUFBTSxPQUFPLEdBQW1CO0lBQzlCLElBQUksRUFBRSxRQUFRO0lBQ2QsS0FBSyxFQUFFLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQztJQUNyQixXQUFXLEVBQ1Qsb0ZBQW9GO0lBQ3RGLEdBQUcsRUFBRSxLQUFLLEVBQUUsRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFOztRQUNqRCxNQUFNLElBQUEsd0JBQWlCLEdBQUUsQ0FBQTtRQUV6QixNQUFNLGdCQUFnQixHQUFHLEVBQUUsQ0FBQTtRQUUzQixJQUFJLElBQUEseUJBQWMsR0FBRSxFQUFFO1lBQ3BCLGdCQUFnQixDQUFDLElBQUksQ0FBQyxzQkFBWSxDQUFDLFlBQUUsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxXQUFXLEVBQVksQ0FBQyxDQUFDLENBQUE7U0FDdkU7UUFFRCxJQUNFLE9BQU8sT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLEtBQUssUUFBUTtZQUN4QyxVQUFVLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLEtBQUssS0FBSyxFQUNqRDtZQUNBLGdCQUFnQixDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQTtTQUMvQjtRQUNELElBQ0UsT0FBTyxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsS0FBSyxRQUFRO1lBQ3hDLFVBQVUsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsS0FBSyxLQUFLO1lBQ2pELFVBQVUsQ0FBQyxNQUFNLENBQ2YsVUFBVSxDQUFDLE9BQU8sQ0FBQyxPQUFP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
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.ensureHomebrew = void 0;
|
|
6
|
+
exports.formulaeExists = exports.ensureHomebrew = void 0;
|
|
7
7
|
const os_1 = __importDefault(require("os"));
|
|
8
8
|
const gluegun_1 = require("gluegun");
|
|
9
9
|
const upsert_1 = __importDefault(require("../patching/upsert"));
|
|
@@ -45,4 +45,13 @@ async function ensureHomebrew() {
|
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
47
|
exports.ensureHomebrew = ensureHomebrew;
|
|
48
|
-
|
|
48
|
+
async function formulaeExists(formulae) {
|
|
49
|
+
if (gluegun_1.system.which('brew') === null)
|
|
50
|
+
return false;
|
|
51
|
+
const result = await gluegun_1.system.spawn(`brew list ${formulae}`, {
|
|
52
|
+
shell: process.env.SHELL,
|
|
53
|
+
});
|
|
54
|
+
return result.status === 0;
|
|
55
|
+
}
|
|
56
|
+
exports.formulaeExists = formulaeExists;
|
|
57
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaG9tZWJyZXcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdG9vbGJveC9zZXR1cC9ob21lYnJldy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSw0Q0FBbUI7QUFDbkIscUNBQTJEO0FBQzNELGdFQUF1QztBQUN2QywyQ0FBNEM7QUFFNUMsU0FBUyxXQUFXO0lBQ2xCLElBQUksWUFBRSxDQUFDLElBQUksRUFBRSxLQUFLLE9BQU87UUFBRSxPQUFPLG1CQUFtQixDQUFBO0lBQ3JELE9BQU8sZ0JBQWdCLENBQUE7QUFDekIsQ0FBQztBQUVNLEtBQUssVUFBVSxjQUFjO0lBQ2xDLElBQUksZ0JBQU0sQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLEtBQUssSUFBSSxFQUFFO1FBQ2pDLE1BQU0sUUFBUSxHQUFHLFdBQVcsRUFBRSxDQUFBO1FBQzlCLE1BQU0sWUFBWSxHQUFHLFdBQVcsUUFBUSxrQkFBa0IsQ0FBQTtRQUUxRCxJQUFJLG9CQUFVLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxLQUFLLEtBQUssRUFBRTtZQUN6QyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksR0FBRyxHQUFHLFFBQVEsSUFBSSxNQUFNLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFBO1lBQzVELE9BQU07U0FDUDtRQUVELE1BQU0saUJBQWlCLEdBQUcsTUFBTSxnQkFBTSxDQUFDLE9BQU8sQ0FDNUMsOElBQThJLENBQy9JLENBQUE7UUFFRCxJQUFJLGlCQUFpQixFQUFFO1lBQ3JCLElBQUk7Z0JBQ0YsZUFBSyxDQUFDLElBQUksQ0FBQyxvQ0FBb0MsQ0FBQyxDQUFBO2dCQUNoRCxNQUFNLGdCQUFNLENBQUMsSUFBSSxDQUNmLGlHQUFpRyxFQUNqRztvQkFDRSxLQUFLLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLO29CQUN4QixNQUFNLEVBQUUsT0FBTyxDQUFDLE1BQU07b0JBQ3RCLEtBQUssRUFBRSxPQUFPLENBQUMsS0FBSztpQkFDckIsQ0FDRixDQUFBO2dCQUNELE1BQU0sWUFBWSxHQUFHLElBQUEsMEJBQWMsR0FBRSxDQUFBO2dCQUNyQyxNQUFNLElBQUEsZ0JBQU0sRUFBQyxZQUFZLEVBQUUsWUFBWSxDQUFDLENBQUE7Z0JBQ3hDLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxHQUFHLEdBQUcsUUFBUSxJQUFJLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUE7Z0JBQzVELE9BQU07YUFDUDtZQUFDLE9BQU8sS0FBYyxFQUFFO2dCQUN2QixJQUFJLEtBQUssWUFBWSxLQUFLLEVBQUU7b0JBQzFCLGVBQUssQ0FBQyxLQUFLLENBQUMsK0JBQStCLEtBQUssQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFBO2lCQUM1RDthQUNGO1NBQ0Y7UUFFRCxNQUFNLElBQUksS0FBSyxDQUNiLHNMQUFzTCxDQUN2TCxDQUFBO0tBQ0Y7QUFDSCxDQUFDO0FBeENELHdDQXdDQztBQVFNLEtBQUssVUFBVSxjQUFjLENBQUMsUUFBZ0I7SUFDbkQsSUFBSSxnQkFBTSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxJQUFJO1FBQUUsT0FBTyxLQUFLLENBQUE7SUFFL0MsTUFBTSxNQUFNLEdBQWdCLE1BQU0sZ0JBQU0sQ0FBQyxLQUFLLENBQUMsYUFBYSxRQUFRLEVBQUUsRUFBRTtRQUN0RSxLQUFLLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLO0tBQ3pCLENBQUMsQ0FBQTtJQUNGLE9BQU8sTUFBTSxDQUFDLE1BQU0sS0FBSyxDQUFDLENBQUE7QUFDNUIsQ0FBQztBQVBELHdDQU9DIn0=
|
|
@@ -24,8 +24,12 @@ function moddableExists() {
|
|
|
24
24
|
(releaseTools === 'dir' || debugTools === 'dir'));
|
|
25
25
|
}
|
|
26
26
|
exports.moddableExists = moddableExists;
|
|
27
|
+
function isGitRepo(path) {
|
|
28
|
+
return gluegun_1.filesystem.exists(gluegun_1.filesystem.resolve(path, '.git')) === 'dir';
|
|
29
|
+
}
|
|
27
30
|
async function getModdableVersion() {
|
|
28
|
-
|
|
31
|
+
var _a;
|
|
32
|
+
if (moddableExists() && isGitRepo((_a = process.env.MODDABLE) !== null && _a !== void 0 ? _a : '')) {
|
|
29
33
|
const tags = await gluegun_1.system.run('git tag -l --sort=-taggerdate', {
|
|
30
34
|
cwd: process.env.MODDABLE,
|
|
31
35
|
});
|
|
@@ -78,4 +82,4 @@ async function downloadReleaseTools({ writePath, assetName, release, }) {
|
|
|
78
82
|
await finishedPromise(zipWriter);
|
|
79
83
|
}
|
|
80
84
|
exports.downloadReleaseTools = downloadReleaseTools;
|
|
81
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
85
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kZGFibGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdG9vbGJveC9zZXR1cC9tb2RkYWJsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSwyQkFBeUM7QUFDekMsbUNBQWlDO0FBQ2pDLCtCQUFnQztBQUNoQyxxQ0FBNEM7QUFDNUMsd0NBQWdFO0FBQ2hFLCtDQUFvRDtBQUNwRCxrREFBeUI7QUFDekIsMkNBQTBDO0FBRTFDLCtDQUFnRDtBQUVoRCxNQUFNLGVBQWUsR0FBRyxJQUFBLGdCQUFTLEVBQUMsaUJBQVEsQ0FBQyxDQUFBO0FBRTNDLFNBQWdCLGNBQWM7SUFDNUIsTUFBTSxFQUFFLEdBQUcsSUFBQSxTQUFZLEdBQUUsQ0FBQyxXQUFXLEVBQVksQ0FBQTtJQUNqRCxNQUFNLFdBQVcsR0FBRyxzQkFBWSxDQUFDLEVBQUUsQ0FBQyxDQUFBO0lBQ3BDLE1BQU0sWUFBWSxHQUFHLG9CQUFVLENBQUMsTUFBTSxDQUNwQyxvQkFBVSxDQUFDLE9BQU8sQ0FBQyx3QkFBWSxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsV0FBVyxFQUFFLFNBQVMsQ0FBQyxDQUN6RSxDQUFBO0lBQ0QsTUFBTSxVQUFVLEdBQUcsb0JBQVUsQ0FBQyxNQUFNLENBQ2xDLG9CQUFVLENBQUMsT0FBTyxDQUFDLHdCQUFZLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxXQUFXLEVBQUUsT0FBTyxDQUFDLENBQ3ZFLENBQUE7SUFDRCxPQUFPLENBQ0wsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLEtBQUssU0FBUztRQUNsQyxvQkFBVSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxLQUFLLEtBQUs7UUFDakQsQ0FBQyxZQUFZLEtBQUssS0FBSyxJQUFJLFVBQVUsS0FBSyxLQUFLLENBQUMsQ0FDakQsQ0FBQTtBQUNILENBQUM7QUFkRCx3Q0FjQztBQUVELFNBQVMsU0FBUyxDQUFDLElBQVk7SUFD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
|
|
@@ -13,7 +13,8 @@ async function installDeps(spinner) {
|
|
|
13
13
|
process.exit(1);
|
|
14
14
|
}
|
|
15
15
|
}
|
|
16
|
-
if (gluegun_1.system.which('arm-none-eabi-gcc') !== null
|
|
16
|
+
if (gluegun_1.system.which('arm-none-eabi-gcc') !== null &&
|
|
17
|
+
(await (0, homebrew_1.formulaeExists)('arm-none-eabi-gcc'))) {
|
|
17
18
|
spinner.start('Removing outdated arm gcc dependency');
|
|
18
19
|
await gluegun_1.system.exec('brew untap ArmMbed/homebrew-formulae');
|
|
19
20
|
await gluegun_1.system.exec('brew uninstall arm-none-eabi-gcc');
|
|
@@ -29,4 +30,4 @@ async function installDeps(spinner) {
|
|
|
29
30
|
spinner.succeed();
|
|
30
31
|
}
|
|
31
32
|
exports.installDeps = installDeps;
|
|
32
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
33
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFjLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3Rvb2xib3gvc2V0dXAvcGljby9tYWMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEscUNBQXFEO0FBQ3JELDBDQUE0RDtBQUVyRCxLQUFLLFVBQVUsV0FBVyxDQUMvQixPQUF5QztJQUV6QyxJQUFJO1FBQ0YsTUFBTSxJQUFBLHlCQUFjLEdBQUUsQ0FBQTtLQUN2QjtJQUFDLE9BQU8sS0FBYyxFQUFFO1FBQ3ZCLElBQUksS0FBSyxZQUFZLEtBQUssRUFBRTtZQUMxQixlQUFLLENBQUMsSUFBSSxDQUFDLEdBQUcsS0FBSyxDQUFDLE9BQU8sdUNBQXVDLENBQUMsQ0FBQTtZQUNuRSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO1NBQ2hCO0tBQ0Y7SUFFRCxJQUNFLGdCQUFNLENBQUMsS0FBSyxDQUFDLG1CQUFtQixDQUFDLEtBQUssSUFBSTtRQUMxQyxDQUFDLE1BQU0sSUFBQSx5QkFBYyxFQUFDLG1CQUFtQixDQUFDLENBQUMsRUFDM0M7UUFDQSxPQUFPLENBQUMsS0FBSyxDQUFDLHNDQUFzQyxDQUFDLENBQUE7UUFDckQsTUFBTSxnQkFBTSxDQUFDLElBQUksQ0FBQyxzQ0FBc0MsQ0FBQyxDQUFBO1FBQ3pELE1BQU0sZ0JBQU0sQ0FBQyxJQUFJLENBQUMsa0NBQWtDLENBQUMsQ0FBQTtRQUNyRCxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUE7S0FDbEI7SUFFRCxPQUFPLENBQUMsS0FBSyxDQUFDLG9DQUFvQyxDQUFDLENBQUE7SUFDbkQsTUFBTSxnQkFBTSxDQUFDLElBQUksQ0FBQyxnQ0FBZ0MsRUFBRTtRQUNsRCxLQUFLLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLO0tBQ3pCLENBQUMsQ0FBQTtJQUNGLE1BQU0sZ0JBQU0sQ0FBQyxJQUFJLENBQUMsc0NBQXNDLEVBQUU7UUFDeEQsS0FBSyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsS0FBSztLQUN6QixDQUFDLENBQUE7SUFDRixPQUFPLENBQUMsT0FBTyxFQUFFLENBQUE7QUFDbkIsQ0FBQztBQTlCRCxrQ0E4QkMifQ==
|