Skip to content

build: use the repo name mapping in use_repo instead of replacing the naming during usages of npm_typescript #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
josephperrott wants to merge 1 commit into
base: main
Choose a base branch
from
Open

build: use the repo name mapping in use_repo instead of replacing the naming during usages of npm_typescript #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"})
10 changes: 5 additions & 5 deletions MODULE.bazel.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions browsers/private/update-tool/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 0 additions & 3 deletions protractor_test/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 0 additions & 3 deletions server_test/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion test/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"})
6 changes: 3 additions & 3 deletions test/MODULE.bazel.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions test/wtr/typescript-multiple-files-should-fail/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
)

Expand Down
3 changes: 0 additions & 3 deletions test/wtr/typescript-multiple-files/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
)

Expand Down
3 changes: 0 additions & 3 deletions test/wtr/typescript/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
)

Expand Down
Loading