From 4e9f78ec7b78838113b354737af05963a816cfca Mon Sep 17 00:00:00 2001
From: Kris De Volder <kdevolder@pivotal.io>
Date: Wed, 31 Jan 2018 16:36:29 -0800
Subject: [PATCH] More attempts to fix vscode ci builds

---
 vscode-extensions/commons-vscode/.gitignore              | 2 +-
 vscode-extensions/commons-vscode/package.json            | 5 +++--
 vscode-extensions/vscode-concourse/build.sh              | 4 ++--
 vscode-extensions/vscode-concourse/package.json          | 2 +-
 vscode-extensions/vscode-concourse/scripts/preinstall.sh | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/vscode-extensions/commons-vscode/.gitignore b/vscode-extensions/commons-vscode/.gitignore
index 108587088..4bdf45c84 100644
--- a/vscode-extensions/commons-vscode/.gitignore
+++ b/vscode-extensions/commons-vscode/.gitignore
@@ -2,4 +2,4 @@ coverage/
 node_modules/
 npm-debug.log
 lib/
-
+commons-vscode-*.tgz
diff --git a/vscode-extensions/commons-vscode/package.json b/vscode-extensions/commons-vscode/package.json
index d5c14d018..1ec8ab182 100644
--- a/vscode-extensions/commons-vscode/package.json
+++ b/vscode-extensions/commons-vscode/package.json
@@ -1,7 +1,7 @@
 {
   "name": "commons-vscode",
   "private": true,
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "commons-vscode",
   "license": "MIT",
   "repository": "",
@@ -20,7 +20,8 @@
   "scripts": {
     "clean": "rm -rf lib node_modules package-lock.json",
     "compile": "tsc -p ./",
-    "watch": "tsc -watch -p ./"
+    "watch": "tsc -watch -p ./",
+    "prepack": "node ./node_modules/vscode/bin/install && tsc -p ./"
   },
   "dependencies": {
     "portfinder": "^0.4.0"
diff --git a/vscode-extensions/vscode-concourse/build.sh b/vscode-extensions/vscode-concourse/build.sh
index 341c53289..1423ec8bf 100755
--- a/vscode-extensions/vscode-concourse/build.sh
+++ b/vscode-extensions/vscode-concourse/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
-if [ ! -d "node_modules/commons-vscode" ]; then
+#if [ ! -d "node_modules/commons-vscode" ]; then
     ./scripts/preinstall.sh
-fi
+#fi
 npm install
 npm run vsce-package
\ No newline at end of file
diff --git a/vscode-extensions/vscode-concourse/package.json b/vscode-extensions/vscode-concourse/package.json
index 3dc43158e..f53ac8ee6 100644
--- a/vscode-extensions/vscode-concourse/package.json
+++ b/vscode-extensions/vscode-concourse/package.json
@@ -90,7 +90,7 @@
     "vsce-package": "vsce package"
   },
   "dependencies": {
-    "commons-vscode": "file:../commons-vscode",
+    "commons-vscode": "0.1.4",
     "vscode-languageclient": "^3.4.2"
   },
   "devDependencies": {
diff --git a/vscode-extensions/vscode-concourse/scripts/preinstall.sh b/vscode-extensions/vscode-concourse/scripts/preinstall.sh
index a7fb9223b..6fc1d8cde 100755
--- a/vscode-extensions/vscode-concourse/scripts/preinstall.sh
+++ b/vscode-extensions/vscode-concourse/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/concourse-language-server