Skip to content

Commit 2e128ce

Browse files
gregmagolanalexeagle
authored andcommitted
fix(typescript): remove override of @bazel/tsetse
...in generated ts_library tsconfig. This fixes an issue where the @bazel/tsetse plugin values in a user's config would always be overridden by ts_library and not honoured. Also remove disable_tsetse_for_external test as we no longer doing this.
1 parent 3d55b41 commit 2e128ce

7 files changed

Lines changed: 1 addition & 80 deletions

File tree

e2e/ts_library/WORKSPACE

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,3 @@ install_bazel_dependencies()
4646
load("@npm_bazel_typescript//:index.bzl", "ts_setup_workspace")
4747

4848
ts_setup_workspace()
49-
50-
# Tell Bazel where the nested local repositories are that are used for tests
51-
local_repository(
52-
name = "disable_tsetse_for_external_test",
53-
path = "disable_tsetse_for_external",
54-
)

e2e/ts_library/disable_tsetse_for_external/BUILD.bazel

Lines changed: 0 additions & 23 deletions
This file was deleted.

e2e/ts_library/disable_tsetse_for_external/WORKSPACE

Lines changed: 0 additions & 15 deletions
This file was deleted.

e2e/ts_library/disable_tsetse_for_external/main.ts

Lines changed: 0 additions & 19 deletions
This file was deleted.

e2e/ts_library/disable_tsetse_for_external/tsconfig.json

Whitespace-only changes.

e2e/ts_library/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
},
1313
"scripts": {
1414
"pretest": "bazel run @nodejs//:yarn",
15-
"test": "bazel build ... && bazel test ... && bazel build @disable_tsetse_for_external_test//..."
15+
"test": "bazel test ..."
1616
}
1717
}

packages/typescript/internal/build_defs.bzl

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -246,22 +246,6 @@ def tsc_wrapped_tsconfig(
246246
if jsx_factory:
247247
config["compilerOptions"]["jsxFactory"] = jsx_factory
248248

249-
tsetse_disabled_rules = []
250-
251-
# Matches section in javascript/typescript/tsconfig.bzl
252-
# TODO(alexeagle): make them share code
253-
if ctx.label.workspace_root.startswith("external/"):
254-
# Violated by rxjs
255-
tsetse_disabled_rules += ["ban-promise-as-condition"]
256-
257-
# For local testing
258-
tsetse_disabled_rules += ["check-return-value"]
259-
260-
config["compilerOptions"]["plugins"] = [{
261-
"name": "@bazel/tsetse",
262-
"disabledRules": tsetse_disabled_rules,
263-
}]
264-
265249
return config
266250

267251
# ************ #

0 commit comments

Comments
 (0)