angular · alan-agius4 · Oct 9, 2025 · Oct 9, 2025 · Oct 9, 2025 · Oct 9, 2025
diff --git a/.ng-dev/release.mts b/.ng-dev/release.mts
@@ -7,15 +7,16 @@ export const release: ReleaseConfig = {
   npmPackages: [
     {name: '@angular/animations'},
     {name: '@angular/common'},
-    {name: '@angular/compiler'},
     {name: '@angular/compiler-cli'},
+    {name: '@angular/compiler'},
     {name: '@angular/core'},
     {name: '@angular/elements'},
     {name: '@angular/forms'},
+    {name: '@angular/language-server'},
     {name: '@angular/language-service'},
     {name: '@angular/localize'},
-    {name: '@angular/platform-browser'},
     {name: '@angular/platform-browser-dynamic'},
+    {name: '@angular/platform-browser'},
     {name: '@angular/platform-server'},
     {name: '@angular/router'},
     {name: '@angular/service-worker'},

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -20,7 +20,7 @@
       "runtimeExecutable": "${execPath}",
       "args": [
         "--disable-extensions",
-        "--extensionDevelopmentPath=${workspaceFolder}/dist/bin/vscode-ng-language-service/npm/vscode-ng-language-service/vsix_sandbox"
+        "--extensionDevelopmentPath=${workspaceFolder}/dist/bin/vscode-ng-language-service/development_package"
       ],
       "preLaunchTask": "VSCE: package"
     },

diff --git a/integration/legacy-animations/package.json b/integration/legacy-animations/package.json
@@ -26,7 +26,6 @@
     "@angular-devkit/build-angular": "21.0.0-next.7",
     "@angular/cli": "21.0.0-next.7",
     "@angular/compiler-cli": "link:./in-existing-linked-by-bazel",
-    "@angular/language-service": "link:./in-existing-linked-by-bazel",
     "@types/jasmine": "^5.0.0",
     "@types/jasminewd2": "^2.0.8",
     "@types/node": "^20.14.8",

diff --git a/integration/legacy-animations/pnpm-lock.yaml b/integration/legacy-animations/pnpm-lock.yaml
diff --git a/integration/package.json b/integration/package.json
@@ -8,7 +8,6 @@
     "@angular/core": "workspace:*",
     "@angular/elements": "workspace:*",
     "@angular/forms": "workspace:*",
-    "@angular/language-service": "workspace: *",
     "@angular/localize": "workspace: *",
     "@angular/platform-browser-dynamic": "workspace:*",
     "@angular/platform-browser": "workspace:*",

diff --git a/packages.bzl b/packages.bzl
@@ -50,7 +50,7 @@ UNPUBLISHED_PACKAGES = [
 ALL_PACKAGES = PUBLISHED_PACKAGES + UNPUBLISHED_PACKAGES
 
 # Packages used by integration tests
-INTEGRATION_PACKAGES = _exclude_pkgs(PUBLISHED_PACKAGES, "zone.js", "angular-in-memory-web-api")
+INTEGRATION_PACKAGES = _exclude_pkgs(PUBLISHED_PACKAGES, "@angular/language-service", "zone.js", "angular-in-memory-web-api")
 
 # Package names under //packages that have `files_for_docgen` targets
 DOCS_ENTRYPOINTS = [

diff --git a/packages/language-service/BUILD.bazel b/packages/language-service/BUILD.bazel
@@ -63,8 +63,5 @@ npm_package(
     ],
     # Do not add more to this list.
     # Dependencies on the full npm_package cause long re-builds.
-    visibility = [
-        "//integration:__subpackages__",
-        "//modules/ssr-benchmarks:__subpackages__",
-    ],
+    visibility = [],
 )
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/scripts/build/package-builder.mts b/scripts/build/package-builder.mts
@@ -24,7 +24,7 @@ const releaseTargetTag = 'release-with-framework';
 /** Command that queries Bazel for all release package targets. */
 const queryPackagesCmd =
   `${bazelCmd} query --output=label "filter(':npm_package$', ` +
-  `attr('tags', '\\[.*${releaseTargetTag}.*\\]', //packages/...))"`;
+  `attr('tags', '\\[.*${releaseTargetTag}.*\\]', //packages/... + //vscode-ng-language-service/...))"`;
 
 /** Path for the default distribution output directory. */
 const defaultDistPath = join(projectDir, 'dist/packages-dist');
@@ -59,8 +59,12 @@ function buildReleasePackages(
   const targets = exec(queryPackagesCmd, true).split(/\r?\n/).concat(additionalTargets);
   const packageNames = getPackageNamesOfTargets(targets);
   const bazelBinPath = exec(`${bazelCmd} info bazel-bin`, true);
-  const getBazelOutputPath = (pkgName: string) =>
-    join(bazelBinPath, 'packages', pkgName, 'npm_package');
+  const getBazelOutputPath = (pkgName: string) => {
+    return pkgName === 'language-server'
+      ? join(bazelBinPath, 'vscode-ng-language-service/server/npm_package')
+      : join(bazelBinPath, 'packages', pkgName, 'npm_package');
+  };
+
   const getDistPath = (pkgName: string) => join(distPath, pkgName);
 
   // Build with "--config=release" or `--config=snapshot-build` so that Bazel
@@ -109,13 +113,18 @@ function buildReleasePackages(
  */
 function getPackageNamesOfTargets(targets: string[]): string[] {
   return targets.map((targetName) => {
+    if (targetName === '//vscode-ng-language-service/server:npm_package') {
+      return 'language-server';
+    }
+
     const matches = targetName.match(/\/\/packages\/(.*):npm_package/);
     if (matches === null) {
       throw Error(
         `Found Bazel target with "${releaseTargetTag}" tag, but could not ` +
           `determine release output name: ${targetName}`,
       );
     }
+
     return matches[1];
   });
 }

diff --git a/tools/defaults.bzl b/tools/defaults.bzl
@@ -78,6 +78,9 @@ def _determine_tsconfig(testonly):
     if native.package_name().startswith("tools"):
         return "//tools:tsconfig_test" if testonly else "//tools:tsconfig_build"
 
+    if native.package_name().startswith("vscode-ng-language-service"):
+        return "//vscode-ng-language-service:tsconfig_test" if testonly else "//vscode-ng-language-service:tsconfig_build"
+
     fail("Failing... a tsconfig value must be provided.")
 
 def ts_project(

diff --git a/vscode-ng-language-service/BUILD.bazel b/vscode-ng-language-service/BUILD.bazel
@@ -14,18 +14,28 @@ js_library(
 )
 
 ts_config(
-    name = "tsconfig",
+    name = "tsconfig_build",
     src = "tsconfig.json",
     visibility = ["//visibility:public"],
 )
 
+ts_config(
+    name = "tsconfig_test",
+    src = "tsconfig-test.json",
+    visibility = ["//visibility:public"],
+    deps = [
+        ":tsconfig_build",
+    ],
+)
+
 expand_template_rule(
     name = "package_json_expanded",
     out = "package_expanded.json",
     stamp_substitutions = {
-        "0.0.0-PLACEHOLDER": "{{BUILD_SCM_VERSION}}",
+        "workspace:*": "{{STABLE_PROJECT_VERSION}}",
     },
     substitutions = {
+        "workspace:*": "0.0.0",
         "../dist/bin/vscode-ng-language-service/client/src/extension.js": "./index",
     },
     template = "package.json",
@@ -34,12 +44,12 @@ expand_template_rule(
 npm_package(
     name = "vsix_sandbox",
     srcs = [
-        "package_expanded.json",
-        "angular.png",
         "CHANGELOG.md",
         "README.md",
+        "angular.png",
+        "package_expanded.json",
         "//vscode-ng-language-service/client:index.js",
-        "//vscode-ng-language-service/server:npm_files",
+        "//vscode-ng-language-service/server:npm_package",
         "//vscode-ng-language-service/syntaxes:npm_files",
         # Transitive closure of npm deps that are marked as "external" in esbuild needed for vsce;
         # this set was determined manually by running `bazel build //:vsix` and burning down missing packages.
@@ -56,7 +66,7 @@ npm_package(
     ],
     replace_prefixes = {
         "package_expanded.json": "package.json",
-        "server/package_expanded.json": "server/package.json",
+        "server/npm_package/": "server/",
         "client/": "",
         "syntaxes/src/": "syntaxes/",
     },
@@ -82,16 +92,14 @@ vsce_bin.vsce(
 )
 
 npm_package(
-    name = "npm",
+    name = "development_package",
     srcs = [
         ":vsix",
         ":vsix_sandbox",
     ],
-    data = [
-        "//vscode-ng-language-service:node_modules/@angular/language-service",
-    ],
     root_paths = [
-        "vsix_sandbox",
+        "vscode-ng-language-service/vsix_sandbox",
+        "vscode-ng-language-service",
     ],
-    visibility = ["//vscode-ng-language-service/integration:__subpackages__"],
+    visibility = ["//vscode-ng-language-service/integration/e2e:__subpackages__"],
 )
diff --git a/vscode-ng-language-service/client/BUILD.bazel b/vscode-ng-language-service/client/BUILD.bazel
@@ -1,15 +1,4 @@
 load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild")
-load("@aspect_rules_ts//ts:defs.bzl", "ts_config")
-
-ts_config(
-    name = "tsconfig",
-    src = "tsconfig.json",
-    visibility = ["//vscode-ng-language-service/client:__subpackages__"],
-    deps = [
-        "//vscode-ng-language-service:tsconfig",
-        "//vscode-ng-language-service/common:tsconfig",
-    ],
-)
 
 esbuild(
     name = "index",

diff --git a/vscode-ng-language-service/client/src/BUILD.bazel b/vscode-ng-language-service/client/src/BUILD.bazel
@@ -1,11 +1,8 @@
-load("@aspect_rules_ts//ts:defs.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 
 ts_project(
     name = "src",
     srcs = glob(["*.ts"]),
-    declaration = True,
-    source_map = True,
-    tsconfig = "//vscode-ng-language-service/client:tsconfig",
     visibility = [
         "//vscode-ng-language-service/client:__subpackages__",
     ],

diff --git a/vscode-ng-language-service/client/src/tests/BUILD.bazel b/vscode-ng-language-service/client/src/tests/BUILD.bazel
@@ -1,21 +1,10 @@
-load("@aspect_rules_jasmine//jasmine:defs.bzl", "jasmine_test")
-load("@aspect_rules_ts//ts:defs.bzl", "ts_config", "ts_project")
-
-ts_config(
-    name = "tsconfig",
-    src = "tsconfig.json",
-    deps = [
-        "//vscode-ng-language-service:tsconfig",
-        "//vscode-ng-language-service/client:tsconfig",
-    ],
-)
+load("@devinfra//bazel/jasmine:jasmine.bzl", "jasmine_test")
+load("//tools:defaults.bzl", "ts_project")
 
 ts_project(
     name = "tests",
+    testonly = True,
     srcs = glob(["*.ts"]),
-    declaration = True,
-    source_map = True,
-    tsconfig = ":tsconfig",
     deps = [
         "//vscode-ng-language-service:node_modules/@types/jasmine",
         "//vscode-ng-language-service:node_modules/@types/vscode",