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
|
@@ -42,6 +42,7 @@ const moddable_1 = require("./moddable");
|
|
|
42
42
|
const windows_1 = require("./windows");
|
|
43
43
|
const upsert_1 = __importDefault(require("../patching/upsert"));
|
|
44
44
|
const windows_2 = require("./nrf52/windows");
|
|
45
|
+
const errors_1 = require("../system/errors");
|
|
45
46
|
const finishedPromise = (0, util_1.promisify)(stream_1.finished);
|
|
46
47
|
const ARCH_ALIAS = {
|
|
47
48
|
darwin_arm64: 'darwin-arm64',
|
|
@@ -66,10 +67,12 @@ async function default_1() {
|
|
|
66
67
|
spinner.start('Setting up nrf52 tools');
|
|
67
68
|
if (!(0, moddable_1.moddableExists)()) {
|
|
68
69
|
spinner.fail(`Moddable tooling required. Run 'xs-dev setup --device ${devices_1.DEVICE_ALIAS[OS]}' before trying again.`);
|
|
69
|
-
|
|
70
|
+
return (0, errors_1.failure)(`Moddable tooling required. Run 'xs-dev setup --device ${devices_1.DEVICE_ALIAS[OS]}' before trying again.`);
|
|
70
71
|
}
|
|
71
72
|
if (isWindows) {
|
|
72
|
-
await (0, windows_1.ensureModdableCommandPrompt)(spinner);
|
|
73
|
+
const result = await (0, windows_1.ensureModdableCommandPrompt)(spinner);
|
|
74
|
+
if ((0, errors_1.isFailure)(result))
|
|
75
|
+
return result;
|
|
73
76
|
}
|
|
74
77
|
let createUnxz = () => {
|
|
75
78
|
void 0;
|
|
@@ -81,7 +84,7 @@ async function default_1() {
|
|
|
81
84
|
}
|
|
82
85
|
catch (error) {
|
|
83
86
|
spinner.fail('Unable to extract Arm Embedded Toolchain without XZ utils (https://tukaani.org/xz/). Please install that dependency on your system and reinstall xs-dev before attempting this setup again. See https://xs-dev.js.org/troubleshooting for more info.');
|
|
84
|
-
|
|
87
|
+
return (0, errors_1.failure)('Unable to extract Arm Embedded Toolchain without XZ utils (https://tukaani.org/xz/). Please install that dependency on your system and reinstall xs-dev before attempting this setup again. See https://xs-dev.js.org/troubleshooting for more info.');
|
|
85
88
|
}
|
|
86
89
|
}
|
|
87
90
|
spinner.info('Ensuring nrf52 directory');
|
|
@@ -133,12 +136,10 @@ async function default_1() {
|
|
|
133
136
|
process.env.NRF52_SDK_PATH = NRF5_SDK_PATH;
|
|
134
137
|
await (0, windows_1.setEnv)('NRF_ROOT', NRF52_DIR);
|
|
135
138
|
await (0, windows_1.setEnv)('NRF52_SDK_PATH', NRF5_SDK_PATH);
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
// Command Prompt restart needed
|
|
141
|
-
process.exit(1);
|
|
139
|
+
const pythonResult = await (0, windows_2.installPython)(spinner);
|
|
140
|
+
if ((0, errors_1.isFailure)(pythonResult)) {
|
|
141
|
+
// Command Prompt restart needed or Python installation failed
|
|
142
|
+
return pythonResult;
|
|
142
143
|
}
|
|
143
144
|
}
|
|
144
145
|
if (OS === 'linux') {
|
|
@@ -153,5 +154,6 @@ async function default_1() {
|
|
|
153
154
|
Successfully set up nrf52 platform support for Moddable!
|
|
154
155
|
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 nrf52
|
|
155
156
|
`);
|
|
157
|
+
return (0, errors_1.successVoid)();
|
|
156
158
|
}
|
|
157
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
159
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnJmNTIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvdG9vbGJveC9zZXR1cC9ucmY1Mi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBMEJBLDRCQXFJQztBQS9KRCxrREFBeUI7QUFDekIsMkJBQXNDO0FBQ3RDLHFDQUEyQztBQUMzQywyQkFBK0M7QUFDL0MsbUNBQWlEO0FBQ2pELG1DQUFnQztBQUNoQywrQkFBZ0M7QUFDaEMsK0NBQW9EO0FBRXBELCtDQUFnRDtBQUNoRCx5Q0FBZ0U7QUFDaEUsMkNBQTREO0FBQzVELHlDQUEyQztBQUMzQyx1Q0FBK0Q7QUFDL0QsZ0VBQXVDO0FBQ3ZDLDZDQUErQztBQUMvQyw2Q0FBa0U7QUFFbEUsTUFBTSxlQUFlLEdBQUcsSUFBQSxnQkFBUyxFQUFDLGlCQUFRLENBQUMsQ0FBQTtBQUUzQyxNQUFNLFVBQVUsR0FBMkI7SUFDekMsWUFBWSxFQUFFLGNBQWM7SUFDNUIsVUFBVSxFQUFFLGVBQWU7SUFDM0IsU0FBUyxFQUFFLFFBQVE7SUFDbkIsY0FBYyxFQUFFLGdCQUFnQjtDQUNqQyxDQUFBO0FBQ2MsS0FBSztJQUNsQixNQUFNLEVBQUUsR0FBRyxJQUFBLFNBQVksR0FBRSxDQUFDLFdBQVcsRUFBWSxDQUFBO0lBQ2pELE1BQU0sU0FBUyxHQUFHLEVBQUUsS0FBSyxZQUFZLENBQUE7SUFDckMsTUFBTSxTQUFTLEdBQUcsK0JBQStCLFVBQVUsQ0FBQyxHQUFHLEVBQUUsSUFBSSxJQUFBLFNBQUksR0FBRSxFQUFFLENBQUMsZ0JBQWdCLENBQUE7SUFDOUYsTUFBTSxrQkFBa0IsR0FBRywwRUFBMEUsU0FBUyxJQUFJLFNBQVMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQTtJQUNoSixNQUFNLDBDQUEwQyxHQUM5QyxrRkFBa0YsQ0FBQTtJQUNwRixNQUFNLFFBQVEsR0FBRyx5QkFBeUIs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
|
|
@@ -2,8 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.installDeps = installDeps;
|
|
4
4
|
const exec_1 = require("../../system/exec");
|
|
5
|
+
const errors_1 = require("../../system/errors");
|
|
5
6
|
async function installDeps(spinner) {
|
|
6
|
-
await (0, exec_1.execWithSudo)('apt-get install --yes cmake gcc-arm-none-eabi libnewlib-arm-none-eabi build-essential libusb-1.0.0-dev pkg-config', { stdout: process.stdout });
|
|
7
|
+
const result = await (0, exec_1.execWithSudo)('apt-get install --yes cmake gcc-arm-none-eabi libnewlib-arm-none-eabi build-essential libusb-1.0.0-dev pkg-config', { stdout: process.stdout });
|
|
8
|
+
if ((0, errors_1.isFailure)(result))
|
|
9
|
+
return result;
|
|
7
10
|
spinner.succeed();
|
|
11
|
+
return (0, errors_1.successVoid)();
|
|
8
12
|
}
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGludXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvdG9vbGJveC9zZXR1cC9waWNvL2xpbnV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBS0Esa0NBV0M7QUFmRCw0Q0FBZ0Q7QUFDaEQsZ0RBQTREO0FBR3JELEtBQUssVUFBVSxXQUFXLENBQy9CLE9BQXlDO0lBRXpDLE1BQU0sTUFBTSxHQUFHLE1BQU0sSUFBQSxtQkFBWSxFQUMvQixtSEFBbUgsRUFDbkgsRUFBRSxNQUFNLEVBQUUsT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUMzQixDQUFBO0lBQ0QsSUFBSSxJQUFBLGtCQUFTLEVBQUMsTUFBTSxDQUFDO1FBQUUsT0FBTyxNQUFNLENBQUE7SUFDcEMsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFBO0lBRWpCLE9BQU8sSUFBQSxvQkFBVyxHQUFFLENBQUE7QUFDdEIsQ0FBQyJ9
|
|
@@ -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
|
async function installDeps(spinner) {
|
|
7
8
|
try {
|
|
8
9
|
await (0, homebrew_1.ensureHomebrew)();
|
|
@@ -10,7 +11,7 @@ async function installDeps(spinner) {
|
|
|
10
11
|
catch (error) {
|
|
11
12
|
if (error instanceof Error) {
|
|
12
13
|
gluegun_1.print.info(`${error.message} gcc-arm-embedded, libusb, pkg-config`);
|
|
13
|
-
|
|
14
|
+
return (0, errors_1.failure)(`${error.message} gcc-arm-embedded, libusb, pkg-config`);
|
|
14
15
|
}
|
|
15
16
|
}
|
|
16
17
|
if (gluegun_1.system.which('arm-none-eabi-gcc') !== null &&
|
|
@@ -28,5 +29,6 @@ async function installDeps(spinner) {
|
|
|
28
29
|
shell: process.env.SHELL,
|
|
29
30
|
});
|
|
30
31
|
spinner.succeed();
|
|
32
|
+
return (0, errors_1.successVoid)();
|
|
31
33
|
}
|
|
32
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
34
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFjLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL3Rvb2xib3gvc2V0dXAvcGljby9tYWMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFLQSxrQ0FnQ0M7QUFyQ0QscUNBQTBEO0FBQzFELDBDQUE0RDtBQUM1RCxnREFBMEQ7QUFHbkQsS0FBSyxVQUFVLFdBQVcsQ0FDL0IsT0FBeUM7SUFFekMsSUFBSSxDQUFDO1FBQ0gsTUFBTSxJQUFBLHlCQUFjLEdBQUUsQ0FBQTtJQUN4QixDQUFDO0lBQUMsT0FBTyxLQUFjLEVBQUUsQ0FBQztRQUN4QixJQUFJLEtBQUssWUFBWSxLQUFLLEVBQUUsQ0FBQztZQUMzQixlQUFLLENBQUMsSUFBSSxDQUFDLEdBQUcsS0FBSyxDQUFDLE9BQU8sdUNBQXVDLENBQUMsQ0FBQTtZQUNuRSxPQUFPLElBQUEsZ0JBQU8sRUFBQyxHQUFHLEtBQUssQ0FBQyxPQUFPLHVDQUF1QyxDQUFDLENBQUE7UUFDekUsQ0FBQztJQUNILENBQUM7SUFFRCxJQUNFLGdCQUFNLENBQUMsS0FBSyxDQUFDLG1CQUFtQixDQUFDLEtBQUssSUFBSTtRQUMxQyxDQUFDLE1BQU0sSUFBQSx5QkFBYyxFQUFDLG1CQUFtQixDQUFDLENBQUMsRUFDM0MsQ0FBQztRQUNELE9BQU8sQ0FBQyxLQUFLLENBQUMsc0NBQXNDLENBQUMsQ0FBQTtRQUNyRCxNQUFNLGdCQUFNLENBQUMsSUFBSSxDQUFDLHNDQUFzQyxDQUFDLENBQUE7UUFDekQsTUFBTSxnQkFBTSxDQUFDLElBQUksQ0FBQyxrQ0FBa0MsQ0FBQyxDQUFBO1FBQ3JELE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUNuQixDQUFDO0lBRUQsT0FBTyxDQUFDLEtBQUssQ0FBQyxvQ0FBb0MsQ0FBQyxDQUFBO0lBQ25ELE1BQU0sZ0JBQU0sQ0FBQyxJQUFJLENBQUMsZ0NBQWdDLEVBQUU7UUFDbEQsS0FBSyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsS0FBSztLQUN6QixDQUFDLENBQUE7SUFDRixNQUFNLGdCQUFNLENBQUMsSUFBSSxDQUFDLHNDQUFzQyxFQUFFO1FBQ3hELEtBQUssRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUs7S0FDekIsQ0FBQyxDQUFBO0lBQ0YsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFBO0lBRWpCLE9BQU8sSUFBQSxvQkFBVyxHQUFFLENBQUE7QUFDdEIsQ0FBQyJ9
|
|
@@ -12,6 +12,7 @@ const mac_1 = require("./pico/mac");
|
|
|
12
12
|
const linux_1 = require("./pico/linux");
|
|
13
13
|
const moddable_1 = require("./moddable");
|
|
14
14
|
const exec_1 = require("../system/exec");
|
|
15
|
+
const errors_1 = require("../system/errors");
|
|
15
16
|
async function default_1() {
|
|
16
17
|
const OS = (0, os_1.type)().toLowerCase();
|
|
17
18
|
const PICO_BRANCH = '2.0.0';
|
|
@@ -35,7 +36,7 @@ async function default_1() {
|
|
|
35
36
|
// 0. ensure pico install directory and Moddable exists
|
|
36
37
|
if (!(0, moddable_1.moddableExists)()) {
|
|
37
38
|
spinner.fail('Moddable platform tooling required. Run `xs-dev setup` before trying again.');
|
|
38
|
-
|
|
39
|
+
return (0, errors_1.failure)('Moddable platform tooling required. Run `xs-dev setup` before trying again.');
|
|
39
40
|
}
|
|
40
41
|
spinner.info('Ensuring pico directory');
|
|
41
42
|
gluegun_1.filesystem.dir(PICO_ROOT);
|
|
@@ -49,14 +50,18 @@ async function default_1() {
|
|
|
49
50
|
await gluegun_1.system.exec('brew install cmake');
|
|
50
51
|
spinner.succeed();
|
|
51
52
|
}
|
|
52
|
-
await (0, mac_1.installDeps)(spinner);
|
|
53
|
+
const result = await (0, mac_1.installDeps)(spinner);
|
|
54
|
+
if ((0, errors_1.isFailure)(result))
|
|
55
|
+
return result;
|
|
53
56
|
const brewPrefix = await gluegun_1.system.run('brew --prefix');
|
|
54
57
|
process.env.PICO_GCC_ROOT = brewPrefix;
|
|
55
58
|
await (0, upsert_1.default)(constants_1.EXPORTS_FILE_PATH, `export PICO_GCC_ROOT=${brewPrefix}`);
|
|
56
59
|
}
|
|
57
60
|
if (OS === 'linux') {
|
|
58
61
|
spinner.start('Installing build dependencies with apt');
|
|
59
|
-
await (0, linux_1.installDeps)(spinner);
|
|
62
|
+
const result = await (0, linux_1.installDeps)(spinner);
|
|
63
|
+
if ((0, errors_1.isFailure)(result))
|
|
64
|
+
return result;
|
|
60
65
|
process.env.PICO_GCC_ROOT = '/usr';
|
|
61
66
|
await (0, upsert_1.default)(constants_1.EXPORTS_FILE_PATH, `export PICO_GCC_ROOT=/usr`);
|
|
62
67
|
}
|
|
@@ -183,5 +188,6 @@ Successfully set up pico platform support for Moddable!
|
|
|
183
188
|
Test out the setup by starting a new terminal session and putting the device into programming mode by holding the BOOTSEL button when powering on the Pico
|
|
184
189
|
Then run: xs-dev run --example helloworld --device pico
|
|
185
190
|
`);
|
|
191
|
+
return (0, errors_1.successVoid)();
|
|
186
192
|
}
|
|
187
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
193
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"pico.js","sourceRoot":"","sources":["../../../../src/toolbox/setup/pico.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ const moddable_1 = require("./moddable");
|
|
|
11
11
|
const upsert_1 = __importDefault(require("../patching/upsert"));
|
|
12
12
|
const exec_1 = require("../system/exec");
|
|
13
13
|
const homebrew_1 = require("./homebrew");
|
|
14
|
+
const errors_1 = require("../system/errors");
|
|
14
15
|
async function default_1() {
|
|
15
16
|
const OS = (0, os_1.type)().toLowerCase();
|
|
16
17
|
const EMSDK_REPO = 'https://github.com/emscripten-core/emsdk.git';
|
|
@@ -21,10 +22,10 @@ async function default_1() {
|
|
|
21
22
|
await (0, exec_1.sourceEnvironment)();
|
|
22
23
|
const spinner = gluegun_1.print.spin({ stream: process.stdout });
|
|
23
24
|
spinner.start('Setting up wasm simulator tools');
|
|
24
|
-
// 0. ensure wasm
|
|
25
|
+
// 0. ensure wasm install directory and Moddable exists
|
|
25
26
|
if (!(0, moddable_1.moddableExists)()) {
|
|
26
27
|
spinner.fail('Moddable platform tooling required. Run `xs-dev setup` before trying again.');
|
|
27
|
-
|
|
28
|
+
return (0, errors_1.failure)('Moddable platform tooling required. Run `xs-dev setup` before trying again.');
|
|
28
29
|
}
|
|
29
30
|
spinner.info('Ensuring wasm directory');
|
|
30
31
|
gluegun_1.filesystem.dir(WASM_DIR);
|
|
@@ -61,7 +62,7 @@ async function default_1() {
|
|
|
61
62
|
}
|
|
62
63
|
catch (error) {
|
|
63
64
|
spinner.fail(`Error activating emsdk: ${String(error)}`);
|
|
64
|
-
|
|
65
|
+
return (0, errors_1.failure)(`Error activating emsdk: ${String(error)}`);
|
|
65
66
|
}
|
|
66
67
|
}
|
|
67
68
|
spinner.succeed('emsdk setup complete');
|
|
@@ -79,7 +80,7 @@ async function default_1() {
|
|
|
79
80
|
catch (error) {
|
|
80
81
|
if (error instanceof Error) {
|
|
81
82
|
gluegun_1.print.info(`${error.message} cmake`);
|
|
82
|
-
|
|
83
|
+
return (0, errors_1.failure)(`${error.message} cmake`);
|
|
83
84
|
}
|
|
84
85
|
}
|
|
85
86
|
spinner.start('Cmake required, installing with Homebrew');
|
|
@@ -120,5 +121,6 @@ async function default_1() {
|
|
|
120
121
|
stdout: process.stdout,
|
|
121
122
|
});
|
|
122
123
|
spinner.succeed(`Successfully set up wasm platform support for Moddable! Test out the setup by starting a new terminal session and running: xs-dev run --example helloworld --device wasm`);
|
|
124
|
+
return (0, errors_1.successVoid)();
|
|
123
125
|
}
|
|
124
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
126
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2FzbS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy90b29sYm94L3NldHVwL3dhc20udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFVQSw0QkF5SkM7QUFuS0QscUNBQW1EO0FBQ25ELDJCQUF5QztBQUN6QywyQ0FBNEQ7QUFDNUQseUNBQTJDO0FBQzNDLGdFQUF1QztBQUN2Qyx5Q0FBZ0U7QUFDaEUseUNBQTJDO0FBQzNDLDZDQUF1RDtBQUd4QyxLQUFLO0lBQ2xCLE1BQU0sRUFBRSxHQUFHLElBQUEsU0FBWSxHQUFFLENBQUMsV0FBVyxFQUFFLENBQUE7SUFDdkMsTUFBTSxVQUFVLEdBQUcsOENBQThDLENBQUE7SUFDakUsTUFBTSxhQUFhLEdBQUcsNkNBQTZDLENBQUE7SUFDbkUsTUFBTSxRQUFRLEdBQUcsb0JBQVUsQ0FBQyxPQUFPLENBQUMsdUJBQVcsRUFBRSxNQUFNLENBQUMsQ0FBQTtJQUN4RCxNQUFNLFVBQVUsR0FBRyxvQkFBVSxDQUFDLE9BQU8sQ0FBQyxRQUFRLEVBQUUsT0FBTyxDQUFDLENBQUE7SUFDeEQsTUFBTSxhQUFhLEdBQUcsb0JBQVUsQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFLFVBQVUsQ0FBQyxDQUFBO0lBRTlELE1BQU0sSUFBQSx3QkFBaUIsR0FBRSxDQUFBO0lBRXpCLE1BQU0sT0FBTyxHQUFHLGVBQUssQ0FBQyxJQUFJLENBQUMsRUFBRSxNQUFNLEVBQUUsT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUE7SUFDdEQsT0FBTyxDQUFDLEtBQUssQ0FBQyxpQ0FBaUMsQ0FBQyxDQUFBO0lBRWhELHVEQUF1RDtJQUN2RCxJQUFJLENBQUMsSUFBQSx5QkFBYyxHQUFFLEVBQUUsQ0FBQztRQUN0QixPQUFPLENBQUMsSUFBSSxDQUNWLDZFQUE2RSxDQUM5RSxDQUFBO1FBQ0QsT0FBTyxJQUFBLGdCQUFPLEVBQ1osNkVBQTZFLENBQzlFLENBQUE7SUFDSCxDQUFDO0lBQ0QsT0FB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
|
|
@@ -14,6 +14,7 @@ const upsert_1 = __importDefault(require("../patching/upsert"));
|
|
|
14
14
|
const windows_shortcuts_1 = __importDefault(require("windows-shortcuts"));
|
|
15
15
|
const util_1 = require("util");
|
|
16
16
|
const moddable_1 = require("./moddable");
|
|
17
|
+
const errors_1 = require("../system/errors");
|
|
17
18
|
const wsPromise = (0, util_1.promisify)(windows_shortcuts_1.default.create);
|
|
18
19
|
const SHORTCUT = gluegun_1.filesystem.resolve(constants_1.INSTALL_DIR, 'Moddable Command Prompt.lnk');
|
|
19
20
|
async function setEnv(name, permanentValue, envValue) {
|
|
@@ -38,8 +39,9 @@ async function ensureModdableCommandPrompt(spinner) {
|
|
|
38
39
|
else {
|
|
39
40
|
spinner.fail('Moddable tooling required. Run `xs-dev setup` before trying again.');
|
|
40
41
|
}
|
|
41
|
-
|
|
42
|
+
return (0, errors_1.failure)('Moddable tooling required.');
|
|
42
43
|
}
|
|
44
|
+
return (0, errors_1.successVoid)();
|
|
43
45
|
}
|
|
44
46
|
async function default_1({ sourceRepo, branch, release, interactive, }) {
|
|
45
47
|
const BIN_PATH = gluegun_1.filesystem.resolve(constants_1.INSTALL_PATH, 'build', 'bin', 'win', 'release');
|
|
@@ -59,7 +61,7 @@ async function default_1({ sourceRepo, branch, release, interactive, }) {
|
|
|
59
61
|
gluegun_1.print.info('Or xs-dev can manage installing Visual Studio 2022 Community and other dependencies using the Windows Package Manager Client (winget).');
|
|
60
62
|
gluegun_1.print.info('You can install winget via the App Installer package in the Microsoft Store.');
|
|
61
63
|
gluegun_1.print.info('Please install either Visual Studio 2022 Community or winget, then launch a new xs86 Native Tools Command Prompt for VS 2022 and re-run this setup.');
|
|
62
|
-
|
|
64
|
+
return (0, errors_1.failure)('Visual Studio 2022 Community is required to build the Moddable SDK');
|
|
63
65
|
}
|
|
64
66
|
gluegun_1.print.error('Visual Studio 2022 Community is required to build the Moddable SDK but has not been detected');
|
|
65
67
|
gluegun_1.print.error('If you already have VS 2022 Community installed, please run "xs-dev setup" from the x86 Native Tools Command Prompt for VS 2022');
|
|
@@ -67,7 +69,7 @@ async function default_1({ sourceRepo, branch, release, interactive, }) {
|
|
|
67
69
|
const response = await gluegun_1.prompt.confirm('Would you like for xs-dev to install VS 2022 Community for you?');
|
|
68
70
|
if (!response) {
|
|
69
71
|
gluegun_1.print.info('Okay. Please manually install VS 2022 Community from https://www.visualstudio.com/downloads/ if necessary and then run "xs-dev setup" from the x86 Native Tools Command Prompt for VS 2022');
|
|
70
|
-
|
|
72
|
+
return (0, errors_1.failure)('Please manually install VS 2022 Community');
|
|
71
73
|
}
|
|
72
74
|
gluegun_1.print.info('Okay. Installing Visual Studio 2022 Community from winget...');
|
|
73
75
|
try {
|
|
@@ -75,13 +77,13 @@ async function default_1({ sourceRepo, branch, release, interactive, }) {
|
|
|
75
77
|
}
|
|
76
78
|
catch (error) {
|
|
77
79
|
gluegun_1.print.error('Visual Studio 2022 Community install failed');
|
|
78
|
-
|
|
80
|
+
return (0, errors_1.failure)('Visual Studio 2022 Community install failed');
|
|
79
81
|
}
|
|
80
82
|
gluegun_1.print.info('Visual Studio 2022 Community successfully installed.');
|
|
81
83
|
gluegun_1.print.info('The "Desktop development for C++" workload must be manually installed.');
|
|
82
84
|
gluegun_1.print.info('From your Start Menu, select Visual Studio Installer. Then "Modify." Then select "Desktop development with C++" Then "Modify" again.');
|
|
83
85
|
gluegun_1.print.info('When complete, please close this window and launch the "x86 Native Tools Command Prompt for VS 2022" from the start menu.');
|
|
84
|
-
|
|
86
|
+
return (0, errors_1.successVoid)();
|
|
85
87
|
}
|
|
86
88
|
if (gluegun_1.system.which('git') === null) {
|
|
87
89
|
try {
|
|
@@ -93,7 +95,7 @@ async function default_1({ sourceRepo, branch, release, interactive, }) {
|
|
|
93
95
|
gluegun_1.print.info('Or xs-dev can manage installing git and other dependencies using the Windows Package Manager Client (winget).');
|
|
94
96
|
gluegun_1.print.info('You can install winget via the App Installer package in the Microsoft Store.');
|
|
95
97
|
gluegun_1.print.info('Please install either git or winget, then launch a new xs86 Native Tools Command Prompt for VS 2022 and re-run this setup.');
|
|
96
|
-
|
|
98
|
+
return (0, errors_1.failure)('git is required to clone the Moddable SDK');
|
|
97
99
|
}
|
|
98
100
|
gluegun_1.print.info('Installing git from winget...');
|
|
99
101
|
try {
|
|
@@ -104,10 +106,10 @@ async function default_1({ sourceRepo, branch, release, interactive, }) {
|
|
|
104
106
|
}
|
|
105
107
|
catch (error) {
|
|
106
108
|
gluegun_1.print.error('git install failed');
|
|
107
|
-
|
|
109
|
+
return (0, errors_1.failure)('git install failed');
|
|
108
110
|
}
|
|
109
111
|
gluegun_1.print.info('git successfully installed. Please close this window and re-launch the x86 Native Tools Command Prompt for VS 2022, then re-run this setup.');
|
|
110
|
-
|
|
112
|
+
return (0, errors_1.successVoid)();
|
|
111
113
|
}
|
|
112
114
|
const spinner = gluegun_1.print.spin();
|
|
113
115
|
await (0, upsert_1.default)(constants_1.EXPORTS_FILE_PATH, '@echo off');
|
|
@@ -119,7 +121,7 @@ async function default_1({ sourceRepo, branch, release, interactive, }) {
|
|
|
119
121
|
}
|
|
120
122
|
catch (error) {
|
|
121
123
|
spinner.fail(`Error setting up install directory: ${String(error)}`);
|
|
122
|
-
|
|
124
|
+
return (0, errors_1.failure)(`Error setting up install directory: ${String(error)}`);
|
|
123
125
|
}
|
|
124
126
|
let buildTools = false;
|
|
125
127
|
if (gluegun_1.filesystem.exists(constants_1.INSTALL_PATH) !== false) {
|
|
@@ -129,7 +131,11 @@ async function default_1({ sourceRepo, branch, release, interactive, }) {
|
|
|
129
131
|
try {
|
|
130
132
|
if (release !== undefined && (branch === undefined || branch === null)) {
|
|
131
133
|
spinner.start(`Getting latest Moddable-OpenSource/moddable release`);
|
|
132
|
-
const
|
|
134
|
+
const remoteReleaseResult = await (0, moddable_1.fetchRelease)(release);
|
|
135
|
+
if ((0, errors_1.isFailure)(remoteReleaseResult)) {
|
|
136
|
+
throw new Error(remoteReleaseResult.error);
|
|
137
|
+
}
|
|
138
|
+
const remoteRelease = (0, errors_1.unwrap)(remoteReleaseResult);
|
|
133
139
|
if (remoteRelease.assets.length === 0) {
|
|
134
140
|
spinner.stop();
|
|
135
141
|
gluegun_1.print.warning(`Moddable release ${release} does not have any pre-built assets.`);
|
|
@@ -138,7 +144,7 @@ async function default_1({ sourceRepo, branch, release, interactive, }) {
|
|
|
138
144
|
(await gluegun_1.prompt.confirm('Would you like to continue setting up and build the SDK locally?', true));
|
|
139
145
|
if (!buildTools) {
|
|
140
146
|
gluegun_1.print.info('Please select another release version with pre-built assets: https://github.com/Moddable-OpenSource/moddable/releases');
|
|
141
|
-
|
|
147
|
+
return (0, errors_1.successVoid)();
|
|
142
148
|
}
|
|
143
149
|
spinner.start();
|
|
144
150
|
}
|
|
@@ -168,7 +174,7 @@ async function default_1({ sourceRepo, branch, release, interactive, }) {
|
|
|
168
174
|
}
|
|
169
175
|
catch (error) {
|
|
170
176
|
spinner.fail(`Error cloning moddable repo: ${String(error)}`);
|
|
171
|
-
|
|
177
|
+
return (0, errors_1.failure)(`Error cloning moddable repo: ${String(error)}`);
|
|
172
178
|
}
|
|
173
179
|
}
|
|
174
180
|
// 2. configure MODDABLE env variable, add release binaries dir to PATH
|
|
@@ -191,7 +197,7 @@ async function default_1({ sourceRepo, branch, release, interactive, }) {
|
|
|
191
197
|
}
|
|
192
198
|
catch (error) {
|
|
193
199
|
spinner.fail(`Error building Moddable SDK tools: ${String(error)}`);
|
|
194
|
-
|
|
200
|
+
return (0, errors_1.failure)(`Error building Moddable SDK tools: ${String(error)}`);
|
|
195
201
|
}
|
|
196
202
|
}
|
|
197
203
|
// 4. create Windows shortcut
|
|
@@ -219,5 +225,6 @@ async function default_1({ sourceRepo, branch, release, interactive, }) {
|
|
|
219
225
|
gluegun_1.print.info(`The Moddable Command Prompt will now open for you in a new Window. Please close this Command Prompt and use the Moddable Command Prompt instead.`);
|
|
220
226
|
gluegun_1.print.info(`As a next step, try running the "helloworld example" in the Moddable Command Prompt: xs-dev run --example helloworld'`);
|
|
221
227
|
await openModdableCommandPrompt();
|
|
228
|
+
return (0, errors_1.successVoid)();
|
|
222
229
|
}
|
|
223
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"windows.js","sourceRoot":"","sources":["../../../../src/toolbox/setup/windows.ts"],"names":[],"mappings":"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"}
|
|
230
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"windows.js","sourceRoot":"","sources":["../../../../src/toolbox/setup/windows.ts"],"names":[],"mappings":"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"}
|