chore: use bzlmod override_repo() to replace go.mod with bzlmods

go.work.sum

@@ -164,6 +164,7 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -175,6 +176,7 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw=
+github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c=
 github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
@@ -192,6 +194,7 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:
 github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
 github.com/skeema/knownhosts v1.3.1/go.mod h1:r7KTdC8l4uxWRyK2TpQZ/1o5HaSzh06ePQNxPwTcfiY=
 github.com/spf13/afero v1.10.0/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
@@ -308,13 +311,15 @@ google.golang.org/genproto v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:0joYwWwL
 google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422/go.mod h1:b6h1vNKhxaSoEI+5jc3PJUCustfli/mRab7295pY7rw=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422/go.mod h1:3ENsm/5D1mzDyhpzeRi1NR784I0BcofWBoSc5QqqMK4=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250204164813-702378808489 h1:5bKytslY8ViY0Cj/ewmRtrWHW64bNF03cAatUUFCdFI=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250204164813-702378808489/go.mod h1:8BS3B93F/U1juMFq9+EDk+qOT5CO1R9IzXxG3PTqiRk=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250922171735-9219d122eba9/go.mod h1:HSkG/KdJWusxU1F6CNrwNDjBMgisKxGnc5dAZfT0mjQ=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.67.3/go.mod h1:YGaHCc6Oap+FzBJTZLBzkGSYt/cvGPFTPxkn7QfSU8s=
+google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ=
 google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw=
 google.golang.org/grpc v1.71.0/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1/go.mod h1:5KF+wpkbTSbGcR9zteSqZV6fqFOWBl4Yde8En8MryZA=

language/js/go.mod

@@ -18,7 +18,7 @@ require (
 
 require golang.org/x/tools/go/vcs v0.1.0-deprecated // indirect
 
-require github.com/aspect-build/aspect-gazelle/common v0.0.0-00010101000000-000000000000
+require github.com/aspect-build/aspect-gazelle/common v0.0.0-20251007231102-88e4ec95608b
 
 require (
 	github.com/kr/text v0.2.0 // indirect

language/kotlin/go.mod

@@ -5,7 +5,7 @@ go 1.24.5
 replace github.com/aspect-build/aspect-gazelle/common => ../../common
 
 require (
-	github.com/aspect-build/aspect-gazelle/common v0.0.0-00010101000000-000000000000
+	github.com/aspect-build/aspect-gazelle/common v0.0.0-20251007231102-88e4ec95608b
 	github.com/bazel-contrib/rules_jvm v0.30.0
 	github.com/bazelbuild/bazel-gazelle v0.45.1-0.20250924144014-2de7b829fef1
 	github.com/emirpasic/gods v1.18.1

language/orion/go.mod

@@ -18,7 +18,7 @@ require (
 )
 
 require (
-	github.com/aspect-build/aspect-gazelle/common v0.0.0-00010101000000-000000000000
+	github.com/aspect-build/aspect-gazelle/common v0.0.0-20251007231102-88e4ec95608b
 	github.com/mikefarah/yq/v4 v4.46.1
 )
 

runner/BUILD.bazel

@@ -2,13 +2,8 @@ load("@gazelle//:def.bzl", "gazelle", "gazelle_binary")
 load("@rules_go//go:def.bzl", "go_library")
 
 # Use the gazelle bazel modules instead of go.mod modules
-# gazelle:resolve_regexp go github.com/bazelbuild/bazel-gazelle/(.*) @gazelle//$1
 # gazelle:resolve_regexp go github.com/bazel-contrib/rules_python/gazelle/(.*) @rules_python_gazelle_plugin//$1
-# gazelle:resolve_regexp go github.com/EngFlow/gazelle_cc/(.*) @gazelle_cc//$1
 # gazelle:resolve_regexp go github.com/aspect-build/aspect-gazelle/common(/.*)? @aspect_gazelle//common$1
-# gazelle:resolve_regexp go github.com/aspect-build/aspect-gazelle/language/js @aspect_gazelle_js
-# gazelle:resolve_regexp go github.com/aspect-build/aspect-gazelle/language/orion @aspect_gazelle_orion
-# gazelle:resolve_regexp go github.com/aspect-build/aspect-gazelle/language/kotlin @aspect_gazelle_kotlin
 # gazelle:resolve_regexp go github.com/aspect-build/aspect-gazelle/runner/(.*) //$1
 
 gazelle(
@@ -56,13 +51,13 @@ go_library(
         "//progress",
         "//vendored/gazelle",
         "@aspect_gazelle//common/bazel",
-        "@aspect_gazelle_js",
-        "@aspect_gazelle_orion",
-        "@gazelle//config",
-        "@gazelle//language",
-        "@gazelle//language/go",
-        "@gazelle//language/proto",
-        "@gazelle_cc//language/cc",
+        "@com_github_aspect_build_aspect_gazelle_language_js//:js",
+        "@com_github_aspect_build_aspect_gazelle_language_orion//:orion",
+        "@com_github_bazelbuild_bazel_gazelle//config",
+        "@com_github_bazelbuild_bazel_gazelle//language",
+        "@com_github_bazelbuild_bazel_gazelle//language/go",
+        "@com_github_bazelbuild_bazel_gazelle//language/proto",
+        "@com_github_engflow_gazelle_cc//language/cc",
         "@io_opentelemetry_go_otel//:otel",
         "@io_opentelemetry_go_otel//attribute",
         "@io_opentelemetry_go_otel_trace//:trace",

runner/MODULE.bazel

@@ -50,7 +50,17 @@ archive_override(
 # Go modules
 go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
 go_deps.from_file(go_mod = "//:go.mod")
-use_repo(go_deps, "com_github_bazelbuild_bazel_gazelle", "com_github_bazelbuild_buildtools", "com_github_engflow_gazelle_cc", "com_github_fatih_color", "com_github_go_git_go_git_v5", "com_github_pmezard_go_difflib", "in_gopkg_yaml_v3", "io_opentelemetry_go_otel", "io_opentelemetry_go_otel_trace", "org_golang_x_term")
+
+# Use bazel modules when a go.mod is also available as both bzlmod
+override_repo(
+    go_deps,
+    com_github_aspect_build_aspect_gazelle_language_js = "aspect_gazelle_js",
+    com_github_aspect_build_aspect_gazelle_language_orion = "aspect_gazelle_orion",
+    com_github_bazelbuild_bazel_gazelle = "gazelle",
+    com_github_engflow_gazelle_cc = "gazelle_cc",
+)
+
+use_repo(go_deps, "com_github_aspect_build_aspect_gazelle_language_js", "com_github_aspect_build_aspect_gazelle_language_orion", "com_github_bazelbuild_bazel_gazelle", "com_github_bazelbuild_buildtools", "com_github_engflow_gazelle_cc", "com_github_fatih_color", "com_github_go_git_go_git_v5", "com_github_pmezard_go_difflib", "in_gopkg_yaml_v3", "io_opentelemetry_go_otel", "io_opentelemetry_go_otel_trace", "org_golang_x_term")
 
 ####### Dev dependencies ########
 

runner/bin/BUILD.bazel

@@ -15,8 +15,8 @@ go_library(
         "//:runner",
         "//pkg/ibp",
         "@aspect_gazelle//common/buildinfo",
-        "@aspect_gazelle_orion",
-        "@gazelle//language",
+        "@com_github_aspect_build_aspect_gazelle_language_orion//:orion",
+        "@com_github_bazelbuild_bazel_gazelle//language",
         "@in_gopkg_yaml_v3//:yaml_v3",
     ],
 )

runner/go.mod

@@ -38,9 +38,9 @@ require (
 )
 
 require (
-	github.com/aspect-build/aspect-gazelle/common v0.0.0-00010101000000-000000000000
-	github.com/aspect-build/aspect-gazelle/language/js v0.0.0-00010101000000-000000000000
-	github.com/aspect-build/aspect-gazelle/language/orion v0.0.0-00010101000000-000000000000
+	github.com/aspect-build/aspect-gazelle/common v0.0.0-20251007231102-88e4ec95608b
+	github.com/aspect-build/aspect-gazelle/language/js v0.0.0-20251001194427-669d53ca49e3
+	github.com/aspect-build/aspect-gazelle/language/orion v0.0.0-20251001194427-669d53ca49e3
 )
 
 require (

runner/language/bzl/BUILD.bazel

@@ -9,14 +9,14 @@ go_library(
     importpath = "github.com/aspect-build/aspect-gazelle/runner/language/bzl",
     visibility = ["//visibility:public"],
     deps = [
+        "@com_github_bazelbuild_bazel_gazelle//config",
+        "@com_github_bazelbuild_bazel_gazelle//label",
+        "@com_github_bazelbuild_bazel_gazelle//language",
+        "@com_github_bazelbuild_bazel_gazelle//pathtools",
+        "@com_github_bazelbuild_bazel_gazelle//repo",
+        "@com_github_bazelbuild_bazel_gazelle//resolve",
+        "@com_github_bazelbuild_bazel_gazelle//rule",
         "@com_github_bazelbuild_buildtools//build",
-        "@gazelle//config",
-        "@gazelle//label",
-        "@gazelle//language",
-        "@gazelle//pathtools",
-        "@gazelle//repo",
-        "@gazelle//resolve",
-        "@gazelle//rule",
     ],
 )
 

runner/pkg/git/BUILD.bazel

@@ -10,8 +10,8 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "@aspect_gazelle//common/logger",
+        "@com_github_bazelbuild_bazel_gazelle//walk",
         "@com_github_go_git_go_git_v5//plumbing/format/gitignore",
-        "@gazelle//walk",
     ],
 )
 

runner/pkg/git/testing/BUILD.bazel

@@ -8,11 +8,11 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//pkg/git",
-        "@gazelle//config",
-        "@gazelle//label",
-        "@gazelle//language",
-        "@gazelle//repo",
-        "@gazelle//resolve",
-        "@gazelle//rule",
+        "@com_github_bazelbuild_bazel_gazelle//config",
+        "@com_github_bazelbuild_bazel_gazelle//label",
+        "@com_github_bazelbuild_bazel_gazelle//language",
+        "@com_github_bazelbuild_bazel_gazelle//repo",
+        "@com_github_bazelbuild_bazel_gazelle//resolve",
+        "@com_github_bazelbuild_bazel_gazelle//rule",
     ],
 )

runner/pkg/watchman/BUILD.bazel

@@ -13,7 +13,7 @@ go_library(
         "@aspect_gazelle//common/bazel",
         "@aspect_gazelle//common/cache",
         "@aspect_gazelle//common/logger",
-        "@gazelle//config",
+        "@com_github_bazelbuild_bazel_gazelle//config",
     ],
 )
 

runner/progress/BUILD.bazel

@@ -6,12 +6,12 @@ go_library(
     importpath = "github.com/aspect-build/aspect-gazelle/runner/progress",
     visibility = ["//visibility:public"],
     deps = [
-        "@gazelle//config",
-        "@gazelle//label",
-        "@gazelle//language",
-        "@gazelle//repo",
-        "@gazelle//resolve",
-        "@gazelle//rule",
+        "@com_github_bazelbuild_bazel_gazelle//config",
+        "@com_github_bazelbuild_bazel_gazelle//label",
+        "@com_github_bazelbuild_bazel_gazelle//language",
+        "@com_github_bazelbuild_bazel_gazelle//repo",
+        "@com_github_bazelbuild_bazel_gazelle//resolve",
+        "@com_github_bazelbuild_bazel_gazelle//rule",
         "@org_golang_x_term//:term",
     ],
 )

runner/vendored/gazelle/BUILD.bazel

@@ -16,16 +16,16 @@ go_library(
     deps = [
         "//vendored/gazelle/internal/wspace",
         "@aspect_gazelle//common/cache",
+        "@com_github_bazelbuild_bazel_gazelle//config",
+        "@com_github_bazelbuild_bazel_gazelle//flag",
+        "@com_github_bazelbuild_bazel_gazelle//label",
+        "@com_github_bazelbuild_bazel_gazelle//language",
+        "@com_github_bazelbuild_bazel_gazelle//merger",
+        "@com_github_bazelbuild_bazel_gazelle//repo",
+        "@com_github_bazelbuild_bazel_gazelle//resolve",
+        "@com_github_bazelbuild_bazel_gazelle//rule",
+        "@com_github_bazelbuild_bazel_gazelle//walk",
         "@com_github_bazelbuild_buildtools//build",
         "@com_github_pmezard_go_difflib//difflib",
-        "@gazelle//config",
-        "@gazelle//flag",
-        "@gazelle//label",
-        "@gazelle//language",
-        "@gazelle//merger",
-        "@gazelle//repo",
-        "@gazelle//resolve",
-        "@gazelle//rule",
-        "@gazelle//walk",
     ],
 )