xs-dev 0.32.2 → 0.32.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.
Files changed (70) hide show
  1. package/bin/xs-dev +1 -0
  2. package/build/commands/build.js +4 -3
  3. package/build/commands/clean.js +4 -3
  4. package/build/commands/debug.js +2 -1
  5. package/build/commands/doctor.js +16 -41
  6. package/build/commands/include.js +12 -10
  7. package/build/commands/init.js +6 -8
  8. package/build/commands/remove.js +16 -9
  9. package/build/commands/run.js +4 -3
  10. package/build/commands/scan.js +3 -3
  11. package/build/commands/setup.js +3 -9
  12. package/build/commands/teardown.js +2 -1
  13. package/build/commands/update.js +2 -1
  14. package/build/commands/xs-dev.js +2 -1
  15. package/build/toolbox/build/index.js +41 -101
  16. package/build/toolbox/patching/upsert.js +2 -2
  17. package/build/toolbox/prompt/choices.js +3 -5
  18. package/build/toolbox/prompt/devices.js +1 -1
  19. package/build/toolbox/scan/parse.js +2 -3
  20. package/build/toolbox/setup/constants.js +8 -10
  21. package/build/toolbox/setup/ejectfix.js +3 -4
  22. package/build/toolbox/setup/esp32/linux.js +2 -3
  23. package/build/toolbox/setup/esp32/mac.js +8 -12
  24. package/build/toolbox/setup/esp32/windows.js +4 -5
  25. package/build/toolbox/setup/esp32.js +7 -10
  26. package/build/toolbox/setup/esp8266/linux.js +2 -3
  27. package/build/toolbox/setup/esp8266/mac.js +2 -3
  28. package/build/toolbox/setup/esp8266/windows.js +10 -12
  29. package/build/toolbox/setup/esp8266.js +4 -4
  30. package/build/toolbox/setup/homebrew.js +4 -7
  31. package/build/toolbox/setup/linux.js +3 -3
  32. package/build/toolbox/setup/mac.js +3 -3
  33. package/build/toolbox/setup/moddable.js +12 -19
  34. package/build/toolbox/setup/nrf52/windows.js +4 -5
  35. package/build/toolbox/setup/nrf52.js +9 -16
  36. package/build/toolbox/setup/pico/linux.js +2 -3
  37. package/build/toolbox/setup/pico/mac.js +5 -11
  38. package/build/toolbox/setup/pico.js +3 -3
  39. package/build/toolbox/setup/wasm.js +7 -7
  40. package/build/toolbox/setup/windows.js +18 -24
  41. package/build/toolbox/system/exec.js +25 -35
  42. package/build/toolbox/system/python.js +4 -5
  43. package/build/toolbox/update/esp32.js +5 -9
  44. package/build/toolbox/update/esp8266.js +2 -2
  45. package/build/toolbox/update/linux.js +2 -2
  46. package/build/toolbox/update/mac.js +2 -2
  47. package/build/toolbox/update/nrf52.js +2 -2
  48. package/build/toolbox/update/pico.js +5 -9
  49. package/build/toolbox/update/wasm.js +2 -2
  50. package/build/toolbox/update/windows.js +2 -2
  51. package/build/types/commands/xs-dev.d.ts +1 -1
  52. package/build/types/extensions/build-extension.d.ts +1 -1
  53. package/build/types/toolbox/build/index.d.ts +2 -2
  54. package/build/types/toolbox/prompt/devices.d.ts +1 -1
  55. package/build/types/toolbox/scan/parse.d.ts +1 -2
  56. package/build/types/toolbox/setup/linux.d.ts +2 -2
  57. package/build/types/toolbox/setup/mac.d.ts +2 -2
  58. package/build/types/toolbox/setup/moddable.d.ts +3 -3
  59. package/build/types/toolbox/setup/nrf52/windows.d.ts +1 -1
  60. package/build/types/toolbox/setup/pico/mac.d.ts +1 -1
  61. package/build/types/toolbox/setup/windows.d.ts +3 -3
  62. package/build/types/toolbox/system/exec.d.ts +5 -1
  63. package/build/types/toolbox/update/linux.d.ts +1 -1
  64. package/build/types/toolbox/update/mac.d.ts +1 -1
  65. package/build/types/types.d.ts +1 -1
  66. package/docs/src/content/config.ts +3 -3
  67. package/docs/src/content/docs/guide/00-prepare.md +2 -2
  68. package/docs/src/content/docs/guide/02-blinky.md +2 -2
  69. package/package.json +14 -12
  70. package/tsconfig.json +10 -3
@@ -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.build = void 0;
6
+ exports.build = build;
7
7
  const node_child_process_1 = require("node:child_process");
8
8
  const node_os_1 = require("node:os");
9
9
  const serve_handler_1 = __importDefault(require("serve-handler"));
@@ -20,8 +20,8 @@ const DEPLOY_TARGET = Object.freeze({
20
20
  push: 'build',
21
21
  run: 'all',
22
22
  });
23
- async function build({ listDevices, port, example, listExamples, log = false, projectPath, targetPlatform, mode, deployStatus, outputDir, config = {}, }) {
24
- var _a, _b, _c, _d, _e, _f, _g;
23
+ async function build({ listDevices, port, example, listExamples, log = false, projectPath, targetPlatform, mode, deployStatus, outputDir, config = {} }) {
24
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
25
25
  const OS = (0, node_os_1.type)().toLowerCase();
26
26
  await (0, exec_1.sourceEnvironment)();
27
27
  if (!(0, moddable_1.moddableExists)()) {
@@ -30,67 +30,17 @@ async function build({ listDevices, port, example, listExamples, log = false, pr
30
30
  }
31
31
  outputDir !== null && outputDir !== void 0 ? outputDir : (outputDir = gluegun_1.filesystem.resolve(String(process.env.MODDABLE), 'build'));
32
32
  if (listDevices) {
33
- const choices = [
34
- 'esp',
35
- 'esp/moddable_zero',
36
- 'esp/moddable_one',
37
- 'esp/moddable_three',
38
- 'esp/nodemcu',
39
- 'esp32',
40
- 'esp32/moddable_two',
41
- 'esp32/nodemcu',
42
- 'esp32/m5stack',
43
- 'esp32/m5stack_core2',
44
- 'esp32/m5stack_fire',
45
- 'esp32/m5stick_c',
46
- 'esp32/m5stick_cplus',
47
- 'esp32/m5atom_echo',
48
- 'esp32/m5atom_lite',
49
- 'esp32/m5atom_matrix',
50
- 'esp32/m5atom_u',
51
- 'esp32/m5paper',
52
- 'esp32/m5core_ink',
53
- 'esp32/heltec_wifi_kit_32',
54
- 'esp32/esp32_thing',
55
- 'esp32/esp32_thing_plus',
56
- 'esp32/wrover_kit',
57
- 'esp32/kaluga',
58
- 'esp32/saola_wroom',
59
- 'esp32/saola_wrover',
60
- 'esp32/esp32s3',
61
- 'esp32/esp32c3',
62
- 'esp32/c3_32s_kit',
63
- 'esp32/c3_32s_kit_2m',
64
- 'wasm',
65
- 'pico',
66
- 'pico/pico_w',
67
- 'pico/ili9341',
68
- 'pico/pico_display',
69
- 'pico/pico_display_2',
70
- 'pico/pico_lcd_1.3',
71
- 'pico/itsybitsy',
72
- 'pico/lilygo_t_display',
73
- 'pico/picosystem',
74
- 'pico/qtpy',
75
- 'pico/tiny2040',
76
- 'pico/xiao_rp2040',
77
- 'pico/pro_micro',
78
- 'nrf52/moddable_four',
79
- 'nrf52/dk',
80
- 'nrf52/sparkfun',
81
- 'nrf52/makerdiary',
82
- 'nrf52/xiao',
83
- 'nrf52/itsybitsy',
84
- 'simulator/moddable_one',
85
- 'simulator/moddable_two',
86
- 'simulator/moddable_three',
87
- 'simulator/moddable_four',
88
- 'simulator/m5stickc',
89
- 'simulator/m5paper',
90
- 'simulator/nodemcu',
91
- 'simulator/pico_display',
92
- 'simulator/pico_display_2',
93
- ];
33
+ const deviceTargetsPath = gluegun_1.filesystem.resolve(String(process.env.MODDABLE), 'build', 'devices');
34
+ const simulatorsPath = gluegun_1.filesystem.resolve(String(process.env.MODDABLE), 'build', 'simulators');
35
+ const devices = (_b = (_a = gluegun_1.filesystem.inspectTree(deviceTargetsPath)) === null || _a === void 0 ? void 0 : _a.children) !== null && _b !== void 0 ? _b : [];
36
+ const deviceTargets = devices.flatMap(dev => {
37
+ const targets = dev.children
38
+ .filter(c => c.name === 'targets')
39
+ .flatMap(c => c.children.flatMap(dir => (0, choices_1.collectChoicesFromTree)(dir, [], `${dev.name}/`)));
40
+ return [dev.name].concat(targets);
41
+ });
42
+ const simulators = (_e = (_d = (_c = gluegun_1.filesystem.inspectTree(simulatorsPath)) === null || _c === void 0 ? void 0 : _c.children) === null || _d === void 0 ? void 0 : _d.flatMap(sim => (0, choices_1.collectChoicesFromTree)(sim, [], `simulator/`))) !== null && _e !== void 0 ? _e : [];
43
+ const choices = deviceTargets.concat(simulators, 'wasm', devices_1.DEVICE_ALIAS[OS]);
94
44
  const { device: selectedDevice } = await gluegun_1.prompt.ask([
95
45
  {
96
46
  type: 'autocomplete',
@@ -108,49 +58,51 @@ async function build({ listDevices, port, example, listExamples, log = false, pr
108
58
  }
109
59
  }
110
60
  if (targetPlatform !== '') {
111
- if (targetPlatform.includes('esp32')) {
112
- if (typeof process.env.IDF_PATH !== 'string' ||
113
- gluegun_1.filesystem.exists(process.env.IDF_PATH) !== 'dir') {
61
+ const startsWithSimulator = targetPlatform.startsWith('simulator');
62
+ if (targetPlatform.includes('esp32') && !startsWithSimulator) {
63
+ if (typeof process.env.IDF_PATH !== 'string' || gluegun_1.filesystem.exists(process.env.IDF_PATH) !== 'dir') {
114
64
  gluegun_1.print.error('The current environment does not appear to be set up for the ESP32 build target. Please run `xs-dev setup --device esp32` before trying again.');
115
65
  process.exit(1);
116
66
  }
67
+ else {
68
+ await (0, exec_1.sourceIdfPythonEnv)();
69
+ }
117
70
  }
118
- else if (targetPlatform.includes('esp')) {
119
- if (typeof process.env.ESP_BASE !== 'string' ||
120
- gluegun_1.filesystem.exists(process.env.ESP_BASE) !== 'dir') {
71
+ else if (targetPlatform.includes('esp') && !startsWithSimulator) {
72
+ if (typeof process.env.ESP_BASE !== 'string' || gluegun_1.filesystem.exists(process.env.ESP_BASE) !== 'dir') {
121
73
  gluegun_1.print.error('The current environment does not appear to be set up for the ESP8266 build target. Please run `xs-dev setup --device esp8266` before trying again.');
122
74
  process.exit(1);
123
75
  }
124
76
  }
125
- if (targetPlatform.includes('wasm')) {
126
- if (!((_a = process.env.PATH) !== null && _a !== void 0 ? _a : '').includes('binaryen') ||
127
- gluegun_1.filesystem.exists((_b = process.env.EMSDK) !== null && _b !== void 0 ? _b : '') !== 'dir' ||
128
- gluegun_1.filesystem.exists((_c = process.env.EMSDK_NODE) !== null && _c !== void 0 ? _c : '') !== 'file' ||
129
- gluegun_1.filesystem.exists((_d = process.env.EMSDK_PYTHON) !== null && _d !== void 0 ? _d : '') !== 'file') {
77
+ if (targetPlatform.includes('wasm') && !startsWithSimulator) {
78
+ if (!((_f = process.env.PATH) !== null && _f !== void 0 ? _f : '').includes('binaryen') || gluegun_1.filesystem.exists((_g = process.env.EMSDK) !== null && _g !== void 0 ? _g : '') !== 'dir' || gluegun_1.filesystem.exists((_h = process.env.EMSDK_NODE) !== null && _h !== void 0 ? _h : '') !== 'file' || gluegun_1.filesystem.exists((_j = process.env.EMSDK_PYTHON) !== null && _j !== void 0 ? _j : '') !== 'file') {
130
79
  gluegun_1.print.error('The current environment does not appear to be set up for the wasm build target. Please run `xs-dev setup --device wasm` before trying again.');
131
80
  process.exit(1);
132
81
  }
133
82
  }
134
- if (targetPlatform.includes('pico')) {
135
- if (typeof process.env.PICO_SDK_PATH !== 'string' ||
136
- gluegun_1.filesystem.exists(process.env.PICO_SDK_PATH) !== 'dir' ||
137
- gluegun_1.system.which('picotool') === null ||
138
- gluegun_1.filesystem.exists((_e = process.env.PIOASM) !== null && _e !== void 0 ? _e : '') !== 'file') {
83
+ if (targetPlatform.includes('pico') && !startsWithSimulator) {
84
+ if (typeof process.env.PICO_SDK_PATH !== 'string' || gluegun_1.filesystem.exists(process.env.PICO_SDK_PATH) !== 'dir' || gluegun_1.system.which('picotool') === null || gluegun_1.filesystem.exists((_k = process.env.PIOASM) !== null && _k !== void 0 ? _k : '') !== 'file') {
139
85
  gluegun_1.print.error('The current environment does not appear to be set up for the pico build target. Please run `xs-dev setup --device pico` before trying again.');
140
86
  process.exit(1);
141
87
  }
142
88
  }
89
+ if (targetPlatform.includes('nrf52') && !startsWithSimulator) {
90
+ if (typeof process.env.NRF_ROOT !== 'string' || typeof process.env.NRF_SDK_DIR !== 'string' || gluegun_1.filesystem.exists(process.env.NRF_ROOT) !== 'dir' || gluegun_1.filesystem.exists(process.env.NRF_SDK_DIR) !== 'dir') {
91
+ gluegun_1.print.error('The current environment does not appear to be set up for the nrf52 build target. Please run `xs-dev setup --device nrf52` before trying again.');
92
+ process.exit(1);
93
+ }
94
+ }
143
95
  }
144
96
  if (listExamples) {
145
97
  const exampleProjectPath = gluegun_1.filesystem.resolve(String(process.env.MODDABLE), 'examples');
146
98
  const contributedProjectPath = gluegun_1.filesystem.resolve(String(process.env.MODDABLE), 'contributed');
147
- const examples = (_f = gluegun_1.filesystem.inspectTree(exampleProjectPath)) === null || _f === void 0 ? void 0 : _f.children;
148
- const contributed = (_g = gluegun_1.filesystem.inspectTree(contributedProjectPath)) === null || _g === void 0 ? void 0 : _g.children;
99
+ const examples = (_l = gluegun_1.filesystem.inspectTree(exampleProjectPath)) === null || _l === void 0 ? void 0 : _l.children;
100
+ const contributed = (_m = gluegun_1.filesystem.inspectTree(contributedProjectPath)) === null || _m === void 0 ? void 0 : _m.children;
149
101
  const choices = examples !== undefined
150
102
  ? examples.map((example) => (0, choices_1.collectChoicesFromTree)(example)).flat()
151
103
  : [];
152
104
  if (contributed !== undefined)
153
- choices.push(...contributed.map((project) => (0, choices_1.collectChoicesFromTree)(project)).flat());
105
+ choices.push(...contributed.flatMap(project => (0, choices_1.collectChoicesFromTree)(project)));
154
106
  const { example: selectedExample } = await gluegun_1.prompt.ask([
155
107
  {
156
108
  type: 'autocomplete',
@@ -171,22 +123,17 @@ async function build({ listDevices, port, example, listExamples, log = false, pr
171
123
  if (example !== undefined) {
172
124
  const exampleProjectPath = gluegun_1.filesystem.resolve(String(process.env.MODDABLE), 'examples', example);
173
125
  const contributedProjectPath = gluegun_1.filesystem.resolve(String(process.env.MODDABLE), 'contributed', example);
174
- if (gluegun_1.filesystem.exists(exampleProjectPath) === false &&
175
- gluegun_1.filesystem.exists(contributedProjectPath) === false) {
126
+ if (gluegun_1.filesystem.exists(exampleProjectPath) === false && gluegun_1.filesystem.exists(contributedProjectPath) === false) {
176
127
  gluegun_1.print.error('Example project does not exist.');
177
128
  gluegun_1.print.info(`Lookup the available examples: xs-dev run --list-examples`);
178
129
  process.exit(1);
179
130
  }
180
- if (gluegun_1.filesystem.exists(gluegun_1.filesystem.resolve(exampleProjectPath, 'manifest.json')) === false &&
181
- gluegun_1.filesystem.exists(gluegun_1.filesystem.resolve(contributedProjectPath, 'manifest.json')) === false) {
131
+ if (gluegun_1.filesystem.exists(gluegun_1.filesystem.resolve(exampleProjectPath, 'manifest.json')) === false && gluegun_1.filesystem.exists(gluegun_1.filesystem.resolve(contributedProjectPath, 'manifest.json')) === false) {
182
132
  gluegun_1.print.error('Example project must contain a manifest.json.');
183
133
  gluegun_1.print.info(`Lookup the available examples: xs-dev run --list-examples`);
184
134
  process.exit(1);
185
135
  }
186
- projectPath =
187
- gluegun_1.filesystem.exists(exampleProjectPath) === 'dir'
188
- ? exampleProjectPath
189
- : contributedProjectPath;
136
+ projectPath = gluegun_1.filesystem.exists(exampleProjectPath) === 'dir' ? exampleProjectPath : contributedProjectPath;
190
137
  }
191
138
  if (port !== undefined) {
192
139
  process.env.UPLOAD_PORT = port;
@@ -217,20 +164,14 @@ async function build({ listDevices, port, example, listExamples, log = false, pr
217
164
  Object.entries(config).forEach(([element, value]) => {
218
165
  configArgs.push(`${element}="${value}"`);
219
166
  });
220
- const canUseMCPack = gluegun_1.system.which('mcpack') !== null &&
221
- gluegun_1.filesystem.exists(gluegun_1.filesystem.resolve(projectPath, 'package.json')) ===
222
- 'file';
167
+ const canUseMCPack = gluegun_1.system.which('mcpack') !== null && gluegun_1.filesystem.exists(gluegun_1.filesystem.resolve(projectPath, 'package.json')) === 'file';
223
168
  let rootCommand = 'mcconfig';
224
169
  if (canUseMCPack) {
225
170
  rootCommand = 'mcpack';
226
171
  configArgs.unshift('mcconfig');
227
172
  }
228
173
  if (log) {
229
- const logOutput = (0, node_child_process_1.spawn)(rootCommand, configArgs, {
230
- cwd: projectPath,
231
- stdio: 'inherit',
232
- shell: true,
233
- });
174
+ const logOutput = (0, node_child_process_1.spawn)(rootCommand, configArgs, { cwd: projectPath, stdio: 'inherit', shell: true });
234
175
  logOutput.on('close', (exitCode) => {
235
176
  if (exitCode !== null) {
236
177
  process.exit(exitCode);
@@ -274,5 +215,4 @@ async function build({ listDevices, port, example, listExamples, log = false, pr
274
215
  process.exit(0);
275
216
  }
276
217
  }
277
- exports.build = build;
278
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/toolbox/build/index.ts"],"names":[],"mappings":"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"}
218
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/toolbox/build/index.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.default = default_1;
3
4
  const gluegun_1 = require("gluegun");
4
5
  async function default_1(filePath, newLine) {
5
6
  gluegun_1.filesystem.file(filePath);
@@ -10,5 +11,4 @@ async function default_1(filePath, newLine) {
10
11
  return contents;
11
12
  });
12
13
  }
13
- exports.default = default_1;
14
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBzZXJ0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3Rvb2xib3gvcGF0Y2hpbmcvdXBzZXJ0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEscUNBQThDO0FBRS9CLEtBQUssb0JBQ2xCLFFBQWdCLEVBQ2hCLE9BQWU7SUFFZixvQkFBVSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQTtJQUV6QixNQUFNLGtCQUFRLENBQUMsTUFBTSxDQUFDLFFBQVEsRUFBRSxDQUFDLFFBQWdCLEVBQUUsRUFBRTtRQUNuRCxJQUFJLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsRUFBRTtZQUMvQixPQUFPLENBQUMsUUFBUSxFQUFFLE9BQU8sQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQTtTQUN0QztRQUNELE9BQU8sUUFBUSxDQUFBO0lBQ2pCLENBQUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQztBQVpELDRCQVlDIn0=
14
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBzZXJ0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3Rvb2xib3gvcGF0Y2hpbmcvdXBzZXJ0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBRUEsNEJBWUM7QUFkRCxxQ0FBOEM7QUFFL0IsS0FBSyxvQkFDbEIsUUFBZ0IsRUFDaEIsT0FBZTtJQUVmLG9CQUFVLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFBO0lBRXpCLE1BQU0sa0JBQVEsQ0FBQyxNQUFNLENBQUMsUUFBUSxFQUFFLENBQUMsUUFBZ0IsRUFBRSxFQUFFO1FBQ25ELElBQUksQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7WUFDaEMsT0FBTyxDQUFDLFFBQVEsRUFBRSxPQUFPLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUE7UUFDdkMsQ0FBQztRQUNELE9BQU8sUUFBUSxDQUFBO0lBQ2pCLENBQUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQyJ9
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.collectChoicesFromTree = void 0;
3
+ exports.collectChoicesFromTree = collectChoicesFromTree;
4
4
  function collectChoicesFromTree(fd, results = [], root = '') {
5
5
  if (fd.type === 'dir' &&
6
6
  fd.children.find((file) => file.name === 'manifest.json') !== undefined) {
@@ -8,10 +8,8 @@ function collectChoicesFromTree(fd, results = [], root = '') {
8
8
  }
9
9
  else if (fd.type === 'dir') {
10
10
  results.concat(fd.children
11
- .map((child) => collectChoicesFromTree(child, results, `${root}${fd.name}/`))
12
- .flat());
11
+ .flatMap((child) => collectChoicesFromTree(child, results, `${root}${fd.name}/`)));
13
12
  }
14
13
  return results.flat();
15
14
  }
16
- exports.collectChoicesFromTree = collectChoicesFromTree;
17
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hvaWNlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy90b29sYm94L3Byb21wdC9jaG9pY2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQU1BLFNBQWdCLHNCQUFzQixDQUNwQyxFQUFxQixFQUNyQixVQUFvQixFQUFFLEVBQ3RCLE9BQWUsRUFBRTtJQUVqQixJQUNFLEVBQUUsQ0FBQyxJQUFJLEtBQUssS0FBSztRQUNqQixFQUFFLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLElBQUksS0FBSyxlQUFlLENBQUMsS0FBSyxTQUFTLEVBQ3ZFO1FBQ0EsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFBO0tBQzdCO1NBQU0sSUFBSSxFQUFFLENBQUMsSUFBSSxLQUFLLEtBQUssRUFBRTtRQUM1QixPQUFPLENBQUMsTUFBTSxDQUNaLEVBQUUsQ0FBQyxRQUFRO2FBQ1IsR0FBRyxDQUFDLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FDYixzQkFBc0IsQ0FBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLEdBQUcsSUFBSSxHQUFHLEVBQUUsQ0FBQyxJQUFJLEdBQUcsQ0FBQyxDQUM3RDthQUNBLElBQUksRUFBRSxDQUNWLENBQUE7S0FDRjtJQUNELE9BQU8sT0FBTyxDQUFDLElBQUksRUFBRSxDQUFBO0FBQ3ZCLENBQUM7QUFwQkQsd0RBb0JDIn0=
15
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hvaWNlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy90b29sYm94L3Byb21wdC9jaG9pY2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBTUEsd0RBbUJDO0FBbkJELFNBQWdCLHNCQUFzQixDQUNwQyxFQUFxQixFQUNyQixVQUFvQixFQUFFLEVBQ3RCLElBQUksR0FBRyxFQUFFO0lBRVQsSUFDRSxFQUFFLENBQUMsSUFBSSxLQUFLLEtBQUs7UUFDakIsRUFBRSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxJQUFJLEtBQUssZUFBZSxDQUFDLEtBQUssU0FBUyxFQUN2RSxDQUFDO1FBQ0QsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFBO0lBQzlCLENBQUM7U0FBTSxJQUFJLEVBQUUsQ0FBQyxJQUFJLEtBQUssS0FBSyxFQUFFLENBQUM7UUFDN0IsT0FBTyxDQUFDLE1BQU0sQ0FDWixFQUFFLENBQUMsUUFBUTthQUNSLE9BQU8sQ0FBQyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQ2pCLHNCQUFzQixDQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsR0FBRyxJQUFJLEdBQUcsRUFBRSxDQUFDLElBQUksR0FBRyxDQUFDLENBQzdELENBQ0osQ0FBQTtJQUNILENBQUM7SUFDRCxPQUFPLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQTtBQUN2QixDQUFDIn0=
@@ -13,6 +13,6 @@ exports.DEVICE_ALIAS = Object.freeze({
13
13
  esp32: 'esp32',
14
14
  wasm: 'wasm',
15
15
  pico: 'pico',
16
- nrf52: 'nrf52',
16
+ nrf52: 'nrf52'
17
17
  });
18
18
  //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGV2aWNlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy90b29sYm94L3Byb21wdC9kZXZpY2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUVhLFFBQUEsWUFBWSxHQUF1QyxNQUFNLENBQUMsTUFBTSxDQUFDO0lBQzVFLE9BQU8sRUFBRSxLQUFLO0lBQ2QsTUFBTSxFQUFFLEtBQUs7SUFDYixHQUFHLEVBQUUsS0FBSztJQUNWLFVBQVUsRUFBRSxLQUFLO0lBQ2pCLEdBQUcsRUFBRSxLQUFLO0lBQ1YsS0FBSyxFQUFFLEtBQUs7SUFDWixHQUFHLEVBQUUsS0FBSztJQUNWLEdBQUcsRUFBRSxLQUFLO0lBQ1YsS0FBSyxFQUFFLE9BQU87SUFDZCxJQUFJLEVBQUUsTUFBTTtJQUNaLElBQUksRUFBRSxNQUFNO0lBQ1osS0FBSyxFQUFFLE9BQU87Q0FDZixDQUFDLENBQUEifQ==
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.parseScanResult = void 0;
3
+ exports.parseScanResult = parseScanResult;
4
4
  function parseEsptoolLines(lines) {
5
5
  let state = 'searching';
6
6
  let currentPort = null;
@@ -82,5 +82,4 @@ function parseScanResult(scans) {
82
82
  return { ...result, ...parseEsptoolLines(lines) };
83
83
  }, {});
84
84
  }
85
- exports.parseScanResult = parseScanResult;
86
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFyc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdG9vbGJveC9zY2FuL3BhcnNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUdBLFNBQVMsaUJBQWlCLENBQUMsS0FBZTtJQUN4QyxJQUFJLEtBQUssR0FBZSxXQUFXLENBQUE7SUFDbkMsSUFBSSxXQUFXLEdBQWtCLElBQUksQ0FBQTtJQUVyQyxPQUFPLEtBQUssQ0FBQyxNQUFNLENBQWEsQ0FBQyxNQUFNLEVBQUUsSUFBSSxFQUFFLEVBQUU7UUFDL0MsSUFBSSxLQUFLLEtBQUssV0FBVyxFQUFFO1lBQ3pCLElBQUksSUFBSSxDQUFDLFVBQVUsQ0FBQyxhQUFhLENBQUMsRUFBRTtnQkFDbEMsV0FBVyxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsY0FBYyxFQUFFLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLENBQUE7Z0JBQ25FLE1BQU0sQ0FBQyxXQUFXLENBQUMsR0FBRyxFQUFFLE1BQU0sRUFBRSxFQUFFLEVBQUUsUUFBUSxFQUFFLEVBQUUsRUFBRSxDQUFBO2dCQUNsRCxLQUFLLEdBQUcsV0FBVyxDQUFBO2FBQ3BCO1NBQ0Y7UUFFRCxJQUFJLEtBQUssS0FBSyxXQUFXLEVBQUU7WUFDekIsSUFBSSxJQUFJLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQyxJQUFJLFdBQVcsS0FBSyxJQUFJLEVBQUU7Z0JBQ3ZELE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVSxFQUFFLEVBQUUsQ0FBQyxDQUFBO2dCQUMzQyxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQTtnQkFDbkMsS0FBSyxHQUFHLGFBQWEsQ0FBQTthQUN0QjtZQUNELElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxtQkFBbUIsQ0FBQyxJQUFJLFdBQVcsS0FBSyxJQUFJLEVBQUU7Z0JBQzlELGdFQUFnRTtnQkFD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
85
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFyc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdG9vbGJveC9zY2FuL3BhcnNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBb0ZBLDBDQWNDO0FBL0ZELFNBQVMsaUJBQWlCLENBQUMsS0FBZTtJQUN4QyxJQUFJLEtBQUssR0FBZSxXQUFXLENBQUE7SUFDbkMsSUFBSSxXQUFXLEdBQWtCLElBQUksQ0FBQTtJQUVyQyxPQUFPLEtBQUssQ0FBQyxNQUFNLENBQWEsQ0FBQyxNQUFNLEVBQUUsSUFBSSxFQUFFLEVBQUU7UUFDL0MsSUFBSSxLQUFLLEtBQUssV0FBVyxFQUFFLENBQUM7WUFDMUIsSUFBSSxJQUFJLENBQUMsVUFBVSxDQUFDLGFBQWEsQ0FBQyxFQUFFLENBQUM7Z0JBQ25DLFdBQVcsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLGNBQWMsRUFBRSxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxDQUFBO2dCQUNuRSxNQUFNLENBQUMsV0FBVyxDQUFDLEdBQUcsRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFLFFBQVEsRUFBRSxFQUFFLEVBQUUsQ0FBQTtnQkFDbEQsS0FBSyxHQUFHLFdBQVcsQ0FBQTtZQUNyQixDQUFDO1FBQ0gsQ0FBQztRQUVELElBQUksS0FBSyxLQUFLLFdBQVcsRUFBRSxDQUFDO1lBQzFCLElBQUksSUFBSSxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsSUFBSSxXQUFXLEtBQUssSUFBSSxFQUFFLENBQUM7Z0JBQ3hELE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVSxFQUFFLEVBQUUsQ0FBQyxDQUFBO2dCQUMzQyxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQTtnQkFDbkMsS0FBSyxHQUFHLGFBQWEsQ0FBQTtZQUN2QixDQUFDO1lBQ0QsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLG1CQUFtQixD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
@@ -1,19 +1,18 @@
1
1
  "use strict";
2
2
  var _a;
3
3
  Object.defineProperty(exports, "__esModule", { value: true });
4
- exports.getProfilePath = exports.XSBUG_LOG_PATH = exports.MODDABLE_REPO = exports.EXPORTS_FILE_PATH = exports.INSTALL_PATH = exports.INSTALL_DIR = exports.HOME_DIR = void 0;
4
+ exports.XSBUG_LOG_PATH = exports.MODDABLE_REPO = exports.EXPORTS_FILE_PATH = exports.INSTALL_PATH = exports.INSTALL_DIR = exports.HOME_DIR = void 0;
5
+ exports.getProfilePath = getProfilePath;
5
6
  const gluegun_1 = require("gluegun");
6
7
  const os_1 = require("os");
7
8
  const currentPlatform = (0, os_1.type)().toLowerCase();
8
- const isWindows = currentPlatform === 'windows_nt';
9
+ const isWindows = currentPlatform === "windows_nt";
9
10
  exports.HOME_DIR = gluegun_1.filesystem.homedir();
10
- exports.INSTALL_DIR = isWindows
11
- ? gluegun_1.filesystem.resolve(exports.HOME_DIR, 'xs-dev')
12
- : gluegun_1.filesystem.resolve(exports.HOME_DIR, '.local', 'share');
11
+ exports.INSTALL_DIR = isWindows ? gluegun_1.filesystem.resolve(exports.HOME_DIR, 'xs-dev') : gluegun_1.filesystem.resolve(exports.HOME_DIR, '.local', 'share');
13
12
  exports.INSTALL_PATH = (_a = process.env.MODDABLE) !== null && _a !== void 0 ? _a : gluegun_1.filesystem.resolve(exports.INSTALL_DIR, 'moddable');
14
- exports.EXPORTS_FILE_PATH = isWindows
15
- ? gluegun_1.filesystem.resolve(exports.INSTALL_DIR, 'Moddable.bat')
16
- : gluegun_1.filesystem.resolve(exports.HOME_DIR, '.local', 'share', 'xs-dev-export.sh');
13
+ exports.EXPORTS_FILE_PATH = isWindows ?
14
+ gluegun_1.filesystem.resolve(exports.INSTALL_DIR, "Moddable.bat") :
15
+ gluegun_1.filesystem.resolve(exports.HOME_DIR, '.local', 'share', 'xs-dev-export.sh');
17
16
  exports.MODDABLE_REPO = 'https://github.com/Moddable-OpenSource/moddable';
18
17
  exports.XSBUG_LOG_PATH = gluegun_1.filesystem.resolve(exports.INSTALL_PATH, 'tools', 'xsbug-log');
19
18
  function getProfilePath() {
@@ -33,5 +32,4 @@ function getProfilePath() {
33
32
  gluegun_1.filesystem.file(profilePath);
34
33
  return profilePath;
35
34
  }
36
- exports.getProfilePath = getProfilePath;
37
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3Rvb2xib3gvc2V0dXAvY29uc3RhbnRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7QUFBQSxxQ0FBb0M7QUFDcEMsMkJBQXlDO0FBR3pDLE1BQU0sZUFBZSxHQUFXLElBQUEsU0FBWSxHQUFFLENBQUMsV0FBVyxFQUFZLENBQUE7QUFDdEUsTUFBTSxTQUFTLEdBQUcsZUFBZSxLQUFLLFlBQVksQ0FBQTtBQUVyQyxRQUFBLFFBQVEsR0FBRyxvQkFBVSxDQUFDLE9BQU8sRUFBRSxDQUFBO0FBQy9CLFFBQUEsV0FBVyxHQUFHLFNBQVM7SUFDbEMsQ0FBQyxDQUFDLG9CQUFVLENBQUMsT0FBTyxDQUFDLGdCQUFRLEVBQUUsUUFBUSxDQUFDO0lBQ3hDLENBQUMsQ0FBQyxvQkFBVSxDQUFDLE9BQU8sQ0FBQyxnQkFBUSxFQUFFLFFBQVEsRUFBRSxPQUFPLENBQUMsQ0FBQTtBQUN0QyxRQUFBLFlBQVksR0FDdkIsTUFBQSxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsbUNBQUksb0JBQVUsQ0FBQyxPQUFPLENBQUMsbUJBQVcsRUFBRSxVQUFVLENBQUMsQ0FBQTtBQUN4RCxRQUFBLGlCQUFpQixHQUFHLFNBQVM7SUFDeEMsQ0FBQyxDQUFDLG9CQUFVLENBQUMsT0FBTyxDQUFDLG1CQUFXLEVBQUUsY0FBYyxDQUFDO0lBQ2pELENBQUMsQ0FBQyxvQkFBVSxDQUFDLE9BQU8sQ0FBQyxnQkFBUSxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsa0JBQWtCLENBQUMsQ0FBQTtBQUMxRCxRQUFBLGFBQWEsR0FBRyxpREFBaUQsQ0FBQTtBQUNqRSxRQUFBLGNBQWMsR0FBRyxvQkFBVSxDQUFDLE9BQU8sQ0FDOUMsb0JBQVksRUFDWixPQUFPLEVBQ1AsV0FBVyxDQUNaLENBQUE7QUFDRCxTQUFnQixjQUFjOztJQUM1QixNQUFNLEtBQUssR0FBRyxNQUFBLE9BQU8sQ0FBQyxHQUFHLENBQUMsS0FBSyxtQ0FBSSxFQUFFLENBQUE7SUFDckMsSUFBSSxPQUFPLEdBQUcsVUFBVSxDQUFBO0lBRXhCLElBQUksS0FBSyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsRUFBRTtRQUN6QixPQUFPLEdBQUcsUUFBUSxDQUFBO0tBQ25CO0lBQ0QsSUFBSSxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxFQUFFO1FBQzFCLE9BQU8sR0FBRyxTQUFTLENBQUE7S0FDcEI7SUFFRCxJQUFJLFdBQVcsR0FBRyxvQkFBVSxDQUFDLE9BQU8sQ0FBQyxnQkFBUSxFQUFFLE9BQU8sQ0FBQyxDQUFBO0lBQ3ZELElBQUksb0JBQVUsQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLEtBQUssTUFBTTtRQUFFLE9BQU8sV0FBVyxDQUFBO0lBRWpFLFdBQVcsR0FBRyxvQkFBVSxDQUFDLE9BQU8sQ0FBQyxnQkFBUSxFQUFFLFVBQVUsQ0FBQyxDQUFBO0lBQ3RELG9CQUFVLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFBO0lBQzVCLE9BQU8sV0FBVyxDQUFBO0FBQ3BCLENBQUM7QUFqQkQsd0NBaUJDIn0=
35
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3Rvb2xib3gvc2V0dXAvY29uc3RhbnRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7QUF5QkEsd0NBaUJDO0FBMUNELHFDQUFvQztBQUNwQywyQkFBeUM7QUFHekMsTUFBTSxlQUFlLEdBQVcsSUFBQSxTQUFZLEdBQUUsQ0FBQyxXQUFXLEVBQVksQ0FBQztBQUN2RSxNQUFNLFNBQVMsR0FBRyxlQUFlLEtBQUssWUFBWSxDQUFBO0FBRXJDLFFBQUEsUUFBUSxHQUFHLG9CQUFVLENBQUMsT0FBTyxFQUFFLENBQUE7QUFDL0IsUUFBQSxXQUFXLEdBQUcsU0FBUyxDQUFDLENBQUMsQ0FBQyxvQkFBVSxDQUFDLE9BQU8sQ0FBQyxnQkFBUSxFQUFFLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxvQkFBVSxDQUFDLE9BQU8sQ0FBQyxnQkFBUSxFQUFFLFFBQVEsRUFBRSxPQUFPLENBQUMsQ0FBQTtBQUNsSCxRQUFBLFlBQVksR0FDdkIsTUFBQSxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsbUNBQUksb0JBQVUsQ0FBQyxPQUFPLENBQUMsbUJBQVcsRUFBRSxVQUFVLENBQUMsQ0FBQTtBQUN4RCxRQUFBLGlCQUFpQixHQUFHLFNBQVMsQ0FBQyxDQUFDO0lBQzFDLG9CQUFVLENBQUMsT0FBTyxDQUFDLG1CQUFXLEVBQUUsY0FBYyxDQUFDLENBQUMsQ0FBQztJQUNqRCxvQkFBVSxDQUFDLE9BQU8sQ0FDaEIsZ0JBQVEsRUFDUixRQUFRLEVBQ1IsT0FBTyxFQUNQLGtCQUFrQixDQUNuQixDQUFBO0FBQ1UsUUFBQSxhQUFhLEdBQUcsaURBQWlELENBQUE7QUFDakUsUUFBQSxjQUFjLEdBQUcsb0JBQVUsQ0FBQyxPQUFPLENBQzlDLG9CQUFZLEVBQ1osT0FBTyxFQUNQLFdBQVcsQ0FDWixDQUFBO0FBQ0QsU0FBZ0IsY0FBYzs7SUFDNUIsTUFBTSxLQUFLLEdBQUcsTUFBQSxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssbUNBQUksRUFBRSxDQUFBO0lBQ3JDLElBQUksT0FBTyxHQUFHLFVBQVUsQ0FBQTtJQUV4QixJQUFJLEtBQUssQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQztRQUMxQixPQUFPLEdBQUcsUUFBUSxDQUFBO0lBQ3BCLENBQUM7SUFDRCxJQUFJLEtBQUssQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQztRQUMzQixPQUFPLEdBQUcsU0FBUyxDQUFBO0lBQ3JCLENBQUM7SUFFRCxJQUFJLFdBQVcsR0FBRyxvQkFBVSxDQUFDLE9BQU8sQ0FBQyxnQkFBUSxFQUFFLE9BQU8sQ0FBQyxDQUFBO0lBQ3ZELElBQUksb0JBQVUsQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLEtBQUssTUFBTTtRQUFFLE9BQU8sV0FBVyxDQUFBO0lBRWpFLFdBQVcsR0FBRyxvQkFBVSxDQUFDLE9BQU8sQ0FBQyxnQkFBUSxFQUFFLFVBQVUsQ0FBQyxDQUFBO0lBQ3RELG9CQUFVLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFBO0lBQzVCLE9BQU8sV0FBVyxDQUFBO0FBQ3BCLENBQUMifQ==
@@ -3,6 +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.default = default_1;
6
7
  const gluegun_1 = require("gluegun");
7
8
  const constants_1 = require("./constants");
8
9
  const os_1 = require("os");
@@ -22,8 +23,7 @@ async function default_1() {
22
23
  const PREFS_BACKUP_DIR = gluegun_1.filesystem.resolve(constants_1.INSTALL_DIR, 'ejectfix');
23
24
  const NC_PREFS_PATH = gluegun_1.filesystem.resolve(PREFS_DIR, NC_PREFS_PLIST);
24
25
  gluegun_1.filesystem.dir(PREFS_BACKUP_DIR);
25
- if (gluegun_1.filesystem.exists(gluegun_1.filesystem.resolve(PREFS_BACKUP_DIR, NC_PREFS_PLIST)) !==
26
- false) {
26
+ if (gluegun_1.filesystem.exists(gluegun_1.filesystem.resolve(PREFS_BACKUP_DIR, NC_PREFS_PLIST)) !== false) {
27
27
  spinner.info('A backup of your notification preferences already exists.');
28
28
  const shouldContinue = await gluegun_1.prompt.confirm('Would you like to override this backup and continue?');
29
29
  if (!shouldContinue) {
@@ -58,5 +58,4 @@ async function default_1() {
58
58
  await gluegun_1.system.exec('killall usernoted cfprefsd');
59
59
  spinner.succeed('Successfully updated notification preferences for `DISK NOT EJECTED PROPERLY` warning!');
60
60
  }
61
- exports.default = default_1;
62
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZWplY3RmaXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdG9vbGJveC9zZXR1cC9lamVjdGZpeC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLHFDQUEyRDtBQUMzRCwyQ0FBeUM7QUFDekMsMkJBQXlDO0FBQ3pDLGdFQUFnQztBQUVoQyxNQUFNLGNBQWMsR0FBRyx5QkFBeUIsQ0FBQTtBQUNoRCxNQUFNLHFCQUFxQixHQUN6QixnRUFBZ0UsQ0FBQTtBQUVuRCxLQUFLOztJQUNsQixNQUFNLE9BQU8sR0FBRyxlQUFLLENBQUMsSUFBSSxFQUFFLENBQUE7SUFDNUIsT0FBTyxDQUFDLEtBQUssQ0FBQyxvQkFBb0IsQ0FBQyxDQUFBO0lBRW5DLE1BQU0sRUFBRSxHQUFHLElBQUEsU0FBWSxHQUFFLENBQUMsV0FBVyxFQUFFLENBQUE7SUFDdkMsSUFBSSxFQUFFLEtBQUssUUFBUSxFQUFFO1FBQ25CLGVBQUssQ0FBQyxLQUFLLENBQUMsT0FBTyxFQUFFLGlCQUFpQixDQUFDLENBQUE7UUFDdkMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtLQUNoQjtJQUVELE1BQU0sU0FBUyxHQUFHLG9CQUFVLENBQUMsT0FBTyxDQUNsQyxNQUFBLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxtQ0FBSSxHQUFHLEVBQ3ZCLFNBQVMsRUFDVCxhQUFhLENBQ2QsQ0FBQTtJQUNELE1BQU0sZ0JBQWdCLEdBQUcsb0JBQVUsQ0FBQyxPQUFPLENBQUMsdUJBQVcsRUFBRSxVQUFVLENBQUMsQ0FBQTtJQUNwRSxNQUFNLGFBQWEsR0FBRyxvQkFBVSxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsY0FBYyxDQUFDLENBQUE7SUFFbkUsb0JBQVUsQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLENBQUMsQ0FBQTtJQUVoQyxJQUNFLG9CQUFVLENBQUMsTUFBTSxDQUFDLG9CQUFVLENBQUMsT0FBTyxDQUFDLGdCQUFnQixFQUFFLGNBQWMsQ0FBQyxDQUFDO1FBQ3ZFLEtBQUssRUFDTDtRQUNBLE9BQU8sQ0FBQyxJQUFJLENBQUMsMkRBQTJELENBQUMsQ0FBQTtRQUN6RSxNQUFNLGNBQWMsR0FBRyxNQUFNLGdCQUFNLENBQUMsT0FBTyxDQUN6QyxzREFBc0QsQ0FDdkQsQ0FBQTtRQUNELElBQUksQ0FBQyxjQUFjLEVBQUU7WUFDbkIsZUFBSyxDQUFDLElBQUksQ0FBQyw0QkFBNEIsQ0FBQyxDQUFBO1lBQ3hDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7U0FDaEI7S0FDRjtJQUNELElBQUksb0JBQVUsQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLEtBQUssS0FBSyxFQUFFO1FBQzlDLE9BQU8sQ0FBQyxJQUFJLENBQUMsOENBQThDLGFBQWEsRUFBRSxDQUFDLENBQUE7UUFDM0UsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtLQUNoQjtJQUVELElBQUk7UUFDRixvQkFBVSxDQUFDLElBQUksQ0FDYixhQUFhLEVBQ2Isb0JBQVUsQ0FBQyxPQUFPLENBQUMsZ0JBQWdCLEVBQUUsY0FBYyxDQUFDLEVBQ3BELEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxDQUNwQixDQUFBO0tBQ0Y7SUFBQyxPQUFPLEtBQUssRUFBRTtRQUNkLE9BQU8sQ0FBQyxJQUFJLENBQUMsMkNBQTJDLE1BQU0sQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUE7UUFDeEUsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtLQUNoQjtJQUVELElBQUk7UUFDRixNQUFNLEtBQUssR0FDVCxzQkFBSyxDQUFDLFlBQVksQ0FFZixhQUFhLENBQUMsQ0FBQTtRQUNuQixLQUFLLE1BQU0sR0FBRyxJQUFJLEtBQUssQ0FBQyxJQUFJLEVBQUU7WUFDNUIsSUFBSSxHQUFHLENBQUMsV0FBVyxDQUFDLEtBQUsscUJBQXFCLEVBQUU7Z0JBQzlDLEdBQUcsQ0FBQyxLQUFLLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEdBQUcsVUFBVSxDQUFBO2FBQzNEO1NBQ0Y7UUFDRCxzQkFBSyxDQUFDLG1CQUFtQixDQUFDLGFBQWEsRUFBRSxLQUFLLENBQUMsQ0FBQTtLQUNoRDtJQUFDLE9BQU8sS0FBSyxFQUFFO1FBQ2QsT0FBTyxDQUFDLElBQUksQ0FBQyw4Q0FBOEMsTUFBTSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsQ0FBQTtRQUMzRSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO0tBQ2hCO0lBRUQsTUFBTSxnQkFBTSxDQUFDLElBQUksQ0FBQyw0QkFBNEIsQ0FBQyxDQUFBO0lBQy9DLE9BQU8sQ0FBQyxPQUFPLENBQ2Isd0ZBQXdGLENBQ3pGLENBQUE7QUFDSCxDQUFDO0FBckVELDRCQXFFQyJ9
61
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZWplY3RmaXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdG9vbGJveC9zZXR1cC9lamVjdGZpeC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQVFBLDRCQW1EQztBQTNERCxxQ0FBNEQ7QUFDNUQsMkNBQXlDO0FBQ3pDLDJCQUF5QztBQUN6QyxnRUFBZ0M7QUFFaEMsTUFBTSxjQUFjLEdBQUcseUJBQXlCLENBQUE7QUFDaEQsTUFBTSxxQkFBcUIsR0FBRyxnRUFBZ0UsQ0FBQTtBQUUvRSxLQUFLOztJQUNsQixNQUFNLE9BQU8sR0FBRyxlQUFLLENBQUMsSUFBSSxFQUFFLENBQUE7SUFDNUIsT0FBTyxDQUFDLEtBQUssQ0FBQyxvQkFBb0IsQ0FBQyxDQUFBO0lBRW5DLE1BQU0sRUFBRSxHQUFHLElBQUEsU0FBWSxHQUFFLENBQUMsV0FBVyxFQUFFLENBQUE7SUFDdkMsSUFBSSxFQUFFLEtBQUssUUFBUSxFQUFFLENBQUM7UUFDcEIsZUFBSyxDQUFDLEtBQUssQ0FBQyxPQUFPLEVBQUUsaUJBQWlCLENBQUMsQ0FBQTtRQUN2QyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ2pCLENBQUM7SUFFRCxNQUFNLFNBQVMsR0FBRyxvQkFBVSxDQUFDLE9BQU8sQ0FBQyxNQUFBLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxtQ0FBSSxHQUFHLEVBQUUsU0FBUyxFQUFFLGFBQWEsQ0FBQyxDQUFBO0lBQ3ZGLE1BQU0sZ0JBQWdCLEdBQUcsb0JBQVUsQ0FBQyxPQUFPLENBQUMsdUJBQVcsRUFBRSxVQUFVLENBQUMsQ0FBQTtJQUNwRSxNQUFNLGFBQWEsR0FBRyxvQkFBVSxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsY0FBYyxDQUFDLENBQUE7SUFFbkUsb0JBQVUsQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLENBQUMsQ0FBQTtJQUVoQyxJQUFJLG9CQUFVLENBQUMsTUFBTSxDQUFDLG9CQUFVLENBQUMsT0FBTyxDQUFDLGdCQUFnQixFQUFFLGNBQWMsQ0FBQyxDQUFDLEtBQUssS0FBSyxFQUFFLENBQUM7UUFDdEYsT0FBTyxDQUFDLElBQUksQ0FBQywyREFBMkQsQ0FBQyxDQUFBO1FBQ3pFLE1BQU0sY0FBYyxHQUFHLE1BQU0sZ0JBQU0sQ0FBQyxPQUFPLENBQUMsc0RBQXNELENBQUMsQ0FBQTtRQUNuRyxJQUFJLENBQUMsY0FBYyxFQUFFLENBQUM7WUFDcEIsZUFBSyxDQUFDLElBQUksQ0FBQyw0QkFBNEIsQ0FBQyxDQUFBO1lBQ3hDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7UUFDakIsQ0FBQztJQUNILENBQUM7SUFDRCxJQUFJLG9CQUFVLENBQUMsTUFBTSxDQUFDLGFBQWEsQ0FBQyxLQUFLLEtBQUssRUFBRSxDQUFDO1FBQy9DLE9BQU8sQ0FBQyxJQUFJLENBQUMsOENBQThDLGFBQWEsRUFBRSxDQUFDLENBQUE7UUFDM0UsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUNqQixDQUFDO0lBRUQsSUFBSSxDQUFDO1FBQ0gsb0JBQVUsQ0FBQyxJQUFJLENBQUMsYUFBYSxFQUFFLG9CQUFVLENBQUMsT0FBTyxDQUFDLGdCQUFnQixFQUFFLGNBQWMsQ0FBQyxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUE7SUFDM0csQ0FBQztJQUFDLE9BQU8sS0FBSyxFQUFFLENBQUM7UUFDZixPQUFPLENBQUMsSUFBSSxDQUFDLDJDQUEyQyxNQUFNLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxDQUFBO1FBQ3hFLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDakIsQ0FBQztJQUVELElBQUksQ0FBQztRQUNILE1BQU0sS0FBSyxHQUFHLHNCQUFLLENBQUMsWUFBWSxDQUE0RCxhQUFhLENBQUMsQ0FBQTtRQUMxRyxLQUFLLE1BQU0sR0FBRyxJQUFJLEtBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUM3QixJQUFJLEdBQUcsQ0FBQyxXQUFXLENBQUMsS0FBSyxxQkFBcUIsRUFBRSxDQUFDO2dCQUMvQyxHQUFHLENBQUMsS0FBSyxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxHQUFHLFVBQVUsQ0FBQTtZQUM1RCxDQUFDO1FBQ0gsQ0FBQztRQUNELHNCQUFLLENBQUMsbUJBQW1CLENBQUMsYUFBYSxFQUFFLEtBQUssQ0FBQyxDQUFBO0lBQ2pELENBQUM7SUFBQyxPQUFPLEtBQUssRUFBRSxDQUFDO1FBQ2YsT0FBTyxDQUFDLElBQUksQ0FBQyw4Q0FBOEMsTUFBTSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsQ0FBQTtRQUMzRSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ2pCLENBQUM7SUFFRCxNQUFNLGdCQUFNLENBQUMsSUFBSSxDQUFDLDRCQUE0QixDQUFDLENBQUE7SUFDL0MsT0FBTyxDQUFDLE9BQU8sQ0FBQyx3RkFBd0YsQ0FBQyxDQUFBO0FBQzNHLENBQUMifQ==
@@ -1,11 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.installDeps = void 0;
3
+ exports.installDeps = installDeps;
4
4
  const exec_1 = require("../../system/exec");
5
5
  // apt-get install git wget flex bison gperf python-is-python3 python3-pip python3-serial python-setuptools cmake ninja-build ccache libffi-dev libssl-dev dfu-util
6
6
  async function installDeps(spinner) {
7
7
  await (0, exec_1.execWithSudo)('apt-get install --yes git wget flex bison gperf python-is-python3 python3-pip python3-serial python3-setuptools cmake ninja-build ccache libffi-dev libssl-dev dfu-util', { stdout: process.stdout });
8
8
  spinner.succeed();
9
9
  }
10
- exports.installDeps = installDeps;
11
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGludXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvdG9vbGJveC9zZXR1cC9lc3AzMi9saW51eC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSw0Q0FBZ0Q7QUFFaEQsbUtBQW1LO0FBQzVKLEtBQUssVUFBVSxXQUFXLENBQy9CLE9BQXlDO0lBRXpDLE1BQU0sSUFBQSxtQkFBWSxFQUNoQix5S0FBeUssRUFDekssRUFBRSxNQUFNLEVBQUUsT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUMzQixDQUFBO0lBQ0QsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFBO0FBQ25CLENBQUM7QUFSRCxrQ0FRQyJ9
10
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGludXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvdG9vbGJveC9zZXR1cC9lc3AzMi9saW51eC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUlBLGtDQVFDO0FBWEQsNENBQWdEO0FBRWhELG1LQUFtSztBQUM1SixLQUFLLFVBQVUsV0FBVyxDQUMvQixPQUF5QztJQUV6QyxNQUFNLElBQUEsbUJBQVksRUFDaEIseUtBQXlLLEVBQ3pLLEVBQUUsTUFBTSxFQUFFLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FDM0IsQ0FBQTtJQUNELE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQTtBQUNuQixDQUFDIn0=
@@ -1,10 +1,11 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.installDeps = void 0;
3
+ exports.installDeps = installDeps;
4
4
  const gluegun_1 = require("gluegun");
5
5
  const homebrew_1 = require("../homebrew");
6
6
  // brew install python3, cmake, ninja, dfu-util
7
7
  async function installDeps(spinner) {
8
+ var _a;
8
9
  spinner.stop();
9
10
  try {
10
11
  await (0, homebrew_1.ensureHomebrew)();
@@ -16,11 +17,11 @@ async function installDeps(spinner) {
16
17
  }
17
18
  }
18
19
  if (gluegun_1.system.which('python') === null ||
19
- // get python verion, check if v3
20
- gluegun_1.semver.satisfies((await gluegun_1.system.exec('python --version', { trim: true }))
20
+ // get python version, check if v3
21
+ gluegun_1.semver.satisfies((_a = (await gluegun_1.system.exec('python --version', { trim: true }))
21
22
  .toString()
22
23
  .split(' ')
23
- .pop(), '>= 3.x.x')) {
24
+ .pop()) !== null && _a !== void 0 ? _a : '', '>= 3.x.x')) {
24
25
  const maybePython3Path = gluegun_1.system.which('python3');
25
26
  if (typeof maybePython3Path !== 'string') {
26
27
  try {
@@ -46,17 +47,12 @@ async function installDeps(spinner) {
46
47
  // 4. install pip, if needed
47
48
  if (gluegun_1.system.which('pip3') === null) {
48
49
  spinner.start('Installing pip3');
49
- await gluegun_1.system.exec('python3 -m ensurepip --user', {
50
- shell: process.env.SHELL,
51
- });
50
+ await gluegun_1.system.exec('python3 -m ensurepip --user', { shell: process.env.SHELL });
52
51
  spinner.succeed();
53
52
  }
54
53
  // 5. pip install pyserial, if needed
55
54
  spinner.start('Installing pyserial through pip3');
56
- await gluegun_1.system.exec('python3 -m pip install pyserial', {
57
- shell: process.env.SHELL,
58
- });
55
+ await gluegun_1.system.exec('python3 -m pip install pyserial', { shell: process.env.SHELL });
59
56
  spinner.succeed();
60
57
  }
61
- exports.installDeps = installDeps;
62
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFjLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3Rvb2xib3gvc2V0dXAvZXNwMzIvbWFjLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHFDQUErQztBQUUvQywwQ0FBNEM7QUFFNUMsK0NBQStDO0FBQ3hDLEtBQUssVUFBVSxXQUFXLENBQy9CLE9BQXlDO0lBRXpDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQTtJQUVkLElBQUk7UUFDRixNQUFNLElBQUEseUJBQWMsR0FBRSxDQUFBO0tBQ3ZCO0lBQUMsT0FBTyxLQUFjLEVBQUU7UUFDdkIsSUFBSSxLQUFLLFlBQVksS0FBSyxFQUFFO1lBQzFCLGVBQUssQ0FBQyxJQUFJLENBQUMsR0FBRyxLQUFLLENBQUMsT0FBTyxtQ0FBbUMsQ0FBQyxDQUFBO1lBQy9ELE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7U0FDaEI7S0FDRjtJQUVELElBQ0UsZ0JBQU0sQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLEtBQUssSUFBSTtRQUMvQixpQ0FBaUM7UUFDakMsZ0JBQU0sQ0FBQyxTQUFTLENBQ2QsQ0FBQyxNQUFNLGdCQUFNLENBQUMsSUFBSSxDQUFDLGtCQUFrQixFQUFFLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7YUFDcEQsUUFBUSxFQUFFO2FBQ1YsS0FBSyxDQUFDLEdBQUcsQ0FBQzthQUNWLEdBQUcsRUFBRSxFQUNSLFVBQVUsQ0FDWCxFQUNEO1FBQ0EsTUFBTSxnQkFBZ0IsR0FBRyxnQkFBTSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQTtRQUVoRCxJQUFJLE9BQU8sZ0JBQWdCLEtBQUssUUFBUSxFQUFFO1lBQ3hDLElBQUk7Z0JBQ0YsTUFBTSxnQkFBTSxDQUFDLElBQUksQ0FBQyxxQkFBcUIsRUFBRSxFQUFFLEtBQUssRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUE7YUFDdkU7WUFBQyxPQUFPLEtBQWMsRUFBRTtnQkFDdkIsSUFBSSxLQUFLLFlBQVksS0FBSyxJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBQyxFQUFFO29CQUNwRSxlQUFLLENBQUMsS0FBSyxDQUNULCtJQUErSSxDQUNoSixDQUFBO29CQUNELE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7aUJBQ2hCO2FBQ0Y7U0FDRjtLQUNGO0lBRUQsSUFBSSxnQkFBTSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsS0FBSyxJQUFJLEVBQUU7UUFDbEMsTUFBTSxnQkFBTSxDQUFDLElBQUksQ0FBQyxvQkFBb0IsRUFBRSxFQUFFLEtBQUssRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUE7S0FDdEU7SUFFRCxJQUFJLGdCQUFNLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLElBQUksRUFBRTtRQUNsQyxNQUFNLGdCQUFNLENBQUMsSUFBSSxDQUFDLG9CQUFvQixFQUFFLEVBQUUsS0FBSyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsS0FBSyxFQUFFLENBQUMsQ0FBQTtLQUN0RTtJQUVELElBQUksZ0JBQU0sQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFDLEtBQUssSUFBSSxFQUFFO1FBQ3JDLE1BQU0sZ0JBQU0sQ0FBQyxJQUFJLENBQUMsdUJBQXVCLEVBQUUsRUFBRSxLQUFLLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFBO0tBQ3pFO0lBRUQsNEJBQTRCO0lBQzVCLElBQUksZ0JBQU0sQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLEtBQUssSUFBSSxFQUFFO1FBQ2pDLE9BQU8sQ0FBQyxLQUFLLENBQUMsaUJBQWlCLENBQUMsQ0FBQTtRQUNoQyxNQUFNLGdCQUFNLENBQUMsSUFBSSxDQUFDLDZCQUE2QixFQUFFO1lBQy9DLEtBQUssRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUs7U0FDekIsQ0FBQyxDQUFBO1FBQ0YsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFBO0tBQ2xCO0lBRUQscUNBQXFDO0lBQ3JDLE9BQU8sQ0FBQyxLQUFLLENBQUMsa0NBQWtDLENBQUMsQ0FBQTtJQUNqRCxNQUFNLGdCQUFNLENBQUMsSUFBSSxDQUFDLGlDQUFpQyxFQUFFO1FBQ25ELEtBQUssRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUs7S0FDekIsQ0FBQyxDQUFBO0lBQ0YsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFBO0FBQ25CLENBQUM7QUFwRUQsa0NBb0VDIn0=
58
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFjLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3Rvb2xib3gvc2V0dXAvZXNwMzIvbWFjLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBS0Esa0NBOERDO0FBbkVELHFDQUErQztBQUUvQywwQ0FBNEM7QUFFNUMsK0NBQStDO0FBQ3hDLEtBQUssVUFBVSxXQUFXLENBQy9CLE9BQXlDOztJQUV6QyxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUE7SUFFZCxJQUFJLENBQUM7UUFDSCxNQUFNLElBQUEseUJBQWMsR0FBRSxDQUFBO0lBQ3hCLENBQUM7SUFBQyxPQUFPLEtBQWMsRUFBRSxDQUFDO1FBQ3hCLElBQUksS0FBSyxZQUFZLEtBQUssRUFBRSxDQUFDO1lBQzNCLGVBQUssQ0FBQyxJQUFJLENBQUMsR0FBRyxLQUFLLENBQUMsT0FBTyxtQ0FBbUMsQ0FBQyxDQUFBO1lBQy9ELE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDbEIsQ0FBQztJQUNILENBQUM7SUFFRCxJQUNFLGdCQUFNLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxLQUFLLElBQUk7UUFDL0Isa0NBQWtDO1FBQ2xDLGdCQUFNLENBQUMsU0FBUyxDQUNkLE1BQUMsQ0FBQyxNQUFNLGdCQUFNLENBQUMsSUFBSSxDQUFDLGtCQUFrQixFQUFFLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7YUFDckQsUUFBUSxFQUFhO2FBQ3JCLEtBQUssQ0FBQyxHQUFHLENBQUM7YUFDVixHQUFHLEVBQUUsbUNBQUksRUFBRSxFQUNkLFVBQVUsQ0FDWCxFQUNELENBQUM7UUFDRCxNQUFNLGdCQUFnQixHQUFHLGdCQUFNLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxDQUFBO1FBRWhELElBQUksT0FBTyxnQkFBZ0IsS0FBSyxRQUFRLEVBQUUsQ0FBQztZQUN6QyxJQUFJLENBQUM7Z0JBQ0gsTUFBTSxnQkFBTSxDQUFDLElBQUksQ0FBQyxxQkFBcUIsRUFBRSxFQUFFLEtBQUssRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUE7WUFDeEUsQ0FBQztZQUFDLE9BQU8sS0FBYyxFQUFFLENBQUM7Z0JBQ3hCLElBQUksS0FBSyxZQUFZLEtBQUssSUFBSSxLQUFLLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQUMsRUFBRSxDQUFDO29CQUNyRSxlQUFLLENBQUMsS0FBSyxDQUFDLCtJQUErSSxDQUFDLENBQUE7b0JBQzVKLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7Z0JBQ2pCLENBQUM7WUFDSCxDQUFDO1FBQ0gsQ0FBQztJQUNILENBQUM7SUFFRCxJQUFJLGdCQUFNLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLElBQUksRUFBRSxDQUFDO1FBQ25DLE1BQU0sZ0JBQU0sQ0FBQyxJQUFJLENBQUMsb0JBQW9CLEVBQUUsRUFBRSxLQUFLLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFBO0lBQ3ZFLENBQUM7SUFFRCxJQUFJLGdCQUFNLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLElBQUksRUFBRSxDQUFDO1FBQ25DLE1BQU0sZ0JBQU0sQ0FBQyxJQUFJLENBQUMsb0JBQW9CLEVBQUUsRUFBRSxLQUFLLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFBO0lBQ3ZFLENBQUM7SUFFRCxJQUFJLGdCQUFNLENBQUMsS0FBSyxDQUFDLFVBQVUsQ0FBQyxLQUFLLElBQUksRUFBRSxDQUFDO1FBQ3RDLE1BQU0sZ0JBQU0sQ0FBQyxJQUFJLENBQUMsdUJBQXVCLEVBQUUsRUFBRSxLQUFLLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFBO0lBQzFFLENBQUM7SUFFRCw0QkFBNEI7SUFDNUIsSUFBSSxnQkFBTSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxJQUFJLEVBQUUsQ0FBQztRQUNsQyxPQUFPLENBQUMsS0FBSyxDQUFDLGlCQUFpQixDQUFDLENBQUE7UUFDaEMsTUFBTSxnQkFBTSxDQUFDLElBQUksQ0FBQyw2QkFBNkIsRUFBRSxFQUFFLEtBQUssRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUE7UUFDOUUsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFBO0lBQ25CLENBQUM7SUFFRCxxQ0FBcUM7SUFDckMsT0FBTyxDQUFDLEtBQUssQ0FBQyxrQ0FBa0MsQ0FBQyxDQUFBO0lBQ2pELE1BQU0sZ0JBQU0sQ0FBQyxJQUFJLENBQUMsaUNBQWlDLEVBQUUsRUFBRSxLQUFLLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFBO0lBQ2xGLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQTtBQUNuQixDQUFDIn0=
@@ -3,7 +3,8 @@ 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.esp32Exists = exports.installDeps = void 0;
6
+ exports.installDeps = installDeps;
7
+ exports.esp32Exists = esp32Exists;
7
8
  const gluegun_1 = require("gluegun");
8
9
  const axios_1 = __importDefault(require("axios"));
9
10
  const util_1 = require("util");
@@ -13,7 +14,7 @@ const IDF_INSTALLER = 'https://github.com/espressif/idf-installer/releases/downl
13
14
  async function installDeps(spinner, ESP32_DIR, IDF_PATH) {
14
15
  var _a;
15
16
  if (esp32Exists()) {
16
- gluegun_1.print.info(`ESP-IDF tooling exists at ${(_a = process.env.IDF_PATH) !== null && _a !== void 0 ? _a : ''}`);
17
+ gluegun_1.print.info(`ESP-IDF tooling exists at ${(_a = process.env.IDF_PATH) !== null && _a !== void 0 ? _a : ""}`);
17
18
  return;
18
19
  }
19
20
  spinner.start('Downloading ESP-IDF Tools Installer');
@@ -31,12 +32,10 @@ async function installDeps(spinner, ESP32_DIR, IDF_PATH) {
31
32
  await gluegun_1.system.exec(`start /B ${destination}`);
32
33
  spinner.succeed();
33
34
  }
34
- exports.installDeps = installDeps;
35
35
  function esp32Exists() {
36
36
  return (process.env.IDF_PATH !== undefined &&
37
37
  process.env.IDF_TOOLS_PATH !== undefined &&
38
38
  gluegun_1.filesystem.exists(process.env.IDF_TOOLS_PATH) === 'dir' &&
39
39
  gluegun_1.filesystem.exists(process.env.IDF_PATH) === 'dir');
40
40
  }
41
- exports.esp32Exists = esp32Exists;
42
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2luZG93cy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy90b29sYm94L3NldHVwL2VzcDMyL3dpbmRvd3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEscUNBQW1EO0FBRW5ELGtEQUF5QjtBQUN6QiwrQkFBZ0M7QUFDaEMsbUNBQWlDO0FBRWpDLE1BQU0sZUFBZSxHQUFHLElBQUEsZ0JBQVMsRUFBQyxpQkFBUSxDQUFDLENBQUE7QUFFM0MsTUFBTSxhQUFhLEdBQ2pCLDhHQUE4RyxDQUFBO0FBRXpHLEtBQUssVUFBVSxXQUFXLENBQy9CLE9BQXlDLEVBQ3pDLFNBQWlCLEVBQ2pCLFFBQWdCOztJQUVoQixJQUFJLFdBQVcsRUFBRSxFQUFFO1FBQ2pCLGVBQUssQ0FBQyxJQUFJLENBQUMsNkJBQTZCLE1BQUEsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLG1DQUFJLEVBQUUsRUFBRSxDQUFDLENBQUE7UUFDckUsT0FBTTtLQUNQO0lBRUQsT0FBTyxDQUFDLEtBQUssQ0FBQyxxQ0FBcUMsQ0FBQyxDQUFBO0lBQ3BELE1BQU0sV0FBVyxHQUFHLG9CQUFVLENBQUMsT0FBTyxDQUNwQyxTQUFTLEVBQ1QscUNBQXFDLENBQ3RDLENBQUE7SUFDRCxNQUFNLE1BQU0sR0FBRyxvQkFBVSxDQUFDLGlCQUFpQixDQUFDLFdBQVcsQ0FBQyxDQUFBO0lBQ3hELE1BQU0sUUFBUSxHQUFHLE1BQU0sZUFBSyxDQUFDLEdBQUcsQ0FBQyxhQUFhLEVBQUU7UUFDOUMsWUFBWSxFQUFFLFFBQVE7S0FDdkIsQ0FBQyxDQUFBO0lBQ0YsUUFBUSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUE7SUFDMUIsTUFBTSxlQUFlLENBQUMsTUFBTSxDQUFDLENBQUE7SUFDN0IsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFBO0lBRWpCLGVBQUssQ0FBQyxJQUFJLENBQ1Isd0VBQXdFLFFBQVEsR0FBRyxDQUNwRixDQUFBO0lBQ0QsZUFBSyxDQUFDLElBQUksQ0FBQyxnREFBZ0QsQ0FBQyxDQUFBO0lBQzVELE9BQU8sQ0FBQyxLQUFLLENBQUMsaUNBQWlDLENBQUMsQ0FBQTtJQUNoRCxNQUFNLGdCQUFNLENBQUMsSUFBSSxDQUFDLFlBQVksV0FBVyxFQUFFLENBQUMsQ0FBQTtJQUM1QyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUE7QUFDbkIsQ0FBQztBQTlCRCxrQ0E4QkM7QUFFRCxTQUFnQixXQUFXO0lBQ3pCLE9BQU8sQ0FDTCxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsS0FBSyxTQUFTO1FBQ2xDLE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxLQUFLLFNBQVM7UUFDeEMsb0JBQVUsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUMsS0FBSyxLQUFLO1FBQ3ZELG9CQUFVLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLEtBQUssS0FBSyxDQUNsRCxDQUFBO0FBQ0gsQ0FBQztBQVBELGtDQU9DIn0=
41
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2luZG93cy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy90b29sYm94L3NldHVwL2VzcDMyL3dpbmRvd3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFVQSxrQ0EwQkc7QUFFRCxrQ0FPQztBQTdDSCxxQ0FBbUQ7QUFFbkQsa0RBQXlCO0FBQ3pCLCtCQUFnQztBQUNoQyxtQ0FBaUM7QUFFakMsTUFBTSxlQUFlLEdBQUcsSUFBQSxnQkFBUyxFQUFDLGlCQUFRLENBQUMsQ0FBQTtBQUUzQyxNQUFNLGFBQWEsR0FBRyw4R0FBOEcsQ0FBQTtBQUU3SCxLQUFLLFVBQVUsV0FBVyxDQUM3QixPQUF5QyxFQUN6QyxTQUFpQixFQUNqQixRQUFnQjs7SUFHaEIsSUFBSSxXQUFXLEVBQUUsRUFBRSxDQUFDO1FBQ2xCLGVBQUssQ0FBQyxJQUFJLENBQUMsNkJBQTZCLE1BQUEsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLG1DQUFJLEVBQUUsRUFBRSxDQUFDLENBQUE7UUFDckUsT0FBTTtJQUNSLENBQUM7SUFFRCxPQUFPLENBQUMsS0FBSyxDQUFDLHFDQUFxQyxDQUFDLENBQUE7SUFDcEQsTUFBTSxXQUFXLEdBQUcsb0JBQVUsQ0FBQyxPQUFPLENBQUMsU0FBUyxFQUFFLHFDQUFxQyxDQUFDLENBQUE7SUFDeEYsTUFBTSxNQUFNLEdBQUcsb0JBQVUsQ0FBQyxpQkFBaUIsQ0FBQyxXQUFXLENBQUMsQ0FBQTtJQUN4RCxNQUFNLFFBQVEsR0FBRyxNQUFNLGVBQUssQ0FBQyxHQUFHLENBQUMsYUFBYSxFQUFFO1FBQzVDLFlBQVksRUFBRSxRQUFRO0tBQ3pCLENBQUMsQ0FBQTtJQUNGLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBQzFCLE1BQU0sZUFBZSxDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBQzdCLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUVqQixlQUFLLENBQUMsSUFBSSxDQUFDLHdFQUF3RSxRQUFRLEdBQUcsQ0FBQyxDQUFBO0lBQy9GLGVBQUssQ0FBQyxJQUFJLENBQUMsZ0RBQWdELENBQUMsQ0FBQTtJQUM1RCxPQUFPLENBQUMsS0FBSyxDQUFDLGlDQUFpQyxDQUFDLENBQUE7SUFDaEQsTUFBTSxnQkFBTSxDQUFDLElBQUksQ0FBQyxZQUFZLFdBQVcsRUFBRSxDQUFDLENBQUE7SUFDNUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFBO0FBQ25CLENBQUM7QUFFRCxTQUFnQixXQUFXO0lBQ3pCLE9BQU8sQ0FDTCxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsS0FBSyxTQUFTO1FBQ2xDLE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxLQUFLLFNBQVM7UUFDeEMsb0JBQVUsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUMsS0FBSyxLQUFLO1FBQ3ZELG9CQUFVLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLEtBQUssS0FBSyxDQUNsRCxDQUFBO0FBQ0gsQ0FBQyJ9