Altarik/Launcher
4
0
Fork 0
mirror of https://github.com/AltarikMC/Launcher synced 2024-11-22 06:19:50 +01:00
Code

Merge pull request #12 from AltarikMC/dependabot/npm_and_yarn/electron-12.0.1

Browse Source 
Bump electron from 12.0.0 to 12.0.1
This commit is contained in:
Quentin Legot 2021-03-16 10:24:42 +01:00 committed by GitHub
commit 8bc658bcfa
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package-lock.json generated
View File

@ -1389,9 +1389,9 @@
} }
}, },
"electron": { "electron": {
"version": "12.0.0", "version": "12.0.1",
"resolved": "https://registry.npmjs.org/electron/-/electron-12.0.0.tgz", "resolved": "https://registry.npmjs.org/electron/-/electron-12.0.1.tgz",
"integrity": "sha512-p6oxZ4LG82hopPGAsIMOjyoL49fr6cexyFNH0kADA9Yf+mJ72DN7bjvBG+6V7r6QKhwYgsSsW8RpxBeVOUbxVQ==", "integrity": "sha512-4bTfLSTmuFkMxq3RMyjd8DxuzbxI1Bde879XDrBA4kFWbKhZ3hfXqHXQz3129eCmcLre5odcNsWq7/xzyJilMA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@electron/get": "^1.0.1", "@electron/get": "^1.0.1",
@ -1400,9 +1400,9 @@
}, },
"dependencies": { "dependencies": {
"@types/node": { "@types/node": {
"version": "14.14.33", "version": "14.14.35",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.33.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.35.tgz",
"integrity": "sha512-oJqcTrgPUF29oUP8AsUqbXGJNuPutsetaa9kTQAQce5Lx5dTYWV02ScBiT/k1BX/Z7pKeqedmvp39Wu4zR7N7g==", "integrity": "sha512-Lt+wj8NVPx0zUmUwumiVXapmaLUcAk3yPuHCFVXras9k5VT9TdhJqKqGVUQCD60OTMCl0qxJ57OiTL0Mic3Iag==",
"dev": true "dev": true
} }
} }

2
package.json
View File

@ -16,7 +16,7 @@
"devDependencies": { "devDependencies": {
"@electron-forge/cli": "^6.0.0-beta.54", "@electron-forge/cli": "^6.0.0-beta.54",
"@electron-forge/maker-squirrel": "^6.0.0-beta.54", "@electron-forge/maker-squirrel": "^6.0.0-beta.54",
"electron": "^12.0.0" "electron": "^12.0.1"
}, },
"dependencies": { "dependencies": {
"electron-is-dev": "^2.0.0", "electron-is-dev": "^2.0.0",

2
src/client/assets/js/script.js
View File

@ -1,5 +1,5 @@
'use strict'; 'use strict';
const {ipcRenderer} = require('electron'); const { ipcRenderer } = require('electron');
window.addEventListener("DOMContentLoaded", () => { window.addEventListener("DOMContentLoaded", () => {
const minimizeButton = document.getElementById("minimize-btn") const minimizeButton = document.getElementById("minimize-btn")

2
src/server/main.js
View File

@ -31,7 +31,7 @@ function createWindow () {
icon: iconPath, icon: iconPath,
webPreferences: { webPreferences: {
nodeIntegration: true, nodeIntegration: true,
enableRemoteModule: true contextIsolation: false
}, },
frame: false, frame: false,
}) })