diff --git a/.gitignore b/.gitignore index f019d886..66987b30 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ .DS_Store node_modules/ /.webpack/**/* -!/.webpack/package.json npm-debug.log* .vs/ /data/ diff --git a/.webpack/package.json b/.webpack/package.json deleted file mode 100644 index 5bbefffb..00000000 --- a/.webpack/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "type": "commonjs" -} diff --git a/package.json b/package.json index 8f8d45d0..35d7337d 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ }, "homepage": "https://optolith.app", "license": "MPL-2.0", - "main": ".webpack/main.js", + "main": ".webpack/main.cjs", "dependencies": { "@reduxjs/toolkit": "^1.9.7", "adm-zip": "^0.5.10", diff --git a/src/main/index.ts b/src/main/index.ts index 91b20ae3..dd142834 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -17,7 +17,7 @@ app.setAppUserModelId("lukasobermann.optolith") const isMac = process.platform === "darwin" debug("loading database ...") -const databaseProcess = utilityProcess.fork(join(__dirname, "./database.js")) +const databaseProcess = utilityProcess.fork(join(__dirname, "./database.cjs")) const databaseLoading = new Promise(resolve => { databaseProcess.on("message", (message: Database) => { debug("database received") diff --git a/src/main/mainWindow.ts b/src/main/mainWindow.ts index 094da1ad..ae18824d 100644 --- a/src/main/mainWindow.ts +++ b/src/main/mainWindow.ts @@ -41,7 +41,7 @@ export const createMainWindow = async (database: Database) => { acceptFirstMouse: true, backgroundColor: getWindowBackgroundColor(getGlobalSettings().theme), webPreferences: { - preload: path.join(__dirname, "renderer_main_preload.js"), + preload: path.join(__dirname, "renderer_main_preload.cjs"), }, show: false, titleBarStyle: "hiddenInset", diff --git a/src/main/settingsWindow.ts b/src/main/settingsWindow.ts index 2dcd4147..9da5d5c2 100644 --- a/src/main/settingsWindow.ts +++ b/src/main/settingsWindow.ts @@ -38,7 +38,7 @@ export const createSettingsWindow = async ( acceptFirstMouse: true, backgroundColor: getWindowBackgroundColor(getGlobalSettings().theme), webPreferences: { - preload: path.join(__dirname, "renderer_settings_preload.js"), + preload: path.join(__dirname, "renderer_settings_preload.cjs"), }, show: false, titleBarStyle: "hidden", diff --git a/webpack.config.js b/webpack.config.js index dc004452..a1e6a602 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -18,7 +18,7 @@ const createRendererConfig = name => [ entry: { [`renderer_${name}`]: `./src/${name}_window/index.tsx` }, - target: "electron-renderer", + target: "electron27-renderer", optimization: getOptimization(`renderer_${name}`), module: { rules: rules @@ -45,7 +45,7 @@ const createRendererConfig = name => [ entry: { [`renderer_${name}_preload`]: `./src/${name}_window_preload/index.ts` }, - target: "electron-preload", + target: "electron27-preload", module: { rules: rules }, @@ -54,7 +54,7 @@ const createRendererConfig = name => [ }, output: { path: resolve(dirname(fileURLToPath(import.meta.url)), ".webpack"), - filename: "[name].js" + filename: "[name].cjs" } } ] @@ -67,7 +67,7 @@ export default [ entry: { main: "./src/main/index.ts" }, - target: "electron-main", + target: "electron27-main", optimization: getOptimization("main"), module: { rules: rules @@ -77,7 +77,7 @@ export default [ }, output: { path: resolve(dirname(fileURLToPath(import.meta.url)), ".webpack"), - filename: "[name].js" + filename: "[name].cjs" }, externalsPresets: { electronMain: true @@ -89,7 +89,7 @@ export default [ entry: { database: "./src/database/index.ts" }, - target: "electron-main", + target: "electron27-main", optimization: getOptimization("database"), module: { rules: rules @@ -99,7 +99,7 @@ export default [ }, output: { path: resolve(dirname(fileURLToPath(import.meta.url)), ".webpack"), - filename: "[name].js" + filename: "[name].cjs" }, externalsPresets: { electronMain: true