Commit 4d2eaa0a authored by 神楽坂玲奈's avatar 神楽坂玲奈

update

parent dc6e0585
...@@ -48,7 +48,13 @@ ...@@ -48,7 +48,13 @@
"glob", "glob",
"aria2", "aria2",
"fast-glob", "fast-glob",
"fs-extra" "fs-extra",
"jquery-i18n",
"strophe.js",
"strophejs-plugin-caps",
"strophejs-plugin-disco",
"strophejs-plugin-muc",
"strophejs-plugin-roster"
], ],
"customWebpackConfig": {}, "customWebpackConfig": {},
"outputPath": "dist/mycard", "outputPath": "dist/mycard",
...@@ -86,7 +92,7 @@ ...@@ -86,7 +92,7 @@
"vendorChunk": true, "vendorChunk": true,
"extractLicenses": false, "extractLicenses": false,
"sourceMap": true, "sourceMap": true,
"namedChunks": true, "namedChunks": true
} }
}, },
"defaultConfiguration": "production" "defaultConfiguration": "production"
......
...@@ -10,7 +10,9 @@ const Store = require('electron-store'); ...@@ -10,7 +10,9 @@ const Store = require('electron-store');
const isDev = require('electron-is-dev'); const isDev = require('electron-is-dev');
const child_process = require('child_process'); const child_process = require('child_process');
const path = require('path'); const path = require('path');
require('@electron/remote/main').initialize(); import remote from '@electron/remote/main';
remote.initialize();
const store = new Store(); const store = new Store();
const locale = store.get('locale'); const locale = store.get('locale');
...@@ -85,8 +87,9 @@ autoUpdater.on('update-downloaded', (event) => { ...@@ -85,8 +87,9 @@ autoUpdater.on('update-downloaded', (event) => {
width: 640, width: 640,
height: 360, height: 360,
autoHideMenuBar: true, autoHideMenuBar: true,
webPreferences: { nodeIntegration: true, contextIsolation: false, enableRemoteModule: true } webPreferences: { nodeIntegration: true, contextIsolation: false }
}); });
remote.enable(updateWindow.webContents);
updateWindow.loadFile('projects/update/update.html'); updateWindow.loadFile('projects/update/update.html');
updateWindow.webContents.on('new-window', function(e, url) { updateWindow.webContents.on('new-window', function(e, url) {
e.preventDefault(); e.preventDefault();
...@@ -154,9 +157,10 @@ async function createWindow() { ...@@ -154,9 +157,10 @@ async function createWindow() {
minWidth: 1024, minWidth: 1024,
minHeight: 640, minHeight: 640,
frame: process.platform === 'darwin', frame: process.platform === 'darwin',
webPreferences: { nodeIntegration: true, contextIsolation: false, enableRemoteModule: true, webviewTag: true, webSecurity: false }, webPreferences: { nodeIntegration: true, contextIsolation: false, webviewTag: true, webSecurity: false },
titleBarStyle: process.platform === 'darwin' ? 'hidden' : undefined titleBarStyle: process.platform === 'darwin' ? 'hidden' : undefined
}); });
remote.enable(mainWindow.webContents);
// and load the index.html of the app. // and load the index.html of the app.
if (isDev) { if (isDev) {
......
This diff is collapsed.
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
"description": "萌卡客户端", "description": "萌卡客户端",
"author": "zh99998 <zh99998@gmail.com>", "author": "zh99998 <zh99998@gmail.com>",
"dependencies": { "dependencies": {
"@electron/remote": "^1.2.1", "@electron/remote": "^2.0.1",
"bootstrap": "^5.1.0", "bootstrap": "^5.1.0",
"electron-browser-storage": "^1.0.7", "electron-browser-storage": "^1.0.7",
"electron-is-dev": "^2.0.0", "electron-is-dev": "^2.0.0",
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
"aria2": "^4.1.2", "aria2": "^4.1.2",
"candy": "https://github.com/moecube/candy/releases/download/v2.2.0/candy.tar.gz", "candy": "https://github.com/moecube/candy/releases/download/v2.2.0/candy.tar.gz",
"candy-shop": "github:candy-chat/candy-plugins", "candy-shop": "github:candy-chat/candy-plugins",
"electron": "^13.3.0", "electron": "^14.0.1",
"electron-builder": "^22.11.7", "electron-builder": "^22.11.7",
"electron-builder-notarize": "^1.2.0", "electron-builder-notarize": "^1.2.0",
"exports-loader": "^3.0.0", "exports-loader": "^3.0.0",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment