Browse Source

fix build

master
peter 6 years ago
parent
commit
4afc627c23
3 changed files with 9 additions and 7 deletions
  1. 3
    3
      package-lock.json
  2. 3
    3
      package.json
  3. 3
    1
      src/backend/Installer.ts

+ 3
- 3
package-lock.json View File

4863
       }
4863
       }
4864
     },
4864
     },
4865
     "rpclibrary": {
4865
     "rpclibrary": {
4866
-      "version": "1.3.0",
4867
-      "resolved": "https://registry.npmjs.org/rpclibrary/-/rpclibrary-1.3.0.tgz",
4868
-      "integrity": "sha512-7ZDMBhGqYj3UKAdslkih0P8w4eKnrG8ElZ62qWtB2Kn8zGbl7/a2/QgYFF0O6/3aAUEEUcllvUwPXTo3f5+osw==",
4866
+      "version": "1.3.2",
4867
+      "resolved": "https://registry.npmjs.org/rpclibrary/-/rpclibrary-1.3.2.tgz",
4868
+      "integrity": "sha512-pA+/TDYdx6B+d5NcKjSVgmizUqJX6A7PuUGLScDZpRYEPyX2kQoKIxJd8NzkFqRa/YtuiQJf+hG7/3N4TgnMNw==",
4869
       "requires": {
4869
       "requires": {
4870
         "bsock": "^0.1.9",
4870
         "bsock": "^0.1.9",
4871
         "http": "0.0.0",
4871
         "http": "0.0.0",

+ 3
- 3
package.json View File

7
     "start": "npm run build; node dist/FrontblockAdmin.js",
7
     "start": "npm run build; node dist/FrontblockAdmin.js",
8
     "build": "npm run clean; npm run build-backend; npm run build-frontend",
8
     "build": "npm run clean; npm run build-backend; npm run build-frontend",
9
     "build-backend": "tsc; npm run webpack",
9
     "build-backend": "tsc; npm run webpack",
10
-    "build-frontend": "npm run build-dashboard; cp ./dist/FrontblockLib.js ./dist/static",
11
-    "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",
10
+    "build-frontend": "npm run build-dashboard; cp node_modules/rpclibrary/js/browser/rpclibrary.browser.js ./dist/static/FrontblockLib.js",
11
+    "build-dashboard": "cd src/frontend; npm i && npm run build; mkdir ../../dist/static; cp -r dist/* ../../dist/static",
12
     "clean": "rm -rf lib static plugins conf dist widget .rpt2_cache *.js *.ts src/frontend/dist data",
12
     "clean": "rm -rf lib static plugins conf dist widget .rpt2_cache *.js *.ts src/frontend/dist data",
13
     "update-frontblock": "npm remove frontblock frontblock-generic; npm install frontblock-generic@latest frontblock@latest",
13
     "update-frontblock": "npm remove frontblock frontblock-generic; npm install frontblock-generic@latest frontblock@latest",
14
     "webpack": "webpack  --config src/backend/webpack.prod.js --progress --colors"
14
     "webpack": "webpack  --config src/backend/webpack.prod.js --progress --colors"
37
     "node-fetch": "^2.6.0",
37
     "node-fetch": "^2.6.0",
38
     "path": "^0.12.7",
38
     "path": "^0.12.7",
39
     "rimraf": "^3.0.0",
39
     "rimraf": "^3.0.0",
40
-    "rpclibrary": "^1.3.0",
40
+    "rpclibrary": "^1.3.2",
41
     "simple-git": "^1.124.0",
41
     "simple-git": "^1.124.0",
42
     "spawn-sync": "^2.0.0",
42
     "spawn-sync": "^2.0.0",
43
     "sqlite3": "^4.1.0",
43
     "sqlite3": "^4.1.0",

+ 3
- 1
src/backend/Installer.ts View File

1
 import { Plugin } from "frontblock-generic/Plugin"
1
 import { Plugin } from "frontblock-generic/Plugin"
2
 import { getLogger } from "frontblock-generic/Types"
2
 import { getLogger } from "frontblock-generic/Types"
3
+import { FrontworkAdmin } from "./Admin";
3
 var exec = require('child-process-promise').exec;
4
 var exec = require('child-process-promise').exec;
4
 
5
 
5
 const logger = getLogger("installer", 'info') 
6
 const logger = getLogger("installer", 'info') 
16
     exec("npm i " + deps).then(async process => {
17
     exec("npm i " + deps).then(async process => {
17
         logger.debug(process.stdout)    
18
         logger.debug(process.stdout)    
18
         const Admin = require("./Admin").FrontworkAdmin
19
         const Admin = require("./Admin").FrontworkAdmin
19
-        const fbAdmin = new Admin(plugins)
20
+        const fbAdmin:FrontworkAdmin = new Admin(plugins)
21
+        fbAdmin.start()
20
     })
22
     })
21
 
23
 
22
 }
24
 }

Loading…
Cancel
Save