From d8903fe85fe0321800a591991acbf61d3d36eb4c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Mar 2021 06:29:38 +0000 Subject: [PATCH 1/2] Bump electron from 12.0.0 to 12.0.1 Bumps [electron](https://github.com/electron/electron) from 12.0.0 to 12.0.1. - [Release notes](https://github.com/electron/electron/releases) - [Changelog](https://github.com/electron/electron/blob/master/docs/breaking-changes.md) - [Commits](https://github.com/electron/electron/compare/v12.0.0...v12.0.1) Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index d270a54..c16f67b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1389,9 +1389,9 @@ } }, "electron": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-12.0.0.tgz", - "integrity": "sha512-p6oxZ4LG82hopPGAsIMOjyoL49fr6cexyFNH0kADA9Yf+mJ72DN7bjvBG+6V7r6QKhwYgsSsW8RpxBeVOUbxVQ==", + "version": "12.0.1", + "resolved": "https://registry.npmjs.org/electron/-/electron-12.0.1.tgz", + "integrity": "sha512-4bTfLSTmuFkMxq3RMyjd8DxuzbxI1Bde879XDrBA4kFWbKhZ3hfXqHXQz3129eCmcLre5odcNsWq7/xzyJilMA==", "dev": true, "requires": { "@electron/get": "^1.0.1", @@ -1400,9 +1400,9 @@ }, "dependencies": { "@types/node": { - "version": "14.14.33", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.33.tgz", - "integrity": "sha512-oJqcTrgPUF29oUP8AsUqbXGJNuPutsetaa9kTQAQce5Lx5dTYWV02ScBiT/k1BX/Z7pKeqedmvp39Wu4zR7N7g==", + "version": "14.14.34", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.34.tgz", + "integrity": "sha512-dBPaxocOK6UVyvhbnpFIj2W+S+1cBTkHQbFQfeeJhoKFbzYcVUGHvddeWPSucKATb3F0+pgDq0i6ghEaZjsugA==", "dev": true } } diff --git a/package.json b/package.json index 7d0a9b6..7502b65 100644 --- a/package.json +++ b/package.json @@ -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", From f82c4199d5d6d7604e0f97c1d3bb31a5156b88a1 Mon Sep 17 00:00:00 2001 From: Quentin Legot Date: Tue, 16 Mar 2021 10:19:51 +0100 Subject: [PATCH 2/2] dump @types/node from 14.14.34 to 14.14.35 + contextIsolation from false to true --- package-lock.json | 6 +++--- src/client/assets/js/script.js | 2 +- src/server/main.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index c16f67b..b3b4f08 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1400,9 +1400,9 @@ }, "dependencies": { "@types/node": { - "version": "14.14.34", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.34.tgz", - "integrity": "sha512-dBPaxocOK6UVyvhbnpFIj2W+S+1cBTkHQbFQfeeJhoKFbzYcVUGHvddeWPSucKATb3F0+pgDq0i6ghEaZjsugA==", + "version": "14.14.35", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.35.tgz", + "integrity": "sha512-Lt+wj8NVPx0zUmUwumiVXapmaLUcAk3yPuHCFVXras9k5VT9TdhJqKqGVUQCD60OTMCl0qxJ57OiTL0Mic3Iag==", "dev": true } } diff --git a/src/client/assets/js/script.js b/src/client/assets/js/script.js index a97b5e7..c0d1f9e 100644 --- a/src/client/assets/js/script.js +++ b/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") diff --git a/src/server/main.js b/src/server/main.js index f75857a..debf063 100644 --- a/src/server/main.js +++ b/src/server/main.js @@ -31,7 +31,7 @@ function createWindow () { icon: iconPath, webPreferences: { nodeIntegration: true, - enableRemoteModule: true + contextIsolation: false }, frame: false, })