Bazel: Migrate to gerrit_js_bundle rule Depends-On: https://gerrit-review.googlesource.com/c/gerrit/+/304193 Change-Id: Ic1d7b800abacb5a9e21f815baaed532ceb6c5f4c
diff --git a/BUILD b/BUILD index d560d98..fd820e4 100644 --- a/BUILD +++ b/BUILD
@@ -1,5 +1,4 @@ load("@rules_java//java:defs.bzl", "java_library") -load("@npm//@bazel/rollup:index.bzl", "rollup_bundle") load("//tools/bzl:junit.bzl", "junit_tests") load("//tools/js:eslint.bzl", "eslint") load( @@ -8,8 +7,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") gerrit_plugin( name = "delete-project", @@ -20,39 +18,15 @@ "Gerrit-HttpModule: com.googlesource.gerrit.plugins.deleteproject.HttpModule", "Gerrit-SshModule: com.googlesource.gerrit.plugins.deleteproject.SshModule", ], - resource_jars = [":gr-delete-repo-static"], + resource_jars = [":gr-delete-repo"], resources = glob(["src/main/resources/Documentation/*.md"]), deps = ["@commons-io//jar"], ) -genrule2( - name = "gr-delete-repo-static", - srcs = [":gr-delete-repo"], - outs = ["gr-delete-repo-static.jar"], - cmd = " && ".join([ - "mkdir $$TMP/static", - "cp $(locations :gr-delete-repo) $$TMP/static", - "cd $$TMP", - "zip -Drq $$ROOT/$@ -g .", - ]), -) - -polygerrit_plugin( +gerrit_js_bundle( name = "gr-delete-repo", - app = "delete-project-bundle.js", - plugin_name = "delete-project", -) - -rollup_bundle( - name = "delete-project-bundle", srcs = glob(["gr-delete-repo/*.js"]), entry_point = "gr-delete-repo/plugin.js", - format = "iife", - rollup_bin = "//tools/node_tools:rollup-bin", - sourcemap = "hidden", - deps = [ - "@tools_npm//rollup-plugin-node-resolve", - ], ) junit_tests(
diff --git a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/HttpModule.java b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/HttpModule.java index e0d8541..563b1ab 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/HttpModule.java +++ b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/HttpModule.java
@@ -23,6 +23,6 @@ @Override protected void configureServlets() { DynamicSet.bind(binder(), WebUiPlugin.class) - .toInstance(new JavaScriptPlugin("delete-project.js")); + .toInstance(new JavaScriptPlugin("gr-delete-repo.js")); } }