From fd575b8cfdfd98f012a18c88d36ebb86d4045d23 Mon Sep 17 00:00:00 2001
From: Daniel Huebleitner <daniel.huebleitner@gmail.com>
Date: Wed, 30 Oct 2019 20:40:55 +0100
Subject: [PATCH] fixed some imports

---
 package-lock.json              | 6 +++---
 package.json                   | 2 +-
 src/backend/Admin.ts           | 2 +-
 src/backend/Eventbus.ts        | 4 +---
 src/backend/Installer.ts       | 2 +-
 src/backend/Plugin.ts          | 3 +--
 src/backend/PluginLoader.ts    | 2 +-
 src/backend/RPCConfigLoader.ts | 2 +-
 8 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 037af3c..93caa57 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4863,9 +4863,9 @@
       }
     },
     "rpclibrary": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/rpclibrary/-/rpclibrary-1.3.4.tgz",
-      "integrity": "sha512-wrAAJ6cknpsoH7xrcbzheps0NgnlGrCzHPfTVHB+VgM2QAeEJfbbleDRVkFyf8bZmCJqxlEk0P1DH3xhTB2TMA==",
+      "version": "1.3.17",
+      "resolved": "https://registry.npmjs.org/rpclibrary/-/rpclibrary-1.3.17.tgz",
+      "integrity": "sha512-ZdhZ1TSDO+bcz5kCJ7Ol+YAAyYpwg7YI/hETS4vv3RYerUEQVZSZjcm22J5a91RnQVN2SRiXzdoXbbFb/Renog==",
       "requires": {
         "bsock": "^0.1.9",
         "http": "0.0.0",
diff --git a/package.json b/package.json
index 15bfb67..0325597 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "node-fetch": "^2.6.0",
     "path": "^0.12.7",
     "rimraf": "^3.0.0",
-    "rpclibrary": "^1.3.4",
+    "rpclibrary": "^1.3.17",
     "simple-git": "^1.124.0",
     "spawn-sync": "^2.0.0",
     "sqlite3": "^4.1.0",
diff --git a/src/backend/Admin.ts b/src/backend/Admin.ts
index f1091e4..ef75efb 100644
--- a/src/backend/Admin.ts
+++ b/src/backend/Admin.ts
@@ -2,7 +2,7 @@
 
 import { getLogger } from 'frontblock-generic/Types';
 import { promises as fs, mkdirSync } from "fs"
-import { RPCServer } from 'rpclibrary/js/src/Backend'
+import { RPCServer } from 'rpclibrary'
 import { AdminConf, TableDefiniton } from './Types';
 import { RPCConfigLoader } from './RPCConfigLoader';
 
diff --git a/src/backend/Eventbus.ts b/src/backend/Eventbus.ts
index 5e33a06..2c38159 100644
--- a/src/backend/Eventbus.ts
+++ b/src/backend/Eventbus.ts
@@ -1,6 +1,4 @@
-import { RPCExporter } from "rpclibrary/js/src/Interfaces";
-import { SubscriptionResponse, ErrorResponse } from "rpclibrary/js/src/Types";
-import { makeSubResponse } from "rpclibrary/js/src/Utils";
+import { RPCExporter, SubscriptionResponse, ErrorResponse, makeSubResponse } from "rpclibrary";
 import { FrontworkAdmin } from "./Admin";
 import { TableDefinitionExporter } from "./Interfaces";
 
diff --git a/src/backend/Installer.ts b/src/backend/Installer.ts
index 47ac081..a712d53 100644
--- a/src/backend/Installer.ts
+++ b/src/backend/Installer.ts
@@ -1,4 +1,4 @@
-import { Plugin } from "frontblock-generic/Plugin"
+import { Plugin } from "./Plugin"
 import { getLogger } from "frontblock-generic/Types"
 import { FrontworkAdmin } from "./Admin";
 var exec = require('child-process-promise').exec;
diff --git a/src/backend/Plugin.ts b/src/backend/Plugin.ts
index 364524c..44effdb 100644
--- a/src/backend/Plugin.ts
+++ b/src/backend/Plugin.ts
@@ -1,7 +1,6 @@
 import { FrontworkAdmin } from "./Admin"
-import { RPC } from "rpclibrary/js/src/Types"
+import { RPC, RPCExporter } from "rpclibrary"
 import { TableDefiniton } from "./Types"
-import { RPCExporter } from "rpclibrary/js/src/Interfaces"
 import { TableDefinitionExporter } from "./Interfaces"
 import { ConfigExporter } from "loadson"
 
diff --git a/src/backend/PluginLoader.ts b/src/backend/PluginLoader.ts
index 3991cee..a713d61 100644
--- a/src/backend/PluginLoader.ts
+++ b/src/backend/PluginLoader.ts
@@ -1,4 +1,4 @@
-import { RPCExporter } from "rpclibrary/js/src/Interfaces";
+import { RPCExporter } from "rpclibrary";
 import { Git } from "upgiter"
 import { FolderStatus } from "upgiter/js/src/Types";
 import { Plugin } from "./Plugin";
diff --git a/src/backend/RPCConfigLoader.ts b/src/backend/RPCConfigLoader.ts
index e5d41b3..94cd732 100644
--- a/src/backend/RPCConfigLoader.ts
+++ b/src/backend/RPCConfigLoader.ts
@@ -1,5 +1,5 @@
 import { ConfigLoader } from 'loadson'
-import { RPCExporter } from 'rpclibrary/js/src/Interfaces'
+import { RPCExporter } from 'rpclibrary'
 
 export type ConfigLoaderIfc<ConfT> = {
     Config : {