Skirda/SkirdaElectronLauncher
4
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Updated to Electron v3.0.0, renderer to node v10.

Browse Source 
Fixed deprecation of Buffer constructor in node v10.
Set flag to print the stack trace of node warnings in the renderer.
This commit is contained in:
Daniel Scalzi 2018-09-22 05:07:18 -04:00
parent 72f822d2b2
commit b2e9223b10
No known key found for this signature in database
GPG Key ID: 5CA2F145B63535F9
5 changed files with 85 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/js/scripts/landing.js
View File

@ -1096,9 +1096,9 @@ function loadNews(){
}, },
timeout: 2500 timeout: 2500
}).catch(err => { }).catch(err => {
resolve({ resolve({
articles: null articles: null
})
}) })
})
}) })
} }

4
app/assets/js/scripts/uicore.js
View File

@ -14,6 +14,10 @@ const loggerUICore = LoggerUtil('%c[UICore]', 'color: #000668; font-
const loggerAutoUpdater = LoggerUtil('%c[AutoUpdater]', 'color: #000668; font-weight: bold') const loggerAutoUpdater = LoggerUtil('%c[AutoUpdater]', 'color: #000668; font-weight: bold')
const loggerAutoUpdaterSuccess = LoggerUtil('%c[AutoUpdater]', 'color: #209b07; font-weight: bold') const loggerAutoUpdaterSuccess = LoggerUtil('%c[AutoUpdater]', 'color: #209b07; font-weight: bold')
// Log deprecation and process warnings.
process.traceProcessWarnings = true
process.traceDeprecation = true
// Disable eval function. // Disable eval function.
// eslint-disable-next-line // eslint-disable-next-line
window.eval = global.eval = function () { window.eval = global.eval = function () {

2
app/assets/js/serverstatus.js
View File

@ -19,7 +19,7 @@ exports.getStatus = function(address, port = 25565){
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const socket = net.connect(port, address, () => { const socket = net.connect(port, address, () => {
let buff = new Buffer([0xFE, 0x01]) let buff = Buffer.from([0xFE, 0x01])
socket.write(buff) socket.write(buff)
}) })

136
package-lock.json generated
View File

@ -31,9 +31,9 @@
} }
}, },
"@types/node": { "@types/node": {
"version": "8.10.29", "version": "8.10.30",
"resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.29.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.30.tgz",
"integrity": "sha512-zbteaWZ2mdduacm0byELwtRyhYE40aK+pAanQk415gr1eRuu67x7QGOLmn8jz5zI8LDK7d0WI/oT6r5Trz4rzQ==", "integrity": "sha512-Le8HGMI5gjFSBqcCuKP/wfHC19oURzkU2D+ERIescUoJd+CmNEMYBib9LQ4zj1HHEZOJQWhw2ZTnbD8weASh/Q==",
"dev": true "dev": true
}, },
"acorn": { "acorn": {
@ -928,13 +928,13 @@
} }
}, },
"electron": { "electron": {
"version": "2.0.9", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/electron/-/electron-2.0.9.tgz", "resolved": "https://registry.npmjs.org/electron/-/electron-3.0.0.tgz",
"integrity": "sha512-xRefYuz6C65ahX8vDwIJxr1Y5ffFa106dugZEbl23yLKfrAG01lh5csBJ9hJwCBPLHp2zj/9PGoJ8dt5zlzOvQ==", "integrity": "sha512-QN9X5vYa4kzJKniwhXlJwioX9qw2fDehdqxN/00KCLz/qnOz/IHLAHGikFjRwfEF2xnkmHxf61F8wn2LePPXXQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/node": "^8.0.24", "@types/node": "^8.0.24",
"electron-download": "^3.0.1", "electron-download": "^4.1.0",
"extract-zip": "^1.0.3" "extract-zip": "^1.0.3"
} }
}, },
@ -960,20 +960,37 @@
} }
}, },
"electron-download": { "electron-download": {
"version": "3.3.0", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/electron-download/-/electron-download-3.3.0.tgz", "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-4.1.1.tgz",
"integrity": "sha1-LP1U1pZsAZxNSa1l++Zcyc3vaMg=", "integrity": "sha512-FjEWG9Jb/ppK/2zToP+U5dds114fM1ZOJqMAR4aXXL5CvyPE9fiqBK/9YcwC9poIFQTEJk/EM/zyRwziziRZrg==",
"dev": true, "dev": true,
"requires": { "requires": {
"debug": "^2.2.0", "debug": "^3.0.0",
"fs-extra": "^0.30.0", "env-paths": "^1.0.0",
"home-path": "^1.0.1", "fs-extra": "^4.0.1",
"minimist": "^1.2.0", "minimist": "^1.2.0",
"nugget": "^2.0.0", "nugget": "^2.0.1",
"path-exists": "^2.1.0", "path-exists": "^3.0.0",
"rc": "^1.1.2", "rc": "^1.2.1",
"semver": "^5.3.0", "semver": "^5.4.1",
"sumchecker": "^1.2.0" "sumchecker": "^2.0.2"
},
"dependencies": {
"debug": {
"version": "3.2.5",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.5.tgz",
"integrity": "sha512-D61LaDQPQkxJ5AUM2mbSJRbPkNs/TmdmOeLAi1hgDkpDfIfetSrjmWhccwtuResSwMbACjx/xXQofvM9CE/aeg==",
"dev": true,
"requires": {
"ms": "^2.1.1"
}
},
"ms": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
"dev": true
}
} }
}, },
"electron-is-dev": { "electron-is-dev": {
@ -1037,6 +1054,13 @@
"lodash.isequal": "^4.5.0", "lodash.isequal": "^4.5.0",
"semver": "^5.5.1", "semver": "^5.5.1",
"source-map-support": "^0.5.9" "source-map-support": "^0.5.9"
},
"dependencies": {
"electron-is-dev": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-0.3.0.tgz",
"integrity": "sha1-FOb9pcaOnk7L7/nM8DfL18BcWv4="
}
} }
}, },
"end-of-stream": { "end-of-stream": {
@ -1047,6 +1071,12 @@
"once": "^1.4.0" "once": "^1.4.0"
} }
}, },
"env-paths": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/env-paths/-/env-paths-1.0.0.tgz",
"integrity": "sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA=",
"dev": true
},
"error-ex": { "error-ex": {
"version": "1.3.2", "version": "1.3.2",
"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@ -1056,12 +1086,6 @@
"is-arrayish": "^0.2.1" "is-arrayish": "^0.2.1"
} }
}, },
"es6-promise": {
"version": "4.2.5",
"resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz",
"integrity": "sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==",
"dev": true
},
"escape-string-regexp": { "escape-string-regexp": {
"version": "1.0.5", "version": "1.0.5",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@ -1350,6 +1374,17 @@
"requires": { "requires": {
"path-exists": "^2.0.0", "path-exists": "^2.0.0",
"pinkie-promise": "^2.0.0" "pinkie-promise": "^2.0.0"
},
"dependencies": {
"path-exists": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
"dev": true,
"requires": {
"pinkie-promise": "^2.0.0"
}
}
} }
}, },
"flat-cache": { "flat-cache": {
@ -1385,16 +1420,14 @@
"integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
}, },
"fs-extra": { "fs-extra": {
"version": "0.30.0", "version": "4.0.3",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
"integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=", "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
"dev": true, "dev": true,
"requires": { "requires": {
"graceful-fs": "^4.1.2", "graceful-fs": "^4.1.2",
"jsonfile": "^2.1.0", "jsonfile": "^4.0.0",
"klaw": "^1.0.0", "universalify": "^0.1.0"
"path-is-absolute": "^1.0.0",
"rimraf": "^2.2.8"
} }
}, },
"fs-extra-p": { "fs-extra-p": {
@ -1554,12 +1587,6 @@
"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
"dev": true "dev": true
}, },
"home-path": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/home-path/-/home-path-1.0.6.tgz",
"integrity": "sha512-wo+yjrdAtoXt43Vy92a+0IPCYViiyLAHyp0QVS4xL/tfvVz5sXIW1ubLZk3nhVkD92fQpUMKX+fzMjr5F489vw==",
"dev": true
},
"hosted-git-info": { "hosted-git-info": {
"version": "2.7.1", "version": "2.7.1",
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
@ -1904,9 +1931,9 @@
} }
}, },
"jsonfile": { "jsonfile": {
"version": "2.4.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
"integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
"dev": true, "dev": true,
"requires": { "requires": {
"graceful-fs": "^4.1.6" "graceful-fs": "^4.1.6"
@ -1923,15 +1950,6 @@
"verror": "1.10.0" "verror": "1.10.0"
} }
}, },
"klaw": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
"integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
"dev": true,
"requires": {
"graceful-fs": "^4.1.9"
}
},
"latest-version": { "latest-version": {
"version": "3.1.0", "version": "3.1.0",
"resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz", "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz",
@ -2392,13 +2410,10 @@
} }
}, },
"path-exists": { "path-exists": {
"version": "2.1.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
"dev": true, "dev": true
"requires": {
"pinkie-promise": "^2.0.0"
}
}, },
"path-is-absolute": { "path-is-absolute": {
"version": "1.0.1", "version": "1.0.1",
@ -3021,13 +3036,12 @@
"dev": true "dev": true
}, },
"sumchecker": { "sumchecker": {
"version": "1.3.1", "version": "2.0.2",
"resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-1.3.1.tgz", "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-2.0.2.tgz",
"integrity": "sha1-ebs7RFbdBPGOvbwNcDodHa7FEF0=", "integrity": "sha1-D0LBDl0F2l1C7qPlbDOZo31sWz4=",
"dev": true, "dev": true,
"requires": { "requires": {
"debug": "^2.2.0", "debug": "^2.2.0"
"es6-promise": "^4.0.5"
} }
}, },
"supports-color": { "supports-color": {

4
package.json
View File

@ -36,7 +36,7 @@
"discord-rpc": "^3.0.0", "discord-rpc": "^3.0.0",
"ejs": "^2.6.1", "ejs": "^2.6.1",
"ejs-electron": "^2.0.3", "ejs-electron": "^2.0.3",
"electron-is-dev": "^0.3.0", "electron-is-dev": "=0.3.0",
"electron-updater": "^3.1.2", "electron-updater": "^3.1.2",
"github-syntax-dark": "^0.5.0", "github-syntax-dark": "^0.5.0",
"jquery": "^3.3.1", "jquery": "^3.3.1",
@ -49,7 +49,7 @@
"winreg": "^1.2.4" "winreg": "^1.2.4"
}, },
"devDependencies": { "devDependencies": {
"electron": "^2.0.9", "electron": "^3.0.0",
"electron-builder": "^20.28.4", "electron-builder": "^20.28.4",
"eslint": "^5.6.0" "eslint": "^5.6.0"
}, },