Skip to content

Commit 1c07cb0

Browse files
alan-agius4AndrewKushnir
authored andcommitted
build: add @angular/language-server to framework release output (angular#64306)
This change updates the build configuration to include the @angular/language-server package in the standard framework release output. By integrating it into the release train, we ensure that it is versioned and published consistently with the rest of the Angular framework. PR Close angular#64306
1 parent ad279ef commit 1c07cb0

File tree

4 files changed

+18
-8
lines changed

4 files changed

+18
-8
lines changed

.ng-dev/release.mts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@ export const release: ReleaseConfig = {
77
npmPackages: [
88
{name: '@angular/animations'},
99
{name: '@angular/common'},
10-
{name: '@angular/compiler'},
1110
{name: '@angular/compiler-cli'},
11+
{name: '@angular/compiler'},
1212
{name: '@angular/core'},
1313
{name: '@angular/elements'},
1414
{name: '@angular/forms'},
15+
{name: '@angular/language-server'},
1516
{name: '@angular/language-service'},
1617
{name: '@angular/localize'},
17-
{name: '@angular/platform-browser'},
1818
{name: '@angular/platform-browser-dynamic'},
19+
{name: '@angular/platform-browser'},
1920
{name: '@angular/platform-server'},
2021
{name: '@angular/router'},
2122
{name: '@angular/service-worker'},

scripts/build/package-builder.mts

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const releaseTargetTag = 'release-with-framework';
2424
/** Command that queries Bazel for all release package targets. */
2525
const queryPackagesCmd =
2626
`${bazelCmd} query --output=label "filter(':npm_package$', ` +
27-
`attr('tags', '\\[.*${releaseTargetTag}.*\\]', //packages/...))"`;
27+
`attr('tags', '\\[.*${releaseTargetTag}.*\\]', //packages/... + //vscode-ng-language-service/...))"`;
2828

2929
/** Path for the default distribution output directory. */
3030
const defaultDistPath = join(projectDir, 'dist/packages-dist');
@@ -59,8 +59,12 @@ function buildReleasePackages(
5959
const targets = exec(queryPackagesCmd, true).split(/\r?\n/).concat(additionalTargets);
6060
const packageNames = getPackageNamesOfTargets(targets);
6161
const bazelBinPath = exec(`${bazelCmd} info bazel-bin`, true);
62-
const getBazelOutputPath = (pkgName: string) =>
63-
join(bazelBinPath, 'packages', pkgName, 'npm_package');
62+
const getBazelOutputPath = (pkgName: string) => {
63+
return pkgName === 'language-server'
64+
? join(bazelBinPath, 'vscode-ng-language-service/server/npm_package')
65+
: join(bazelBinPath, 'packages', pkgName, 'npm_package');
66+
};
67+
6468
const getDistPath = (pkgName: string) => join(distPath, pkgName);
6569

6670
// Build with "--config=release" or `--config=snapshot-build` so that Bazel
@@ -109,13 +113,18 @@ function buildReleasePackages(
109113
*/
110114
function getPackageNamesOfTargets(targets: string[]): string[] {
111115
return targets.map((targetName) => {
116+
if (targetName === '//vscode-ng-language-service/server:npm_package') {
117+
return 'language-server';
118+
}
119+
112120
const matches = targetName.match(/\/\/packages\/(.*):npm_package/);
113121
if (matches === null) {
114122
throw Error(
115123
`Found Bazel target with "${releaseTargetTag}" tag, but could not ` +
116124
`determine release output name: ${targetName}`,
117125
);
118126
}
127+
119128
return matches[1];
120129
});
121130
}

vscode-ng-language-service/server/BUILD.bazel

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,5 +96,8 @@ npm_package(
9696
replace_prefixes = {
9797
"package_expanded.json": "package.json",
9898
},
99+
tags = [
100+
"release-with-framework",
101+
],
99102
visibility = ["//vscode-ng-language-service:__pkg__"],
100103
)

vscode-ng-language-service/server/package.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,5 @@
2626
"vscode-languageserver": "7.0.0",
2727
"vscode-languageserver-textdocument": "^1.0.12",
2828
"vscode-uri": "3.1.0"
29-
},
30-
"publishConfig": {
31-
"registry": "https://wombat-dressing-room.appspot.com"
3229
}
3330
}

0 commit comments

Comments
 (0)