diff --git a/forge.config.ts b/forge.config.ts index 300a11fed..db8e7a0bb 100644 --- a/forge.config.ts +++ b/forge.config.ts @@ -67,6 +67,7 @@ const config: ForgeConfig = { preload: { js: './src/renderer/main/preload.ts', }, + nodeIntegration: true, }, { html: './src/renderer/about/about.html', @@ -75,6 +76,7 @@ const config: ForgeConfig = { preload: { js: './src/renderer/about/about_preload.ts', }, + nodeIntegration: true, }, { html: './src/renderer/splash/splash.html', diff --git a/package.json b/package.json index 6b2a74369..67364eeb7 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "@electron-forge/maker-squirrel": "^6.4.2", "@electron-forge/maker-zip": "^6.4.2", "@electron-forge/plugin-auto-unpack-natives": "^6.4.2", - "@electron-forge/plugin-webpack": "6.4.1", + "@electron-forge/plugin-webpack": "6.4.2", "@electron-forge/publisher-github": "^6.4.2", "@types/bootstrap": "^5.2.6", "@types/electron-prompt": "^1.6.1", diff --git a/yarn.lock b/yarn.lock index 653c1d613..cccb237b0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -216,22 +216,6 @@ listr2 "^5.0.3" semver "^7.2.1" -"@electron-forge/core-utils@6.4.1": - version "6.4.1" - resolved "https://registry.yarnpkg.com/@electron-forge/core-utils/-/core-utils-6.4.1.tgz#a440e6261af6ba1d12135eee3400b43c84ce54f5" - integrity sha512-6vydG7ixJamMM/rkOjHfQBiSiJrRVA4vDnFxt1WTIYFAmhODkrjKFlIXZrGNaV18AKG9B42nTXl9gz69YbAFOQ== - dependencies: - "@electron-forge/shared-types" "6.4.1" - "@electron/rebuild" "^3.2.10" - "@malept/cross-spawn-promise" "^2.0.0" - chalk "^4.0.0" - debug "^4.3.1" - find-up "^5.0.0" - fs-extra "^10.0.0" - log-symbols "^4.0.0" - semver "^7.2.1" - yarn-or-npm "^3.0.1" - "@electron-forge/core-utils@6.4.2": version "6.4.2" resolved "https://registry.yarnpkg.com/@electron-forge/core-utils/-/core-utils-6.4.2.tgz#99c2b459e07ec504b3e0ee0af090e180e78aefa1" @@ -347,13 +331,6 @@ "@electron-forge/plugin-base" "6.4.2" "@electron-forge/shared-types" "6.4.2" -"@electron-forge/plugin-base@6.4.1": - version "6.4.1" - resolved "https://registry.yarnpkg.com/@electron-forge/plugin-base/-/plugin-base-6.4.1.tgz#8821a17f4ba53de3838322db1dedb1db9bbacdad" - integrity sha512-GZDltDglbqX56vJTR9vQCeC6igTYo5u0Eqi987kBemjzJpPpMzO9FgzXNhDU+llUVsFO0pKojV4r5SSTStI/Hg== - dependencies: - "@electron-forge/shared-types" "6.4.1" - "@electron-forge/plugin-base@6.4.2": version "6.4.2" resolved "https://registry.yarnpkg.com/@electron-forge/plugin-base/-/plugin-base-6.4.2.tgz#65054f841728688cc31edeb94479e6bd4bc07782" @@ -361,19 +338,19 @@ dependencies: "@electron-forge/shared-types" "6.4.2" -"@electron-forge/plugin-webpack@6.4.1": - version "6.4.1" - resolved "https://registry.yarnpkg.com/@electron-forge/plugin-webpack/-/plugin-webpack-6.4.1.tgz#e4c4f6c36a88ed8096856df562249a449b22d2ff" - integrity sha512-L2qyr3aq+/ofPBLvooCvX//ujGdc88gibJGHuGRTba7kdNbkdDsFuiHSsSecc5VjzDafTRjIaBJjV0/VcDH4YQ== +"@electron-forge/plugin-webpack@6.4.2": + version "6.4.2" + resolved "https://registry.yarnpkg.com/@electron-forge/plugin-webpack/-/plugin-webpack-6.4.2.tgz#0d2da71314a91fc0f5e6d538fe18a4dd616c0a84" + integrity sha512-o+iQajtCCnYEPaJy0IkYI0noGqHoCDGMydki9sNU+CoUfDYBCNDkUXLTpoVkL6GmKTINT8kvOFgsFfPF9fhXlg== dependencies: - "@electron-forge/core-utils" "6.4.1" - "@electron-forge/plugin-base" "6.4.1" - "@electron-forge/shared-types" "6.4.1" - "@electron-forge/web-multi-logger" "6.4.1" + "@electron-forge/core-utils" "6.4.2" + "@electron-forge/plugin-base" "6.4.2" + "@electron-forge/shared-types" "6.4.2" + "@electron-forge/web-multi-logger" "6.4.2" chalk "^4.0.0" debug "^4.3.1" fs-extra "^10.0.0" - html-webpack-plugin "^5.3.1" + html-webpack-plugin "^5.5.3" webpack "^5.69.1" webpack-dev-server "^4.0.0" webpack-merge "^5.7.3" @@ -400,15 +377,6 @@ fs-extra "^10.0.0" mime-types "^2.1.25" -"@electron-forge/shared-types@6.4.1": - version "6.4.1" - resolved "https://registry.yarnpkg.com/@electron-forge/shared-types/-/shared-types-6.4.1.tgz#1f36f4a2bab30d856118a727291893c1e12bcd0e" - integrity sha512-Nr4ZLBzXX7ycqkNYJ+wQ2lCttQfkTN1OPOuY1jEGESNjCqcJ/apZszaLurVb5UwKucpk3/CzRGtg9DH4GIEEkw== - dependencies: - "@electron/rebuild" "^3.2.10" - electron-packager "^17.1.2" - listr2 "^5.0.3" - "@electron-forge/shared-types@6.4.2": version "6.4.2" resolved "https://registry.yarnpkg.com/@electron-forge/shared-types/-/shared-types-6.4.2.tgz#ffc25a21d1bc7e6cb8fcf8dc1e1767c6a8c52d02" @@ -465,10 +433,10 @@ "@electron-forge/template-base" "6.4.2" fs-extra "^10.0.0" -"@electron-forge/web-multi-logger@6.4.1": - version "6.4.1" - resolved "https://registry.yarnpkg.com/@electron-forge/web-multi-logger/-/web-multi-logger-6.4.1.tgz#f285c756fff32dbec0f9ad4cb920c4c199db7a82" - integrity sha512-S+vBfAcTf7qPwRNETGc7PZ8F3JftEVpwXeWxOj5uBLjnhw0kur+xGSeMIqimvDxDpq5bgU6fIJfbwNC4gmvsTg== +"@electron-forge/web-multi-logger@6.4.2": + version "6.4.2" + resolved "https://registry.yarnpkg.com/@electron-forge/web-multi-logger/-/web-multi-logger-6.4.2.tgz#d5504a7545dc5d1cf9defd27175277d932c56f85" + integrity sha512-acZwr5+4l5G6baaqUwU9tuJ/njhJLUu9LgTvjedknIipg22EwLqwhjdXuTpWb9gidXDjdAjSRFzEEyVZCCooFA== dependencies: express "^4.17.1" express-ws "^5.0.2" @@ -5099,10 +5067,10 @@ html-minifier-terser@^7.0.0: relateurl "^0.2.7" terser "^5.14.2" -html-webpack-plugin@^5.3.1: - version "5.5.0" - resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz#c3911936f57681c1f9f4d8b68c158cd9dfe52f50" - integrity sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw== +html-webpack-plugin@^5.5.3: + version "5.5.3" + resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz#72270f4a78e222b5825b296e5e3e1328ad525a3e" + integrity sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg== dependencies: "@types/html-minifier-terser" "^6.0.0" html-minifier-terser "^6.0.2"