Merge branch 'origin/development' into Weblate.
This commit is contained in:
commit
aeb9cdd04e
|
@ -1,19 +0,0 @@
|
||||||
{
|
|
||||||
// See https://go.microsoft.com/fwlink/?LinkId=733558
|
|
||||||
// for the documentation about the tasks.json format
|
|
||||||
"version": "2.0.0",
|
|
||||||
"tasks": [
|
|
||||||
{
|
|
||||||
"type": "npm",
|
|
||||||
"script": "dev",
|
|
||||||
"problemMatcher": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "npm",
|
|
||||||
"script": "dev-runner",
|
|
||||||
"problemMatcher": [],
|
|
||||||
"label": "npm: dev-runner",
|
|
||||||
"detail": "node _scripts/dev-runner.js"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
|
@ -45,7 +45,7 @@ async function restartElectron() {
|
||||||
|
|
||||||
electronProcess = spawn(electron, [
|
electronProcess = spawn(electron, [
|
||||||
path.join(__dirname, '../dist/main.js'),
|
path.join(__dirname, '../dist/main.js'),
|
||||||
// '--enable-logging', Enable to show logs from all electron processes
|
'--enable-logging', // Enable to show logs from all electron processes
|
||||||
remoteDebugging ? '--inspect=9222' : '',
|
remoteDebugging ? '--inspect=9222' : '',
|
||||||
remoteDebugging ? '--remote-debugging-port=9223' : '',
|
remoteDebugging ? '--remote-debugging-port=9223' : '',
|
||||||
])
|
])
|
||||||
|
|
|
@ -212,7 +212,6 @@ function runApp() {
|
||||||
async function installDevTools () {
|
async function installDevTools () {
|
||||||
try {
|
try {
|
||||||
/* eslint-disable */
|
/* eslint-disable */
|
||||||
require('devtron').install()
|
|
||||||
require('vue-devtools').install()
|
require('vue-devtools').install()
|
||||||
/* eslint-enable */
|
/* eslint-enable */
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
|
Loading…
Reference in New Issue