diff --git a/packages/uhk-agent/src/electron-main.ts b/packages/uhk-agent/src/electron-main.ts index 325ebf04e32..e18837f5369 100644 --- a/packages/uhk-agent/src/electron-main.ts +++ b/packages/uhk-agent/src/electron-main.ts @@ -104,9 +104,9 @@ async function createWindow() { webPreferences: { contextIsolation: false, spellcheck: false, - preload: path.join(__dirname, 'preload.js') + preload: path.join(import.meta.dirname, 'preload.js') }, - icon: path.join(__dirname, 'renderer/assets/images/agent-app-icon.png'), + icon: path.join(import.meta.dirname, 'renderer/assets/images/agent-app-icon.png'), backgroundColor: await getWindowBackgroundColor(), show: false }); @@ -125,7 +125,7 @@ async function createWindow() { // and load the index.html of the app. win.loadURL(url.format({ - pathname: path.join(__dirname, 'renderer/index.html'), + pathname: path.join(import.meta.dirname, 'renderer/index.html'), protocol: 'file:', slashes: true })); diff --git a/packages/uhk-agent/webpack.config.js b/packages/uhk-agent/webpack.config.js index c9d82b5e536..13e767723e0 100644 --- a/packages/uhk-agent/webpack.config.js +++ b/packages/uhk-agent/webpack.config.js @@ -13,10 +13,14 @@ module.exports = { path: rootDir + "/dist", filename: "electron-main.js" }, - target: 'electron-main', + target: 'electron42.4-main', + experiments: { + outputModule: true, + }, + externalsType: 'module', externals: { - "node-hid": "require('node-hid')", - "serialport": "require('serialport')", + "node-hid": "node-hid", + "serialport": "serialport", }, devtool: 'source-map', resolve: { @@ -52,9 +56,4 @@ module.exports = { webpackHelper.root(__dirname, './src') // location of your src ) ], - node: { - __dirname: false, - __filename: false - } - }