diff --git a/apps/auth/package.json b/apps/auth/package.json index ad880443..28f7dcaa 100644 --- a/apps/auth/package.json +++ b/apps/auth/package.json @@ -4,7 +4,7 @@ "scripts": { "dev": "wrangler dev", "serve": "bun run src/server.ts", - "preview": "bun --watch script/preview.ts", + "preview": "bun script/preview-watch.ts", "deploy": "wrangler deploy" }, "dependencies": { diff --git a/apps/auth/script/preview-watch.ts b/apps/auth/script/preview-watch.ts new file mode 100644 index 00000000..7578728e --- /dev/null +++ b/apps/auth/script/preview-watch.ts @@ -0,0 +1,49 @@ +/** + * Runs `preview.ts`, and runs it again whenever the sign-in UI's source changes. + * + * Not `bun --watch`, which watches each imported file. Many editors save by + * writing a new file and renaming it over the old one, and a watch on a file + * does not follow the rename: the first such save reloads, and every one after + * it is silently ignored. A watch on the directory sees every save, however it + * was made. + */ + +import { watch } from 'node:fs'; +import { join } from 'node:path'; + +const ROOT = join(import.meta.dir, '..', '..', '..'); +const DIRS = [join(ROOT, 'packages/auth/src'), join(ROOT, 'apps/auth/src'), import.meta.dir]; +const SERVER = join(import.meta.dir, 'preview.ts'); + +let child = start(); +let timer: ReturnType | undefined; + +function start() { + return Bun.spawn(['bun', SERVER], { stdio: ['inherit', 'inherit', 'inherit'] }); +} + +async function restart(file: string) { + child.kill(); + // The port is free only once the old server has exited. + await child.exited; + console.log(`changed: ${file}`); + child = start(); +} + +for (const dir of DIRS) { + watch(dir, { recursive: true }, (_event, file) => { + if (!file || !/\.(ts|tsx)$/.test(file)) return; + // One save can be several events: a write, then a rename. + clearTimeout(timer); + timer = setTimeout(() => restart(file), 60); + }); +} + +// Ctrl-C reaches the whole process group, but a plain `kill` reaches only +// this process, and would leave the server holding the port. +for (const signal of ['SIGINT', 'SIGTERM', 'SIGHUP'] as const) { + process.on(signal, () => { + child.kill(); + process.exit(0); + }); +} diff --git a/apps/auth/script/preview.ts b/apps/auth/script/preview.ts index 07c4290a..9411411e 100644 --- a/apps/auth/script/preview.ts +++ b/apps/auth/script/preview.ts @@ -8,9 +8,9 @@ * screens from `ui/issuer.ts` — drawn by the real renderer with the real * theme. What differs from production is only how the page was reached. * - * `bun --watch` restarts this process when anything it imports changes, which - * includes `css.ts`, `render.tsx` and `base.tsx`. Each page polls for the - * restart and reloads itself, so saving a file is the whole loop. + * `preview-watch.ts` restarts this process when the UI's source changes — + * the renderer, the stylesheet, the copy, the issuer's screens. Each page polls + * for the restart and reloads itself, so saving a file is the whole loop. * * A state that is missing here is a state nobody will look at before it * ships. Adding a screen to the flow means adding it to `STATES`.