Skip to content

Merge upstream changes from master #1

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

Merged
merged 7 commits into from
Oct 6, 2025
Merged

Merge upstream changes from master #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4f635b9
Migrate away from deprecated ScopedAliases pass constructor (#667)
lauraharker Sep 22, 2025
b8735ca
Add missing rules_java loads (#670)
gkdn Sep 23, 2025
e687d24
Remove no-op diagnostic groups (#669)
gkdn Sep 23, 2025
6de69f0
Use a consisten jsr305 target (#668)
gkdn Sep 23, 2025
e96aeef
Remove custom repo names for rules_webtesting (#671)
gkdn Sep 23, 2025
e634475
Merge remote-tracking branch 'upstream/master'
pcj Oct 6, 2025
327c568
Remove repo_name(s)
pcj Oct 6, 2025
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
4 changes: 2 additions & 2 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ bazel_dep(name = "rules_jvm_external", version = "6.8")
bazel_dep(name = "rules_proto", version = "7.1.0")
bazel_dep(name = "rules_python", version = "1.5.3")
bazel_dep(name = "rules_tsickle", version = "1.0.0")
bazel_dep(name = "rules_web_testing_java", version = "0.4.1", repo_name = "io_rules_web_testing_java")
bazel_dep(name = "rules_webtesting", version = "0.4.1", repo_name = "io_bazel_rules_webtesting")
bazel_dep(name = "rules_web_testing_java", version = "0.4.1")
bazel_dep(name = "rules_webtesting", version = "0.4.1")

# -------------------------------------------------------------------
# Overrides
Expand Down
1 change: 0 additions & 1 deletion closure/compiler/closure_js_library.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ def _closure_js_library_impl(
suppress = suppress + [
"analyzerChecks",
"deprecated",
"legacyGoogScopeRequire",
"lintChecks",
"missingOverride",
"reportUnknownTypes",
Expand Down
2 changes: 1 addition & 1 deletion closure/testing/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ bzl_library(
srcs = ["webdriver_test.bzl"],
deps = [
"//closure:web_library_bzl",
"@io_bazel_rules_webtesting//web:web",
"@rules_webtesting//web:web",
],
)

Expand Down
4 changes: 2 additions & 2 deletions closure/testing/test/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ closure_js_test(
name = "simple_webtest_test",
timeout = "short",
srcs = ["simple_test.js"],
browsers = ["@io_bazel_rules_webtesting//browsers:chromium-local"],
browsers = ["@rules_webtesting//browsers:chromium-local"],
tags = [
"local",
"manual",
Expand All @@ -133,7 +133,7 @@ closure_js_test(
name = "arithmetic_module_webtest_test",
timeout = "short",
srcs = ["arithmetic_module_test.js"],
browsers = ["@io_bazel_rules_webtesting//browsers:chromium-local"],
browsers = ["@rules_webtesting//browsers:chromium-local"],
entry_points = ["goog:arithmetic_module_test"],
tags = [
"local",
Expand Down
2 changes: 1 addition & 1 deletion closure/testing/webdriver_test.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

"""Macro for running webtest with a test driver."""

load("@io_bazel_rules_webtesting//web:web.bzl", "web_test", "web_test_suite")
load("@rules_webtesting//web:web.bzl", "web_test", "web_test_suite")
load("//closure:webfiles/web_library.bzl", "web_library")

def webdriver_test(
Expand Down
2 changes: 0 additions & 2 deletions java/com/google/javascript/jscomp/Diagnostics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ final class Diagnostics {
"globalThis",
"invalidCasts",
"lateProvide",
"legacyGoogScopeRequire",
"lintChecks",
"messageConventions",
"misplacedTypeAnnotation",
Expand Down Expand Up @@ -118,7 +117,6 @@ final class Diagnostics {
"unknownDefines",
"untranspilableFeatures",
"unusedLocalVariables",
"unusedPrivateMembers",
"useOfGoogProvide",
"uselessCode",
"visibility",
Expand Down
6 changes: 1 addition & 5 deletions java/com/google/javascript/jscomp/JsCheckerPassConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,7 @@ private PassFactory scopedAliases() {
return PassFactory.builder()
.setName("scopedAliases")
.setInternalFactory(
(compiler) ->
new ScopedAliases(
compiler,
/*preprocessorSymbolTable=*/ null,
compiler.getOptions().getAliasTransformationHandler()))
(compiler) -> ScopedAliases.builder(compiler).build())
.build();
}

Expand Down
2 changes: 1 addition & 1 deletion java/io/bazel/rules/closure/testing/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ java_binary(
"@maven//:org_seleniumhq_selenium_selenium_api",
"@maven//:org_seleniumhq_selenium_selenium_remote_driver",
"@maven//:org_seleniumhq_selenium_selenium_support",
"@io_rules_web_testing_java//java/com/google/testing/web",
"@rules_web_testing_java//java/com/google/testing/web",
],
)
4 changes: 1 addition & 3 deletions java/io/bazel/rules/closure/webfiles/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ licenses(["notice"])

java_library(
name = "webfiles",
srcs = glob(
["*.java"],
),
srcs = glob(["*.java"]),
visibility = ["//visibility:public"],
deps = [
":build_info_java_proto",
Expand Down
2 changes: 1 addition & 1 deletion java/io/bazel/rules/closure/webfiles/compiler/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ java_library(
deps = [
"@google_bazel_common//third_party/java/dagger",
"@google_bazel_common//third_party/java/guava",
"@google_bazel_common//third_party/java/jsr330_inject",
"@maven//:com_google_closure_stylesheets_closure_stylesheets",
"@maven//:javax_inject_javax_inject",
],
)
2 changes: 1 addition & 1 deletion java/io/bazel/rules/closure/worker/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ java_library(
"@google_bazel_common//third_party/java/auto:value",
"@google_bazel_common//third_party/java/dagger",
"@google_bazel_common//third_party/java/guava",
"@maven//:javax_inject_javax_inject",
"@google_bazel_common//third_party/java/jsr330_inject",
],
)

Expand Down
2 changes: 1 addition & 1 deletion javatests/io/bazel/rules/closure/http/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ java_test(
"@google_bazel_common//third_party/java/dagger",
"@google_bazel_common//third_party/java/guava",
"@google_bazel_common//third_party/java/guava:testlib",
"@google_bazel_common//third_party/java/jsr330_inject",
"@google_bazel_common//third_party/java/junit",
"@google_bazel_common//third_party/java/truth",
"@maven//:com_google_dagger_dagger_producers",
"@maven//:javax_inject_javax_inject",
],
)
2 changes: 1 addition & 1 deletion javatests/io/bazel/rules/closure/worker/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ java_test(
"@google_bazel_common//third_party/java/dagger",
"@google_bazel_common//third_party/java/guava",
"@google_bazel_common//third_party/java/jsr305_annotations",
"@google_bazel_common//third_party/java/jsr330_inject",
"@google_bazel_common//third_party/java/junit",
"@google_bazel_common//third_party/java/mockito",
"@google_bazel_common//third_party/java/truth",
"@maven//:com_google_jimfs_jimfs",
"@maven//:javax_inject_javax_inject",
],
)
Loading