create-m5kdev 0.33.0 → 0.34.0

package/templates/minimal-app/apps/server/tsup.config.ts.tpl

@@ -1,9 +1,23 @@
-import { defineConfig } from "tsup";
-
-export default defineConfig({
-  entry: ["src/index.ts"],
-  format: ["cjs"],
-  outDir: "dist",
-  sourcemap: true,
-  clean: true,
-});
+import { defineConfig } from "tsup";
+
+export default defineConfig({
+  entry: ["src/index.ts"],
+  format: ["cjs"],
+  outDir: "dist",
+  sourcemap: true,
+  clean: true,
+  // Workspace packages export TypeScript source for local tsx/Vite. Node
+  // cannot strip types from files under node_modules
+  // (ERR_UNSUPPORTED_NODE_MODULES_TYPE_STRIPPING), so bundle them into dist.
+  noExternal: [/^{{PACKAGE_SCOPE}}\//],
+  // Only leave runtime requires for packages the server installs. Bundling
+  // @beatquill/email would otherwise emit require("@m5kdev/email/...") and
+  // require("@react-email/...") that pnpm deploy does not hoist to /app.
+  external: [
+    /^@m5kdev\/backend(\/|$)/,
+    /^@m5kdev\/commons(\/|$)/,
+    /^@m5kdev\/config(\/|$)/,
+    "react",
+    "react-dom",
+  ],
+});

package/templates/minimal-app/apps/shared/.env.example.tpl

@@ -30,6 +30,11 @@ VAPID_SUBJECT=mailto:you@example.com
 # Optional: FCM (Android) — service account JSON path
 # FIREBASE_SERVICE_ACCOUNT_PATH=
 
+# Optional OpenRouter (AI Conversation). Required to get an assistant reply.
+# m5k:ai:start
+OPENROUTER_API_KEY=
+# m5k:ai:end
+
 # Optional email and analytics providers
 RESEND_API_KEY=
 VITE_PUBLIC_POSTHOG_KEY=demo

package/templates/minimal-app/apps/shared/.env.production.example.tpl

@@ -0,0 +1,23 @@
+# Copy to .env.production and fill in values. This file is not copied into the
+# image (.dockerignore excludes .env*). app:deploy forwards every key as a Fly
+# build secret; app:secrets imports the same file as runtime secrets.
+
+# Database (Fly volume at /app/data)
+DATABASE_URL=file:/app/data/local.db
+
+# Redis — set as a Fly runtime secret (do not bake into the image)
+REDIS_URL=
+
+# Auth
+BETTER_AUTH_SECRET=
+
+# Public URLs (baked into the webapp at image build)
+VITE_APP_NAME={{APP_NAME}}
+VITE_APP_URL=
+VITE_SERVER_URL=
+VITE_ENABLE_WAITLIST=false
+
+# Optional
+RESEND_API_KEY=
+VITE_PUBLIC_POSTHOG_KEY=
+VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com

package/templates/minimal-app/apps/shared/.env.tpl

@@ -12,6 +12,11 @@ DATABASE_URL=file:./local.db
 TURSO_DATABASE_URL=
 TURSO_AUTH_TOKEN=
 
+# m5k:ai:start
+# Optional OpenRouter (AI Conversation). Required to get an assistant reply.
+OPENROUTER_API_KEY=
+# m5k:ai:end
+
 # Local email delivery falls back to file output when unset
 RESEND_API_KEY=
 

package/templates/minimal-app/apps/shared/Dockerfile.tpl

@@ -0,0 +1,48 @@
+# syntax = docker/dockerfile:1
+
+FROM node:24-slim AS base
+
+LABEL fly_launch_runtime="NodeJS"
+
+WORKDIR /app
+
+ENV NODE_ENV=production
+
+FROM base AS build
+
+RUN apt-get update -qq && \
+    apt-get install -y python-is-python3 pkg-config build-essential ca-certificates && \
+    update-ca-certificates
+
+RUN npm install -g pnpm@10.13.1
+
+COPY --link . .
+
+RUN pnpm install --frozen-lockfile --prod=false
+RUN pnpm --filter={{PACKAGE_SCOPE}}/server build
+
+# Frontend bake needs VITE_* from the operator env file. Fly cannot declare
+# an unknown set of --mount=type=secret,id=<each key>, so the wrapper also
+# passes ALL_SECRETS (export KEY=value for every key) and still forwards each
+# key as --build-secret.
+# m5k:webapp:start
+RUN --mount=type=secret,id=ALL_SECRETS,required=false \
+    if [ -f /run/secrets/ALL_SECRETS ]; then . /run/secrets/ALL_SECRETS; fi && \
+    pnpm --filter={{PACKAGE_SCOPE}}/webapp build
+# m5k:webapp:end
+
+RUN pnpm --filter={{PACKAGE_SCOPE}}/server deploy --prod --legacy /deploy
+RUN cp -r /app/apps/server/dist/. /deploy
+
+# m5k:webapp:start
+RUN cp -r /app/apps/webapp/dist /deploy/client
+# m5k:webapp:end
+
+FROM base
+
+COPY --from=build /deploy /app
+COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+
+WORKDIR /app
+
+CMD ["node", "index.js"]

package/templates/minimal-app/apps/shared/fly.toml.tpl

@@ -0,0 +1,24 @@
+app = "{{APP_SLUG}}-app"
+primary_region = "iad"
+
+[build]
+
+[env]
+  PORT = "8080"
+
+[[mounts]]
+  source = "libsql_data"
+  destination = "/app/data"
+
+[http_service]
+  internal_port = 8080
+  force_https = true
+  auto_stop_machines = "stop"
+  auto_start_machines = true
+  min_machines_running = 0
+  processes = ["app"]
+
+[[vm]]
+  memory = "1gb"
+  cpu_kind = "shared"
+  cpus = 1

package/templates/minimal-app/apps/shared/package.json.tpl

@@ -1,24 +1,25 @@
-{
-  "name": "{{PACKAGE_SCOPE}}/shared",
-  "version": "0.0.0",
-  "private": true,
-  "scripts": {
-    "build": "tsc --noEmit",
-    "lint": "biome check .",
-    "lint:fix": "biome check . --write",
-    "check-types": "tsc --noEmit"
-  },
-  "dependencies": {
-    "@m5kdev/commons": "catalog:m5kdev",
-    "zod": "catalog:m5kdev"
-  },
-  "devDependencies": {
-    "@m5kdev/config": "catalog:m5kdev",
-    "tslib": "catalog:m5kdev",
-    "typescript": "catalog:m5kdev"
-  },
-  "exports": {
-    "./modules/app/*": "./src/modules/app/*.ts",
-    "./modules/posts/*": "./src/modules/posts/*.ts"
-  }
-}
+{
+  "name": "{{PACKAGE_SCOPE}}/shared",
+  "version": "0.0.0",
+  "private": true,
+  "scripts": {
+    "build": "tsc --noEmit",
+    "lint": "biome check .",
+    "lint:fix": "biome check . --write",
+    "check-types": "tsc --noEmit"
+  },
+  "dependencies": {
+    "@m5kdev/commons": "catalog:m5kdev",
+    "zod": "catalog:m5kdev"
+  },
+  "devDependencies": {
+    "@m5kdev/config": "catalog:m5kdev",
+    "tslib": "catalog:m5kdev",
+    "typescript": "catalog:m5kdev"
+  },
+  "exports": {
+    "./modules/app/*": "./src/modules/app/*.ts",
+    "./modules/conversation/*": "./src/modules/conversation/*.ts",
+    "./modules/posts/*": "./src/modules/posts/*.ts"
+  }
+}

package/templates/minimal-app/apps/shared/scripts/fly-deploy.mjs.tpl

@@ -0,0 +1,75 @@
+#!/usr/bin/env node
+import { spawnSync } from "node:child_process";
+import { existsSync, readFileSync } from "node:fs";
+import { parseArgs } from "node:util";
+
+function missingEnvMessage(envPath) {
+  return `Missing ${envPath}. Copy the .env.production.example next to it, fill in values, then retry.`;
+}
+
+function parseDotenv(source) {
+  const vars = {};
+  for (const rawLine of source.split(/\r?\n/)) {
+    const line = rawLine.trim();
+    if (!line || line.startsWith("#")) continue;
+    const eq = line.indexOf("=");
+    if (eq === -1) continue;
+    const key = line.slice(0, eq).trim();
+    let value = line.slice(eq + 1);
+    if (
+      (value.startsWith('"') && value.endsWith('"')) ||
+      (value.startsWith("'") && value.endsWith("'"))
+    ) {
+      value = value.slice(1, -1);
+    }
+    vars[key] = value;
+  }
+  return vars;
+}
+
+function shellSingleQuote(value) {
+  return `'${value.replaceAll("'", `'\\''`)}'`;
+}
+
+function toExportScript(vars) {
+  return Object.entries(vars)
+    .map(([key, value]) => `export ${key}=${shellSingleQuote(value)}`)
+    .join("\n");
+}
+
+const { values } = parseArgs({
+  options: {
+    config: { type: "string" },
+    dockerfile: { type: "string" },
+    env: { type: "string" },
+  },
+});
+
+if (!values.config || !values.dockerfile || !values.env) {
+  console.error(
+    "Usage: fly-deploy.mjs --config <fly.toml> --dockerfile <Dockerfile> --env <.env.production>"
+  );
+  process.exit(1);
+}
+
+if (!existsSync(values.env)) {
+  console.error(missingEnvMessage(values.env));
+  process.exit(1);
+}
+
+const vars = parseDotenv(readFileSync(values.env, "utf8"));
+const args = [
+  "deploy",
+  "-c",
+  values.config,
+  "--dockerfile",
+  values.dockerfile,
+  "--build-secret",
+  `ALL_SECRETS=${toExportScript(vars)}`,
+];
+for (const [key, value] of Object.entries(vars)) {
+  args.push("--build-secret", `${key}=${value}`);
+}
+
+const result = spawnSync("fly", args, { stdio: "inherit" });
+process.exit(result.status ?? 1);

package/templates/minimal-app/apps/shared/scripts/fly-secrets.mjs.tpl

@@ -0,0 +1,31 @@
+#!/usr/bin/env node
+import { spawnSync } from "node:child_process";
+import { existsSync, readFileSync } from "node:fs";
+import { parseArgs } from "node:util";
+
+function missingEnvMessage(envPath) {
+  return `Missing ${envPath}. Copy the .env.production.example next to it, fill in values, then retry.`;
+}
+
+const { values } = parseArgs({
+  options: {
+    config: { type: "string" },
+    env: { type: "string" },
+  },
+});
+
+if (!values.config || !values.env) {
+  console.error("Usage: fly-secrets.mjs --config <fly.toml> --env <.env.production>");
+  process.exit(1);
+}
+
+if (!existsSync(values.env)) {
+  console.error(missingEnvMessage(values.env));
+  process.exit(1);
+}
+
+const result = spawnSync("fly", ["secrets", "import", "-c", values.config], {
+  input: readFileSync(values.env),
+  stdio: ["pipe", "inherit", "inherit"],
+});
+process.exit(result.status ?? 1);

package/templates/minimal-app/apps/shared/src/modules/app/app.constants.ts.tpl

@@ -1,28 +1,28 @@
-import { defineAuthRoles } from "@m5kdev/commons/modules/auth/auth.roles";
-
-export const APP_NAME = "{{APP_NAME}}";
-export const APP_SLUG = "{{APP_SLUG}}";
-
-export const APP_LOCALE_CONFIG = {
-  defaultLocale: "en",
-  locales: [
-    { code: "en", displayName: "English" },
-    { code: "en_GB", displayName: "English (UK)" },
-  ],
-} as const;
-
-export const APP_ROLES_CONFIG = defineAuthRoles({
-  user: {
-    roles: ["user", "admin"],
-  },
-  organization: {
-    roles: ["member", "admin", "owner"],
-    managerRoles: ["admin", "owner"],
-    assignableRoles: ["member", "admin", "owner"],
-    defaultRole: "member",
-  },
-  team: {
-    roles: ["owner"],
-    defaultRole: "owner",
-  },
-});
+import { defineAuthRoles } from "@m5kdev/commons/modules/auth/auth.roles";
+
+export const APP_NAME = "{{APP_NAME}}";
+export const APP_SLUG = "{{APP_SLUG}}";
+
+export const APP_LOCALE_CONFIG = {
+  defaultLocale: "en",
+  locales: [
+    { code: "en", displayName: "English" },
+    { code: "en_GB", displayName: "English (UK)" },
+  ],
+} as const;
+
+export const APP_ROLES_CONFIG = defineAuthRoles({
+  user: {
+    roles: ["user", "admin"],
+  },
+  organization: {
+    roles: ["member", "admin", "owner"],
+    managerRoles: ["admin", "owner"],
+    assignableRoles: ["member", "admin", "owner"],
+    defaultRole: "member",
+  },
+  team: {
+    roles: ["owner"],
+    defaultRole: "owner",
+  },
+});

package/templates/minimal-app/apps/shared/src/modules/conversation/conversation.constants.ts.tpl

@@ -0,0 +1 @@
+export const STARTER_ASSISTANT_AGENT_ID = "assistant" as const;

package/templates/minimal-app/apps/shared/src/modules/notification/notification.schema.ts.tpl

@@ -1,3 +1,3 @@
-/** Re-export shared push-notification contracts from commons. */
-export * from "@m5kdev/commons/modules/notification/notification.constants";
-export * from "@m5kdev/commons/modules/notification/notification.schema";
+/** Re-export shared push-notification contracts from commons. */
+export * from "@m5kdev/commons/modules/notification/notification.constants";
+export * from "@m5kdev/commons/modules/notification/notification.schema";

package/templates/minimal-app/apps/shared/src/modules/posts/posts.constants.ts.tpl

@@ -1,5 +1,5 @@
-export const POST_STATUS_VALUES = ["draft", "published"] as const;
-
-export const POST_FILTER_VALUES = ["all", ...POST_STATUS_VALUES] as const;
-
-export const POSTS_PAGE_SIZE = 6;
+export const POST_STATUS_VALUES = ["draft", "published"] as const;
+
+export const POST_FILTER_VALUES = ["all", ...POST_STATUS_VALUES] as const;
+
+export const POSTS_PAGE_SIZE = 6;

package/templates/minimal-app/apps/shared/src/modules/posts/posts.schema.ts.tpl

@@ -1,25 +1,25 @@
-import { z } from "zod";
-import { POST_STATUS_VALUES } from "./posts.constants";
-
-/**
- * Shared schemas have a deliberately narrow role: server row/list types are
- * inferred from the tRPC router (AppRouter), and the API surface is defined by
- * the server module's DTO. A schema lives here only when the frontend needs it
- * at runtime (form validation) or when both sides genuinely share it — the
- * DTO imports these create/update schemas so the contract cannot drift.
- */
-export const postStatusSchema = z.enum(POST_STATUS_VALUES);
-export type PostStatusSchema = z.infer<typeof postStatusSchema>;
-
-export const postCreateInputSchema = z.object({
-  title: z.string().min(1),
-  slug: z.string().optional(),
-  excerpt: z.string().optional(),
-  content: z.string().min(1),
-});
-export type PostCreateInputSchema = z.infer<typeof postCreateInputSchema>;
-
-export const postUpdateInputSchema = postCreateInputSchema.extend({
-  id: z.string(),
-});
-export type PostUpdateInputSchema = z.infer<typeof postUpdateInputSchema>;
+import { z } from "zod";
+import { POST_STATUS_VALUES } from "./posts.constants";
+
+/**
+ * Shared schemas have a deliberately narrow role: server row/list types are
+ * inferred from the tRPC router (AppRouter), and the API surface is defined by
+ * the server module's DTO. A schema lives here only when the frontend needs it
+ * at runtime (form validation) or when both sides genuinely share it — the
+ * DTO imports these create/update schemas so the contract cannot drift.
+ */
+export const postStatusSchema = z.enum(POST_STATUS_VALUES);
+export type PostStatusSchema = z.infer<typeof postStatusSchema>;
+
+export const postCreateInputSchema = z.object({
+  title: z.string().min(1),
+  slug: z.string().optional(),
+  excerpt: z.string().optional(),
+  content: z.string().min(1),
+});
+export type PostCreateInputSchema = z.infer<typeof postCreateInputSchema>;
+
+export const postUpdateInputSchema = postCreateInputSchema.extend({
+  id: z.string(),
+});
+export type PostUpdateInputSchema = z.infer<typeof postUpdateInputSchema>;

package/templates/minimal-app/apps/webapp/package.json.tpl

@@ -1,53 +1,53 @@
-{
-  "name": "{{PACKAGE_SCOPE}}/webapp",
-  "private": true,
-  "version": "0.0.0",
-  "type": "module",
-  "scripts": {
-    "dev": "vite",
-    "build": "vite build",
-    "lint": "biome check .",
-    "lint:fix": "biome check . --write",
-    "check-types": "tsc --noEmit",
-    "preview": "vite preview"
-  },
-  "dependencies": {
-    "{{PACKAGE_SCOPE}}/shared": "workspace:*",
-    "@heroui/react": "catalog:m5kdev",
-    "@heroui/styles": "catalog:m5kdev",
-    "@m5kdev/commons": "catalog:m5kdev",
-    "@m5kdev/frontend": "catalog:m5kdev",
-    "@m5kdev/web-ui": "catalog:m5kdev",
-    "@tanstack/react-query": "catalog:m5kdev",
-    "@trpc/client": "catalog:m5kdev",
-    "@trpc/tanstack-react-query": "catalog:m5kdev",
-    "better-auth": "catalog:m5kdev",
-    "i18next": "catalog:m5kdev",
-    "lucide-react": "catalog:m5kdev",
-    "nuqs": "catalog:m5kdev",
-    "posthog-js": "catalog:m5kdev",
-    "react": "catalog:m5kdev",
-    "react-dom": "catalog:m5kdev",
-    "react-hook-form": "catalog:m5kdev",
-    "react-i18next": "catalog:m5kdev",
-    "react-router": "catalog:m5kdev",
-    "sonner": "catalog:m5kdev",
-    "tailwindcss": "catalog:m5kdev",
-    "tw-animate-css": "catalog:m5kdev",
-    "zod": "catalog:m5kdev"
-  },
-  "devDependencies": {
-    "{{PACKAGE_SCOPE}}/server": "workspace:*",
-    "@m5kdev/config": "catalog:m5kdev",
-    "@tailwindcss/vite": "catalog:m5kdev",
-    "@types/react": "catalog:m5kdev",
-    "@types/react-dom": "catalog:m5kdev",
-    "@vitejs/plugin-react": "catalog:m5kdev",
-    "babel-plugin-react-compiler": "catalog:m5kdev",
-    "typescript": "catalog:m5kdev",
-    "vite": "catalog:m5kdev",
-    "vite-plugin-i18next-loader": "catalog:m5kdev",
-    "vite-tsconfig-paths": "catalog:m5kdev",
-    "@trpc/server": "catalog:m5kdev"
-  }
-}
+{
+  "name": "{{PACKAGE_SCOPE}}/webapp",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "lint": "biome check .",
+    "lint:fix": "biome check . --write",
+    "check-types": "tsc --noEmit",
+    "preview": "vite preview"
+  },
+  "dependencies": {
+    "{{PACKAGE_SCOPE}}/shared": "workspace:*",
+    "@heroui/react": "catalog:m5kdev",
+    "@heroui/styles": "catalog:m5kdev",
+    "@m5kdev/commons": "catalog:m5kdev",
+    "@m5kdev/frontend": "catalog:m5kdev",
+    "@m5kdev/web-ui": "catalog:m5kdev",
+    "@tanstack/react-query": "catalog:m5kdev",
+    "@trpc/client": "catalog:m5kdev",
+    "@trpc/tanstack-react-query": "catalog:m5kdev",
+    "better-auth": "catalog:m5kdev",
+    "i18next": "catalog:m5kdev",
+    "lucide-react": "catalog:m5kdev",
+    "nuqs": "catalog:m5kdev",
+    "posthog-js": "catalog:m5kdev",
+    "react": "catalog:m5kdev",
+    "react-dom": "catalog:m5kdev",
+    "react-hook-form": "catalog:m5kdev",
+    "react-i18next": "catalog:m5kdev",
+    "react-router": "catalog:m5kdev",
+    "sonner": "catalog:m5kdev",
+    "tailwindcss": "catalog:m5kdev",
+    "tw-animate-css": "catalog:m5kdev",
+    "zod": "catalog:m5kdev"
+  },
+  "devDependencies": {
+    "{{PACKAGE_SCOPE}}/server": "workspace:*",
+    "@m5kdev/config": "catalog:m5kdev",
+    "@tailwindcss/vite": "catalog:m5kdev",
+    "@types/react": "catalog:m5kdev",
+    "@types/react-dom": "catalog:m5kdev",
+    "@vitejs/plugin-react": "catalog:m5kdev",
+    "babel-plugin-react-compiler": "catalog:m5kdev",
+    "typescript": "catalog:m5kdev",
+    "vite": "catalog:m5kdev",
+    "vite-plugin-i18next-loader": "catalog:m5kdev",
+    "vite-tsconfig-paths": "catalog:m5kdev",
+    "@trpc/server": "catalog:m5kdev"
+  }
+}

package/templates/minimal-app/apps/webapp/public/push-sw.js.tpl

@@ -1,34 +1,34 @@
-/* global self */
-self.addEventListener("push", (event) => {
-  let payload = { title: "Notification", body: "" };
-  try {
-    if (event.data) {
-      payload = { ...payload, ...event.data.json() };
-    }
-  } catch {
-    const text = event.data?.text();
-    if (text) payload = { title: "Notification", body: text };
-  }
-  event.waitUntil(
-    self.registration.showNotification(payload.title, {
-      body: payload.body,
-      data: payload.data ?? {},
-    })
-  );
-});
-
-self.addEventListener("notificationclick", (event) => {
-  event.notification.close();
-  event.waitUntil(
-    self.clients.matchAll({ type: "window", includeUncontrolled: true }).then((clientList) => {
-      if (clientList.length > 0) {
-        const client = clientList[0];
-        if ("focus" in client) return client.focus();
-      }
-      if (self.clients.openWindow) {
-        return self.clients.openWindow("/");
-      }
-      return undefined;
-    })
-  );
-});
+/* global self */
+self.addEventListener("push", (event) => {
+  let payload = { title: "Notification", body: "" };
+  try {
+    if (event.data) {
+      payload = { ...payload, ...event.data.json() };
+    }
+  } catch {
+    const text = event.data?.text();
+    if (text) payload = { title: "Notification", body: text };
+  }
+  event.waitUntil(
+    self.registration.showNotification(payload.title, {
+      body: payload.body,
+      data: payload.data ?? {},
+    })
+  );
+});
+
+self.addEventListener("notificationclick", (event) => {
+  event.notification.close();
+  event.waitUntil(
+    self.clients.matchAll({ type: "window", includeUncontrolled: true }).then((clientList) => {
+      if (clientList.length > 0) {
+        const client = clientList[0];
+        if ("focus" in client) return client.focus();
+      }
+      if (self.clients.openWindow) {
+        return self.clients.openWindow("/");
+      }
+      return undefined;
+    })
+  );
+});