Merge branch 'develop'
This commit is contained in:
@@ -37,7 +37,6 @@ const { BOARD, SOFTWARE, USER } = Config;
|
|||||||
const fs = Mixly.require('node:fs');
|
const fs = Mixly.require('node:fs');
|
||||||
const fs_plus = Mixly.require('fs-plus');
|
const fs_plus = Mixly.require('fs-plus');
|
||||||
const fs_extra = Mixly.require('fs-extra');
|
const fs_extra = Mixly.require('fs-extra');
|
||||||
const lodash_fp = Mixly.require('lodash/fp');
|
|
||||||
const child_process = Mixly.require('node:child_process');
|
const child_process = Mixly.require('node:child_process');
|
||||||
const iconv_lite = Mixly.require('iconv-lite');
|
const iconv_lite = Mixly.require('iconv-lite');
|
||||||
|
|
||||||
|
|||||||
@@ -36,7 +36,6 @@ const fs = Mixly.require('node:fs');
|
|||||||
const fs_plus = Mixly.require('fs-plus');
|
const fs_plus = Mixly.require('fs-plus');
|
||||||
const fs_extra = Mixly.require('fs-extra');
|
const fs_extra = Mixly.require('fs-extra');
|
||||||
const path = Mixly.require('node:path');
|
const path = Mixly.require('node:path');
|
||||||
const lodash_fp = Mixly.require('lodash/fp');
|
|
||||||
const child_process = Mixly.require('node:child_process');
|
const child_process = Mixly.require('node:child_process');
|
||||||
const iconv_lite = Mixly.require('iconv-lite');
|
const iconv_lite = Mixly.require('iconv-lite');
|
||||||
const os = Mixly.require('node:os');
|
const os = Mixly.require('node:os');
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ goog.require('Mixly.Debug');
|
|||||||
goog.require('Mixly.Electron');
|
goog.require('Mixly.Electron');
|
||||||
goog.provide('Mixly.Electron.Serial');
|
goog.provide('Mixly.Electron.Serial');
|
||||||
|
|
||||||
const lodash_fp = Mixly.require('lodash/fp');
|
|
||||||
const child_process = Mixly.require('node:child_process');
|
const child_process = Mixly.require('node:child_process');
|
||||||
const serialport = Mixly.require('serialport');
|
const serialport = Mixly.require('serialport');
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
importScripts('../common/serial-worker.js');
|
importScripts('../common/serial-worker.js');
|
||||||
const lodash_fp = require('lodash/fp');
|
|
||||||
const child_process = require('node:child_process');
|
const child_process = require('node:child_process');
|
||||||
const serialport = require('serialport');
|
const serialport = require('serialport');
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user