From 6c2f61012235a7cf3c3e77a255eb57114787f0c7 Mon Sep 17 00:00:00 2001
From: Elvis Wianda <elvis@benchsci.com>
Date: Sun, 24 Mar 2024 17:24:10 -0400
Subject: [PATCH 1/2] Configure bcr

---
 .bcr/config.yml                        |  3 ++
 .bcr/metadata.template.json            | 18 +++++++++
 .bcr/presubmit.yml                     | 12 ++++++
 .bcr/source.template.json              |  5 +++
 .github/workflows/release.yml          |  5 ++-
 .github/workflows/workspace_snippet.sh | 20 ++++------
 examples/nextjs/.bazelrc               |  1 +
 examples/nextjs/MODULE.bazel           | 53 ++++++++++++++++++++++++++
 examples/nextjs/WORKSPACE              |  2 +-
 9 files changed, 105 insertions(+), 14 deletions(-)
 create mode 100644 .bcr/config.yml
 create mode 100644 .bcr/metadata.template.json
 create mode 100644 .bcr/presubmit.yml
 create mode 100644 .bcr/source.template.json
 create mode 100644 examples/nextjs/.bazelrc
 create mode 100644 examples/nextjs/MODULE.bazel

diff --git a/.bcr/config.yml b/.bcr/config.yml
new file mode 100644
index 0000000..0d27c7c
--- /dev/null
+++ b/.bcr/config.yml
@@ -0,0 +1,3 @@
+fixedReleaser:
+    login: ewianda
+    email: elvis@benchsci.com
diff --git a/.bcr/metadata.template.json b/.bcr/metadata.template.json
new file mode 100644
index 0000000..39ff780
--- /dev/null
+++ b/.bcr/metadata.template.json
@@ -0,0 +1,18 @@
+{
+  "homepage": "https://github.com/benchsci/rules_nodejs_gazelle",
+  "maintainers": [
+    {
+      "name": "Elvis Wianda",
+      "email": "elvis@benchsci.com",
+      "github": "ewianda"
+    },
+    {
+      "name": "Collin Heathman",
+      "email": "cheathman@benchsci.com",
+      "github": "ColinHeathman"
+    }
+  ],
+  "repository": ["https://github.com/benchsci/rules_nodejs_gazelle"],
+  "versions": [],
+  "yanked_versions": {}
+}
diff --git a/.bcr/presubmit.yml b/.bcr/presubmit.yml
new file mode 100644
index 0000000..cecf772
--- /dev/null
+++ b/.bcr/presubmit.yml
@@ -0,0 +1,12 @@
+bcr_test_module:
+    module_path: 'examples/nextjs'
+    matrix:
+        bazel: ['7.x', '6.x']
+        platform: ['debian10', 'macos', 'ubuntu2004', 'windows']
+    tasks:
+        run_tests:
+            name: 'Run test module'
+            bazel: ${{ bazel }}
+            platform: ${{ platform }}
+            test_targets:
+                - '//apps/alpha/...'
diff --git a/.bcr/source.template.json b/.bcr/source.template.json
new file mode 100644
index 0000000..9b852e3
--- /dev/null
+++ b/.bcr/source.template.json
@@ -0,0 +1,5 @@
+{
+  "integrity": "**leave this alone**",
+  "strip_prefix": "{REPO}-{VERSION}",
+  "url": "https://github.com/{OWNER}/{REPO}/releases/download/{TAG}/rules_nodejs_gazelle-{TAG}.tar.gz"
+}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3e58b41..e0803fe 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,7 +27,7 @@ jobs:
                   # Bazel will download bazel to here
                   XDG_CACHE_HOME: ~/.cache/bazel-repo
               run: bazel test //...
-            - name: Prepare workspace snippet
+            - name: Prepare Release
               run: .github/workflows/workspace_snippet.sh ${{ env.GITHUB_REF_NAME }} > release_notes.txt
             - name: Release
               uses: benchsci/action-gh-release@v1
@@ -35,3 +35,6 @@ jobs:
                   # Use GH feature to populate the changelog automatically
                   generate_release_notes: true
                   body_path: release_notes.txt
+                  files: rules_nodejs_gazelle-*.tar.gz
+                  fail_on_unmatched_files: true
+
diff --git a/.github/workflows/workspace_snippet.sh b/.github/workflows/workspace_snippet.sh
index b768e25..9b263b7 100755
--- a/.github/workflows/workspace_snippet.sh
+++ b/.github/workflows/workspace_snippet.sh
@@ -5,23 +5,19 @@ set -o errexit -o nounset -o pipefail
 # Set by GH actions, see
 # https://docs.github.com/en/actions/learn-github-actions/environment-variables#default-environment-variables
 NAME=rules_nodejs_gazelle
-COMMIT=$(git rev-parse HEAD)
-PREFIX=${NAME}-${COMMIT}
-SHA=$(git archive --format=tar --prefix=${PREFIX}/ ${COMMIT} | gzip | shasum -a 256 | awk '{print $1}')
-INTEGRITY=$(git archive --format=tar --prefix=${PREFIX}/ ${COMMIT} | gzip | openssl dgst -sha256 -binary | openssl base64 -A)
+TAG=${GITHUB_REF_NAME}
+# The prefix is chosen to match what GitHub generates for source archives
+PREFIX="${NAME}-${TAG:1}"
+ARCHIVE="${NAME}-$TAG.tar.gz"
+git archive --format=tar --prefix="${PREFIX}/" "${TAG}" | gzip >"$ARCHIVE"
+SHA=$(shasum -a 256 "$ARCHIVE" | awk '{print $1}')
 
 cat <<EOF
 MODULE.bazel setup:
 
 \`\`\`starlark
-bazel_dep(name = "com_github_benchsci_rules_nodejs_gazelle", version = "0.0.0", repo_name = "com_github_benchsci_rules_nodejs_gazelle")
+bazel_dep(name = "com_github_benchsci_rules_nodejs_gazelle", version = "${TAG:1}", repo_name = "com_github_benchsci_rules_nodejs_gazelle")
 
-archive_override(
-    module_name = "com_github_benchsci_rules_nodejs_gazelle",
-    integrity = "sha256-${INTEGRITY}",
-    strip_prefix = "${PREFIX}",
-    urls = ["https://github.com/benchsci/rules_nodejs_gazelle/archive/$COMMIT.tar.gz"],
-)
 \`\`\`
 
 WORKSPACE setup:
@@ -32,7 +28,7 @@ http_archive(
     name = "com_github_benchsci_rules_nodejs_gazelle",
     sha256 = "${SHA}",
     strip_prefix = "${PREFIX}",
-    url = "https://github.com/benchsci/rules_nodejs_gazelle/archive/$COMMIT.tar.gz",
+    url = "https://github.com/benchsci/rules_nodejs_gazelle/releases/download/${TAG}/${ARCHIVE}",
 )
 \`\`\`
 EOF
diff --git a/examples/nextjs/.bazelrc b/examples/nextjs/.bazelrc
new file mode 100644
index 0000000..3ce91d2
--- /dev/null
+++ b/examples/nextjs/.bazelrc
@@ -0,0 +1 @@
+common --enable_bzlmod
diff --git a/examples/nextjs/MODULE.bazel b/examples/nextjs/MODULE.bazel
new file mode 100644
index 0000000..fb2299b
--- /dev/null
+++ b/examples/nextjs/MODULE.bazel
@@ -0,0 +1,53 @@
+module(
+    name = "e2e_rules_nodejs_gazelle",
+    version = "0.0.0",
+    compatibility_level = 1,
+)
+
+bazel_dep(name = "aspect_rules_js", version = "1.26.0")
+bazel_dep(name = "bazel_skylib", version = "1.4.1")
+bazel_dep(name = "aspect_rules_ts", version = "1.4.0")
+bazel_dep(name = "aspect_rules_jest", version = "0.0.0", repo_name = "aspect_rules_jest")
+
+local_path_override(
+    module_name = "com_github_benchsci_rules_nodejs_gazelle",
+    path = "../..",
+)
+
+npm = use_extension(
+    "@aspect_rules_js//npm:extensions.bzl",
+    "npm",
+    dev_dependency = True,
+)
+npm.npm_translate_lock(
+    name = "npm",
+    bins = {
+        # derived from "bin" attribute in node_modules/next/package.json
+        "next": [
+            "next=./dist/bin/next",
+        ],
+    },
+    # Test that lifecycle hooks can resolve node, npm as well as dep bins on that PATH.
+    # This e2e test is run on Windows as well so this test coverage is here for now. Once
+    # Windows CI runs on the root WORKSPACE, coverage can be moved there.
+    # See https://github.com/aspect-build/rules_js/pull/1142 for more info.
+    npmrc = "//:.npmrc",
+    pnpm_lock = "//:pnpm-lock.yaml",
+    verify_node_modules_ignored = "//:.bazelignore",
+)
+use_repo(npm, "npm")
+
+rules_ts_ext = use_extension(
+    "@aspect_rules_ts//ts:extensions.bzl",
+    "ext",
+    dev_dependency = True,
+)
+rules_ts_ext.deps()
+use_repo(rules_ts_ext, "npm_typescript")
+
+archive_override(
+    module_name = "aspect_rules_jest",
+    integrity = "sha256-F1+SRIvRGzmO6UxrsJyr9233WnfSHJVVcjeYxYouc8g=",
+    strip_prefix = "rules_jest-0.19.2",
+    urls = ["https://github.com/aspect-build/rules_jest/releases/download/v0.19.2/rules_jest-v0.19.2.tar.gz"],
+)
diff --git a/examples/nextjs/WORKSPACE b/examples/nextjs/WORKSPACE
index e50d1da..3bcac89 100644
--- a/examples/nextjs/WORKSPACE
+++ b/examples/nextjs/WORKSPACE
@@ -54,8 +54,8 @@ npm_translate_lock(
             "next": "./dist/bin/next",
         },
     },
-    pnpm_lock = "//:pnpm-lock.yaml",
     npmrc = "//:.npmrc",
+    pnpm_lock = "//:pnpm-lock.yaml",
     verify_node_modules_ignored = "//:.bazelignore",
 )
 

From c23150ea2600cd3313cc5c12d66110ba23ac5ad1 Mon Sep 17 00:00:00 2001
From: Elvis Wianda <elvis@benchsci.com>
Date: Mon, 25 Mar 2024 15:08:24 -0400
Subject: [PATCH 2/2] Change to run_targets

---
 .bcr/metadata.template.json      | 2 +-
 .bcr/presubmit.yml               | 4 ++--
 examples/nextjs/MODULE.bazel     | 6 ++++--
 examples/nextjs/WORKSPACE.bzlmod | 0
 4 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 examples/nextjs/WORKSPACE.bzlmod

diff --git a/.bcr/metadata.template.json b/.bcr/metadata.template.json
index 39ff780..15fea91 100644
--- a/.bcr/metadata.template.json
+++ b/.bcr/metadata.template.json
@@ -7,7 +7,7 @@
       "github": "ewianda"
     },
     {
-      "name": "Collin Heathman",
+      "name": "Colin Heathman",
       "email": "cheathman@benchsci.com",
       "github": "ColinHeathman"
     }
diff --git a/.bcr/presubmit.yml b/.bcr/presubmit.yml
index cecf772..5941b69 100644
--- a/.bcr/presubmit.yml
+++ b/.bcr/presubmit.yml
@@ -8,5 +8,5 @@ bcr_test_module:
             name: 'Run test module'
             bazel: ${{ bazel }}
             platform: ${{ platform }}
-            test_targets:
-                - '//apps/alpha/...'
+            run_targets:
+              - '//:gazelle'
diff --git a/examples/nextjs/MODULE.bazel b/examples/nextjs/MODULE.bazel
index fb2299b..39e897f 100644
--- a/examples/nextjs/MODULE.bazel
+++ b/examples/nextjs/MODULE.bazel
@@ -4,11 +4,13 @@ module(
     compatibility_level = 1,
 )
 
-bazel_dep(name = "aspect_rules_js", version = "1.26.0")
+bazel_dep(name = "aspect_rules_js", version = "1.27.0")
+bazel_dep(name = "gazelle", version = "0.34.0", repo_name = "bazel_gazelle")
+bazel_dep(name = "rules_go", version = "0.42.0", repo_name = "io_bazel_rules_go")
 bazel_dep(name = "bazel_skylib", version = "1.4.1")
 bazel_dep(name = "aspect_rules_ts", version = "1.4.0")
 bazel_dep(name = "aspect_rules_jest", version = "0.0.0", repo_name = "aspect_rules_jest")
-
+bazel_dep(name = "com_github_benchsci_rules_nodejs_gazelle", version = "0.0.0", repo_name = "com_github_benchsci_rules_nodejs_gazelle")
 local_path_override(
     module_name = "com_github_benchsci_rules_nodejs_gazelle",
     path = "../..",
diff --git a/examples/nextjs/WORKSPACE.bzlmod b/examples/nextjs/WORKSPACE.bzlmod
new file mode 100644
index 0000000..e69de29