From 2b010183a332864ff29b76cc890b1df5f80b0387 Mon Sep 17 00:00:00 2001
From: Kris De Volder <kdevolder@pivotal.io>
Date: Wed, 31 Jan 2018 16:52:30 -0800
Subject: [PATCH] Fix vscode-bosh ci build

---
 vscode-extensions/vscode-bosh/package.json      | 17 +++++++++--------
 .../vscode-bosh/scripts/preinstall.sh           |  4 ++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/vscode-extensions/vscode-bosh/package.json b/vscode-extensions/vscode-bosh/package.json
index 2199c5409..1a2dff069 100644
--- a/vscode-extensions/vscode-bosh/package.json
+++ b/vscode-extensions/vscode-bosh/package.json
@@ -12,7 +12,7 @@
   "license": "EPL-1.0",
   "engines": {
     "npm": "^3.0.0",
-    "vscode": "^1.15.0"
+    "vscode": "^1.19.0"
   },
   "categories": [
     "Languages",
@@ -90,9 +90,10 @@
   },
   "main": "./out/lib/Main",
   "scripts": {
-    "prepublish": "tsc -p .",
-    "clean": "rm -fr node_modules out *.vsix",
-    "compile": "tsc -watch -p ./",
+    "vscode:prepublish": "npm run compile",
+    "compile": "tsc -p ./",
+    "watch": "tsc -watch -p ./",
+    "clean": "rm -fr node_modules out *.vsix package-lock.json",
     "preinstall": "./scripts/preinstall.sh",
     "postinstall": "node ./node_modules/vscode/bin/install",
     "vsce-package": "vsce package"
@@ -102,9 +103,9 @@
     "commons-vscode": "0.1.2"
   },
   "devDependencies": {
-    "vsce": "1.30.0",
-    "typescript": "^2.3.0",
-    "@types/node": "^6.0.68",
-    "vscode": "^1.1.5"
+    "vsce": "^1.36.1",
+    "typescript": "2.6.1",
+    "@types/node": "^7.0.43",
+    "vscode": "^1.1.10"
   }
 }
diff --git a/vscode-extensions/vscode-bosh/scripts/preinstall.sh b/vscode-extensions/vscode-bosh/scripts/preinstall.sh
index a0e1dc152..ef1b38256 100755
--- a/vscode-extensions/vscode-bosh/scripts/preinstall.sh
+++ b/vscode-extensions/vscode-bosh/scripts/preinstall.sh
@@ -7,8 +7,8 @@ workdir=`pwd`
 curl https://raw.githubusercontent.com/textmate/yaml.tmbundle/master/Syntaxes/YAML.tmLanguage > yaml-support/yaml.tmLanguage
 
 # Preinstall commons-vscode package
-(cd ../commons-vscode ; npm install)
-npm install ../commons-vscode
+(cd ../commons-vscode ; npm install ; npm pack)
+npm install ../commons-vscode/commons-vscode-*.tgz
 
 # Use maven to build fat jar of the language server
 cd ../../headless-services/bosh-language-server