cdavalos7 · Sep 23, 2026 · Oct 26, 2026 · Oct 26, 2026 · Oct 27, 2026 · arcra
diff --git a/package.json b/package.json
@@ -28,12 +28,12 @@
   },
   "homepage": "https://github.com/tensorflow/tensorboard#readme",
   "devDependencies": {
-    "@angular-devkit/build-angular": "^21.0.0",
-    "@angular/build": "^21.0.0",
+    "@angular-devkit/build-angular": "^22.0.0",
+    "@angular/build": "^22.0.0",
     "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#b87de6c1190eb38a74ce72a530331f2f184fe918",
-    "@angular/cli": "^21.0.0",
-    "@angular/compiler": "21.2.18",
-    "@angular/compiler-cli": "^21.0.0",
+    "@angular/cli": "^22.0.0",
+    "@angular/compiler": "22.1.7",
+    "@angular/compiler-cli": "^22.0.0",
     "@babel/core": "^7.16.12",
     "@bazel/concatjs": "5.8.1",
     "@bazel/esbuild": "5.8.1",
@@ -62,22 +62,22 @@
     "prettier-plugin-organize-imports": "2.3.4",
     "requirejs": "^2.3.7",
     "tslib": "^2.3.0",
-    "typescript": "5.9.3",
+    "typescript": "6.0.3",
     "yarn-deduplicate": "^5.0.0"
   },
   "dependencies": {
-    "@angular/animations": "^21.0.0",
-    "@angular/cdk": "^21.0.0",
-    "@angular/common": "21.2.18",
-    "@angular/core": "^21.0.0",
-    "@angular/forms": "^21.0.0",
-    "@angular/localize": "^21.0.0",
-    "@angular/material": "^21.0.0",
-    "@angular/platform-browser": "^21.0.0",
-    "@angular/platform-browser-dynamic": "^21.0.0",
-    "@angular/router": "^21.0.0",
-    "@ngrx/effects": "^21.0.0",
-    "@ngrx/store": "^21.0.0",
+    "@angular/animations": "^22.0.0",
+    "@angular/cdk": "^22.0.0",
+    "@angular/common": "22.1.7",
+    "@angular/core": "^22.0.0",
+    "@angular/forms": "^22.0.0",
+    "@angular/localize": "^22.0.0",
+    "@angular/material": "^22.0.0",
+    "@angular/platform-browser": "^22.0.0",
+    "@angular/platform-browser-dynamic": "^22.0.0",
+    "@angular/router": "^22.0.0",
+    "@ngrx/effects": "^22.0.0",
+    "@ngrx/store": "^22.0.0",
     "@polymer/decorators": "^3.0.0",
     "@polymer/iron-behaviors": "^3.0.1",
     "@polymer/iron-collapse": "^3.0.1",
@@ -124,7 +124,7 @@
     "marked": "^4.0.10",
     "monaco-editor-core": "^0.26.0",
     "monaco-languages": "^2.6.0",
-    "ngx-color-picker": "13.0.0",
+    "ngx-color-picker": "20.1.1",
     "numeric": "^1.2.6",
     "plottable": "^3.9.0",
     "postinstall-postinstall": "^2.1.0",

diff --git a/patches/@bazel+concatjs+5.8.1.patch b/patches/@bazel+concatjs+5.8.1.patch
@@ -29,10 +29,10 @@ index fed787a..377915a 100755
          closure_js = closure_js_files,
          devmode_js = devmode_js_files,
 diff --git a/node_modules/@bazel/concatjs/internal/common/tsconfig.bzl b/node_modules/@bazel/concatjs/internal/common/tsconfig.bzl
-index b01c999..86d61d4 100755
+index b01c999..8187cfc 100755
 --- a/node_modules/@bazel/concatjs/internal/common/tsconfig.bzl
 +++ b/node_modules/@bazel/concatjs/internal/common/tsconfig.bzl
-@@ -110,6 +110,48 @@ def create_tsconfig(
+@@ -110,6 +110,52 @@ def create_tsconfig(
              "*": node_modules_mappings,
              ctx.workspace_name + "/*": base_path_mappings,
          }
@@ -50,6 +50,10 @@ index b01c999..86d61d4 100755
 +                "@angular/cdk",
 +                "@angular/common",
 +                "@angular/core",
++                # TypeScript 6.0 added error TS2882 for side-effect imports whose types
++                # do not resolve, and bootstrap.ts imports "@angular/localize/init" for
++                # its side effect only.
++                "@angular/localize",
 +                "@angular/material",
 +                "@angular/platform-browser",
 +                "@angular/platform-browser-dynamic",
@@ -115,22 +119,8 @@ index e049d15..9ebeec4 100755
      if (bazelOpts.angularCompilerOptions && bazelOpts.angularCompilerOptions.assets) {
          bazelOpts.angularCompilerOptions.assets = bazelOpts.angularCompilerOptions.assets.map(f => resolveNormalizedPath(options.rootDir, f));
      }
-diff --git a/node_modules/@bazel/concatjs/package.json b/node_modules/@bazel/concatjs/package.json
-index dbc7cee..1129289 100755
---- a/node_modules/@bazel/concatjs/package.json
-+++ b/node_modules/@bazel/concatjs/package.json
-@@ -24,7 +24,8 @@
-     "dependencies": {
-         "protobufjs": "6.8.8",
-         "source-map-support": "0.5.9",
--        "tsutils": "3.21.0"
-+        "tsutils": "3.21.0",
-+        "typescript": "5.9.3"
-     },
-     "peerDependencies": {
-         "karma": ">=4.0.0",
 diff --git a/node_modules/@bazel/concatjs/web_test/karma_web_test.bzl b/node_modules/@bazel/concatjs/web_test/karma_web_test.bzl
-index e66b5e8..3301ef7 100755
+index 55c7d06..b519104 100755
 --- a/node_modules/@bazel/concatjs/web_test/karma_web_test.bzl
 +++ b/node_modules/@bazel/concatjs/web_test/karma_web_test.bzl
 @@ -237,7 +237,7 @@ def _karma_web_test_impl(ctx):

diff --git a/patches/README.md b/patches/README.md
@@ -28,7 +28,7 @@ hunk disappeared.
 **Modified files:**
 * `node_modules/@bazel/concatjs/internal/common/compilation.bzl`
 * `node_modules/@bazel/concatjs/internal/common/tsconfig.bzl`
-* `node_modules/@bazel/concatjs/package.json`
+* `node_modules/@bazel/concatjs/web_test/karma_web_test.bzl`
 
 **What it does:**
 Three independent changes:
@@ -41,8 +41,15 @@ Three independent changes:
    Angular 21, APF packaging exposes type definitions only through
    `package.json` `"exports"`, which the Bazel `node_modules` path mapping
    cannot resolve.
-3. `package.json` adds `typescript` as a direct dependency because the Bazel
-   sandbox cannot find it otherwise.
+3. `karma_web_test.bzl` points the generated test launcher at the Bzlmod
+   canonical runfiles path of rules_nodejs
+   (`+_repo_rules+build_bazel_rules_nodejs`), so the Bash runfiles library is
+   found when the Karma suites start.
+
+The patch used to also add `typescript` to concatjs's `package.json` so the
+Bazel sandbox could find it. Since TypeScript 6.0 the `tsc_wrapped` and
+`tsc_wrapped_with_angular` binaries in `tensorboard/defs/BUILD` list
+`@npm//typescript` in their `data` instead, so that hunk is gone.
 
 Note that putting the mappings from (2) in the workspace `tsconfig.json` does not
 work: the tsconfig Bazel generates does `extends` the workspace one, but it also
@@ -61,10 +68,10 @@ hunk.
 To regenerate:
 * `vi node_modules/@bazel/concatjs/internal/common/compilation.bzl`
 * `vi node_modules/@bazel/concatjs/internal/common/tsconfig.bzl`
-* `vi node_modules/@bazel/concatjs/package.json`
+* `vi node_modules/@bazel/concatjs/web_test/karma_web_test.bzl`
 * make edits
-* `yarn patch-package "@bazel/concatjs" --exclude '^$'` (the `--exclude` is
-  required, otherwise the `package.json` hunk is dropped)
+* `yarn patch-package "@bazel/concatjs" --exclude '^$'` (keep the `--exclude`
+  so a future `package.json` change is not silently dropped)
 * update `third_party/nodejs_extensions.bzl` with the new patch file name
 
 

diff --git a/tensorboard/defs/BUILD b/tensorboard/defs/BUILD
@@ -46,6 +46,28 @@ tb_proto_library(
 ts_library(
     name = "strict_types",
     srcs = ["strict_type_check.d.ts"],
+    compiler = ":tsc_wrapped",
+)
+
+# Custom ts_library compiler for non-Angular targets.
+#
+# The default @npm//@bazel/concatjs/bin:tsc_wrapped needs `typescript` at runtime,
+# but does not include it in its runfiles. This may work locally because the
+# execroot's node_modules directory is available, but fails in the sandbox.
+# Define the binary here and add `typescript` explicitly so the compiler works
+# reliably in both local and sandboxed builds.
+#
+# Angular targets use tsc_wrapped_with_angular below, which declares the Angular
+# compiler dependencies separately.
+nodejs_binary(
+    name = "tsc_wrapped",
+    data = [
+        "@npm//@bazel/concatjs",
+        "@npm//typescript",
+    ],
+    entry_point = "@npm//:node_modules/@bazel/concatjs/internal/tsc_wrapped/tsc_wrapped.js",
+    templated_args = ["--nobazel_run_linker"],
+    visibility = ["//tensorboard:__subpackages__"],
 )
 
 # Isolated canary for the modern rules_ts/rules_js stack. Production
@@ -57,21 +79,25 @@ tf_ts_project(
     srcs = ["rules_ts_canary.ts"],
 )
 
-# Custom ts_library compiler that runs tsc_wrapped with angular/compiler-cli statically linked
-# This can be used with worker mode because we don't need the linker at runtime to make
-# the angular plugin loadable
-# Just a clone of @npm//@bazel/concatjs/bin:tsc_wrapped with added deps
+# Custom ts_library compiler for Angular targets (tf_ng_module).
+#
+# Same binary as tsc_wrapped above, plus @angular/compiler-cli so the Angular
+# plugin can be loaded without the linker. tsc_wrapped only loads that plugin
+# for targets with use_angular_plugin = True.
+#
+# Both binaries go away once the frontend moves to rules_ts / rules_angular.
 nodejs_binary(
     name = "tsc_wrapped_with_angular",
     data = [
         "@npm//@angular/compiler-cli",
         "@npm//@bazel/concatjs",
-        "@npm//@bazel/typescript",
+        "@npm//typescript",
     ],
     entry_point = "@npm//:node_modules/@bazel/concatjs/internal/tsc_wrapped/tsc_wrapped.js",
-    # Disables the Bazel node modules linker. The node module linker is unreliable for the
-    # persistent worker executable, as it would rely on the `node_modules/` folder in the
-    # execroot that can be shared in non-sandbox environments or for persistent workers.
+    # Disables the Bazel node modules linker, here and in tsc_wrapped. The node
+    # module linker is unreliable for the persistent worker executable, as it would
+    # rely on the `node_modules/` folder in the execroot that can be shared in
+    # non-sandbox environments or for persistent workers.
     # https://docs.bazel.build/versions/main/command-line-reference.html#flag--worker_sandboxing.
     templated_args = ["--nobazel_run_linker"],
     visibility = ["//tensorboard:__subpackages__"],

diff --git a/tensorboard/defs/defs.bzl b/tensorboard/defs/defs.bzl
@@ -145,6 +145,10 @@ def tf_ts_library(srcs = [], strict_checks = True, **kwargs):
         tsconfig = "//:tsconfig-lax"
     kwargs.setdefault("deps", []).extend(["@npm//tslib", "//tensorboard/defs:strict_types"])
 
+    # Default to tsc_wrapped from tensorboard/defs/BUILD, see why there.
+    # tf_ng_module overrides it with tsc_wrapped_with_angular.
+    kwargs.setdefault("compiler", "//tensorboard/defs:tsc_wrapped")
+
     new_srcs = []
 
     # Find test.ts and testbed.ts files and rename to test.spec.ts to be

diff --git a/tensorboard/webapp/runs/views/runs_table/runs_table_module.ts b/tensorboard/webapp/runs/views/runs_table/runs_table_module.ts
@@ -29,7 +29,7 @@ import {MatPaginatorModule} from '@angular/material/paginator';
 import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
 import {MatSortModule} from '@angular/material/sort';
 import {MatTableModule} from '@angular/material/table';
-import {ColorPickerModule} from 'ngx-color-picker';
+import {ColorPickerDirective} from 'ngx-color-picker';
 import {MatSelectModule} from '@angular/material/select';
 import {AlertModule} from '../../../alert/alert_module';
 import {DataTableModule} from '../../../widgets/data_table/data_table_module';
@@ -49,7 +49,7 @@ import {ReactiveFormsModule} from '@angular/forms';
 
 @NgModule({
   imports: [
-    ColorPickerModule,
+    ColorPickerDirective,
     CommonModule,
     DataTableModule,
     ExperimentAliasModule,

diff --git a/tsconfig-lax.json b/tsconfig-lax.json
@@ -3,6 +3,8 @@
     "downlevelIteration": true,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
+    // See tsconfig.json for why this is needed.
+    "ignoreDeprecations": "6.0",
     "importHelpers": true,
     "inlineSourceMap": true,
     "inlineSources": true,
@@ -22,7 +24,11 @@
     "plugins": [
       {
         "name": "@bazel/tsetse",
-        "disabledRules": ["ban-promise-as-condition", "must-use-promises"]
+        "disabledRules": [
+          "ban-promise-as-condition",
+          "must-use-promises",
+          "ban-expect-truthy-promise"
+        ]
       }
     ],
   }

diff --git a/tsconfig.json b/tsconfig.json
@@ -4,6 +4,9 @@
     "emitDecoratorMetadata": true,
     "exactOptionalPropertyTypes": true,
     "experimentalDecorators": true,
+    // TODO(@cdavalos7): Remove this after migrating from @bazel/concatjs to rules_js/rules_ts.
+    // TypeScript 6.0 rejects deprecated options added by concatjs.
+    "ignoreDeprecations": "6.0",
     "importHelpers": true,
     "inlineSourceMap": true,
     "lib": ["dom", "es2021", "dom.iterable"],
@@ -23,11 +26,13 @@
     "plugins": [
       {
         "name": "@bazel/tsetse",
-        // disabled: concatjs pins tsutils to 3.21.0, which predates TS 5.9 and
-        // is incompatible with these two rules. ban-promise-as-condition
-        // crashes the compiler, must-use-promises misfires on the one
-        // awaited call in alert_display_snackbar_container.ts.
-        "disabledRules": ["ban-promise-as-condition", "must-use-promises"]
+        // TODO(@cdavalos7): Re-enable these rules after upgrading concatjs and tsutils.
+        // The current versions are incompatible with TypeScript 6.0.
+        "disabledRules": [
+          "ban-promise-as-condition",
+          "must-use-promises",
+          "ban-expect-truthy-promise"
+        ]
       }
     ]
   },