Merge branch 'stable-3.2'

Change-Id: Id2d7502890efab34e4f5f34552947e59267eec02

BUILD

diff --git a/BUILD b/BUILD
index 8616c3c..cacb69a 100644
--- a/BUILD
+++ b/BUILD
@@ -1,4 +1,3 @@
-load("@npm_bazel_rollup//:index.bzl", "rollup_bundle")
 load("@rules_java//java:defs.bzl", "java_library")
 load("//tools/bzl:junit.bzl", "junit_tests")
 load(
@@ -7,8 +6,7 @@
     "PLUGIN_TEST_DEPS",
     "gerrit_plugin",
 )
-load("//tools/bzl:genrule2.bzl", "genrule2")
-load("//tools/bzl:js.bzl", "polygerrit_plugin")
+load("//tools/bzl:js.bzl", "gerrit_js_bundle")
 
 LFS_DEPS = [
     "@jgit//org.eclipse.jgit.lfs.server:jgit-lfs-server",
@@ -41,39 +39,15 @@
         "Gerrit-SshModule: com.googlesource.gerrit.plugins.lfs.SshModule",
         "Gerrit-InitStep: com.googlesource.gerrit.plugins.lfs.InitLfs",
     ],
-    resource_jars = [":gr-lfs-static"],
+    resource_jars = [":gr-lfs"],
     resources = glob(["src/main/resources/**/*"]),
     deps = LFS_DEPS,
 )
 
-genrule2(
-    name = "gr-lfs-static",
-    srcs = [":gr-lfs"],
-    outs = ["gr-lfs-static.jar"],
-    cmd = " && ".join([
-        "mkdir $$TMP/static",
-        "cp -r $(locations :gr-lfs) $$TMP/static",
-        "cd $$TMP",
-        "zip -Drq $$ROOT/$@ -g .",
-    ]),
-)
-
-polygerrit_plugin(
+gerrit_js_bundle(
     name = "gr-lfs",
-    app = "gr-lfs-bundle.js",
-    plugin_name = "gr-lfs",
-)
-
-rollup_bundle(
-    name = "gr-lfs-bundle",
     srcs = glob(["gr-lfs/*.js"]),
     entry_point = "gr-lfs/plugin.js",
-    format = "iife",
-    rollup_bin = "//tools/node_tools:rollup-bin",
-    sourcemap = "hidden",
-    deps = [
-        "@tools_npm//rollup-plugin-node-resolve",
-    ],
 )
 
 junit_tests(