From d6fd1db3f08e4add4f748baf95ef6a8333c46b6d Mon Sep 17 00:00:00 2001 From: Joey Perrott Date: Wed, 13 Aug 2025 16:55:03 +0000 Subject: [PATCH] build: use the repo name mapping in use_repo instead of replacing the naming during usages of npm_typescript --- MODULE.bazel | 8 ++------ MODULE.bazel.lock | 10 +++++----- browsers/private/update-tool/BUILD.bazel | 3 --- protractor_test/BUILD.bazel | 3 --- server_test/BUILD.bazel | 3 --- test/MODULE.bazel | 2 +- test/MODULE.bazel.lock | 6 +++--- .../typescript-multiple-files-should-fail/BUILD.bazel | 3 --- test/wtr/typescript-multiple-files/BUILD.bazel | 3 --- test/wtr/typescript/BUILD.bazel | 3 --- 10 files changed, 11 insertions(+), 33 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 6666881..0c4dfbe 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -54,11 +54,7 @@ bazel_dep(name = "aspect_rules_ts", version = "3.6.3") rules_ts_ext = use_extension("@aspect_rules_ts//ts:extensions.bzl", "ext") rules_ts_ext.deps( - # Specify a name manually to prevent conflicts in consumers that also use - # `aspect_rules_ts`. This requires that we override the default for `tsc`, - # `tsc_worker` and `validator` on all `ts_project` targets. - # Upstream issue: https://github.com/aspect-build/rules_ts/issues/843 - name = "npm_rules_browsers_typescript", + name = "rules_browsers_npm_typescript", ts_version_from = "//:package.json", ) -use_repo(rules_ts_ext, "npm_rules_browsers_typescript") +use_repo(rules_ts_ext, **{"npm_typescript": "rules_browsers_npm_typescript"}) diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 39e901f..8e0c98d 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -163,7 +163,7 @@ "//browsers:extensions.bzl%browsers": { "general": { "bzlTransitiveDigest": "yqhZdGXdR0JohAH2diKEa7TtjybE5ulk1cTFF5q5nL8=", - "usagesDigest": "0dDFTYW4a/Z5wlfEhG3GErmxrbw/4OjbJIfc3YaAUy0=", + "usagesDigest": "ZdoKpZOeP/gz3J/+Vxx6G86muqFz6LGktGf1RJtJNpA=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, @@ -451,14 +451,14 @@ "@@aspect_rules_ts+//ts:extensions.bzl%ext": { "general": { "bzlTransitiveDigest": "aVqwKoRPrSXO367SJABlye04kmpR/9VM2xiXB3nh3Ls=", - "usagesDigest": "QgCJJqzfzt67YhcDRQ4LQ7mvPBhmWYFwo9v/cHAmVjw=", + "usagesDigest": "Ne/2xJQVh6sEkr1aKC/bfxC3n5M+URr/uNDlj2ffVkI=", "recordedFileInputs": { - "@@//package.json": "24fae2e64bcc44f0d8ab07473932c82f5bc05f12dad1431965dd027afe3730ec" + "@@//package.json": "0d8cc69cc2c9ecf0eff677fa86843ad9146eca22462aace022a09c3adcb979f8" }, "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { - "npm_rules_browsers_typescript": { + "rules_browsers_npm_typescript": { "repoRuleId": "@@aspect_rules_ts+//ts/private:npm_repositories.bzl%http_archive_version", "attributes": { "bzlmod": true, @@ -701,7 +701,7 @@ "@@rules_nodejs+//nodejs:extensions.bzl%node": { "general": { "bzlTransitiveDigest": "hdICB1K7PX7oWtO8oksVTBDNt6xxiNERpcO4Yxoa0Gc=", - "usagesDigest": "yLc2EK4inNAwJN7bRRtoATI6JtdKbXLyRQlFGJpjpx8=", + "usagesDigest": "XBWFQdq6kA4UQLy+V98Utnzr/mOQ7B0cMq/WUNf+ErM=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, diff --git a/browsers/private/update-tool/BUILD.bazel b/browsers/private/update-tool/BUILD.bazel index ff7790f..dc461ab 100644 --- a/browsers/private/update-tool/BUILD.bazel +++ b/browsers/private/update-tool/BUILD.bazel @@ -4,10 +4,7 @@ load("@aspect_rules_ts//ts:defs.bzl", "ts_project") ts_project( name = "update_tool_lib", srcs = glob(["**/*.mts"]), - tsc = "@npm_rules_browsers_typescript//:tsc", - tsc_worker = "@npm_rules_browsers_typescript//:tsc_worker", tsconfig = "tsconfig.json", - validator = "@npm_rules_browsers_typescript//:validator", deps = [ "//:node_modules/@puppeteer/browsers", "//:node_modules/@types/node", diff --git a/protractor_test/BUILD.bazel b/protractor_test/BUILD.bazel index 59cef3d..1602ceb 100644 --- a/protractor_test/BUILD.bazel +++ b/protractor_test/BUILD.bazel @@ -5,10 +5,7 @@ package(default_visibility = ["//visibility:public"]) ts_project( name = "config", srcs = ["config.cts"], - tsc = "@npm_rules_browsers_typescript//:tsc", - tsc_worker = "@npm_rules_browsers_typescript//:tsc_worker", tsconfig = "tsconfig.json", - validator = "@npm_rules_browsers_typescript//:validator", deps = [ "//:node_modules/@types/node", "//:node_modules/protractor", diff --git a/server_test/BUILD.bazel b/server_test/BUILD.bazel index f7bb7f1..ec6ac28 100644 --- a/server_test/BUILD.bazel +++ b/server_test/BUILD.bazel @@ -5,10 +5,7 @@ package(default_visibility = ["//visibility:public"]) ts_project( name = "lib", srcs = ["test-runner.mts"], - tsc = "@npm_rules_browsers_typescript//:tsc", - tsc_worker = "@npm_rules_browsers_typescript//:tsc_worker", tsconfig = "tsconfig.json", - validator = "@npm_rules_browsers_typescript//:validator", deps = [ "//:node_modules/@types/node", "//:node_modules/get-port", diff --git a/test/MODULE.bazel b/test/MODULE.bazel index 491d829..4c43eae 100644 --- a/test/MODULE.bazel +++ b/test/MODULE.bazel @@ -14,4 +14,4 @@ use_repo(npm, "npm_rules_browsers") bazel_dep(name = "aspect_rules_ts", version = "3.6.3") rules_ts_ext = use_extension("@aspect_rules_ts//ts:extensions.bzl", "ext", dev_dependency = True) -use_repo(rules_ts_ext, "npm_rules_browsers_typescript") +use_repo(rules_ts_ext, **{"npm_typescript": "rules_browsers_npm_typescript"}) diff --git a/test/MODULE.bazel.lock b/test/MODULE.bazel.lock index 6104d82..ecc9d8d 100644 --- a/test/MODULE.bazel.lock +++ b/test/MODULE.bazel.lock @@ -283,14 +283,14 @@ "@@aspect_rules_ts+//ts:extensions.bzl%ext": { "general": { "bzlTransitiveDigest": "aVqwKoRPrSXO367SJABlye04kmpR/9VM2xiXB3nh3Ls=", - "usagesDigest": "oa0AkIQUt6HMa8dLIiRs1EnoAbtoAnoESdw5pci0lC0=", + "usagesDigest": "S687BKD1QtOgL+rZV7WwRkgUo4myqeakJg5R3qaeXnE=", "recordedFileInputs": { - "@@rules_browsers+//package.json": "24fae2e64bcc44f0d8ab07473932c82f5bc05f12dad1431965dd027afe3730ec" + "@@rules_browsers+//package.json": "0d8cc69cc2c9ecf0eff677fa86843ad9146eca22462aace022a09c3adcb979f8" }, "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { - "npm_rules_browsers_typescript": { + "rules_browsers_npm_typescript": { "repoRuleId": "@@aspect_rules_ts+//ts/private:npm_repositories.bzl%http_archive_version", "attributes": { "bzlmod": true, diff --git a/test/wtr/typescript-multiple-files-should-fail/BUILD.bazel b/test/wtr/typescript-multiple-files-should-fail/BUILD.bazel index ecc2ac2..cadfb26 100644 --- a/test/wtr/typescript-multiple-files-should-fail/BUILD.bazel +++ b/test/wtr/typescript-multiple-files-should-fail/BUILD.bazel @@ -4,10 +4,7 @@ load("@rules_browsers//wtr:index.bzl", "wtr_test") ts_project( name = "test_lib", srcs = glob(["**/*.mts"]), - tsc = "@npm_rules_browsers_typescript//:tsc", - tsc_worker = "@npm_rules_browsers_typescript//:tsc_worker", tsconfig = "tsconfig.json", - validator = "@npm_rules_browsers_typescript//:validator", deps = ["//:node_modules/@types/jasmine"], ) diff --git a/test/wtr/typescript-multiple-files/BUILD.bazel b/test/wtr/typescript-multiple-files/BUILD.bazel index 03e9294..50bd6c2 100644 --- a/test/wtr/typescript-multiple-files/BUILD.bazel +++ b/test/wtr/typescript-multiple-files/BUILD.bazel @@ -4,10 +4,7 @@ load("@rules_browsers//wtr:index.bzl", "wtr_test") ts_project( name = "test_lib", srcs = glob(["**/*.mts"]), - tsc = "@npm_rules_browsers_typescript//:tsc", - tsc_worker = "@npm_rules_browsers_typescript//:tsc_worker", tsconfig = "tsconfig.json", - validator = "@npm_rules_browsers_typescript//:validator", deps = ["//:node_modules/@types/jasmine"], ) diff --git a/test/wtr/typescript/BUILD.bazel b/test/wtr/typescript/BUILD.bazel index 69b1f6d..7122622 100644 --- a/test/wtr/typescript/BUILD.bazel +++ b/test/wtr/typescript/BUILD.bazel @@ -4,10 +4,7 @@ load("@rules_browsers//wtr:index.bzl", "wtr_test") ts_project( name = "test_lib", srcs = ["test.spec.mts"], - tsc = "@npm_rules_browsers_typescript//:tsc", - tsc_worker = "@npm_rules_browsers_typescript//:tsc_worker", tsconfig = "tsconfig.json", - validator = "@npm_rules_browsers_typescript//:validator", deps = ["//:node_modules/@types/jasmine"], )