From 9c1a93f4c1b01092d93a7e0e2cc78c298a258fa2 Mon Sep 17 00:00:00 2001 From: Jiiks Date: Sun, 17 Feb 2019 11:58:45 +0200 Subject: [PATCH] Remove installer scripts, correct sparkplug external --- client/webpack.config.js | 2 +- core/src/main.js | 4 ++-- package.json | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/client/webpack.config.js b/client/webpack.config.js index 8f856b63..22a09c73 100644 --- a/client/webpack.config.js +++ b/client/webpack.config.js @@ -39,7 +39,7 @@ module.exports = { process: 'require("process")', net: 'require("net")', request: 'require(require("path").join(require("electron").remote.app.getAppPath(), "node_modules", "request"))', - sparkplug: 'require("../../core/dist/sparkplug")', + sparkplug: 'require("../core/sparkplug")', 'node-crypto': 'require("crypto")' }, resolve: { diff --git a/core/src/main.js b/core/src/main.js index 35e883c9..d7581000 100644 --- a/core/src/main.js +++ b/core/src/main.js @@ -46,7 +46,7 @@ class Comms { BDIpc.on('bd-sendToDiscord', (event, m) => this.sendToDiscord(m.channel, m.message), true); - BDIpc.on('bd-openCssEditor', (event, options) => this.bd.csseditor.openEditor(options), true); + // BDIpc.on('bd-openCssEditor', (event, options) => this.bd.csseditor.openEditor(options), true); BDIpc.on('bd-sendToCssEditor', (event, m) => this.sendToCssEditor(m.channel, m.message), true); BDIpc.on('bd-native-open', (event, options) => { @@ -67,7 +67,7 @@ class Comms { }); }); - BDIpc.on('bd-dba', (event, options) => this.bd.dbInstance.exec(options), true); + BDIpc.on('bd-dba', (event, options) => this.bd.database.exec(options), true); BDIpc.on('bd-keytar-get', (event, { service, account }) => keytar.getPassword(service, account), true); BDIpc.on('bd-keytar-set', (event, { service, account, password }) => keytar.setPassword(service, account, password), true); diff --git a/package.json b/package.json index 2b79b8c4..9b5bc639 100644 --- a/package.json +++ b/package.json @@ -79,8 +79,6 @@ "watch_core": "npm run watch --prefix core", "build_csseditor": "npm run build --prefix csseditor", "watch_csseditor": "npm run watch --prefix csseditor", - "build_installer": "npm run build --prefix installer", - "watch_installer": "npm run watch --prefix installer", "lint": "eslint -f unix client/src core/src csseditor/src common && npm run sasslint", "lint_fix": "eslint -f unix client/src core/src csseditor/src common --fix", "sasslint": "sass-lint client/src/styles/**/*.scss -v",