diff --git a/package-lock.json b/package-lock.json index 80a48b0..f89f317 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,17 +1,17 @@ { "name": "zy", - "version": "2.8.5", + "version": "2.8.6", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "zy", - "version": "2.8.5", + "version": "2.8.6", "hasInstallScript": true, "dependencies": { "@electron/remote": "^2.0.8", "axios": "^0.21.2", - "bootstrap-vue": "^2.21.2", + "bootstrap-vue": "^2.22.0", "cheerio": "1.0.0-rc.6", "core-js": "^3.10.2", "dexie": "^3.2.2", @@ -48,7 +48,7 @@ "@vue/cli-plugin-vuex": "~4.5.11", "@vue/cli-service": "~4.5.11", "babel-plugin-component": "^1.1.1", - "electron": "^16.0.0", + "electron": "^13.0.0", "electron-devtools-installer": "^3.1.1", "sass": "^1.30.0", "sass-loader": "^10.1.0", @@ -6511,12 +6511,12 @@ } }, "node_modules/electron": { - "version": "16.2.8", - "resolved": "https://registry.npmjs.org/electron/-/electron-16.2.8.tgz", - "integrity": "sha512-KSOytY6SPLsh3iCziztqa/WgJyfDOKzCvNqku9gGIqSdT8CqtV66dTU1SOrKZQjRFLxHaF8LbyxUL1vwe4taqw==", + "version": "13.6.9", + "resolved": "https://registry.npmjs.org/electron/-/electron-13.6.9.tgz", + "integrity": "sha512-Es/sBy85NIuqsO9MW41PUCpwIkeinlTQ7g0ainfnmRAM2rmog3GBxVCaoV5dzEjwTF7TKG1Yr/E7Z3qHmlfWAg==", "hasInstallScript": true, "dependencies": { - "@electron/get": "^1.13.0", + "@electron/get": "^1.0.1", "@types/node": "^14.6.2", "extract-zip": "^1.0.3" }, @@ -23944,11 +23944,11 @@ } }, "electron": { - "version": "16.2.8", - "resolved": "https://registry.npmjs.org/electron/-/electron-16.2.8.tgz", - "integrity": "sha512-KSOytY6SPLsh3iCziztqa/WgJyfDOKzCvNqku9gGIqSdT8CqtV66dTU1SOrKZQjRFLxHaF8LbyxUL1vwe4taqw==", + "version": "13.6.9", + "resolved": "https://registry.npmjs.org/electron/-/electron-13.6.9.tgz", + "integrity": "sha512-Es/sBy85NIuqsO9MW41PUCpwIkeinlTQ7g0ainfnmRAM2rmog3GBxVCaoV5dzEjwTF7TKG1Yr/E7Z3qHmlfWAg==", "requires": { - "@electron/get": "^1.13.0", + "@electron/get": "^1.0.1", "@types/node": "^14.6.2", "extract-zip": "^1.0.3" }, diff --git a/package.json b/package.json index 6423c5a..47beac3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "zy", - "version": "2.8.6", + "version": "2.8.7", "private": true, "scripts": { "serve": "vue-cli-service serve", @@ -19,7 +19,7 @@ "dependencies": { "@electron/remote": "^2.0.8", "axios": "^0.21.2", - "bootstrap-vue": "^2.21.2", + "bootstrap-vue": "^2.22.0", "cheerio": "1.0.0-rc.6", "core-js": "^3.10.2", "dexie": "^3.2.2", @@ -56,7 +56,7 @@ "@vue/cli-plugin-vuex": "~4.5.11", "@vue/cli-service": "~4.5.11", "babel-plugin-component": "^1.1.1", - "electron": "^16.0.0", + "electron": "^13.0.0", "electron-devtools-installer": "^3.1.1", "sass": "^1.30.0", "sass-loader": "^10.1.0", diff --git a/src/background.js b/src/background.js index 96c9e2a..80ffbfa 100644 --- a/src/background.js +++ b/src/background.js @@ -25,6 +25,7 @@ function createWindow () { resizable: true, webPreferences: { webSecurity: false, + enableRemoteModule: true, nodeIntegration: true, contextIsolation: false, allowRunningInsecureContent: false @@ -67,7 +68,7 @@ function createWindow () { if (process.platform === 'darwin') { app.dock.show() } -if (process.platform === 'Linux') { +if (process.platform === 'linux') { app.disableHardwareAcceleration() app.commandLine.appendSwitch('--no-sandbox') // linux 关闭沙盒模式 } diff --git a/yarn.lock b/yarn.lock index 93a4a53..5e29256 100644 --- a/yarn.lock +++ b/yarn.lock @@ -882,7 +882,7 @@ "ajv" "^6.12.0" "ajv-keywords" "^3.4.1" -"@electron/get@^1.13.0": +"@electron/get@^1.0.1": "integrity" "sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw==" "resolved" "https://registry.npmjs.org/@electron/get/-/get-1.14.1.tgz" "version" "1.14.1" @@ -2253,7 +2253,7 @@ "resolved" "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz" "version" "3.2.0" -"bootstrap-vue@^2.21.2": +"bootstrap-vue@^2.22.0": "integrity" "sha512-denjR/ae0K7Jrcqud3TrZWw0p/crtyigeGUNunWQ4t+KFi+7rzJ6j6lx1W5/gpUtSSUgNbWrXcHH4lIWXzXOOQ==" "resolved" "https://registry.npmjs.org/bootstrap-vue/-/bootstrap-vue-2.22.0.tgz" "version" "2.22.0" @@ -4025,12 +4025,12 @@ "lodash.isequal" "^4.5.0" "semver" "^7.3.4" -"electron@^16.0.0", "electron@>= 13.0.0": - "integrity" "sha512-KSOytY6SPLsh3iCziztqa/WgJyfDOKzCvNqku9gGIqSdT8CqtV66dTU1SOrKZQjRFLxHaF8LbyxUL1vwe4taqw==" - "resolved" "https://registry.npmjs.org/electron/-/electron-16.2.8.tgz" - "version" "16.2.8" +"electron@^13.0.0", "electron@>= 13.0.0": + "integrity" "sha512-Es/sBy85NIuqsO9MW41PUCpwIkeinlTQ7g0ainfnmRAM2rmog3GBxVCaoV5dzEjwTF7TKG1Yr/E7Z3qHmlfWAg==" + "resolved" "https://registry.npmjs.org/electron/-/electron-13.6.9.tgz" + "version" "13.6.9" dependencies: - "@electron/get" "^1.13.0" + "@electron/get" "^1.0.1" "@types/node" "^14.6.2" "extract-zip" "^1.0.3"