xs-dev 0.38.1 → 1.0.0
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/README.md +1 -1
- package/build/package.json +13 -3
- package/build/src/commands/doctor.js +4 -3
- package/build/src/commands/init.js +3 -3
- package/build/src/commands/remove.js +2 -2
- package/build/src/commands/setup.js +21 -7
- package/build/src/toolbox/setup/ejectfix.js +29 -26
- package/build/src/toolbox/setup/esp32/linux.js +7 -3
- package/build/src/toolbox/setup/esp32/mac.js +5 -3
- package/build/src/toolbox/setup/esp32/windows.js +4 -2
- package/build/src/toolbox/setup/esp32.js +18 -8
- package/build/src/toolbox/setup/esp8266/linux.js +10 -4
- package/build/src/toolbox/setup/esp8266/mac.js +5 -3
- package/build/src/toolbox/setup/esp8266/windows.js +10 -9
- package/build/src/toolbox/setup/esp8266.js +16 -10
- package/build/src/toolbox/setup/lin.js +19 -7
- package/build/src/toolbox/setup/mac.js +14 -9
- package/build/src/toolbox/setup/moddable.js +35 -28
- package/build/src/toolbox/setup/nrf52/windows.js +5 -3
- package/build/src/toolbox/setup/nrf52.js +12 -10
- package/build/src/toolbox/setup/pico/linux.js +6 -2
- package/build/src/toolbox/setup/pico/mac.js +4 -2
- package/build/src/toolbox/setup/pico.js +10 -4
- package/build/src/toolbox/setup/wasm.js +7 -5
- package/build/src/toolbox/setup/windows.js +21 -14
- package/build/src/toolbox/system/__tests__/errors.test.js +163 -0
- package/build/src/toolbox/system/__tests__/exec.test.js +130 -0
- package/build/src/toolbox/system/errors.js +106 -0
- package/build/src/toolbox/system/exec.js +34 -28
- package/build/src/toolbox/system/packages.js +29 -26
- package/build/src/toolbox/system/python.js +11 -4
- package/build/src/toolbox/update/esp32.js +6 -4
- package/build/src/toolbox/update/lin.js +8 -2
- package/build/src/toolbox/update/mac.js +8 -2
- package/build/types/src/toolbox/setup/ejectfix.d.ts +2 -1
- package/build/types/src/toolbox/setup/esp32/linux.d.ts +2 -1
- package/build/types/src/toolbox/setup/esp32/mac.d.ts +2 -1
- package/build/types/src/toolbox/setup/esp32/windows.d.ts +2 -1
- package/build/types/src/toolbox/setup/esp32.d.ts +2 -1
- package/build/types/src/toolbox/setup/esp8266/linux.d.ts +2 -1
- package/build/types/src/toolbox/setup/esp8266/mac.d.ts +2 -1
- package/build/types/src/toolbox/setup/esp8266/windows.d.ts +3 -2
- package/build/types/src/toolbox/setup/esp8266.d.ts +2 -1
- package/build/types/src/toolbox/setup/lin.d.ts +2 -1
- package/build/types/src/toolbox/setup/mac.d.ts +2 -1
- package/build/types/src/toolbox/setup/moddable.d.ts +4 -3
- package/build/types/src/toolbox/setup/nrf52/windows.d.ts +2 -1
- package/build/types/src/toolbox/setup/nrf52.d.ts +2 -1
- package/build/types/src/toolbox/setup/pico/linux.d.ts +2 -1
- package/build/types/src/toolbox/setup/pico/mac.d.ts +2 -1
- package/build/types/src/toolbox/setup/pico.d.ts +2 -1
- package/build/types/src/toolbox/setup/wasm.d.ts +2 -1
- package/build/types/src/toolbox/setup/windows.d.ts +3 -2
- package/build/types/src/toolbox/system/__tests__/errors.test.d.ts +1 -0
- package/build/types/src/toolbox/system/__tests__/exec.test.d.ts +1 -0
- package/build/types/src/toolbox/system/errors.d.ts +51 -0
- package/build/types/src/toolbox/system/exec.d.ts +6 -5
- package/build/types/src/toolbox/system/packages.d.ts +3 -2
- package/build/types/src/toolbox/system/python.d.ts +2 -1
- package/build/types/src/types.d.ts +10 -0
- package/package.json +13 -3
package/README.md
CHANGED
|
@@ -131,7 +131,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
|
|
|
131
131
|
<!-- markdownlint-disable -->
|
|
132
132
|
<table>
|
|
133
133
|
<tr>
|
|
134
|
-
<td align="center"><a href="https://hipsterbrown.com/"><img src="https://avatars.githubusercontent.com/u/3051193?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nick Hehr</b></sub></a><br /><a href="https://github.com/HipsterBrown/xs-dev/commits?author=HipsterBrown" title="Documentation">📖</a> <a href="#infra-HipsterBrown" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="https://github.com/HipsterBrown/xs-dev/commits?author=HipsterBrown" title="Code">💻</a></td>
|
|
134
|
+
<td align="center"><a href="https://hipsterbrown.com/"><img src="https://avatars.githubusercontent.com/u/3051193?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nick Hehr</b></sub></a><br /><a href="https://github.com/HipsterBrown/xs-dev/commits?author=HipsterBrown" title="Documentation">📖</a> <a href="#infra-HipsterBrown" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="https://github.com/HipsterBrown/xs-dev/commits?author=HipsterBrown" title="Code">💻</a> <a href="https://github.com/HipsterBrown/xs-dev/commits?author=HipsterBrown" title="Tests">⚠️</a></td>
|
|
135
135
|
<td align="center"><a href="https://moddable.com/"><img src="https://avatars.githubusercontent.com/u/1427817?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Andy Carle</b></sub></a><br /><a href="https://github.com/HipsterBrown/xs-dev/commits?author=andycarle" title="Code">💻</a></td>
|
|
136
136
|
<td align="center"><a href="https://moddable.com/"><img src="https://avatars.githubusercontent.com/u/6856458?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Peter Hoddie</b></sub></a><br /><a href="https://github.com/HipsterBrown/xs-dev/commits?author=phoddie" title="Code">💻</a></td>
|
|
137
137
|
<td align="center"><a href="https://github.com/stc1988"><img src="https://avatars.githubusercontent.com/u/11245747?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Satoshi Tanaka</b></sub></a><br /><a href="https://github.com/HipsterBrown/xs-dev/commits?author=stc1988" title="Code">💻</a></td>
|
package/build/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "xs-dev",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "1.0.0",
|
|
4
4
|
"description": "CLI for automating the setup and usage of Moddable XS tools",
|
|
5
5
|
"types": "build/types/types.d.ts",
|
|
6
6
|
"engines": {
|
|
@@ -98,7 +98,10 @@
|
|
|
98
98
|
},
|
|
99
99
|
"jest": {
|
|
100
100
|
"preset": "ts-jest",
|
|
101
|
-
"testEnvironment": "node"
|
|
101
|
+
"testEnvironment": "node",
|
|
102
|
+
"testPathIgnorePatterns": [
|
|
103
|
+
"<rootDir>/build/"
|
|
104
|
+
]
|
|
102
105
|
},
|
|
103
106
|
"volta": {
|
|
104
107
|
"node": "18.14.0"
|
|
@@ -113,7 +116,14 @@
|
|
|
113
116
|
"ejs@<3.1.7": ">=3.1.7",
|
|
114
117
|
"axios@>=0.8.1 <1.6.0": ">=1.6.0",
|
|
115
118
|
"minimatch@<3.0.5": ">=3.0.5"
|
|
116
|
-
}
|
|
119
|
+
},
|
|
120
|
+
"onlyBuiltDependencies": [
|
|
121
|
+
"@serialport/bindings-cpp",
|
|
122
|
+
"esbuild",
|
|
123
|
+
"node-liblzma",
|
|
124
|
+
"sharp",
|
|
125
|
+
"usb"
|
|
126
|
+
]
|
|
117
127
|
},
|
|
118
128
|
"author": "HipsterBrown <headhipster@hipsterbrown.com>",
|
|
119
129
|
"auto": {
|
|
@@ -9,6 +9,7 @@ const devices_1 = require("../toolbox/prompt/devices");
|
|
|
9
9
|
const moddable_1 = require("../toolbox/setup/moddable");
|
|
10
10
|
const exec_1 = require("../toolbox/system/exec");
|
|
11
11
|
const python_1 = require("../toolbox/system/python");
|
|
12
|
+
const errors_1 = require("../toolbox/system/errors");
|
|
12
13
|
const command = (0, core_1.buildCommand)({
|
|
13
14
|
async func() {
|
|
14
15
|
const { print, filesystem, system, currentVersion } = this;
|
|
@@ -48,9 +49,9 @@ const command = (0, core_1.buildCommand)({
|
|
|
48
49
|
filesystem.exists(process.env.NRF52_SDK_PATH) === 'dir'))) {
|
|
49
50
|
supportedDevices.push('nrf52');
|
|
50
51
|
}
|
|
51
|
-
const pythonVersion = (await (0, python_1.getPythonVersion)()
|
|
52
|
+
const pythonVersion = (0, errors_1.unwrapOr)(await (0, python_1.getPythonVersion)(), 'Unavailable');
|
|
52
53
|
const pythonPath = system.which((0, python_1.detectPython)() ?? '') ?? 'n/a';
|
|
53
|
-
const moddableVersion = (await (0, moddable_1.getModdableVersion)()
|
|
54
|
+
const moddableVersion = (0, errors_1.unwrapOr)(await (0, moddable_1.getModdableVersion)(), 'Not found');
|
|
54
55
|
const moddablePath = process.env.MODDABLE ?? 'n/a';
|
|
55
56
|
print.info('xs-dev environment info:');
|
|
56
57
|
print.table([
|
|
@@ -97,4 +98,4 @@ const command = (0, core_1.buildCommand)({
|
|
|
97
98
|
},
|
|
98
99
|
});
|
|
99
100
|
exports.default = command;
|
|
100
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
101
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG9jdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL2RvY3Rvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLHNEQUF3QjtBQUN4Qix3Q0FBNEM7QUFFNUMsdURBQXdEO0FBQ3hELHdEQUE4RTtBQUM5RSxpREFBMEQ7QUFDMUQscURBQXlFO0FBRXpFLHFEQUFtRDtBQUVuRCxNQUFNLE9BQU8sR0FBRyxJQUFBLG1CQUFZLEVBQUM7SUFDM0IsS0FBSyxDQUFDLElBQUk7UUFDUixNQUFNLEVBQUUsS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUsY0FBYyxFQUFFLEdBQUcsSUFBSSxDQUFBO1FBQzFELE1BQU0sSUFBQSx3QkFBaUIsR0FBRSxDQUFBO1FBRXpCLE1BQU0sZ0JBQWdCLEdBQUcsRUFBRSxDQUFBO1FBRTNCLElBQUksSUFBQSx5QkFBYyxHQUFFLEVBQUUsQ0FBQztZQUNyQixnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsc0JBQVksQ0FBQyxpQkFBRSxDQUFDLElBQUksRUFBRSxDQUFDLFdBQVcsRUFBWSxDQUFDLENBQUMsQ0FBQTtRQUN4RSxDQUFDO1FBRUQsSUFDRSxPQUFPLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxLQUFLLFFBQVE7WUFDeEMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxLQUFLLEtBQUssRUFDakQsQ0FBQztZQUNELGdCQUFnQixDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQTtRQUNoQyxDQUFDO1FBQ0QsSUFDRSxPQUFPLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxLQUFLLFFBQVE7WUFDeEMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxLQUFLLEtBQUs7WUFDakQsVUFBVSxDQUFDLE1BQU0sQ0FDZixVQUFVLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxHQUFH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
|
|
@@ -36,7 +36,7 @@ const command = (0, core_1.buildCommand)({
|
|
|
36
36
|
if (projectName !== undefined) {
|
|
37
37
|
if (!overwrite && filesystem.isDirectory(projectName)) {
|
|
38
38
|
warning(`Directory called ${projectName} already exists. Please pass the --overwrite flag to replace an existing project.`);
|
|
39
|
-
|
|
39
|
+
return;
|
|
40
40
|
}
|
|
41
41
|
await (0, exec_1.sourceEnvironment)();
|
|
42
42
|
if (example !== undefined || listExamples) {
|
|
@@ -66,7 +66,7 @@ const command = (0, core_1.buildCommand)({
|
|
|
66
66
|
}
|
|
67
67
|
else {
|
|
68
68
|
warning('Please select an example template to use.');
|
|
69
|
-
|
|
69
|
+
return;
|
|
70
70
|
}
|
|
71
71
|
}
|
|
72
72
|
else {
|
|
@@ -172,4 +172,4 @@ const command = (0, core_1.buildCommand)({
|
|
|
172
172
|
},
|
|
173
173
|
});
|
|
174
174
|
exports.default = command;
|
|
175
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
175
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5pdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb21tYW5kcy9pbml0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSx3Q0FBNEM7QUFFNUMsdURBQWtFO0FBQ2xFLGlEQUEwRDtBQVkxRCxNQUFNLE9BQU8sR0FBRyxJQUFBLG1CQUFZLEVBQUM7SUFDM0IsSUFBSSxFQUFFO1FBQ0osS0FBSyxFQUFFLG9DQUFvQztLQUM1QztJQUNELEtBQUssQ0FBQyxJQUFJLENBQXFCLEtBQWtCLEVBQUUsV0FBbUI7UUFDcEUsTUFBTSxFQUNKLFVBQVUsRUFDVixLQUFLLEVBQUUsRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxFQUNqQyxNQUFNLEdBQ1AsR0FBRyxJQUFJLENBQUE7UUFFUixNQUFNLEVBQ0osVUFBVSxHQUFHLEtBQUssRUFDbEIsRUFBRSxHQUFHLElBQUksRUFDVCxRQUFRLEdBQUcsS0FBSyxFQUNoQixPQUFPLEVBQ1AsZUFBZSxFQUFFLFlBQVksR0FBRyxLQUFLLEVBQ3JDLFNBQVMsR0FBRyxLQUFLLEVBQ2pCLFNBQVMsR0FBRyxLQUFLLEdBQ2xCLEdBQUcsS0FBSyxDQUFBO1FBRVQsSUFBSSxXQUFXLEtBQUssU0FBUyxFQUFFLENBQUM7WUFDOUIsSUFBSSxDQUFDLFNBQVMsSUFBSSxVQUFVLENBQUMsV0FBVyxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUM7Z0JBQ3RELE9BQU8sQ0FDTCxvQkFBb0IsV0FBVyxtRkFBbUYsQ0FDbkgsQ0FBQTtnQkFDRCxPQUFNO1lBQ1IsQ0FBQztZQUVELE1BQU0sSUFBQSx3QkFBaUIsR0FBRSxDQUFBO1lBRXpCLElBQUksT0FBTyxLQUFLLFNBQVMsSUFBSSxZQUFZLEVBQUUsQ0FBQztnQkFDMUMsdUJBQXVCO2dCQUN2QixNQUFNLGtCQUFrQixHQUFHLFVBQVUsQ0FBQyxPQUFPLENBQzNDLE1BQU0sQ0FBQyxPQUFPLENB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
|
|
@@ -17,7 +17,7 @@ const command = (0, core_1.buildCommand)({
|
|
|
17
17
|
const { device = '' } = flags;
|
|
18
18
|
if (moduleName === undefined) {
|
|
19
19
|
print.error('Module name is required');
|
|
20
|
-
|
|
20
|
+
return;
|
|
21
21
|
}
|
|
22
22
|
print.info(`Removing "${String(moduleName)}" from manifest includes`);
|
|
23
23
|
await patching.update(manifestPath, (manifestIn) => {
|
|
@@ -79,4 +79,4 @@ const command = (0, core_1.buildCommand)({
|
|
|
79
79
|
},
|
|
80
80
|
});
|
|
81
81
|
exports.default = command;
|
|
82
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
82
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVtb3ZlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL3JlbW92ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHdDQUE0QztBQUU1Qyx1REFBd0Q7QUFPeEQsTUFBTSxTQUFTLEdBQUcsSUFBSSxHQUFHLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxzQkFBWSxDQUFDLENBQUMsQ0FBQTtBQUV0RCxNQUFNLE9BQU8sR0FBRyxJQUFBLG1CQUFZLEVBQUM7SUFDM0IsSUFBSSxFQUFFO1FBQ0osS0FBSyxFQUFFLGdFQUFnRTtLQUN4RTtJQUNELEtBQUssQ0FBQyxJQUFJLENBQXFCLEtBQW9CLEVBQUUsVUFBa0I7UUFDckUsTUFBTSxFQUFFLFVBQVUsRUFBRSxRQUFRLEVBQUUsS0FBSyxFQUFFLEdBQUcsSUFBSSxDQUFBO1FBQzVDLE1BQU0sWUFBWSxHQUFHLFVBQVUsQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxFQUFFLGVBQWUsQ0FBQyxDQUFBO1FBQ3ZFLElBQUksVUFBVSxDQUFDLE1BQU0sQ0FBQyxZQUFZLENBQUMsS0FBSyxLQUFLLEVBQUUsQ0FBQztZQUM5QyxLQUFLLENBQUMsS0FBSyxDQUNULHNGQUFzRixDQUN2RixDQUFBO1lBQ0QsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUNqQixDQUFDO1FBQ0QsTUFBTSxFQUFFLE1BQU0sR0FBRyxFQUFFLEVBQUUsR0FBRyxLQUFLLENBQUE7UUFFN0IsSUFBSSxVQUFVLEtBQUssU0FBUyxFQUFFLENBQUM7WUFDN0IsS0FBSyxDQUFDLEtBQUssQ0FBQyx5QkFBeUIsQ0FBQyxDQUFBO1lBQ3RDLE9BQU07UUFDUixDQUFDO1FBRUQsS0FBSyxDQUFDLElBQUksQ0FBQyxhQUFhLE1BQU0sQ0FBQyxVQUFVLENBQUMsMEJBQTBCLENBQUMsQ0FBQTtRQUNyRSxNQUFNLFFBQVEsQ0FBQyxNQUFNLENBQUMsWUFBWSxFQUFFLENBQUMsVUFBVSxFQUFFLEVBQUU7WUFDakQsSUFBSSxRQUFRLEdBQUcsVUFBVSxDQUFBO1lBQ3pCLElBQUksTUFBTSxLQUFLLEVBQUUsRUFBRSxDQUFDO2dCQUNsQixRQUFRLENBQUMsU0FBUyxLQUFLLEVBQUUsQ0FBQTtnQkFDekIsUUFBUSxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLENBQUE7Z0JBQ2pDLFFBQVEsR0FBRyxRQUFRLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxDQUFBO1lBQ3ZDLENBQUM7WUFFRCxJQUFJLENBQUMsQ0FBQyxTQUFTLElBQUksUUFBUSxDQUFDLEVBQUUsQ0FBQztnQkFDN0IsT0FBTTtZQUNSLENBQUM7WUFFRCxJQUFJLE9BQU8sUUFBUSxDQUFDLE9BQU8sS0FBSyxRQUFRLEVBQUUsQ0FBQztnQkFDekMsUUFBUSxDQUFDLE9BQU8sR0FBRyxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQTtZQUN2QyxDQUFDO1lBRUQsTUFBTSxNQUFNLEdBQUcsUUFBUSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUE7WUFDdEMsUUFBUSxDQUFDLE9BQU8sR0FBRyxRQUFRLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDLEdBQVcsRUFBRSxFQUFFO2dCQUN6RCxNQUFNLE1BQU0sR0FBRyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDLENBQUE7Z0JBQ3hDLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztvQkFDWixLQUFLLENBQUMsSUFBSSxDQUFDLGNBQWMsR0FBRyxFQUFFLENBQUMsQ0FBQTtnQkFDakMsQ0FBQztnQkFFRCxPQUFPLE1BQU0sQ0FBQTtZQUNmLENBQUMsQ0FBQyxDQUFBO1lBQ0YsSUFBSSxNQUFNLEtBQUssUUFBUSxDQUFDLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQztnQkFDdkMsS0FBSyxDQUFDLEtBQUssQ0FBQyxJQUFJLFVBQVUsa0NBQWtDLENBQUMsQ0FBQTtZQUMvRCxDQUFDO1lBRUQsSUFBSSxRQUFRLENBQUMsT0FBTyxDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUUsQ0FBQztnQkFDbEMsUUFBUSxDQUFDLE9BQU8sR0FBRyxRQUFRLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFBO1lBQ3hDLENBQUM7aUJBQU0sSUFBSSxRQUFRLENBQUMsT0FBTyxDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUUsQ0FBQztnQkFDekMsT0FBTyxRQUFRLENBQUMsT0FBTyxDQUFBO1lBQ3pCLENBQUM7WUFFRCxPQUFPLFVBQVUsQ0FBQTtRQUNuQixDQUFDLENBQUMsQ0FBQTtRQUNGLEtBQUssQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUE7SUFDeEIsQ0FBQztJQUNELFVBQVUsRUFBRTtRQUNWLFVBQVUsRUFBRTtZQUNWLElBQUksRUFBRSxPQUFPO1lBQ2IsVUFBVSxFQUFFO2dCQUNWO29CQUNFLFdBQVcsRUFBRSxZQUFZO29CQUN6QixLQUFLLEVBQ0gsbUVBQW1FO29CQUNyRSxLQUFLLEVBQUUsTUFBTTtpQkFDZDthQUNGO1NBQ0Y7UUFDRCxLQUFLLEVBQUU7WUFDTCxNQUFNLEVBQUU7Z0JBQ04sSUFBSSxFQUFFLE1BQU07Z0JBQ1osTUFBTSxFQUFFLENBQUMsR0FBRyxTQUFTLENBQTBCO2dCQUMvQyxLQUFLLEVBQUUsOENBQThDO2dCQUNyRCxRQUFRLEVBQUUsSUFBSTthQUNmO1NBQ0Y7UUFDRCxPQUFPLEVBQUU7WUFDUCxDQUFDLEVBQUUsUUFBUTtTQUNaO0tBQ0Y7Q0FDRixDQUFDLENBQUE7QUFFRixrQkFBZSxPQUFPLENBQUEifQ==
|
|
@@ -31,6 +31,7 @@ const core_1 = require("@stricli/core");
|
|
|
31
31
|
const ejectfix_1 = __importDefault(require("../toolbox/setup/ejectfix"));
|
|
32
32
|
const devices_1 = require("../toolbox/prompt/devices");
|
|
33
33
|
const constants_1 = require("../toolbox/setup/constants");
|
|
34
|
+
const errors_1 = require("../toolbox/system/errors");
|
|
34
35
|
const command = (0, core_1.buildCommand)({
|
|
35
36
|
docs: {
|
|
36
37
|
brief: 'Download and build Moddable tooling for various platform targets',
|
|
@@ -62,7 +63,7 @@ const command = (0, core_1.buildCommand)({
|
|
|
62
63
|
}
|
|
63
64
|
else {
|
|
64
65
|
print.warning('Please select a target device to run');
|
|
65
|
-
|
|
66
|
+
return;
|
|
66
67
|
}
|
|
67
68
|
}
|
|
68
69
|
if (tool !== undefined) {
|
|
@@ -70,8 +71,13 @@ const command = (0, core_1.buildCommand)({
|
|
|
70
71
|
print.warning(`Unknown tool ${tool}`);
|
|
71
72
|
process.exit(1);
|
|
72
73
|
}
|
|
73
|
-
if (tool === 'ejectfix')
|
|
74
|
-
await (0, ejectfix_1.default)();
|
|
74
|
+
if (tool === 'ejectfix') {
|
|
75
|
+
const result = await (0, ejectfix_1.default)();
|
|
76
|
+
if ((0, errors_1.isFailure)(result)) {
|
|
77
|
+
print.error(result.error);
|
|
78
|
+
process.exit(1);
|
|
79
|
+
}
|
|
80
|
+
}
|
|
75
81
|
return;
|
|
76
82
|
}
|
|
77
83
|
const platformDevices = [
|
|
@@ -85,17 +91,25 @@ const command = (0, core_1.buildCommand)({
|
|
|
85
91
|
];
|
|
86
92
|
const { default: setup } = await Promise.resolve(`${`../toolbox/setup/${target}`}`).then(s => __importStar(require(s)));
|
|
87
93
|
if (platformDevices.includes(target)) {
|
|
88
|
-
await setup({
|
|
94
|
+
const result = (await setup({
|
|
89
95
|
branch,
|
|
90
96
|
release,
|
|
91
97
|
sourceRepo,
|
|
92
98
|
interactive: typeof process.env.CI !== 'undefined'
|
|
93
99
|
? process.env.CI === 'false'
|
|
94
100
|
: interactive,
|
|
95
|
-
});
|
|
101
|
+
}));
|
|
102
|
+
if ((0, errors_1.isFailure)(result)) {
|
|
103
|
+
print.error(result.error);
|
|
104
|
+
process.exit(1);
|
|
105
|
+
}
|
|
96
106
|
}
|
|
97
107
|
else {
|
|
98
|
-
await setup({ branch, release });
|
|
108
|
+
const result = (await setup({ branch, release }));
|
|
109
|
+
if ((0, errors_1.isFailure)(result)) {
|
|
110
|
+
print.error(result.error);
|
|
111
|
+
process.exit(1);
|
|
112
|
+
}
|
|
99
113
|
}
|
|
100
114
|
},
|
|
101
115
|
parameters: {
|
|
@@ -144,4 +158,4 @@ const command = (0, core_1.buildCommand)({
|
|
|
144
158
|
},
|
|
145
159
|
});
|
|
146
160
|
exports.default = command;
|
|
147
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
161
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29tbWFuZHMvc2V0dXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHFDQUE4QztBQUM5Qyx3Q0FBNEM7QUFHNUMseUVBQXFEO0FBQ3JELHVEQUF3RDtBQUN4RCwwREFBMEQ7QUFFMUQscURBQW9EO0FBV3BELE1BQU0sT0FBTyxHQUFHLElBQUEsbUJBQVksRUFBQztJQUMzQixJQUFJLEVBQUU7UUFDSixLQUFLLEVBQUUsa0VBQWtFO0tBQzFFO0lBQ0QsS0FBSyxDQUFDLElBQUksQ0FBcUIsS0FBbUI7UUFDaEQsTUFBTSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsR0FBRyxJQUFJLENBQUE7UUFDOUIsTUFBTSxlQUFlLEdBQVcsSUFBQSxjQUFZLEdBQUUsQ0FBQyxXQUFXLEVBQVksQ0FBQTtRQUN0RSxNQUFNLEVBQ0osTUFBTSxFQUNOLGNBQWMsRUFBRSxXQUFXLEdBQUcsS0FBSyxFQUNuQyxJQUFJLEVBQ0osTUFBTSxFQUNOLE9BQU8sR0FBRyxRQUFRLEVBQ2xCLGFBQWEsRUFBRSxVQUFVLEdBQUcseUJBQWEsRUFDekMsV0FBVyxHQUFHLElBQUksR0FDbkIsR0FBRyxLQUFLLENBQUE7UUFDVCxJQUFJLE1BQU0sR0FDUixzQkFBWSxDQUFDLE1BQU0sSUFBSyxFQUFhLENBQUMsSUFBSSxzQkFBWSxDQUFDLGVBQWUsQ0FBQyxDQUFBO1FBRXpFLElBQUksTUFBTSxLQUFLLFNBQVMsSUFBSSxXQUFXLEVBQUUsQ0FBQztZQUN4QyxNQUFNLE9BQU8sR0FBRztnQkFDZCxTQUFTO2dCQUNULE9BQU87Z0JBQ1AsTUFBTTtnQkFDTixNQUFNO2dCQUNOLE9BQU87Z0JBQ1Asc0JBQVksQ0FBQyxlQUFlLENBQUM7YUFDOUIsQ0FBQTtZQUNELE1BQU0sRUFBRSxNQUFNLEVBQUUsY0FBYyxFQUFFLEdBQUcsTUFBTSxNQUFNLENB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
|
|
@@ -8,6 +8,7 @@ const gluegun_1 = require("gluegun");
|
|
|
8
8
|
const constants_1 = require("./constants");
|
|
9
9
|
const os_1 = require("os");
|
|
10
10
|
const simple_plist_1 = __importDefault(require("simple-plist"));
|
|
11
|
+
const errors_1 = require("../system/errors");
|
|
11
12
|
const NC_PREFS_PLIST = 'com.apple.ncprefs.plist';
|
|
12
13
|
const DISK_AGENT_NC_PREF_ID = '_SYSTEM_CENTER_:com.apple.DiskArbitration.DiskArbitrationAgent';
|
|
13
14
|
async function default_1() {
|
|
@@ -15,8 +16,8 @@ async function default_1() {
|
|
|
15
16
|
spinner.start('Beginning setup...');
|
|
16
17
|
const OS = (0, os_1.type)().toLowerCase();
|
|
17
18
|
if (OS !== 'darwin') {
|
|
18
|
-
|
|
19
|
-
|
|
19
|
+
spinner.fail(`OS "${OS}" not supported`);
|
|
20
|
+
return (0, errors_1.failure)(`OS "${OS}" not supported`);
|
|
20
21
|
}
|
|
21
22
|
const PREFS_DIR = gluegun_1.filesystem.resolve(process.env.HOME ?? '~', 'Library', 'Preferences');
|
|
22
23
|
const PREFS_BACKUP_DIR = gluegun_1.filesystem.resolve(constants_1.INSTALL_DIR, 'ejectfix');
|
|
@@ -27,35 +28,37 @@ async function default_1() {
|
|
|
27
28
|
spinner.info('A backup of your notification preferences already exists.');
|
|
28
29
|
const shouldContinue = await gluegun_1.prompt.confirm('Would you like to override this backup and continue?');
|
|
29
30
|
if (!shouldContinue) {
|
|
30
|
-
|
|
31
|
-
|
|
31
|
+
spinner.info('Cancelling ejectfix setup.');
|
|
32
|
+
return (0, errors_1.success)(undefined);
|
|
32
33
|
}
|
|
33
34
|
}
|
|
34
35
|
if (gluegun_1.filesystem.exists(NC_PREFS_PATH) === false) {
|
|
35
36
|
spinner.fail(`Cannot find notification preferences file: ${NC_PREFS_PATH}`);
|
|
36
|
-
|
|
37
|
+
return (0, errors_1.failure)(`Cannot find notification preferences file: ${NC_PREFS_PATH}`);
|
|
37
38
|
}
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
39
|
+
return await (0, errors_1.wrapAsync)(async () => {
|
|
40
|
+
try {
|
|
41
|
+
gluegun_1.filesystem.copy(NC_PREFS_PATH, gluegun_1.filesystem.resolve(PREFS_BACKUP_DIR, NC_PREFS_PLIST), { overwrite: true });
|
|
42
|
+
}
|
|
43
|
+
catch (error) {
|
|
44
|
+
spinner.fail(`Error copying notification preferences: ${String(error)}`);
|
|
45
|
+
throw new Error(`Error copying notification preferences: ${String(error)}`);
|
|
46
|
+
}
|
|
47
|
+
try {
|
|
48
|
+
const prefs = simple_plist_1.default.readFileSync(NC_PREFS_PATH);
|
|
49
|
+
for (const app of prefs.apps) {
|
|
50
|
+
if (app['bundle-id'] === DISK_AGENT_NC_PREF_ID) {
|
|
51
|
+
app.flags = (Number(app.flags) & ~0b00010000) | 0b01001000;
|
|
52
|
+
}
|
|
50
53
|
}
|
|
54
|
+
simple_plist_1.default.writeBinaryFileSync(NC_PREFS_PATH, prefs);
|
|
51
55
|
}
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
spinner.succeed('Successfully updated notification preferences for `DISK NOT EJECTED PROPERLY` warning!');
|
|
56
|
+
catch (error) {
|
|
57
|
+
spinner.fail(`Unable to update notification preferences: ${String(error)}`);
|
|
58
|
+
throw new Error(`Unable to update notification preferences: ${String(error)}`);
|
|
59
|
+
}
|
|
60
|
+
await gluegun_1.system.exec('killall usernoted cfprefsd');
|
|
61
|
+
spinner.succeed('Successfully updated notification preferences for `DISK NOT EJECTED PROPERLY` warning!');
|
|
62
|
+
});
|
|
60
63
|
}
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
64
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZWplY3RmaXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvdG9vbGJveC9zZXR1cC9lamVjdGZpeC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQVdBLDRCQThFQztBQXpGRCxxQ0FBMkQ7QUFDM0QsMkNBQXlDO0FBQ3pDLDJCQUF5QztBQUN6QyxnRUFBZ0M7QUFFaEMsNkNBQThEO0FBRTlELE1BQU0sY0FBYyxHQUFHLHlCQUF5QixDQUFBO0FBQ2hELE1BQU0scUJBQXFCLEdBQ3pCLGdFQUFnRSxDQUFBO0FBRW5ELEtBQUs7SUFDbEIsTUFBTSxPQUFPLEdBQUcsZUFBSyxDQUFDLElBQUksRUFBRSxDQUFBO0lBQzVCLE9BQU8sQ0FBQyxLQUFLLENBQUMsb0JBQW9CLENBQUMsQ0FBQTtJQUVuQyxNQUFNLEVBQUUsR0FBRyxJQUFBLFNBQVksR0FBRSxDQUFDLFdBQVcsRUFBRSxDQUFBO0lBQ3ZDLElBQUksRUFBRSxLQUFLLFFBQVEsRUFBRSxDQUFDO1FBQ3BCLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLGlCQUFpQixDQUFDLENBQUE7UUFDeEMsT0FBTyxJQUFBLGdCQUFPLEVBQUMsT0FBTyxFQUFFLGlCQUFpQixDQUFDLENBQUE7SUFDNUMsQ0FBQztJQUVELE1BQU0sU0FBUyxHQUFHLG9CQUFVLENBQUMsT0FBTyxDQUNsQyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksSUFBSSxHQUFHLEVBQ3ZCLFNBQVMsRUFDVCxhQUFhLENBQ2QsQ0FBQTtJQUNELE1BQU0sZ0JBQWdCLEdBQUcsb0JBQVUsQ0FBQyxPQUFPLENBQUMsdUJBQVcsRUFBRSxVQUFVLENBQUMsQ0FBQTtJQUNwRSxNQUFNLGFBQWEsR0FBRyxvQkFBVSxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsY0FBYyxDQUFDLENBQUE7SUFFbkUsb0JBQVUsQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLENBQUMsQ0FBQTtJQUVoQyxJQUNFLG9CQUFVLENBQUMs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
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.installDeps = installDeps;
|
|
4
4
|
const packages_1 = require("../../system/packages");
|
|
5
|
+
const errors_1 = require("../../system/errors");
|
|
5
6
|
async function installDeps(spinner) {
|
|
6
7
|
const dependencies = [
|
|
7
8
|
{ name: 'bison', packageName: 'bison', type: 'binary' },
|
|
@@ -24,10 +25,13 @@ async function installDeps(spinner) {
|
|
|
24
25
|
{ name: 'setuptools', packageName: 'python3-setuptools', type: 'pylib' },
|
|
25
26
|
{ name: 'wget', packageName: 'wget', type: 'binary' },
|
|
26
27
|
];
|
|
27
|
-
const missingDependencies = await (0, packages_1.findMissingDependencies)(dependencies);
|
|
28
|
+
const missingDependencies = (0, errors_1.unwrapOr)(await (0, packages_1.findMissingDependencies)(dependencies), []);
|
|
28
29
|
if (missingDependencies.length !== 0) {
|
|
29
|
-
await (0, packages_1.installPackages)(missingDependencies);
|
|
30
|
+
const result = await (0, packages_1.installPackages)(missingDependencies);
|
|
31
|
+
if ((0, errors_1.isFailure)(result))
|
|
32
|
+
return result;
|
|
30
33
|
}
|
|
31
34
|
spinner.succeed();
|
|
35
|
+
return (0, errors_1.successVoid)();
|
|
32
36
|
}
|
|
33
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
37
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGludXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvdG9vbGJveC9zZXR1cC9lc3AzMi9saW51eC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQU1BLGtDQW1DQztBQXZDRCxvREFBZ0Y7QUFDaEYsZ0RBQXNFO0FBRy9ELEtBQUssVUFBVSxXQUFXLENBQy9CLE9BQXlDO0lBRXpDLE1BQU0sWUFBWSxHQUFpQjtRQUNqQyxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsV0FBVyxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFO1FBQ3ZELEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxXQUFXLEVBQUUsUUFBUSxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUU7UUFDekQsRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLFdBQVcsRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRTtRQUN2RCxFQUFFLElBQUksRUFBRSxVQUFVLEVBQUUsV0FBVyxFQUFFLFVBQVUsRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFO1FBQzdELEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxXQUFXLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUU7UUFDckQsRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLFdBQVcsRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRTtRQUNuRCxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsV0FBVyxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFO1FBQ3ZELEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxXQUFXLEVBQUUsWUFBWSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUU7UUFDOUQsRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLFdBQVcsRUFBRSxZQUFZLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRTtRQUM5RCxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsV0FBVyxFQUFFLGFBQWEsRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFO1FBQzdELEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxXQUFXLEVBQUUsWUFBWSxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUU7UUFDMUQ7WUFDRSxJQUFJLEVBQUUsbUJBQW1CO1lBQ3pCLFdBQVcsRUFBRSxnQkFBZ0I7WUFDN0IsSUFBSSxFQUFFLFFBQVE7U0FDZjtRQUNELEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxXQUFXLEVBQUUsbUJBQW1CLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRTtRQUNwRSxFQUFFLElBQUksRUFBRSxZQUFZLEVBQUUsV0FBVyxFQUFFLG9CQUFvQixFQUFFLElBQUksRUFBRSxPQUFPLEVBQUU7UUFDeEUsRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRTtLQUN0RCxDQUFBO0lBRUQsTUFBTSxtQkFBbUIsR0FBRyxJQUFBLGlCQUFRLEVBQ2xDLE1BQU0sSUFBQSxrQ0FBdUIsRUFBQyxZQUFZLENBQUMsRUFDM0MsRUFBRSxDQUNILENBQUE7SUFDRCxJQUFJLG1CQUFtQixDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUUsQ0FBQztRQUNyQyxNQUFNLE1BQU0sR0FBRyxNQUFNLElBQUEsMEJBQWUsRUFBQyxtQkFBbUIsQ0FBQyxDQUFBO1FBQ3pELElBQUksSUFBQSxrQkFBUyxFQUFDLE1BQU0sQ0FBQztZQUFFLE9BQU8sTUFBTSxDQUFBO0lBQ3RDLENBQUM7SUFDRCxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUE7SUFDakIsT0FBTyxJQUFBLG9CQUFXLEdBQUUsQ0FBQTtBQUN0QixDQUFDIn0=
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.installDeps = installDeps;
|
|
4
4
|
const gluegun_1 = require("gluegun");
|
|
5
5
|
const homebrew_1 = require("../homebrew");
|
|
6
|
+
const errors_1 = require("../../system/errors");
|
|
6
7
|
// brew install python3, cmake, ninja, dfu-util
|
|
7
8
|
async function installDeps(spinner) {
|
|
8
9
|
spinner.stop();
|
|
@@ -12,7 +13,7 @@ async function installDeps(spinner) {
|
|
|
12
13
|
catch (error) {
|
|
13
14
|
if (error instanceof Error) {
|
|
14
15
|
gluegun_1.print.info(`${error.message} python 3, cmake, ninja, dfu-util`);
|
|
15
|
-
|
|
16
|
+
return (0, errors_1.failure)(error.message);
|
|
16
17
|
}
|
|
17
18
|
}
|
|
18
19
|
if (gluegun_1.system.which('python') === null ||
|
|
@@ -31,7 +32,7 @@ async function installDeps(spinner) {
|
|
|
31
32
|
spinner.fail();
|
|
32
33
|
if (error instanceof Error && error.message.includes('xcode-select')) {
|
|
33
34
|
gluegun_1.print.error('Apple Command Line Tools must be installed in order to install python from Homebrew. Please run `xcode-select --install` before trying again.');
|
|
34
|
-
|
|
35
|
+
return (0, errors_1.failure)('Apple Command Line Tools must be installed in order to install python from Homebrew. Please run `xcode-select --install` before trying again.');
|
|
35
36
|
}
|
|
36
37
|
}
|
|
37
38
|
}
|
|
@@ -65,5 +66,6 @@ async function installDeps(spinner) {
|
|
|
65
66
|
spinner.fail();
|
|
66
67
|
gluegun_1.print.error('Unable to install pyserial through the availble Python environment. This may be required by the ESP-IDF. If you encounter issues, please try manually installing pyserial.');
|
|
67
68
|
}
|
|
69
|
+
return (0, errors_1.successVoid)();
|
|
68
70
|
}
|
|
69
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
71
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFjLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL3Rvb2xib3gvc2V0dXAvZXNwMzIvbWFjLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBT0Esa0NBb0ZDO0FBM0ZELHFDQUErQztBQUUvQywwQ0FBNEM7QUFFNUMsZ0RBQTBEO0FBRTFELCtDQUErQztBQUN4QyxLQUFLLFVBQVUsV0FBVyxDQUMvQixPQUF5QztJQUV6QyxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUE7SUFFZCxJQUFJLENBQUM7UUFDSCxNQUFNLElBQUEseUJBQWMsR0FBRSxDQUFBO0lBQ3hCLENBQUM7SUFBQyxPQUFPLEtBQWMsRUFBRSxDQUFDO1FBQ3hCLElBQUksS0FBSyxZQUFZLEtBQUssRUFBRSxDQUFDO1lBQzNCLGVBQUssQ0FBQyxJQUFJLENBQUMsR0FBRyxLQUFLLENBQUMsT0FBTyxtQ0FBbUMsQ0FBQyxDQUFBO1lBQy9ELE9BQU8sSUFBQSxnQkFBTyxFQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQTtRQUMvQixDQUFDO0lBQ0gsQ0FBQztJQUVELElBQ0UsZ0JBQU0sQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLEtBQUssSUFBSTtRQUMvQixrQ0FBa0M7UUFDbEMsZ0JBQU0sQ0FBQyxTQUFTLENBRVosQ0FDRSxNQUFNLGdCQUFNLENBQUMsSUFBSSxDQUFDLGtCQUFrQixFQUFFLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxDQUFDLENBQ3RELENBQUMsUUFBUSxFQUNYO2FBQ0UsS0FBSyxDQUFDLEdBQUcsQ0FBQzthQUNWLEdBQUcsRUFBRSxJQUFJLEVBQUUsRUFDZCxVQUFVLENBQ1gsRUFDRCxDQUFDO1FBQ0QsTUFBTSxnQkFBZ0IsR0FBRyxnQkFBTSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQTtRQUVoRCxJQUFJLE9BQU8sZ0JBQWdCLEtBQUssUUFBUSxFQUFFLENBQUM7WUFDekMsSUFBSSxDQUFDO2dCQUNILE9BQU8sQ0FBQyxLQUFLLENBQUMsb0NBQW9DLENBQUMsQ0FBQTtnQkFDbkQsTUFBTSxnQkFBTSxDQUFDLElBQUksQ0FBQyxxQkFBcUIsRUFBRSxFQUFFLEtBQUssRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUE7Z0JBQ3RFLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQTtZQUNuQixDQUFDO1lBQUMsT0FBTyxLQUFjLEVBQUUsQ0FBQztnQkFDeEIsT0FBTyxDQUFDLElBQUksRUFBRSxDQUFBO2dCQUNkLElBQUksS0FBSyxZQUFZLEtBQUssSUFBSSxLQUFLLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQUMsRUFBRSxDQUFDO29CQUNyRSxlQUFLLENBQUMsS0FBSyxDQUNULCtJQUErSSxDQUNoSixDQUFBO29CQUNELE9BQU8sSUFBQSxnQkFBTyxFQUNaLCtJQUErSSxDQUNoSixDQUFBO2dCQUNILENBQUM7WUFDSCxDQUFDO1FBQ0gsQ0FBQztJQUNILENBQUM7SUFFRCxJQUFJLGdCQUFNLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLElBQUksRUFBRSxDQUFDO1FBQ25DLE1BQU0sZ0JBQU0sQ0FBQyxJQUFJLENBQUMsb0JBQW9CLEVBQUUsRUFBRSxLQUFLLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFBO0lBQ3ZFLENBQUM7SUFFRCxJQUFJLGdCQUFNLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLElBQUksRUFBRSxDQUFDO1FBQ25DLE1BQU0sZ0JBQU0sQ0FBQyxJQUFJLENBQUMsb0JBQW9CLEVBQUUsRUFBRSxLQUFLLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFBO0lBQ3ZFLENBQUM7SUFFRCxJQUFJLGdCQUFNLENBQUMsS0FBSyxDQUFDLFVBQVUsQ0FBQyxLQUFLLElBQUksRUFBRSxDQUFDO1FBQ3RDLE1BQU0sZ0JBQU0sQ0FBQyxJQUFJLENBQUMsdUJBQXVCLEVBQUUsRUFBRSxLQUFLLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFBO0lBQzFFLENBQUM7SUFFRCw0QkFBNEI7SUFDNUIsSUFBSSxnQkFBTSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxJQUFJLEVBQUUsQ0FBQztRQUNsQyxPQUFPLENBQUMsS0FBSyxDQUFDLDJCQUEyQixDQUFDLENBQUE7UUFDMUMsTUFBTSxnQkFBTSxDQUFDLElBQUksQ0FBQyw2QkFBNkIsRUFBRTtZQUMvQyxLQUFLLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLO1NBQ3pCLENBQUMsQ0FBQTtRQUNGLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUNuQixDQUFDO0lBRUQscUNBQXFDO0lBQ3JDLElBQUksQ0FBQztRQUNILE9BQU8sQ0FBQyxLQUFLLENBQUMsNENBQTRDLENBQUMsQ0FBQTtRQUMzRCxNQUFNLGdCQUFNLENBQUMsSUFBSSxDQUFDLHdDQUF3QyxFQUFFO1lBQzFELEtBQUssRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUs7U0FDekIsQ0FBQyxDQUFBO1FBQ0YsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFBO0lBQ25CLENBQUM7SUFBQyxPQUFPLEtBQWMsRUFBRSxDQUFDO1FBQ3hCLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQTtRQUNkLGVBQUssQ0FBQyxLQUFLLENBQ1QsNEtBQTRLLENBQzdLLENBQUE7SUFDSCxDQUFDO0lBQ0QsT0FBTyxJQUFBLG9CQUFXLEdBQUUsQ0FBQTtBQUN0QixDQUFDIn0=
|
|
@@ -9,12 +9,13 @@ const gluegun_1 = require("gluegun");
|
|
|
9
9
|
const axios_1 = __importDefault(require("axios"));
|
|
10
10
|
const util_1 = require("util");
|
|
11
11
|
const stream_1 = require("stream");
|
|
12
|
+
const errors_1 = require("../../system/errors");
|
|
12
13
|
const finishedPromise = (0, util_1.promisify)(stream_1.finished);
|
|
13
14
|
const IDF_INSTALLER = 'https://github.com/espressif/idf-installer/releases/download/online-2.15/esp-idf-tools-setup-online-2.15.exe';
|
|
14
15
|
async function installDeps(spinner, ESP32_DIR, IDF_PATH) {
|
|
15
16
|
if (esp32Exists()) {
|
|
16
17
|
gluegun_1.print.info(`ESP-IDF tooling exists at ${process.env.IDF_PATH ?? ''}`);
|
|
17
|
-
return;
|
|
18
|
+
return (0, errors_1.successVoid)();
|
|
18
19
|
}
|
|
19
20
|
spinner.start('Downloading ESP-IDF Tools Installer');
|
|
20
21
|
const destination = gluegun_1.filesystem.resolve(ESP32_DIR, 'esp-idf-tools-setup-online-2.15.exe');
|
|
@@ -30,6 +31,7 @@ async function installDeps(spinner, ESP32_DIR, IDF_PATH) {
|
|
|
30
31
|
spinner.start('Running ESP-IDF Tools Installer');
|
|
31
32
|
await gluegun_1.system.exec(`start /B ${destination}`);
|
|
32
33
|
spinner.succeed();
|
|
34
|
+
return (0, errors_1.successVoid)();
|
|
33
35
|
}
|
|
34
36
|
function esp32Exists() {
|
|
35
37
|
return (process.env.IDF_PATH !== undefined &&
|
|
@@ -37,4 +39,4 @@ function esp32Exists() {
|
|
|
37
39
|
gluegun_1.filesystem.exists(process.env.IDF_TOOLS_PATH) === 'dir' &&
|
|
38
40
|
gluegun_1.filesystem.exists(process.env.IDF_PATH) === 'dir');
|
|
39
41
|
}
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
42
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2luZG93cy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3NyYy90b29sYm94L3NldHVwL2VzcDMyL3dpbmRvd3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFhQSxrQ0ErQkM7QUFFRCxrQ0FPQztBQXJERCxxQ0FBbUQ7QUFFbkQsa0RBQXlCO0FBQ3pCLCtCQUFnQztBQUNoQyxtQ0FBaUM7QUFFakMsZ0RBQWlEO0FBRWpELE1BQU0sZUFBZSxHQUFHLElBQUEsZ0JBQVMsRUFBQyxpQkFBUSxDQUFDLENBQUE7QUFFM0MsTUFBTSxhQUFhLEdBQ2pCLDhHQUE4RyxDQUFBO0FBRXpHLEtBQUssVUFBVSxXQUFXLENBQy9CLE9BQXlDLEVBQ3pDLFNBQWlCLEVBQ2pCLFFBQWdCO0lBRWhCLElBQUksV0FBVyxFQUFFLEVBQUUsQ0FBQztRQUNsQixlQUFLLENBQUMsSUFBSSxDQUFDLDZCQUE2QixPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFBO1FBQ3JFLE9BQU8sSUFBQSxvQkFBVyxHQUFFLENBQUE7SUFDdEIsQ0FBQztJQUVELE9BQU8sQ0FBQyxLQUFLLENBQUMscUNBQXFDLENBQUMsQ0FBQTtJQUNwRCxNQUFNLFdBQVcsR0FBRyxvQkFBVSxDQUFDLE9BQU8sQ0FDcEMsU0FBUyxFQUNULHFDQUFxQyxDQUN0QyxDQUFBO0lBQ0QsTUFBTSxNQUFNLEdBQUcsb0JBQVUsQ0FBQyxpQkFBaUIsQ0FBQyxXQUFXLENBQUMsQ0FBQTtJQUN4RCxNQUFNLFFBQVEsR0FBRyxNQUFNLGVBQUssQ0FBQyxHQUFHLENBQUMsYUFBYSxFQUFFO1FBQzlDLFlBQVksRUFBRSxRQUFRO0tBQ3ZCLENBQUMsQ0FBQTtJQUNGLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBQzFCLE1BQU0sZUFBZSxDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBQzdCLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUVqQixlQUFLLENBQUMsSUFBSSxDQUNSLHdFQUF3RSxRQUFRLEdBQUcsQ0FDcEYsQ0FBQTtJQUNELGVBQUssQ0FBQyxJQUFJLENBQUMsZ0RBQWdELENBQUMsQ0FBQTtJQUM1RCxPQUFPLENBQUMsS0FBSyxDQUFDLGlDQUFpQyxDQUFDLENBQUE7SUFDaEQsTUFBTSxnQkFBTSxDQUFDLElBQUksQ0FBQyxZQUFZLFdBQVcsRUFBRSxDQUFDLENBQUE7SUFDNUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFBO0lBQ2pCLE9BQU8sSUFBQSxvQkFBVyxHQUFFLENBQUE7QUFDdEIsQ0FBQztBQUVELFNBQWdCLFdBQVc7SUFDekIsT0FBTyxDQUNMLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxLQUFLLFNBQVM7UUFDbEMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLEtBQUssU0FBUztRQUN4QyxvQkFBVSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxLQUFLLEtBQUs7UUFDdkQsb0JBQVUsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsS0FBSyxLQUFLLENBQ2xELENBQUE7QUFDSCxDQUFDIn0=
|
|
@@ -15,6 +15,7 @@ const linux_1 = require("./esp32/linux");
|
|
|
15
15
|
const windows_1 = require("./esp32/windows");
|
|
16
16
|
const windows_2 = require("./windows");
|
|
17
17
|
const exec_1 = require("../system/exec");
|
|
18
|
+
const errors_1 = require("../system/errors");
|
|
18
19
|
async function default_1() {
|
|
19
20
|
const OS = (0, os_1.type)().toLowerCase();
|
|
20
21
|
const isWindows = OS === 'windows_nt';
|
|
@@ -29,10 +30,12 @@ async function default_1() {
|
|
|
29
30
|
// 0. ensure Moddable exists
|
|
30
31
|
if (!(0, moddable_1.moddableExists)()) {
|
|
31
32
|
spinner.fail('Moddable tooling required. Run `xs-dev setup` before trying again.');
|
|
32
|
-
|
|
33
|
+
return (0, errors_1.failure)('Moddable tooling required. Run `xs-dev setup` before trying again.');
|
|
33
34
|
}
|
|
34
35
|
if (isWindows) {
|
|
35
|
-
await (0, windows_2.ensureModdableCommandPrompt)(spinner);
|
|
36
|
+
const result = await (0, windows_2.ensureModdableCommandPrompt)(spinner);
|
|
37
|
+
if ((0, errors_1.isFailure)(result))
|
|
38
|
+
return result;
|
|
36
39
|
}
|
|
37
40
|
// 1. ensure ~/.local/share/esp32 directory
|
|
38
41
|
spinner.info('Ensuring esp32 install directory');
|
|
@@ -40,11 +43,11 @@ async function default_1() {
|
|
|
40
43
|
// 2. clone esp-idf into ~/.local/share/esp32/esp-idf
|
|
41
44
|
if (gluegun_1.filesystem.exists(IDF_PATH) === false) {
|
|
42
45
|
spinner.start('Cloning esp-idf repo');
|
|
43
|
-
const moddableVersion = (await (0, moddable_1.getModdableVersion)()
|
|
46
|
+
const moddableVersion = (0, errors_1.unwrapOr)(await (0, moddable_1.getModdableVersion)(), '');
|
|
44
47
|
const expectedEspIdfVersion = await getExpectedEspIdfVersion();
|
|
45
48
|
const branch = expectedEspIdfVersion ??
|
|
46
49
|
(moddableVersion.includes('branch') ||
|
|
47
|
-
gluegun_1.semver.satisfies(moddableVersion
|
|
50
|
+
gluegun_1.semver.satisfies(moddableVersion, '>= 4.2.x')
|
|
48
51
|
? ESP_BRANCH_V5
|
|
49
52
|
: ESP_BRANCH_V4);
|
|
50
53
|
await gluegun_1.system.spawn(`git clone --depth 1 --single-branch -b ${branch} --recursive ${ESP_IDF_REPO} ${IDF_PATH}`);
|
|
@@ -53,13 +56,19 @@ async function default_1() {
|
|
|
53
56
|
// 3. Install build and run dependencies
|
|
54
57
|
spinner.start('Installing build dependencies');
|
|
55
58
|
if (OS === 'darwin') {
|
|
56
|
-
await (0, mac_1.installDeps)(spinner);
|
|
59
|
+
const result = await (0, mac_1.installDeps)(spinner);
|
|
60
|
+
if ((0, errors_1.isFailure)(result))
|
|
61
|
+
return result;
|
|
57
62
|
}
|
|
58
63
|
if (OS === 'linux') {
|
|
59
|
-
await (0, linux_1.installDeps)(spinner);
|
|
64
|
+
const result = await (0, linux_1.installDeps)(spinner);
|
|
65
|
+
if ((0, errors_1.isFailure)(result))
|
|
66
|
+
return result;
|
|
60
67
|
}
|
|
61
68
|
if (isWindows) {
|
|
62
|
-
await (0, windows_1.installDeps)(spinner, ESP32_DIR, IDF_PATH);
|
|
69
|
+
const result = await (0, windows_1.installDeps)(spinner, ESP32_DIR, IDF_PATH);
|
|
70
|
+
if ((0, errors_1.isFailure)(result))
|
|
71
|
+
return result;
|
|
63
72
|
}
|
|
64
73
|
// 4. append IDF_PATH env export to shell profile
|
|
65
74
|
if (isWindows) {
|
|
@@ -100,6 +109,7 @@ async function default_1() {
|
|
|
100
109
|
Test out the setup by starting a new ${isWindows ? 'Moddable Command Prompt' : 'terminal session'}, plugging in your device, and running: xs-dev run --example helloworld --device=esp32
|
|
101
110
|
If there is trouble finding the correct port, pass the "--port" flag to the above command with the ${isWindows ? 'COM Port' : 'path to the /dev.cu.*'} that matches your device.
|
|
102
111
|
`);
|
|
112
|
+
return (0, errors_1.successVoid)();
|
|
103
113
|
}
|
|
104
114
|
async function getExpectedEspIdfVersion() {
|
|
105
115
|
if ((0, moddable_1.moddableExists)()) {
|
|
@@ -108,4 +118,4 @@ async function getExpectedEspIdfVersion() {
|
|
|
108
118
|
}
|
|
109
119
|
return null;
|
|
110
120
|
}
|
|
111
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
121
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXNwMzIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvdG9vbGJveC9zZXR1cC9lc3AzMi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQWFBLDRCQWdIQztBQUVELDREQWVDO0FBOUlELHFDQUEyRDtBQUMzRCwyQkFBeUM7QUFDekMsMkNBQTBFO0FBQzFFLHlDQUErRDtBQUMvRCxnRUFBdUM7QUFDdkMscUNBQTJEO0FBQzNELHlDQUErRDtBQUMvRCw2Q0FBK0Q7QUFDL0QsdUNBQStEO0FBQy9ELHlDQUFrRDtBQUNsRCw2Q0FBNEU7QUFHN0QsS0FBSztJQUNsQixNQUFNLEVBQUUsR0FBRyxJQUFBLFNBQVksR0FBRSxDQUFDLFdBQVcsRUFBRSxDQUFBO0lBQ3ZDLE1BQU0sU0FBUyxHQUFHLEVBQUUsS0FBSyxZQUFZLENBQUE7SUFDckMsTUFBTSxZQUFZLEdBQUcsMENBQTBDLENBQUE7SUFDL0QsTUFBTSxhQUFhLEdBQUcsUUFBUSxDQUFBO0lBQzlCLE1BQU0sYUFBYSxHQUFHLE1BQU0sQ0FBQTtJQUM1QixNQUFNLFNBQVMsR0FBRyxvQkFBVSxDQUFDLE9BQU8sQ0FBQyx1QkFBVyxFQUFFLE9BQU8sQ0FBQyxDQUFBO0lBQzFELE1BQU0sUUFBUSxHQUFHLG9CQUFVLENBQUMsT0FBTyxDQUFDLFNBQVMsRUFBRSxTQUFTLENBQUMsQ0FBQTtJQUV6RCxNQUFNLElBQUEsd0JBQWlCLEdBQUUsQ0FBQTtJQUV6QixNQUFNLE9BQU8sR0FBRyxlQUFLLENBQUMsSUFBSSxFQUFFLENBQUE7SUFDNUIsT0FBTyxDQUFDLEtBQUssQ0FBQyx3QkFBd0IsQ0FBQyxDQUFBO0lBRXZDLDRCQUE0QjtJQUM1QixJQUFJLENBQUMsSUFBQSx5QkFBYyxHQUFFLEVBQUUsQ0FBQztRQUN0QixPQUFPLENBQUMsSUFBSSxDQUNWLG9FQUFvRSxDQUNyRSxDQUFBO1FBQ0QsT0FBTyxJQUFBLGdCQUFPLEVBQ1osb0VBQW9FLENBQ3JFLENBQUE7SUFD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
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.installDeps = installDeps;
|
|
4
4
|
const packages_1 = require("../../system/packages");
|
|
5
|
+
const errors_1 = require("../../system/errors");
|
|
5
6
|
async function installDeps(spinner) {
|
|
6
7
|
spinner.start('Installing python deps with apt-get');
|
|
7
8
|
const dependencies = [
|
|
@@ -13,10 +14,15 @@ async function installDeps(spinner) {
|
|
|
13
14
|
},
|
|
14
15
|
{ name: 'python', packageName: 'python-is-python3', type: 'binary' },
|
|
15
16
|
];
|
|
16
|
-
const
|
|
17
|
-
if (
|
|
18
|
-
|
|
17
|
+
const missingDepsResult = await (0, packages_1.findMissingDependencies)(dependencies);
|
|
18
|
+
if ((0, errors_1.isFailure)(missingDepsResult))
|
|
19
|
+
return missingDepsResult;
|
|
20
|
+
if (missingDepsResult.data.length !== 0) {
|
|
21
|
+
const result = await (0, packages_1.installPackages)(missingDepsResult.data);
|
|
22
|
+
if ((0, errors_1.isFailure)(result))
|
|
23
|
+
return result;
|
|
19
24
|
}
|
|
20
25
|
spinner.succeed();
|
|
26
|
+
return (0, errors_1.successVoid)();
|
|
21
27
|
}
|
|
22
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
28
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGludXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvdG9vbGJveC9zZXR1cC9lc3A4MjY2L2xpbnV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBTUEsa0NBd0JDO0FBNUJELG9EQUFnRjtBQUNoRixnREFBNEQ7QUFHckQsS0FBSyxVQUFVLFdBQVcsQ0FDL0IsT0FBeUM7SUFFekMsT0FBTyxDQUFDLEtBQUssQ0FBQyxxQ0FBcUMsQ0FBQyxDQUFBO0lBQ3BELE1BQU0sWUFBWSxHQUFpQjtRQUNqQyxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsV0FBVyxFQUFFLFlBQVksRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFO1FBQzFEO1lBQ0UsSUFBSSxFQUFFLG1CQUFtQjtZQUN6QixXQUFXLEVBQUUsZ0JBQWdCO1lBQzdCLElBQUksRUFBRSxRQUFRO1NBQ2Y7UUFDRCxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsV0FBVyxFQUFFLG1CQUFtQixFQUFFLElBQUksRUFBRSxRQUFRLEVBQUU7S0FDckUsQ0FBQTtJQUVELE1BQU0saUJBQWlCLEdBQUcsTUFBTSxJQUFBLGtDQUF1QixFQUFDLFlBQVksQ0FBQyxDQUFBO0lBQ3JFLElBQUksSUFBQSxrQkFBUyxFQUFDLGlCQUFpQixDQUFDO1FBQUUsT0FBTyxpQkFBaUIsQ0FBQTtJQUUxRCxJQUFJLGlCQUFpQixDQUFDLElBQUksQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFLENBQUM7UUFDeEMsTUFBTSxNQUFNLEdBQUcsTUFBTSxJQUFBLDBCQUFlLEVBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLENBQUE7UUFDNUQsSUFBSSxJQUFBLGtCQUFTLEVBQUMsTUFBTSxDQUFDO1lBQUUsT0FBTyxNQUFNLENBQUE7SUFDdEMsQ0FBQztJQUNELE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUVqQixPQUFPLElBQUEsb0JBQVcsR0FBRSxDQUFBO0FBQ3RCLENBQUMifQ==
|