Dependency upgrade.

pull/98/head
Daniel Scalzi 2020-08-10 17:41:57 -04:00
parent 0203295e7c
commit 46853157ec
No known key found for this signature in database
GPG Key ID: D18EA3FB4B142A57
5 changed files with 537 additions and 533 deletions

View File

@ -136,10 +136,10 @@ Paste the following into `.vscode/launch.json`
"name": "Debug Main Process",
"type": "node",
"request": "launch",
"cwd": "${workspaceRoot}",
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron",
"cwd": "${workspaceFolder}",
"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
"windows": {
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron.cmd"
"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron.cmd"
},
"args": ["."],
"console": "integratedTerminal",
@ -149,15 +149,15 @@ Paste the following into `.vscode/launch.json`
"name": "Debug Renderer Process",
"type": "chrome",
"request": "launch",
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron",
"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
"windows": {
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron.cmd"
"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron.cmd"
},
"runtimeArgs": [
"${workspaceRoot}/.",
"${workspaceFolder}/.",
"--remote-debugging-port=9222"
],
"webRoot": "${workspaceRoot}"
"webRoot": "${workspaceFolder}"
}
]
}

View File

@ -27,14 +27,14 @@
</style>
</head>
<body bkid="<%=bkid%>">
<% include frame.ejs %>
<%- include('frame') %>
<div id="main">
<% include welcome.ejs %>
<% include login.ejs %>
<% include settings.ejs %>
<% include landing.ejs %>
<%- include('welcome') %>
<%- include('login') %>
<%- include('settings') %>
<%- include('landing') %>
</div>
<% include overlay.ejs %>
<%- include('overlay') %>
<div id="loadingContainer">
<div id="loadingContent">
<div id="loadSpinnerContainer">

View File

@ -102,7 +102,9 @@ function createWindow() {
webPreferences: {
preload: path.join(__dirname, 'app', 'assets', 'js', 'preloader.js'),
nodeIntegration: true,
contextIsolation: false
contextIsolation: false,
enableRemoteModule: true,
worldSafeExecuteJavaScript: false
},
backgroundColor: '#171614'
})

1028
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -27,10 +27,10 @@
"dependencies": {
"adm-zip": "^0.4.16",
"async": "^3.2.0",
"discord-rpc": "^3.1.1",
"discord-rpc": "^3.1.3",
"ejs": "^3.1.3",
"ejs-electron": "^2.1.0",
"electron-updater": "^4.3.1",
"ejs-electron": "^2.1.1",
"electron-updater": "^4.3.4",
"fs-extra": "^9.0.1",
"github-syntax-dark": "^0.5.0",
"jquery": "^3.5.1",
@ -41,9 +41,9 @@
},
"devDependencies": {
"cross-env": "^7.0.2",
"electron": "^9.1.0",
"electron-builder": "^22.7.0",
"eslint": "^7.4.0"
"electron": "^9.2.0",
"electron-builder": "^22.8.0",
"eslint": "^7.6.0"
},
"repository": {
"type": "git",