Extract Alpine.js in script/test so the pre-commit hook works

The extraction moves from the Makefile's assets target into
script/assets. script/test runs it before the tests, so make test,
make check, script/check and the pre-commit hook all get the file on a
fresh clone; make assets, make build and make dev call the same script.
The README now says only that nothing downloads Alpine.js.

Model: opus-5-5

Dockerfile

@@ -51,7 +51,7 @@ RUN go mod download
 # the lint stage above.
 COPY . .
 
-# Run tests and build. Both first run `make assets`, which extracts Alpine.js
+# Run tests and build. Both first run script/assets, which extracts Alpine.js
 # from its tarball in 3p/.
 RUN make test
 

Makefile

@@ -27,13 +27,10 @@ bootstrap:
 setup:
 	@script/setup
 
-# Alpine.js is committed as its npm package tarball in 3p/. This extracts
-# the browser build from it to where go:embed reads it; the extracted file
-# is not committed.
 assets:
-	tar -xzOf 3p/alpinejs-3.14.9.tgz package/dist/cdn.min.js >static/js/alpine.min.js
+	@script/assets
 
-test: assets
+test:
 	@script/test
 
 lint:
@@ -45,7 +42,7 @@ fmt:
 fmt-check:
 	@script/fmt-check
 
-check: assets
+check:
 	@script/check
 
 build: assets

README.md

@@ -1247,16 +1247,16 @@ What that means for an operator:
 This repository adheres to the
 [Scripts to Rule Them All](https://github.com/github/scripts-to-rule-them-all)
 standard: normalized scripts in `script/` are the entrypoints for the
-development workflow. Nine of the Makefile's seventeen targets are thin
+development workflow. Ten of the Makefile's seventeen targets are thin
-shims that call them; `assets`, `build`, `run`, `dev`, `deps`, `clean`,
+shims that call them; `build`, `run`, `dev`, `deps`, `clean`, `css` and
-`css` and `version` are inline commands with no script behind them,
+`version` are inline commands with no script behind them, though `build`
-though `build` and `version` both take their value from
+and `version` both take their value from `script/version`.
-`script/version`.
 
-`make test`, `make check`, `make build` and `make dev` each run
+`script/test`, `make build` and `make dev` each run `script/assets`
-`make assets` first, which writes the ignored `static/js/alpine.min.js`
+first, which writes the ignored `static/js/alpine.min.js` (see
-(see [Third-party browser assets](#third-party-browser-assets)), so
+[Third-party browser assets](#third-party-browser-assets)), so
-`make check` works on a fresh clone without a separate setup step.
+`make test`, `make check` and the pre-commit hook work on a fresh clone
+without a separate step.
 
 We provide:
 
@@ -1264,6 +1264,8 @@ We provide:
 - `script/setup` — make a fresh clone ready for development
   (bootstrap, then install-precommit)
 - `script/projectname` — output the project name ("webhooker")
+- `script/assets` — extract Alpine.js from its tarball in `3p/` (see
+  [Third-party browser assets](#third-party-browser-assets))
 - `script/test` — run the test suite
 - `script/lint` — run golangci-lint in Docker (see Linting below)
 - `script/fmt` — format all code (writes)
@@ -1292,19 +1294,18 @@ publishes it. It is a dependency, not this repo's build output, so
 The directory is `3p/` rather than `vendor/` because Go treats a root
 `vendor/` directory as its module vendor directory.
 
-`make assets` extracts the browser build, `package/dist/cdn.min.js`, from the
+`script/assets` (`make assets`) extracts the browser build,
-tarball to `static/js/alpine.min.js`, where `go:embed` picks it up.
+`package/dist/cdn.min.js`, from the tarball to `static/js/alpine.min.js`,
-`make test`, `make check`, `make build` and `make dev` run it first, and the
+where `go:embed` picks it up. `script/test`, `make build` and `make dev` run
-Dockerfile builds through them, so no build downloads anything. The extracted
+it first, and the Dockerfile builds through `make test` and `make build`, so
-file is not committed, and `.dockerignore` keeps any host copy out of the
+nothing downloads Alpine.js. The extracted file is not committed, and
-build context.
+`.dockerignore` keeps any host copy out of the build context.
 
 To move to a new version: download
 `https://registry.npmjs.org/alpinejs/-/alpinejs-<version>.tgz`, check it
 against the `dist.integrity` hash listed at
 `https://registry.npmjs.org/alpinejs/<version>`, replace the tarball in `3p/`
-with it, update its file name in the Makefile's `assets` target, and run
+with it, update its file name in `script/assets`, and run `make check`.
-`make check`.
 
 ## Rationale
 
@@ -2883,7 +2884,7 @@ webhooker/
 ├── script/                    # Scripts to Rule Them All entrypoints
 ├── Dockerfile                 # Three stages: lint, test+build, Alpine runtime
 ├── Dockerfile.lint            # Lint-only image built by script/lint
-├── Makefile                   # 9 of 17 targets shim script/; 8 are inline
+├── Makefile                   # 10 of 17 targets shim script/; 7 are inline
 ├── go.mod / go.sum
 └── .golangci.yml              # Linter configuration
 ```
@@ -3276,3 +3277,5 @@ MIT
 ## Author
 
 [@sneak](https://sneak.berlin)
+
+

script/assets

@@ -0,0 +1,16 @@
+#!/bin/sh
+# script/assets: extract Alpine.js from its npm package tarball, committed
+# in 3p/, to static/js/alpine.min.js, where go:embed reads it. The
+# extracted file is not committed. script/test, make build and make dev run
+# this first.
+set -eu
+
+ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
+
+main() {
+    cd "$ROOT"
+    tar -xzOf 3p/alpinejs-3.14.9.tgz package/dist/cdn.min.js \
+        >static/js/alpine.min.js
+}
+
+main "$@"

script/test

@@ -28,6 +28,7 @@ ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
 
 main() {
     cd "$ROOT"
+    "$ROOT/script/assets"
     go test -v -race -timeout 90s ./...
 }