diff --git a/package-lock.json b/package-lock.json index a6dea1c..0cbbfe5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4863,9 +4863,9 @@ } }, "rpclibrary": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/rpclibrary/-/rpclibrary-1.3.0.tgz", - "integrity": "sha512-7ZDMBhGqYj3UKAdslkih0P8w4eKnrG8ElZ62qWtB2Kn8zGbl7/a2/QgYFF0O6/3aAUEEUcllvUwPXTo3f5+osw==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/rpclibrary/-/rpclibrary-1.3.2.tgz", + "integrity": "sha512-pA+/TDYdx6B+d5NcKjSVgmizUqJX6A7PuUGLScDZpRYEPyX2kQoKIxJd8NzkFqRa/YtuiQJf+hG7/3N4TgnMNw==", "requires": { "bsock": "^0.1.9", "http": "0.0.0", diff --git a/package.json b/package.json index bf74afd..cb33c31 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,8 @@ "start": "npm run build; node dist/FrontblockAdmin.js", "build": "npm run clean; npm run build-backend; npm run build-frontend", "build-backend": "tsc; npm run webpack", - "build-frontend": "npm run build-dashboard; cp ./dist/FrontblockLib.js ./dist/static", - "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-frontend": "npm run build-dashboard; cp node_modules/rpclibrary/js/browser/rpclibrary.browser.js ./dist/static/FrontblockLib.js", + "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", "update-frontblock": "npm remove frontblock frontblock-generic; npm install frontblock-generic@latest frontblock@latest", "webpack": "webpack --config src/backend/webpack.prod.js --progress --colors" @@ -37,7 +37,7 @@ "node-fetch": "^2.6.0", "path": "^0.12.7", "rimraf": "^3.0.0", - "rpclibrary": "^1.3.0", + "rpclibrary": "^1.3.2", "simple-git": "^1.124.0", "spawn-sync": "^2.0.0", "sqlite3": "^4.1.0", diff --git a/src/backend/Installer.ts b/src/backend/Installer.ts index f4d344a..47ac081 100644 --- a/src/backend/Installer.ts +++ b/src/backend/Installer.ts @@ -1,5 +1,6 @@ import { Plugin } from "frontblock-generic/Plugin" import { getLogger } from "frontblock-generic/Types" +import { FrontworkAdmin } from "./Admin"; var exec = require('child-process-promise').exec; const logger = getLogger("installer", 'info') @@ -16,7 +17,8 @@ export const installAdmin = (plugins: Plugin[] = []) => { exec("npm i " + deps).then(async process => { logger.debug(process.stdout) const Admin = require("./Admin").FrontworkAdmin - const fbAdmin = new Admin(plugins) + const fbAdmin:FrontworkAdmin = new Admin(plugins) + fbAdmin.start() }) } \ No newline at end of file