From 2dde2ebe3dba62f21c01cd5b90fa9cee23f766b7 Mon Sep 17 00:00:00 2001 From: Stephanie DiBenedetto Date: Wed, 14 Jan 2026 08:38:24 +0000 Subject: [PATCH] add MODULE.bazel and licenses to BCR package, bump pre-release version While the traditional dist tarball includes MODULE.bazel, it has an architecture specific name that is inappropriate for BCR. The tar'd javascript filegroup is closer to what we want, but the release process fails when it doesn't find MODULE.bazel. This change just splits the difference and adds MODULE.bazel to the javascript filegroup. --- BUILD.bazel | 4 ++ MODULE.bazel | 2 +- MODULE.bazel.lock | 108 +++++++++++++++++++++++++++++++- conformance/package.json | 2 +- package.json | 2 +- protobuf_javascript_release.bzl | 2 +- protoc_plugin/package.json | 2 +- 7 files changed, 116 insertions(+), 6 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index f81d102..f6c08af 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -143,6 +143,10 @@ filegroup( "map.js", "message.js", "unsafe_bytestring.js", + ] + [ + "MODULE.bazel", + "LICENSE.md", + "LICENSE-asserts.md", ], visibility = ["//visibility:public"], ) diff --git a/MODULE.bazel b/MODULE.bazel index 7f7a23a..e3c8840 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,6 +1,6 @@ "Bazel module that provides protoc-gen-js." -module(name = "protobuf_javascript", version = "4.0.2-rc5") # updated by release action +module(name = "protobuf_javascript", version = "4.0.2-rc6") # updated by release action bazel_dep(name = "abseil-cpp", version = "20250512.1") bazel_dep(name = "protobuf", version = "33.0", repo_name = "com_google_protobuf") diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index be3d31c..918fc46 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -178,6 +178,112 @@ "https://bcr.bazel.build/modules/zlib/1.3.1/MODULE.bazel": "751c9940dcfe869f5f7274e1295422a34623555916eb98c174c1e945594bf198" }, "selectedYankedVersions": {}, - "moduleExtensions": {}, + "moduleExtensions": { + "@@rules_kotlin+//src/main/starlark/core/repositories:bzlmod_setup.bzl%rules_kotlin_extensions": { + "general": { + "bzlTransitiveDigest": "rL/34P1aFDq2GqVC2zCFgQ8nTuOC6ziogocpvG50Qz8=", + "usagesDigest": "QI2z8ZUR+mqtbwsf2fLqYdJAkPOHdOV+tF2yVAUgRzw=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, + "envVariables": {}, + "generatedRepoSpecs": { + "com_github_jetbrains_kotlin_git": { + "repoRuleId": "@@rules_kotlin+//src/main/starlark/core/repositories:compiler.bzl%kotlin_compiler_git_repository", + "attributes": { + "urls": [ + "https://github.com/JetBrains/kotlin/releases/download/v1.9.23/kotlin-compiler-1.9.23.zip" + ], + "sha256": "93137d3aab9afa9b27cb06a824c2324195c6b6f6179d8a8653f440f5bd58be88" + } + }, + "com_github_jetbrains_kotlin": { + "repoRuleId": "@@rules_kotlin+//src/main/starlark/core/repositories:compiler.bzl%kotlin_capabilities_repository", + "attributes": { + "git_repository_name": "com_github_jetbrains_kotlin_git", + "compiler_version": "1.9.23" + } + }, + "com_github_google_ksp": { + "repoRuleId": "@@rules_kotlin+//src/main/starlark/core/repositories:ksp.bzl%ksp_compiler_plugin_repository", + "attributes": { + "urls": [ + "https://github.com/google/ksp/releases/download/1.9.23-1.0.20/artifacts.zip" + ], + "sha256": "ee0618755913ef7fd6511288a232e8fad24838b9af6ea73972a76e81053c8c2d", + "strip_version": "1.9.23-1.0.20" + } + }, + "com_github_pinterest_ktlint": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_file", + "attributes": { + "sha256": "01b2e0ef893383a50dbeb13970fe7fa3be36ca3e83259e01649945b09d736985", + "urls": [ + "https://github.com/pinterest/ktlint/releases/download/1.3.0/ktlint" + ], + "executable": true + } + }, + "rules_android": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "sha256": "cd06d15dd8bb59926e4d65f9003bfc20f9da4b2519985c27e190cddc8b7a7806", + "strip_prefix": "rules_android-0.1.1", + "urls": [ + "https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip" + ] + } + } + }, + "recordedRepoMappingEntries": [ + [ + "rules_kotlin+", + "bazel_tools", + "bazel_tools" + ] + ] + } + }, + "@@rules_python+//python/uv:uv.bzl%uv": { + "general": { + "bzlTransitiveDigest": "8vT1ddXtljNxYD0tJkksqzeKE6xqx4Ix+tXthAppjTI=", + "usagesDigest": "p80sy6cYQuWxx5jhV3fOTu+N9EyIUFG9+F7UC/nhXic=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, + "envVariables": {}, + "generatedRepoSpecs": { + "uv": { + "repoRuleId": "@@rules_python+//python/uv/private:uv_toolchains_repo.bzl%uv_toolchains_repo", + "attributes": { + "toolchain_type": "'@@rules_python+//python/uv:uv_toolchain_type'", + "toolchain_names": [ + "none" + ], + "toolchain_implementations": { + "none": "'@@rules_python+//python:none'" + }, + "toolchain_compatible_with": { + "none": [ + "@platforms//:incompatible" + ] + }, + "toolchain_target_settings": {} + } + } + }, + "recordedRepoMappingEntries": [ + [ + "rules_python+", + "bazel_tools", + "bazel_tools" + ], + [ + "rules_python+", + "platforms", + "platforms" + ] + ] + } + } + }, "facts": {} } diff --git a/conformance/package.json b/conformance/package.json index 9d8890c..2d15417 100644 --- a/conformance/package.json +++ b/conformance/package.json @@ -11,7 +11,7 @@ "LICENSE.md" ], "dependencies": { - "google-protobuf": "file:../google-protobuf-4.0.2-rc5.tgz" + "google-protobuf": "file:../google-protobuf-4.0.2-rc6.tgz" }, "author": "Google Protocol Buffers Team", "license": "BSD-3-Clause" diff --git a/package.json b/package.json index 20266a3..12936c8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "google-protobuf", - "version": "4.0.2-rc5", + "version": "4.0.2-rc6", "description": "Protocol Buffers for JavaScript", "main": "google-protobuf.js", "files": [ diff --git a/protobuf_javascript_release.bzl b/protobuf_javascript_release.bzl index 981601d..38c52b3 100644 --- a/protobuf_javascript_release.bzl +++ b/protobuf_javascript_release.bzl @@ -3,7 +3,7 @@ load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain") load("@rules_pkg//pkg:providers.bzl", "PackageVariablesInfo") -_PROTOBUF_JAVASCRIPT_VERSION = "4.0.2-rc5" +_PROTOBUF_JAVASCRIPT_VERSION = "4.0.2-rc6" def _package_naming_impl(ctx): values = {} diff --git a/protoc_plugin/package.json b/protoc_plugin/package.json index 9e99a65..6855f60 100644 --- a/protoc_plugin/package.json +++ b/protoc_plugin/package.json @@ -1,6 +1,6 @@ { "name": "@protocolbuffers/protoc-gen-js", - "version": "4.0.2-rc5", + "version": "4.0.2-rc6", "description": "Official standalone distribution of the protoc-gen-js plugin for Protocol Buffers", "author": "Google Protocol Buffers Team", "license": "BSD-3-Clause",