diff --git a/concourse/tasks/build-vsix.sh b/concourse/tasks/build-vsix.sh index 0b25dc786..fa72e751c 100755 --- a/concourse/tasks/build-vsix.sh +++ b/concourse/tasks/build-vsix.sh @@ -31,6 +31,7 @@ else echo -e "\n\n*Version: ${base_version}-RELEASE*" >> README.md fi +./scripts/preinstall.sh npm install #npm audit npm run vsce-package diff --git a/concourse/tasks/rc-build.sh b/concourse/tasks/rc-build.sh index bbdb24a4f..2778eb1ff 100755 --- a/concourse/tasks/rc-build.sh +++ b/concourse/tasks/rc-build.sh @@ -34,7 +34,7 @@ echo -e "\n\n*Version: ${version}*" >> README.md # npm install cd "$sources" -# npm install ../commons-vscode +./scripts/preinstall.sh npm install npm run vsce-package diff --git a/vscode-extensions/vscode-bosh/package.json b/vscode-extensions/vscode-bosh/package.json index 85d38b05b..a3232d88f 100644 --- a/vscode-extensions/vscode-bosh/package.json +++ b/vscode-extensions/vscode-bosh/package.json @@ -122,7 +122,6 @@ "compile": "tsc -p ./", "watch": "tsc -watch -p ./", "clean": "rm -fr node_modules out *.vsix package-lock.json", - "preinstall": "./scripts/preinstall.sh", "vsce-package": "vsce package" }, "dependencies": { diff --git a/vscode-extensions/vscode-concourse/build.sh b/vscode-extensions/vscode-concourse/build.sh index 2d14af6cb..dd59f919a 100755 --- a/vscode-extensions/vscode-concourse/build.sh +++ b/vscode-extensions/vscode-concourse/build.sh @@ -1,7 +1,8 @@ #!/bin/bash set -e +./scripts/preinstall.sh npm install npm run vsce-package rm -fr ~/.vscode/extensions/pivotal.vscode-concourse* rm -fr ~/.vscode/extensions/.obsolete -code --install-extension vscode-concourse-*.vsix \ No newline at end of file +code --install-extension vscode-concourse-*.vsix diff --git a/vscode-extensions/vscode-concourse/package.json b/vscode-extensions/vscode-concourse/package.json index 15a84c38c..b176a3634 100644 --- a/vscode-extensions/vscode-concourse/package.json +++ b/vscode-extensions/vscode-concourse/package.json @@ -107,7 +107,6 @@ "compile": "tsc -p ./", "watch": "tsc -watch -p ./", "clean": "rm -fr node_modules out *.vsix package-lock.json", - "preinstall": "./scripts/preinstall.sh", "vsce-package": "vsce package" }, "dependencies": { diff --git a/vscode-extensions/vscode-manifest-yaml/build.sh b/vscode-extensions/vscode-manifest-yaml/build.sh index 8fa38e920..3687cd8df 100755 --- a/vscode-extensions/vscode-manifest-yaml/build.sh +++ b/vscode-extensions/vscode-manifest-yaml/build.sh @@ -1,7 +1,8 @@ #!/bin/bash set -e +./scripts/preinstall.sh npm install npm run vsce-package rm -fr ~/.vscode/extensions/pivotal.vscode-manifest-yaml* rm -fr ~/.vscode/extensions/.obsolete -code --install-extension vscode-*.vsix \ No newline at end of file +code --install-extension vscode-*.vsix diff --git a/vscode-extensions/vscode-manifest-yaml/package.json b/vscode-extensions/vscode-manifest-yaml/package.json index 97aafed80..0718aa628 100644 --- a/vscode-extensions/vscode-manifest-yaml/package.json +++ b/vscode-extensions/vscode-manifest-yaml/package.json @@ -86,7 +86,6 @@ "compile": "tsc -p ./", "watch": "tsc -watch -p ./", "clean": "rm -fr node_modules out *.vsix package-lock.json", - "preinstall": "./scripts/preinstall.sh", "vsce-package": "vsce package" }, "dependencies": { diff --git a/vscode-extensions/vscode-spring-boot/build.sh b/vscode-extensions/vscode-spring-boot/build.sh index 407149be5..d3a9781fc 100755 --- a/vscode-extensions/vscode-spring-boot/build.sh +++ b/vscode-extensions/vscode-spring-boot/build.sh @@ -25,6 +25,7 @@ code --install-extension redhat.java # Build spring boot ls cd $workdir +./scripts/preinstall.sh npm install rm -fr *.vsix npm run vsce-package diff --git a/vscode-extensions/vscode-spring-boot/package.json b/vscode-extensions/vscode-spring-boot/package.json index 0a1664cb4..82476de33 100644 --- a/vscode-extensions/vscode-spring-boot/package.json +++ b/vscode-extensions/vscode-spring-boot/package.json @@ -513,7 +513,6 @@ "compile": "tsc -p ./", "watch": "tsc -watch -p ./", "test": "npm run compile && node ./node_modules/vscode/bin/test", - "preinstall": "bash ./scripts/preinstall.sh", "vsce-package": "vsce package" }, "dependencies": {