Bazel: Migrate to gerrit_js_bundle rule Change-Id: Ie706f0db155a8d79d463f06e47b30fb6b8692782
diff --git a/BUILD b/BUILD index 81b7851..d4074e0 100644 --- a/BUILD +++ b/BUILD
@@ -1,9 +1,6 @@ -load("@npm//@bazel/rollup:index.bzl", "rollup_bundle") -load("//tools/bzl:js.bzl", "polygerrit_plugin") -load("//tools/bzl:genrule2.bzl", "genrule2") -load("//tools/js:eslint.bzl", "eslint") load("//tools/bzl:junit.bzl", "junit_tests") load("//tools/bzl:plugin.bzl", "PLUGIN_DEPS", "PLUGIN_TEST_DEPS", "gerrit_plugin") +load("//tools/js:eslint.bzl", "eslint") gerrit_plugin( name = "serviceuser", @@ -14,7 +11,7 @@ "Gerrit-HttpModule: com.googlesource.gerrit.plugins.serviceuser.HttpModule", "Gerrit-SshModule: com.googlesource.gerrit.plugins.serviceuser.SshModule", ], - resource_jars = [":gr-serviceuser-static"], + resource_jars = ["//plugins/serviceuser/gr-serviceuser:serviceuser"], resources = glob(["src/main/resources/**/*"]), ) @@ -30,36 +27,6 @@ ], ) -genrule2( - name = "gr-serviceuser-static", - srcs = [":gr-serviceuser"], - outs = ["gr-serviceuser-static.jar"], - cmd = " && ".join([ - "mkdir $$TMP/static", - "cp -r $(locations :gr-serviceuser) $$TMP/static", - "cd $$TMP", - "zip -Drq $$ROOT/$@ -g .", - ]), -) - -rollup_bundle( - name = "serviceuser-bundle", - srcs = glob(["gr-serviceuser/*.js"]), - entry_point = "gr-serviceuser/gr-serviceuser.js", - format = "iife", - rollup_bin = "//tools/node_tools:rollup-bin", - sourcemap = "hidden", - deps = [ - "@tools_npm//rollup-plugin-node-resolve", - ], -) - -polygerrit_plugin( - name = "gr-serviceuser", - app = "serviceuser-bundle.js", - plugin_name = "serviceuser", -) - # Define the eslinter for the plugin # The eslint macro creates 2 rules: lint_test and lint_bin eslint(
diff --git a/gr-serviceuser/BUILD b/gr-serviceuser/BUILD new file mode 100644 index 0000000..484aafa --- /dev/null +++ b/gr-serviceuser/BUILD
@@ -0,0 +1,14 @@ +load("//tools/bzl:js.bzl", "gerrit_js_bundle") + +package(default_visibility = [":visibility"]) + +package_group( + name = "visibility", + packages = ["//plugins/serviceuser/..."], +) + +gerrit_js_bundle( + name = "serviceuser", + srcs = glob(["*.js"]), + entry_point = "gr-serviceuser.js", +)