Skip to content

Commit a8c33bf

Browse files
gregmagolandylhunn
authored andcommitted
fix(language-service): update packages/language-service/build.sh script to work with vscode-ng-language-service's new Bazel build (#48120)
Part of fix for angular/vscode-ng-language-service#1815 PR Close #48120
1 parent 0c3389e commit a8c33bf

File tree

1 file changed

+25
-1
lines changed

1 file changed

+25
-1
lines changed

packages/language-service/build.sh

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,31 @@ if [[ -z "${extension_repo}" ]]; then
1313
exit 1
1414
fi
1515

16+
# sedi makes `sed -i` work on both OSX & Linux
17+
# See https://stackoverflow.com/questions/2320564/i-need-my-sed-i-command-for-in-place-editing-to-work-with-both-gnu-sed-and-bsd
18+
_sedi () {
19+
case $(uname) in
20+
Darwin*) sedi=('-i' '') ;;
21+
*) sedi=('-i') ;;
22+
esac
23+
24+
sed "${sedi[@]}" "$@"
25+
}
26+
1627
yarn bazel build --config=release //packages/language-service:npm_package
1728
pushd "${extension_repo}"
18-
yarn add @angular/language-service@file:"${bazel_bin}/packages/language-service/npm_package"
29+
rm -rf .angular_packages/language-service
30+
mkdir -p .angular_packages/language-service
31+
cp -r "${bazel_bin}/packages/language-service/npm_package/" .angular_packages/language-service
32+
chmod -R +w .angular_packages/language-service
33+
cat <<EOT >> .angular_packages/language-service/BUILD.bazel
34+
load("@aspect_rules_js//npm:defs.bzl", "npm_package")
35+
npm_package(
36+
name = "language-service",
37+
srcs = glob(["**"], exclude = ["BUILD.bazel"]),
38+
visibility = ["//visibility:public"],
39+
)
40+
EOT
41+
_sedi 's#\# PLACE_HOLDER_FOR_packages/language-service/build.sh_IN_angular_REPO#data = ["//.angular_packages/language-service:package.json"], \# FOR TESTING ONLY! DO NOT COMMIT THIS LINE!#' WORKSPACE
42+
yarn add @angular/language-service@file:".angular_packages/language-service"
1943
popd

0 commit comments

Comments
 (0)