From d61553ce0cbbd0626a6c5df474cbb9dacd771611 Mon Sep 17 00:00:00 2001
From: Kris De Volder <kdevolder@pivotal.io>
Date: Wed, 31 Jan 2018 16:59:47 -0800
Subject: [PATCH] Fix CI build of boot-java and boot-properties vscode
 extensions

---
 .../vscode-boot-java/package.json             | 20 +++++++++----------
 .../vscode-boot-java/scripts/preinstall.sh    |  4 ++--
 .../vscode-boot-properties/package.json       | 19 +++++++++---------
 .../scripts/preinstall.sh                     |  4 ++--
 vscode-extensions/vscode-bosh/package.json    |  2 +-
 5 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/vscode-extensions/vscode-boot-java/package.json b/vscode-extensions/vscode-boot-java/package.json
index 5efb831f5..9fad6dfb3 100644
--- a/vscode-extensions/vscode-boot-java/package.json
+++ b/vscode-extensions/vscode-boot-java/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",
@@ -40,21 +40,21 @@
   },
   "main": "./out/lib/Main",
   "scripts": {
-    "prepublish": "tsc -p .",
-    "clean": "rm -fr node_modules out *.vsix",
-    "compile": "tsc -watch -p ./",
-    "preinstall": "./scripts/preinstall.sh",
+    "vscode:prepublish": "npm run compile",
+    "compile": "tsc -p ./",
+    "watch": "tsc -watch -p ./",
+    "clean": "rm -fr node_modules out *.vsix package-lock.json",
     "postinstall": "node ./node_modules/vscode/bin/install",
     "vsce-package": "vsce package"
   },
   "dependencies": {
     "vscode-languageclient": "^3.4.5",
-    "commons-vscode": "0.1.2"
+    "commons-vscode": "0.1.4"
   },
   "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-boot-java/scripts/preinstall.sh b/vscode-extensions/vscode-boot-java/scripts/preinstall.sh
index c68f965bc..63f3a81ca 100755
--- a/vscode-extensions/vscode-boot-java/scripts/preinstall.sh
+++ b/vscode-extensions/vscode-boot-java/scripts/preinstall.sh
@@ -4,8 +4,8 @@ set -e
 workdir=`pwd`
 
 # 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/boot-java-language-server
diff --git a/vscode-extensions/vscode-boot-properties/package.json b/vscode-extensions/vscode-boot-properties/package.json
index b1d3ba5e2..4b90ebffe 100644
--- a/vscode-extensions/vscode-boot-properties/package.json
+++ b/vscode-extensions/vscode-boot-properties/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",
@@ -68,21 +68,22 @@
   },
   "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"
   },
   "dependencies": {
     "vscode-languageclient": "^3.4.2",
-    "commons-vscode": "0.1.2"
+    "commons-vscode": "0.1.4"
   },
   "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-boot-properties/scripts/preinstall.sh b/vscode-extensions/vscode-boot-properties/scripts/preinstall.sh
index 5389dc036..fb39d0edf 100755
--- a/vscode-extensions/vscode-boot-properties/scripts/preinstall.sh
+++ b/vscode-extensions/vscode-boot-properties/scripts/preinstall.sh
@@ -4,8 +4,8 @@ set -e
 workdir=`pwd`
 
 # 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
 
 # Copy grammar files for .properties and .yml format
 curl https://raw.githubusercontent.com/textmate/yaml.tmbundle/master/Syntaxes/YAML.tmLanguage > yaml-support/yaml.tmLanguage
diff --git a/vscode-extensions/vscode-bosh/package.json b/vscode-extensions/vscode-bosh/package.json
index 1a2dff069..eb606dffb 100644
--- a/vscode-extensions/vscode-bosh/package.json
+++ b/vscode-extensions/vscode-bosh/package.json
@@ -100,7 +100,7 @@
   },
   "dependencies": {
     "vscode-languageclient": "^3.4.2",
-    "commons-vscode": "0.1.2"
+    "commons-vscode": "0.1.4"
   },
   "devDependencies": {
     "vsce": "^1.36.1",