Skip to content

Commit

Permalink
Merge pull request #12 from AltarikMC/dependabot/npm_and_yarn/electro…
Browse files Browse the repository at this point in the history
…n-12.0.1

Bump electron from 12.0.0 to 12.0.1
  • Loading branch information
quentinlegot committed Mar 16, 2021
2 parents 8e44926 + f82c419 commit 8bc658b
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -16,7 +16,7 @@
"devDependencies": {
"@electron-forge/cli": "^6.0.0-beta.54",
"@electron-forge/maker-squirrel": "^6.0.0-beta.54",
"electron": "^12.0.0"
"electron": "^12.0.1"
},
"dependencies": {
"electron-is-dev": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion src/client/assets/js/script.js
@@ -1,5 +1,5 @@
'use strict';
const {ipcRenderer} = require('electron');
const { ipcRenderer } = require('electron');

window.addEventListener("DOMContentLoaded", () => {
const minimizeButton = document.getElementById("minimize-btn")
Expand Down
2 changes: 1 addition & 1 deletion src/server/main.js
Expand Up @@ -31,7 +31,7 @@ function createWindow () {
icon: iconPath,
webPreferences: {
nodeIntegration: true,
enableRemoteModule: true
contextIsolation: false
},
frame: false,
})
Expand Down

0 comments on commit 8bc658b

Please sign in to comment.