From 90106b54293cbbdfc80508b0aa7acb240b4a2f79 Mon Sep 17 00:00:00 2001
From: Kolja Lampe <razzeee@gmail.com>
Date: Sun, 20 Oct 2019 23:15:07 +0200
Subject: [PATCH] Fix build problems

---
 client/package-lock.json | 6 ++++++
 client/package.json      | 6 +++++-
 package.json             | 4 ++--
 server                   | 2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/client/package-lock.json b/client/package-lock.json
index 6269297..80912db 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -242,6 +242,12 @@
 			"resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
 			"integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
 		},
+		"typescript": {
+			"version": "3.6.4",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.6.4.tgz",
+			"integrity": "sha512-unoCll1+l+YK4i4F8f22TaNVPRHcD9PA3yCuZ8g5e0qGqlVlJ/8FSateOLLSagn+Yg5+ZwuPkL8LFUc0Jcvksg==",
+			"dev": true
+		},
 		"vscode-jsonrpc": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz",
diff --git a/client/package.json b/client/package.json
index 688c836..4138b08 100644
--- a/client/package.json
+++ b/client/package.json
@@ -12,12 +12,16 @@
   "engines": {
     "vscode": "^1.37.0"
   },
+  "scripts": {
+    "compile": "tsc -p ./"
+  },
   "dependencies": {
     "vscode-languageclient": "^5.2.1"
   },
   "devDependencies": {
     "@types/request": "^2.48.3",
     "@types/vscode": "^1.39.0",
-    "vscode-test": "^1.2.0"
+    "vscode-test": "^1.2.0",
+    "typescript": "3.6.4"
   }
 }
diff --git a/package.json b/package.json
index c33bf94..cdb5edf 100644
--- a/package.json
+++ b/package.json
@@ -128,8 +128,8 @@
     }
   },
   "scripts": {
-    "vscode:prepublish": "cd client && cd .. && npm run compile",
-    "compile": "npm run copy-wasm && tsc -b",
+    "vscode:prepublish": "npm run compile",
+    "compile": "cd client && npm run compile && cd ../server && npm run compile && cd .. && tsc -b",
     "watch": "npm run copy-wasm && tsc -b -w",
     "copy-wasm": "cd server && npm run copy-wasm",
     "postinstall": "cd client && npm install && cd ../server && npm install && cd ..",
diff --git a/server b/server
index 28f9282..9229146 160000
--- a/server
+++ b/server
@@ -1 +1 @@
-Subproject commit 28f92829bd3e97b17ca1b959c10d260dc70fc10b
+Subproject commit 922914607e19ee00df83d6c4cf9043fb1180b452