feat(bazel): update http_server to work with rules_js

Updates the `http_server` to work with `rules_js`.

Author: devversion

.bazelrc

@@ -36,6 +36,11 @@ build --symlink_prefix=dist/
 # Write testing errors to log on test failure
 test --test_output=errors
 
+# Do not build runfile forests by default. If an execution strategy relies on runfile
+# forests, the forest is created on-demand. See: https://github.com/bazelbuild/bazel/issues/6627
+# and https://github.com/bazelbuild/bazel/commit/03246077f948f2790a83520e7dccc2625650e6df. This
+# also helps with: https://github.com/bazelbuild/bazel/issues/4327#issuecomment-922106293.
+build --nobuild_runfile_links
 
 # Turn on --incompatible_strict_action_env which was on by default
 # in Bazel 0.21.0 but turned off again in 0.22.0. Follow
@@ -47,12 +52,6 @@ build --incompatible_strict_action_env
 run --incompatible_strict_action_env
 test --incompatible_strict_action_env
 
-# Do not build runfile forests by default. If an execution strategy relies on runfile
-# forests, the forest is created on-demand. See: https://github.com/bazelbuild/bazel/issues/6627
-# and https://github.com/bazelbuild/bazel/commit/03246077f948f2790a83520e7dccc2625650e6df. This
-# also helps with: https://github.com/bazelbuild/bazel/issues/4327#issuecomment-922106293.
-build --nobuild_runfile_links
-
 ################################
 # Remote Execution Setup       #
 ################################

bazel/http-server/BUILD.bazel

@@ -1,5 +1,5 @@
-load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
-load("//bazel:defaults.bzl", "ts_library")
+load("@aspect_rules_js//js:defs.bzl", "js_binary")
+load("@aspect_rules_ts//ts:defs.bzl", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -11,33 +11,27 @@ filegroup(
     srcs = glob(["*"]),
 )
 
-ts_library(
+ts_project(
     name = "server_lib",
     srcs = [
-        "ibazel.ts",
-        "main.ts",
-        "server.ts",
+        "ibazel.mts",
+        "main.mts",
+        "server.mts",
     ],
-    # A tsconfig needs to be specified as otherwise `ts_library` will look for the config
-    # in `//:package.json` and this breaks when the BUILD file is copied to `@npm//`.
-    tsconfig = "//:tsconfig.json",
+    tsconfig = "//bazel:tsconfig",
     deps = [
-        "@npm//@bazel/runfiles",
-        "@npm//@types/browser-sync",
-        "@npm//@types/node",
-        "@npm//@types/send",
-        "@npm//@types/yargs",
-        "@npm//browser-sync",
-        "@npm//send",
-        "@npm//yargs",
+        "//bazel:node_modules/@types/browser-sync",
+        "//bazel:node_modules/@types/node",
+        "//bazel:node_modules/@types/send",
+        "//bazel:node_modules/@types/yargs",
+        "//bazel:node_modules/browser-sync",
+        "//bazel:node_modules/send",
+        "//bazel:node_modules/yargs",
     ],
 )
 
-nodejs_binary(
+js_binary(
     name = "server_bin",
-    data = [
-        ":server_lib",
-    ],
-    entry_point = ":main.ts",
-    templated_args = ["--nobazel_run_linker"],
+    data = [":server_lib"],
+    entry_point = ":main.mjs",
 )

bazel/http-server/ibazel.ts renamed to bazel/http-server/ibazel.mts

@@ -7,7 +7,7 @@
  */
 
 import {createInterface} from 'readline';
-import {HttpServer} from './server';
+import {HttpServer} from './server.mjs';
 
 // ibazel will write this string after a successful build.
 const ibazelNotifySuccessMessage = 'IBAZEL_BUILD_COMPLETED SUCCESS';

bazel/http-server/index.bzl

@@ -1,3 +1,4 @@
+load("@aspect_rules_js//js:providers.bzl", "JsInfo")
 load("@build_bazel_rules_nodejs//:providers.bzl", "JSNamedModuleInfo")
 
 def _get_workspace_name(ctx):
@@ -29,6 +30,8 @@ def _http_server_rule_impl(ctx):
     for dep in ctx.attr.deps:
         if JSNamedModuleInfo in dep:
             transitive_depsets.append(dep[JSNamedModuleInfo].sources)
+        if JsInfo in dep:
+            transitive_depsets.append(dep[JsInfo].transitive_sources)
         elif DefaultInfo in dep:
             transitive_depsets.append(dep[DefaultInfo].files)
 
@@ -136,6 +139,7 @@ http_server_rule = rule(
         "_bash_runfile_helpers": attr.label(default = Label("@bazel_tools//tools/bash/runfiles")),
         "_server_bin": attr.label(
             default = Label("//bazel/http-server:server_bin"),
+            cfg = "exec",
         ),
         "_launcher_template": attr.label(
             allow_single_file = True,

bazel/http-server/launcher_template.sh

@@ -14,19 +14,8 @@ source "$(grep -sm1 "^$f " "$0.exe.runfiles_manifest" | cut -f2- -d' ')" 2>/dev/
 { echo>&2 "ERROR: cannot find $f"; exit 1; }; f=; set -e
 # --- end runfiles.bash initialization v2 ---
 
-# If we do not run the server as part of a test, we always enforce runfile
-# resolution when invoking the server NodeJS binary. This is necessary as
-# runfile trees are disabled as part of this repository. The server NodeJS
-# binary would not find a relative runfile tree directory and error out.
-if [[ -z "${TEST_SRCDIR:-""}" ]]; then
-  export RUNFILES_MANIFEST_ONLY="1"
-fi
-
-# Resolve the path of the server binary. Note: usually we either need to
-# resolve the "nodejs_binary" executable with different file extensions on
-# windows, but since we already run this launcher as part of a "sh_binary", we
-# can safely execute another shell script from the current shell.
-serverBin=$(rlocation "devinfra/bazel/http-server/server_bin.sh")
+# Resolve the path of the server binary.
+serverBin=$(rlocation "devinfra/bazel/http-server/server_bin_/server_bin")
 
 # Start the server with the given arguments. The arguments will be
 # substituted based on the rule attributes.

bazel/http-server/main.ts renamed to bazel/http-server/main.mts

@@ -9,8 +9,8 @@
 import yargs from 'yargs';
 import assert from 'node:assert';
 
-import {HttpServer} from './server';
-import {setupBazelWatcherSupport} from './ibazel';
+import {HttpServer} from './server.mjs';
+import {setupBazelWatcherSupport} from './ibazel.mjs';
 
 const {
   rootPaths,

bazel/http-server/server.ts renamed to bazel/http-server/server.mts

@@ -6,12 +6,16 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {readFileSync} from 'fs';
-import {runfiles} from '@bazel/runfiles';
+import fs from 'node:fs';
 import browserSync from 'browser-sync';
-import http from 'http';
-import path from 'path';
+import http from 'node:http';
+import path from 'node:path';
 import send from 'send';
+import assert from 'node:assert';
+
+// The current working directory is the runfiles root.
+const runfilesRoot = process.env['RUNFILES_DIR']!;
+assert(runfilesRoot, 'Expected `RUNFILES_DIR` to be set.');
 
 /**
  * Http Server implementation that uses browser-sync internally. This server
@@ -26,22 +30,7 @@ export class HttpServer {
   server = browserSync.create();
 
   /** Options of the browser-sync server. */
-  options: browserSync.Options = {
-    open: false,
-    online: false,
-    port: this.port,
-    notify: false,
-    ghostMode: false,
-    server: {
-      directory: false,
-      middleware: [
-        (req, res) => {
-          this._corsMiddleware(req, res);
-          this._bazelMiddleware(req, res);
-        },
-      ],
-    },
-  };
+  options: browserSync.Options;
 
   constructor(
     readonly port: number,
@@ -51,6 +40,23 @@ export class HttpServer {
     private _environmentVariables: string[] = [],
     private _relaxCors: boolean = false,
   ) {
+    this.options = {
+      open: false,
+      online: false,
+      port: this.port,
+      notify: false,
+      ghostMode: false,
+      server: {
+        directory: false,
+        middleware: [
+          (req, res) => {
+            this._corsMiddleware(req, res);
+            this._bazelMiddleware(req, res);
+          },
+        ],
+      },
+    };
+
     if (enableUi === false) {
       this.options.ui = false;
     }
@@ -131,12 +137,15 @@ export class HttpServer {
     return new URL(reqURL, `http://_`).pathname;
   }
 
-  /** Resolves a given URL from the runfiles using the corresponding manifest path. */
+  /** Resolves a given URL from the runfiles using a computed manifest path. */
   private _resolveUrlFromRunfiles(url: string): string | null {
     for (let rootPath of this._rootPaths) {
-      try {
-        return runfiles.resolve(path.posix.join(rootPath, getManifestPath(url)));
-      } catch {}
+      const fragment = path.posix.join(rootPath, getManifestPath(url));
+      const diskPath = path.join(runfilesRoot, fragment);
+
+      if (fs.existsSync(diskPath)) {
+        return diskPath;
+      }
     }
     return null;
   }
@@ -155,7 +164,7 @@ export class HttpServer {
       }
 
       const variables: Record<string, string | undefined> = {};
-      const content = readFileSync(indexPath, 'utf8');
+      const content = fs.readFileSync(indexPath, 'utf8');
 
       // Populate variables object that will be inlined.
       this._environmentVariables.forEach((name) => (variables[name] = process.env[name]));

bazel/http-server/test/BUILD.bazel

@@ -1,11 +1,12 @@
-load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_test")
+load("@aspect_rules_js//js:defs.bzl", "js_test")
+load("@aspect_rules_ts//ts:defs.bzl", "ts_project")
 load("//bazel/http-server:index.bzl", "http_server")
-load("//tools:defaults.bzl", "ts_library")
 
-ts_library(
+ts_project(
     name = "app_lib",
     testonly = True,
     srcs = ["main.ts"],
+    tsconfig = "tsconfig.app.json",
 )
 
 http_server(
@@ -16,23 +17,21 @@ http_server(
     deps = [":app_lib"],
 )
 
-ts_library(
+ts_project(
     name = "test_lib",
     testonly = True,
     srcs = ["server-test.ts"],
-    # TODO(devversion): Remove this when `ts_library` supports `.mts` extension.
-    devmode_module = "commonjs",
+    tsconfig = "//bazel:tsconfig",
     deps = [
-        "@npm//@bazel/runfiles",
-        "@npm//@types/node",
-        "@npm//@types/selenium-webdriver",
-        "@npm//@types/wait-on",
-        "@npm//selenium-webdriver",
-        "@npm//wait-on",
+        "//bazel:node_modules/@types/node",
+        "//bazel:node_modules/@types/selenium-webdriver",
+        "//bazel:node_modules/@types/wait-on",
+        "//bazel:node_modules/selenium-webdriver",
+        "//bazel:node_modules/wait-on",
     ],
 )
 
-nodejs_test(
+js_test(
     name = "test",
     # Pass the chromium and chromedriver binaries as arguments to the test.
     # These variables are made available by the toolchain alias.
@@ -45,6 +44,6 @@ nodejs_test(
         ":test_lib",
         "//bazel/browsers/chromium",
     ],
-    entry_point = ":server-test.ts",
+    entry_point = ":server-test.js",
     toolchains = ["//bazel/browsers/chromium:toolchain_alias"],
 )

bazel/http-server/test/server-test.ts

@@ -6,12 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {runfiles} from '@bazel/runfiles';
 import {Builder, By, WebDriver} from 'selenium-webdriver';
 import {Options as ChromeOptions, ServiceBuilder} from 'selenium-webdriver/chrome';
 
 import waitOn from 'wait-on';
-import * as childProcess from 'child_process';
+import childProcess from 'node:child_process';
+import path from 'node:path';
 
 /**
  * Test script that will start the test http server binary in a background process.
@@ -23,9 +23,9 @@ async function runTest() {
   const [chromiumRootpath, chromedriverRootpath] = process.argv.slice(2);
 
   // Resolve chromium, chromedriver and the server binary to disk paths.
-  const chromiumPath = runfiles.resolveWorkspaceRelative(chromiumRootpath);
-  const chromedriverPath = runfiles.resolveWorkspaceRelative(chromedriverRootpath);
-  const serverBinPath = runfiles.resolveWorkspaceRelative('bazel/http-server/test/server');
+  const chromiumPath = path.resolve(chromiumRootpath);
+  const chromedriverPath = path.resolve(chromedriverRootpath);
+  const serverBinPath = path.resolve('bazel/http-server/test/server');
 
   const serverPort = 1234;
   const serverHost = `127.0.0.1:${serverPort}`;
@@ -36,6 +36,12 @@ async function runTest() {
     stdio: 'inherit',
   });
 
+  console.error('Spawning');
+
+  serverProcess.on('error', (err) => {
+    console.error(err);
+  });
+
   // Ensure the process gets killed, if the test terminates early.
   process.on('exit', () => serverProcess.kill());
 

bazel/http-server/test/tsconfig.app.json

@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "strict": true,
+    "lib": ["dom", "es2022"],
+    "module": "ES2022"
+  }
+}