From 555cb0125c61dac2339e741a9dc807eb65bc33c9 Mon Sep 17 00:00:00 2001 From: Daniel Scalzi Date: Sun, 2 Jun 2019 16:15:57 -0400 Subject: [PATCH] Electron@5 --- app/assets/lang/en_US.json | 2 +- index.js | 2 +- package-lock.json | 29 +++++++++++++++-------------- package.json | 4 ++-- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/app/assets/lang/en_US.json b/app/assets/lang/en_US.json index 46b5a3d..25b34c2 100644 --- a/app/assets/lang/en_US.json +++ b/app/assets/lang/en_US.json @@ -1,6 +1,6 @@ { "html": { - "avatarOverlay": "Dankname" + "avatarOverlay": "Edit" }, "js": { "login": { diff --git a/index.js b/index.js index 4f4f1ab..a4e90b7 100644 --- a/index.js +++ b/index.js @@ -117,7 +117,7 @@ function createWindow() { win.show() })*/ - win.setMenu(null) + win.removeMenu() win.setResizable(true) diff --git a/package-lock.json b/package-lock.json index 1a522e7..d92f474 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,9 +31,9 @@ } }, "@types/node": { - "version": "10.14.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.7.tgz", - "integrity": "sha512-on4MmIDgHXiuJDELPk1NFaKVUxxCFr37tm8E9yN6rAiF5Pzp/9bBfBHkoexqRiY+hk/Z04EJU9kKEb59YqJ82A==", + "version": "10.14.8", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.8.tgz", + "integrity": "sha512-I4+DbJEhLEg4/vIy/2gkWDvXBOOtPKV9EnLhYjMoqxcRW+TTZtUftkHktz/a8suoD5mUL7m6ReLrkPvSsCQQmw==", "dev": true }, "acorn": { @@ -875,8 +875,9 @@ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" }, "discord-rpc": { - "version": "github:discordjs/RPC#1bd83d3b895766e25c457b031079d783678875ff", - "from": "github:discordjs/RPC", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/discord-rpc/-/discord-rpc-3.0.2.tgz", + "integrity": "sha512-13JDueH1geWUlS0aLzVl2nLoEQx9U69Ie3vxMM3D6nOSKASq/irohqxT3AU0zhZDEtkp23AWWMLRwOlXcfCvWg==", "requires": { "node-fetch": "^2.3.0", "ws": "^6.1.1" @@ -998,9 +999,9 @@ } }, "electron": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/electron/-/electron-4.2.2.tgz", - "integrity": "sha512-SNRr83kbsnNZU9AdYkAJZEW7UH9Q9Fvl0ynuKBXgFFulTX+Gkw5JATl2Tt4OQIKdCGUuBDaw+MEMXlaroNpceA==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/electron/-/electron-5.0.2.tgz", + "integrity": "sha512-bUHKQhyuOen/q8iHTkrnzqB9CAwBDI+vHbeu21kpq2bqAD+t25yfrmUEcYHaPL4fZOAhk6nnRqskF6/Xd+aZxg==", "dev": true, "requires": { "@types/node": "^10.12.18", @@ -2418,9 +2419,9 @@ "dev": true }, "node-fetch": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.3.0.tgz", - "integrity": "sha512-MOd8pV3fxENbryESLgVIeaGKrdl+uaYhCSSVkjeOb/31/njTpcis5aWfdqgNlHIrKOLRbMnfPINPOML2CIFeXA==" + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", + "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" }, "normalize-package-data": { "version": "2.5.0", @@ -3857,9 +3858,9 @@ } }, "ws": { - "version": "6.1.4", - "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.4.tgz", - "integrity": "sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz", + "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==", "requires": { "async-limiter": "~1.0.0" } diff --git a/package.json b/package.json index 5e073d5..5a9aaf0 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "dependencies": { "adm-zip": "^0.4.13", "async": "^3.0.1", - "discord-rpc": "github:discordjs/RPC", + "discord-rpc": "3.0.2", "ejs": "^2.6.1", "ejs-electron": "^2.0.3", "electron-updater": "^4.0.6", @@ -41,7 +41,7 @@ }, "devDependencies": { "cross-env": "^5.2.0", - "electron": "^4.2.2", + "electron": "^5.0.2", "electron-builder": "^20.41.0", "eslint": "^5.16.0" },