@cosmicdrift/kumiko-dev-server 0.21.1 → 0.23.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmicdrift/kumiko-dev-server",
-  "version": "0.21.1",
+  "version": "0.23.1",
   "description": "Development server bootstrap for Kumiko apps. Bundles the client, mints dev-JWTs, injects the resolved AppSchema, and seeds an admin. Not for production.",
   "license": "BUSL-1.1",
   "author": "Marc Frost <marc@cosmicdriftgamestudio.com>",

package/src/__tests__/scaffold-deploy.test.ts

@@ -67,6 +67,38 @@ describe("scaffoldDeploy", () => {
     expect(dockerfile).toContain("exec bun run server.js");
   });
 
+  it("Dockerfile copies kumiko/migrations and is free of stale drizzle artefacts", () => {
+    // Regression guard for PR #167 deploy-template drift: after the drizzle
+    // replacement (framework 0.21) + single-bundle server build (0.20), the
+    // template kept three dead drizzle references that broke fresh deploys —
+    // a COPY for the unbundled drizzle.config.ts, a COPY of /app/drizzle
+    // (apps now ship kumiko/), and a KUMIKO_MIGRATION_HOOKS env pointing at
+    // a no-longer-bundled migration-hooks.js. The migrate path is now
+    // `kumiko schema apply` reading ${INIT_CWD}/kumiko/migrations/*.sql.
+    scaffoldDeploy({ appName: "drift-guard", destination: tmp });
+    const dockerfile = readFileSync(join(tmp, "deploy", "Dockerfile"), "utf-8");
+
+    expect(dockerfile).toContain(
+      "COPY --from=build --chown=app:app /app/kumiko/migrations ./kumiko/migrations",
+    );
+
+    expect(dockerfile).not.toContain("/app/dist-server/drizzle.config.ts");
+    expect(dockerfile).not.toContain("COPY --from=build --chown=app:app /app/drizzle ./drizzle");
+    expect(dockerfile).not.toContain("KUMIKO_MIGRATION_HOOKS");
+    expect(dockerfile).not.toContain("migration-hooks.js");
+  });
+
+  it("migrate-step.sh invokes the schema-CLI subcommand registered in kumiko.ts", () => {
+    // Regression guard for PR #167: the deploy step was calling
+    // `bun /app/kumiko.js migrate apply`, but the CLI only registers
+    // `schema` (with subcommand `apply`). The pre-deploy migrate step
+    // crashed with "Unknown command: migrate" until this was fixed.
+    scaffoldDeploy({ appName: "cli-cmd", destination: tmp });
+    const migrate = readFileSync(join(tmp, "deploy", "migrate-step.sh"), "utf-8");
+    expect(migrate).toContain("bun /app/kumiko.js schema apply");
+    expect(migrate).not.toContain("kumiko.js migrate apply");
+  });
+
   it("skips existing files by default", () => {
     const existing = join(tmp, "deploy");
     scaffoldDeploy({ appName: "first", destination: tmp });

package/src/run-prod-app.ts

@@ -3,12 +3,11 @@
 // Symmetrisch zu runDevApp, aber:
 //   - DATABASE_URL / REDIS_URL / JWT_SECRET aus env (fail-fast bei Boot,
 //     keine ephemeralen Test-DBs)
-//   - Hard Schema-Drift-Gate: prüft drizzle/migrations/_journal vs.
-//     __drizzle_migrations + tableExists für jede erwartete Tabelle.
-//     KEIN Auto-CREATE TABLE im Boot — Migration ist ein CI-Step
-//     (`bun kumiko migrate apply`), Boot validiert nur. Verhindert
-//     Race-Conditions bei Multi-Replica-Deploys + macht Schema-Stand
-//     reviewbar in der Pull-Request.
+//   - Hard Schema-Drift-Gate: prüft kumiko/migrations vs. _kumiko_migrations
+//     + tableExists für jede erwartete Tabelle. KEIN Auto-CREATE TABLE im
+//     Boot — Migration ist ein CI-Step (`bun kumiko schema apply`), Boot
+//     validiert nur. Verhindert Race-Conditions bei Multi-Replica-Deploys
+//     + macht Schema-Stand reviewbar in der Pull-Request.
 //   - Idempotente Seeds: laufen nur wenn DB leer (über `isDbEmpty`-Probe
 //     pro Seed). Re-Boots nach erstem Seed sind no-op.
 //   - HTTP-Server via Bun.serve mit graceful SIGTERM/SIGINT → drain().

package/templates/deploy/Dockerfile.template

@@ -7,10 +7,8 @@
 #
 #   dist/                  ← Client build (kumiko-build)
 #   dist-server/           ← Server bundle (bun build) + minimal package.json
-#   drizzle/               ← Migrations
-#   drizzle.config.ts      ← drizzle-kit config (for `bunx drizzle-kit migrate`)
+#   kumiko/migrations/     ← Checked-in SQL migrations applied by `kumiko schema apply`
 #
-# Size: ~250 MB incl. drizzle-kit for the pre-deploy migrate step.
 # Build context: repository root (monorepo is used in the build stage).
 
 ARG BUN_VERSION=1.3.14
@@ -59,12 +57,11 @@ RUN bun install --production
 # Client build (static assets) — served by runProdApp.staticDir.
 COPY --from=build --chown=app:app /app/dist ./dist
 
-# Drizzle artefacts for migrate apply: drizzle-kit reads drizzle.config.ts
-# (bundled — inlined kumikoDrizzleConfig, no dev-server pkg needed) and
-# applies the SQL migrations from drizzle/migrations/. schema.ts is NOT
-# loaded (apply is SQL-only; generate reads schema).
-COPY --from=build --chown=app:app /app/dist-server/drizzle.config.ts ./drizzle.config.ts
-COPY --from=build --chown=app:app /app/drizzle ./drizzle
+# Checked-in SQL migrations for the pre-deploy `kumiko schema apply` step.
+# The shipped `kumiko-schema` bin reads `${INIT_CWD}/kumiko/migrations/*.sql`
+# (see ENV INIT_CWD=/app below). kumiko/schema.ts is NOT needed at runtime
+# (only generate reads it; apply is checksum-tracked SQL only).
+COPY --from=build --chown=app:app /app/kumiko/migrations ./kumiko/migrations
 
 # Container entrypoint — `infra/pulumi/bun-server.ts` overrides the container
 # command to inject DATABASE_URL from the init-container's /shared/database-url
@@ -89,18 +86,14 @@ USER app
 
 ENV NODE_ENV=production
 ENV PORT={{port}}
-# kumiko.ts migrate path resolves drizzle-kit relative to KUMIKO_REPO_ROOT
-# (default is parent-of-import.meta.dir, which in a bundle points to the
-# wrong directory). /app is the app root + node_modules parent here.
+# The bundled kumiko.js CLI resolves its repo-relative paths via
+# KUMIKO_REPO_ROOT (default: parent-of-import.meta.dir, which inside the
+# bundle points to the wrong directory). /app is the app root + the
+# node_modules parent here.
 ENV KUMIKO_REPO_ROOT=/app
-# kumiko.ts expects INIT_CWD as the app workspace (drizzle.config.ts +
-# drizzle/ live per app). In the bundle container, /app is that workspace.
+# INIT_CWD is the app workspace the schema-CLI runs against — that's where
+# `kumiko/migrations/` lives. In the bundle container, /app is the workspace.
 ENV INIT_CWD=/app
-# kumiko.ts would otherwise load drizzle/migration-hooks.ts as an
-# unbundled .ts — that fails because dev-server and framework imports
-# can't be resolved from the runtime node_modules. Override to the
-# bundled equivalent in /app/migration-hooks.js.
-ENV KUMIKO_MIGRATION_HOOKS=/app/migration-hooks.js
 # Build identity in the runtime env so /api/version returns it.
 # Built: SHA of the commit at image build time + ISO timestamp.
 ENV BUILD_VERSION=$BUILD_VERSION

package/templates/deploy/migrate-step.sh.template

@@ -6,7 +6,7 @@
 # equivalent). Lives on the server under `/srv/{{appName}}/migrate-step.sh`,
 # called via `bash migrate-step.sh`.
 #
-# Task: apply drizzle-kit migrations + auto-rebuild for projection-schema
+# Task: apply checked-in SQL migrations + auto-rebuild for projection-schema
 # changes BEFORE the app container starts — runProdApp's boot gate would
 # otherwise abort with SchemaDriftError.
 #
@@ -36,4 +36,4 @@ docker run --rm \
   --network "$STACK_NETWORK" \
   -e DATABASE_URL="postgresql://{{appName}}:${DB_PASSWORD}@db:5432/{{appName}}" \
   ghcr.io/{{githubOrg}}/{{appName}}:latest \
-  bun /app/kumiko.js migrate apply
+  bun /app/kumiko.js schema apply