Skip to content

Commit ae89c41

Browse files
committed
Revert "feat(serial-bridge): Change serial-bridge from common-js to esm-module"
This reverts commit e24cb21.
1 parent 9013879 commit ae89c41

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

frontend/src-electron/electron-main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const bridge = {
4444
path.resolve(
4545
currentDir,
4646
extraResourcesPath,
47-
'serial-bridge/bridgeProcess.js'
47+
'serial-bridge/bridgeProcess.cjs'
4848
)
4949
)
5050
bridge.process.on('message', (message) => {

frontend/src-electron/extraResources/serial-bridge/bridgeProcess.js renamed to frontend/src-electron/extraResources/serial-bridge/bridgeProcess.cjs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
import { spawn } from 'child_process'
2-
import { resolve } from 'path'
1+
const { spawn } = require('child_process')
2+
const path = require('path')
33
const decoder = new TextDecoder()
44

5-
import { fileURLToPath } from 'node:url'
6-
const currentDir = fileURLToPath(new URL('.', import.meta.url))
7-
8-
const bridgeProcess = spawn(resolve(currentDir, 'flipper_lab_bridge'))
5+
const bridgeProcess = spawn(path.resolve(__dirname, 'flipper_lab_bridge'))
96

107
bridgeProcess.stdout.on('data', (data) => {
118
process.parentPort.postMessage({

0 commit comments

Comments
 (0)