From c4da17aa723b68fd0d2cae3ae3a3bf594aeaf64e Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Mon, 2 Apr 2018 09:40:49 -0700 Subject: [PATCH] Make commons-vscode a scoped package --- vscode-extensions/commons-vscode/.gitignore | 2 +- vscode-extensions/commons-vscode/package.json | 5 ++--- vscode-extensions/vscode-bosh/package.json | 2 +- vscode-extensions/vscode-bosh/scripts/preinstall.sh | 2 +- vscode-extensions/vscode-concourse/package.json | 1 + vscode-extensions/vscode-concourse/scripts/preinstall.sh | 2 +- vscode-extensions/vscode-manifest-yaml/package.json | 2 +- vscode-extensions/vscode-manifest-yaml/scripts/preinstall.sh | 2 +- vscode-extensions/vscode-spring-boot/package.json | 2 +- vscode-extensions/vscode-spring-boot/scripts/preinstall.sh | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/vscode-extensions/commons-vscode/.gitignore b/vscode-extensions/commons-vscode/.gitignore index 4bdf45c84..0d8fae17f 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 +*-commons-vscode-*.tgz diff --git a/vscode-extensions/commons-vscode/package.json b/vscode-extensions/commons-vscode/package.json index 507c3cb18..b776ff1e8 100644 --- a/vscode-extensions/commons-vscode/package.json +++ b/vscode-extensions/commons-vscode/package.json @@ -1,7 +1,6 @@ { - "name": "commons-vscode", - "private": true, - "version": "0.1.4", + "name": "@pivotal-tools/commons-vscode", + "version": "0.2.0", "description": "commons-vscode", "license": "MIT", "repository": "", diff --git a/vscode-extensions/vscode-bosh/package.json b/vscode-extensions/vscode-bosh/package.json index 5ae068b74..7570450b7 100644 --- a/vscode-extensions/vscode-bosh/package.json +++ b/vscode-extensions/vscode-bosh/package.json @@ -99,7 +99,7 @@ "vsce-package": "vsce package" }, "dependencies": { - "commons-vscode": "file:../commons-vscode/commons-vscode-0.1.4.tgz", + "@pivotal-tools/commons-vscode": "file:../commons-vscode/commons-vscode-0.1.4.tgz", "vscode-languageclient": "^4.0.0" }, "devDependencies": { diff --git a/vscode-extensions/vscode-bosh/scripts/preinstall.sh b/vscode-extensions/vscode-bosh/scripts/preinstall.sh index 56f0ad372..00be2da49 100755 --- a/vscode-extensions/vscode-bosh/scripts/preinstall.sh +++ b/vscode-extensions/vscode-bosh/scripts/preinstall.sh @@ -8,7 +8,7 @@ curl https://raw.githubusercontent.com/textmate/yaml.tmbundle/master/Syntaxes/YA # Preinstall commons-vscode package (cd ../commons-vscode ; npm install ; npm pack) -npm install ../commons-vscode/commons-vscode-*.tgz +npm install ../commons-vscode/*-commons-vscode-*.tgz # Use maven to build fat jar of the language server cd ../../headless-services/bosh-language-server diff --git a/vscode-extensions/vscode-concourse/package.json b/vscode-extensions/vscode-concourse/package.json index ba16df714..309639a14 100644 --- a/vscode-extensions/vscode-concourse/package.json +++ b/vscode-extensions/vscode-concourse/package.json @@ -90,6 +90,7 @@ "vsce-package": "vsce package" }, "dependencies": { + "@pivotal-tools/commons-vscode": "file:../commons-vscode/pivotal-tools-commons-vscode-0.2.0.tgz", "commons-vscode": "file:../commons-vscode/commons-vscode-0.1.4.tgz", "vscode-languageclient": "^4.0.0" }, diff --git a/vscode-extensions/vscode-concourse/scripts/preinstall.sh b/vscode-extensions/vscode-concourse/scripts/preinstall.sh index 5058062fc..454df2adb 100755 --- a/vscode-extensions/vscode-concourse/scripts/preinstall.sh +++ b/vscode-extensions/vscode-concourse/scripts/preinstall.sh @@ -8,7 +8,7 @@ curl https://raw.githubusercontent.com/textmate/yaml.tmbundle/master/Syntaxes/YA # Preinstall commons-vscode package (cd ../commons-vscode ; npm install ; npm pack) -npm install ../commons-vscode/commons-vscode-*.tgz +npm install ../commons-vscode/*-commons-vscode-*.tgz # Use maven to build fat jar of the language server cd ../../headless-services/concourse-language-server diff --git a/vscode-extensions/vscode-manifest-yaml/package.json b/vscode-extensions/vscode-manifest-yaml/package.json index ad2b19869..878642950 100644 --- a/vscode-extensions/vscode-manifest-yaml/package.json +++ b/vscode-extensions/vscode-manifest-yaml/package.json @@ -58,7 +58,7 @@ "vsce-package": "vsce package" }, "dependencies": { - "commons-vscode": "file:../commons-vscode/commons-vscode-0.1.4.tgz", + "@pivotal-tools/commons-vscode": "file:../commons-vscode/commons-vscode-0.1.4.tgz", "vscode-languageclient": "^4.0.0" }, "devDependencies": { diff --git a/vscode-extensions/vscode-manifest-yaml/scripts/preinstall.sh b/vscode-extensions/vscode-manifest-yaml/scripts/preinstall.sh index abea34b6e..7118b38a3 100755 --- a/vscode-extensions/vscode-manifest-yaml/scripts/preinstall.sh +++ b/vscode-extensions/vscode-manifest-yaml/scripts/preinstall.sh @@ -8,7 +8,7 @@ curl https://raw.githubusercontent.com/textmate/yaml.tmbundle/master/Syntaxes/YA # Preinstall commons-vscode package (cd ../commons-vscode ; npm install ; npm pack) -npm install ../commons-vscode/commons-vscode-*.tgz +npm install ../commons-vscode/*-commons-vscode-*.tgz # Use maven to build fat jar of the language server cd ../../headless-services/manifest-yaml-language-server diff --git a/vscode-extensions/vscode-spring-boot/package.json b/vscode-extensions/vscode-spring-boot/package.json index 303dd936b..ed86d1002 100644 --- a/vscode-extensions/vscode-spring-boot/package.json +++ b/vscode-extensions/vscode-spring-boot/package.json @@ -93,7 +93,7 @@ "vsce-package": "vsce package" }, "dependencies": { - "commons-vscode": "file:../commons-vscode/commons-vscode-0.1.4.tgz", + "@pivotal-tools/commons-vscode": "file:../commons-vscode/commons-vscode-0.1.4.tgz", "vscode-languageclient": "^4.0.0" }, "devDependencies": { diff --git a/vscode-extensions/vscode-spring-boot/scripts/preinstall.sh b/vscode-extensions/vscode-spring-boot/scripts/preinstall.sh index ae464c248..21af126dc 100755 --- a/vscode-extensions/vscode-spring-boot/scripts/preinstall.sh +++ b/vscode-extensions/vscode-spring-boot/scripts/preinstall.sh @@ -5,7 +5,7 @@ workdir=`pwd` # Preinstall commons-vscode package (cd ../commons-vscode ; npm install ; npm pack) -npm install ../commons-vscode/commons-vscode-*.tgz +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