build: use .cjs extension for commonjs bundles

This commit is contained in:
Lukas Obermann
2023-11-05 14:40:40 +01:00
parent 09ffd575fd
commit 14d36afb44
7 changed files with 11 additions and 15 deletions
-1
View File
@@ -1,7 +1,6 @@
.DS_Store
node_modules/
/.webpack/**/*
!/.webpack/package.json
npm-debug.log*
.vs/
/data/
-3
View File
@@ -1,3 +0,0 @@
{
"type": "commonjs"
}
+1 -1
View File
@@ -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",
+1 -1
View File
@@ -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<Database>(resolve => {
databaseProcess.on("message", (message: Database) => {
debug("database received")
+1 -1
View File
@@ -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",
+1 -1
View File
@@ -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",
+7 -7
View File
@@ -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