fix build

This commit is contained in:
peter
2019-10-30 17:54:04 +01:00
parent 0857f1ec25
commit 4afc627c23
3 changed files with 9 additions and 7 deletions
+3 -3
View File
@@ -4863,9 +4863,9 @@
} }
}, },
"rpclibrary": { "rpclibrary": {
"version": "1.3.0", "version": "1.3.2",
"resolved": "https://registry.npmjs.org/rpclibrary/-/rpclibrary-1.3.0.tgz", "resolved": "https://registry.npmjs.org/rpclibrary/-/rpclibrary-1.3.2.tgz",
"integrity": "sha512-7ZDMBhGqYj3UKAdslkih0P8w4eKnrG8ElZ62qWtB2Kn8zGbl7/a2/QgYFF0O6/3aAUEEUcllvUwPXTo3f5+osw==", "integrity": "sha512-pA+/TDYdx6B+d5NcKjSVgmizUqJX6A7PuUGLScDZpRYEPyX2kQoKIxJd8NzkFqRa/YtuiQJf+hG7/3N4TgnMNw==",
"requires": { "requires": {
"bsock": "^0.1.9", "bsock": "^0.1.9",
"http": "0.0.0", "http": "0.0.0",
+3 -3
View File
@@ -7,8 +7,8 @@
"start": "npm run build; node dist/FrontblockAdmin.js", "start": "npm run build; node dist/FrontblockAdmin.js",
"build": "npm run clean; npm run build-backend; npm run build-frontend", "build": "npm run clean; npm run build-backend; npm run build-frontend",
"build-backend": "tsc; npm run webpack", "build-backend": "tsc; npm run webpack",
"build-frontend": "npm run build-dashboard; cp ./dist/FrontblockLib.js ./dist/static", "build-frontend": "npm run build-dashboard; cp node_modules/rpclibrary/js/browser/rpclibrary.browser.js ./dist/static/FrontblockLib.js",
"build-dashboard": "git submodule init && git submodule update --merge; cd src/frontend; npm i && npm run build; mkdir ../../dist/static; cp -r dist/* ../../dist/static", "build-dashboard": "cd src/frontend; npm i && npm run build; mkdir ../../dist/static; cp -r dist/* ../../dist/static",
"clean": "rm -rf lib static plugins conf dist widget .rpt2_cache *.js *.ts src/frontend/dist data", "clean": "rm -rf lib static plugins conf dist widget .rpt2_cache *.js *.ts src/frontend/dist data",
"update-frontblock": "npm remove frontblock frontblock-generic; npm install frontblock-generic@latest frontblock@latest", "update-frontblock": "npm remove frontblock frontblock-generic; npm install frontblock-generic@latest frontblock@latest",
"webpack": "webpack --config src/backend/webpack.prod.js --progress --colors" "webpack": "webpack --config src/backend/webpack.prod.js --progress --colors"
@@ -37,7 +37,7 @@
"node-fetch": "^2.6.0", "node-fetch": "^2.6.0",
"path": "^0.12.7", "path": "^0.12.7",
"rimraf": "^3.0.0", "rimraf": "^3.0.0",
"rpclibrary": "^1.3.0", "rpclibrary": "^1.3.2",
"simple-git": "^1.124.0", "simple-git": "^1.124.0",
"spawn-sync": "^2.0.0", "spawn-sync": "^2.0.0",
"sqlite3": "^4.1.0", "sqlite3": "^4.1.0",
+3 -1
View File
@@ -1,5 +1,6 @@
import { Plugin } from "frontblock-generic/Plugin" import { Plugin } from "frontblock-generic/Plugin"
import { getLogger } from "frontblock-generic/Types" import { getLogger } from "frontblock-generic/Types"
import { FrontworkAdmin } from "./Admin";
var exec = require('child-process-promise').exec; var exec = require('child-process-promise').exec;
const logger = getLogger("installer", 'info') const logger = getLogger("installer", 'info')
@@ -16,7 +17,8 @@ export const installAdmin = (plugins: Plugin[] = []) => {
exec("npm i " + deps).then(async process => { exec("npm i " + deps).then(async process => {
logger.debug(process.stdout) logger.debug(process.stdout)
const Admin = require("./Admin").FrontworkAdmin const Admin = require("./Admin").FrontworkAdmin
const fbAdmin = new Admin(plugins) const fbAdmin:FrontworkAdmin = new Admin(plugins)
fbAdmin.start()
}) })
} }