create-m5kdev 0.25.3 → 0.26.1

package/templates/minimal-app/apps/server/src/schema.ts.tpl

@@ -0,0 +1,20 @@
+export {
+  accountClaimMagicLinks,
+  accounts,
+  apikeys,
+  invitations,
+  members,
+  organizations,
+  sessions,
+  teamMembers,
+  teams,
+  users,
+  verifications,
+  waitlist,
+} from "@m5kdev/backend/modules/auth/auth.db";
+export {
+  notificationDevices,
+  notificationSendLogs,
+} from "@m5kdev/backend/modules/notification/notification.db";
+export { workflows } from "@m5kdev/backend/modules/workflow/workflow.db";
+export { posts } from "./modules/posts/posts.db";

package/templates/minimal-app/apps/server/src/types.ts.tpl

@@ -1 +1 @@
-export type { AppRouter } from "./app";
+export type { AppRouter } from "./app";

package/templates/minimal-app/apps/server/tsconfig.json.tpl

@@ -1,14 +1,20 @@
-{
-  "extends": "@m5kdev/config/tsconfig.node.json",
-  "rootDir": ".",
-  "compilerOptions": {
-    "esModuleInterop": true,
-    "ignoreDeprecations": "6.0",
-    "importHelpers": true,
-    "jsx": "react-jsx",
-    "noEmit": true,
-    "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo"
-  },
-  "exclude": ["node_modules"],
-  "include": ["src/**/*.ts", "drizzle/**/*.ts", "drizzle.config.ts", "tsup.config.ts"]
-}
+{
+  "extends": "@m5kdev/config/tsconfig.node.json",
+  "compilerOptions": {
+    "esModuleInterop": true,
+    "importHelpers": true,
+    "jsx": "react-jsx",
+    "noEmit": true,
+    "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo",
+    "rootDir": "."
+  },
+  "exclude": [
+    "node_modules"
+  ],
+  "include": [
+    "src/**/*.ts",
+    "drizzle/**/*.ts",
+    "drizzle.config.ts",
+    "tsup.config.ts"
+  ]
+}

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

@@ -1,9 +1,9 @@
-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,
+});

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

@@ -1,24 +1,24 @@
-{
-  "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:",
-    "zod": "catalog:"
-  },
-  "devDependencies": {
-    "@m5kdev/config": "catalog:",
-    "tslib": "catalog:",
-    "typescript": "catalog:"
-  },
-  "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:",
+    "zod": "catalog:"
+  },
+  "devDependencies": {
+    "@m5kdev/config": "catalog:",
+    "tslib": "catalog:",
+    "typescript": "catalog:"
+  },
+  "exports": {
+    "./modules/app/*": "./src/modules/app/*.ts",
+    "./modules/posts/*": "./src/modules/posts/*.ts"
+  }
+}

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

@@ -1,2 +1,28 @@
-export const APP_NAME = "{{APP_NAME}}";
-export const APP_SLUG = "{{APP_SLUG}}";
+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/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,76 +1,25 @@
-import { querySchema } from "@m5kdev/commons/modules/schemas/query.schema";
-import { z } from "zod";
-import { POST_STATUS_VALUES } from "./posts.constants";
-
-export const postStatusSchema = z.enum(POST_STATUS_VALUES);
-export type PostStatusSchema = z.infer<typeof postStatusSchema>;
-
-export const postSchema = z.object({
-  id: z.string(),
-  authorUserId: z.string().nullish(),
-  organizationId: z.string().nullish(),
-  teamId: z.string().nullish(),
-  title: z.string(),
-  slug: z.string(),
-  excerpt: z.string().nullish(),
-  content: z.string(),
-  status: postStatusSchema,
-  publishedAt: z.date().nullish(),
-  createdAt: z.date(),
-  updatedAt: z.date().nullish(),
-  deletedAt: z.date().nullish(),
-});
-export type PostSchema = z.infer<typeof postSchema>;
-
-export const postsListInputSchema = querySchema.extend({
-  search: z.string().optional(),
-  status: postStatusSchema.optional(),
-});
-export type PostsListInputSchema = z.infer<typeof postsListInputSchema>;
-
-export const postsListOutputSchema = z.object({
-  rows: z.array(postSchema),
-  total: z.number(),
-});
-export type PostsListOutputSchema = z.infer<typeof postsListOutputSchema>;
-
-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 postCreateOutputSchema = postSchema;
-export type PostCreateOutputSchema = z.infer<typeof postCreateOutputSchema>;
-
-export const postUpdateInputSchema = z.object({
-  id: z.string(),
-  title: z.string().min(1),
-  slug: z.string().optional(),
-  excerpt: z.string().optional(),
-  content: z.string().min(1),
-});
-export type PostUpdateInputSchema = z.infer<typeof postUpdateInputSchema>;
-
-export const postUpdateOutputSchema = postSchema;
-export type PostUpdateOutputSchema = z.infer<typeof postUpdateOutputSchema>;
-
-export const postPublishInputSchema = z.object({
-  id: z.string(),
-});
-export type PostPublishInputSchema = z.infer<typeof postPublishInputSchema>;
-
-export const postPublishOutputSchema = postSchema;
-export type PostPublishOutputSchema = z.infer<typeof postPublishOutputSchema>;
-
-export const postSoftDeleteInputSchema = z.object({
-  id: z.string(),
-});
-export type PostSoftDeleteInputSchema = z.infer<typeof postSoftDeleteInputSchema>;
-
-export const postSoftDeleteOutputSchema = z.object({
-  id: z.string(),
-});
-export type PostSoftDeleteOutputSchema = z.infer<typeof postSoftDeleteOutputSchema>;
+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/shared/tsconfig.json.tpl

@@ -1,12 +1,16 @@
-{
-  "extends": "@m5kdev/config/tsconfig.base.json",
-  "rootDir": ".",
-  "compilerOptions": {
-    "esModuleInterop": true,
-    "importHelpers": true,
-    "noEmit": true,
-    "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo"
-  },
-  "exclude": ["node_modules"],
-  "include": ["src/**/*.ts"]
-}
+{
+  "extends": "@m5kdev/config/tsconfig.base.json",
+  "compilerOptions": {
+    "esModuleInterop": true,
+    "importHelpers": true,
+    "noEmit": true,
+    "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo",
+    "rootDir": "."
+  },
+  "exclude": [
+    "node_modules"
+  ],
+  "include": [
+    "src/**/*.ts"
+  ]
+}

package/templates/minimal-app/apps/webapp/index.html.tpl

@@ -1,22 +1,22 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta
-      name="viewport"
-      content="width=device-width, initial-scale=1.0"
-    />
-    <meta
-      name="description"
-      content="{{APP_DESCRIPTION}}"
-    />
-    <title>{{APP_NAME}}</title>
-  </head>
-  <body>
-    <div id="root"></div>
-    <script
-      type="module"
-      src="/src/main.tsx"
-    ></script>
-  </body>
-</html>
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1.0"
+    />
+    <meta
+      name="description"
+      content="The m5kdev starter application."
+    />
+    <title>{{APP_NAME}}</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script
+      type="module"
+      src="/src/main.tsx"
+    ></script>
+  </body>
+</html>

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

@@ -1,52 +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:",
-    "@heroui/styles": "catalog:",
-    "@m5kdev/commons": "catalog:",
-    "@m5kdev/frontend": "catalog:",
-    "@m5kdev/web-ui": "catalog:",
-    "@tanstack/react-query": "catalog:",
-    "@trpc/client": "catalog:",
-    "@trpc/tanstack-react-query": "catalog:",
-    "better-auth": "catalog:",
-    "i18next": "catalog:",
-    "lucide-react": "catalog:",
-    "nuqs": "catalog:",
-    "posthog-js": "catalog:",
-    "react": "catalog:",
-    "react-dom": "catalog:",
-    "react-hook-form": "catalog:",
-    "react-i18next": "catalog:",
-    "react-router": "catalog:",
-    "sonner": "catalog:",
-    "tailwindcss": "catalog:",
-    "tw-animate-css": "catalog:",
-    "zod": "catalog:"
-  },
-  "devDependencies": {
-    "{{PACKAGE_SCOPE}}/server": "workspace:*",
-    "@m5kdev/config": "catalog:",
-    "@tailwindcss/vite": "catalog:",
-    "@types/react": "catalog:",
-    "@types/react-dom": "catalog:",
-    "@vitejs/plugin-react": "catalog:",
-    "babel-plugin-react-compiler": "catalog:",
-    "typescript": "catalog:",
-    "vite": "catalog:",
-    "vite-plugin-i18next-loader": "catalog:",
-    "vite-tsconfig-paths": "catalog:"
-  }
-}
+{
+  "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:",
+    "@heroui/styles": "catalog:",
+    "@m5kdev/commons": "catalog:",
+    "@m5kdev/frontend": "catalog:",
+    "@m5kdev/web-ui": "catalog:",
+    "@tanstack/react-query": "catalog:",
+    "@trpc/client": "catalog:",
+    "@trpc/tanstack-react-query": "catalog:",
+    "better-auth": "catalog:",
+    "i18next": "catalog:",
+    "lucide-react": "catalog:",
+    "nuqs": "catalog:",
+    "posthog-js": "catalog:",
+    "react": "catalog:",
+    "react-dom": "catalog:",
+    "react-hook-form": "catalog:",
+    "react-i18next": "catalog:",
+    "react-router": "catalog:",
+    "sonner": "catalog:",
+    "tailwindcss": "catalog:",
+    "tw-animate-css": "catalog:",
+    "zod": "catalog:"
+  },
+  "devDependencies": {
+    "{{PACKAGE_SCOPE}}/server": "workspace:*",
+    "@m5kdev/config": "catalog:",
+    "@tailwindcss/vite": "catalog:",
+    "@types/react": "catalog:",
+    "@types/react-dom": "catalog:",
+    "@vitejs/plugin-react": "catalog:",
+    "babel-plugin-react-compiler": "catalog:",
+    "typescript": "catalog:",
+    "vite": "catalog:",
+    "vite-plugin-i18next-loader": "catalog:",
+    "vite-tsconfig-paths": "catalog:",
+    "@trpc/server": "catalog:"
+  }
+}

package/templates/minimal-app/apps/webapp/public/{push-sw.js → 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;
+    })
+  );
+});

package/templates/minimal-app/apps/webapp/src/App.tsx.tpl

@@ -1,13 +1,44 @@
-import { NuqsAdapter } from "nuqs/adapters/react-router/v7";
-import { BrowserRouter } from "react-router";
-import { Providers } from "./Providers";
-
-export function App() {
-  return (
-    <NuqsAdapter>
-      <BrowserRouter>
-        <Providers />
-      </BrowserRouter>
-    </NuqsAdapter>
-  );
-}
+import { AppConfigProvider } from "@m5kdev/frontend/modules/app/components/AppConfigProvider";
+import { AppTrpcQueryProvider } from "@m5kdev/frontend/modules/app/components/AppTrpcQueryProvider";
+import { AuthProvider } from "@m5kdev/frontend/modules/auth/components/AuthProvider";
+import { DialogProvider } from "@m5kdev/web-ui/components/DialogProvider";
+import { ThemeProvider } from "@m5kdev/web-ui/components/theme-provider";
+import { AppLoader } from "@m5kdev/web-ui/modules/app/components/AppLoader";
+import {
+  APP_LOCALE_CONFIG,
+  APP_NAME,
+  APP_ROLES_CONFIG,
+} from "{{PACKAGE_SCOPE}}/shared/modules/app/app.constants";
+import { NuqsAdapter } from "nuqs/adapters/react-router/v7";
+import { BrowserRouter } from "react-router";
+import { Toaster } from "sonner";
+import { Router } from "./Router";
+
+export function App() {
+  return (
+    <NuqsAdapter>
+      <BrowserRouter>
+        <AppConfigProvider
+          config={{
+            appName: APP_NAME,
+            appUrl: import.meta.env.VITE_APP_URL,
+            serverUrl: import.meta.env.VITE_SERVER_URL,
+            locales: APP_LOCALE_CONFIG,
+            roles: APP_ROLES_CONFIG,
+          }}
+        >
+          <ThemeProvider defaultTheme="light" storageKey="m5kdev-theme">
+            <AuthProvider loader={<AppLoader />}>
+              <AppTrpcQueryProvider>
+                <DialogProvider>
+                  <Router />
+                </DialogProvider>
+                <Toaster richColors closeButton />
+              </AppTrpcQueryProvider>
+            </AuthProvider>
+          </ThemeProvider>
+        </AppConfigProvider>
+      </BrowserRouter>
+    </NuqsAdapter>
+  );
+}

package/templates/minimal-app/apps/webapp/src/Layout.tsx.tpl

@@ -7,15 +7,14 @@ import { AppSidebarUser } from "@m5kdev/web-ui/modules/app/components/AppSidebar
 import { AuthOrganizationSelect } from "@m5kdev/web-ui/modules/auth/components/AuthOrganizationSelect";
 import { AuthUtilityImpersonationBanner } from "@m5kdev/web-ui/modules/auth/components/AuthUtilityImpersonationBanner";
 import { APP_NAME } from "{{PACKAGE_SCOPE}}/shared/modules/app/app.constants";
+import { FileIcon, UsersIcon } from "lucide-react";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useNavigate } from "react-router";
-import { PushNotificationsPanel } from "./modules/notification/PushNotificationsPanel";
-import { APP_ROUTES, buildNavigationItems } from "./navigation/navigation.config";
 
 export function Layout() {
   const { data: session } = useSession();
-  const { t } = useTranslation("blog{{PACKAGE_SCOPE}}");
+  const { t } = useTranslation("{{APP_SLUG}}");
   const navigate = useNavigate();
 
   // ephemeral UI state: which collapsible sidebar groups are open
@@ -37,21 +36,28 @@ export function Layout() {
               <AuthOrganizationSelect />
             </div>
             <AppSidebarContent
-              navigationItems={buildNavigationItems(t)}
+              navigationItems={[
+                {
+                  label: t("layout.navigation.posts"),
+                  icon: <FileIcon />,
+                  link: "/",
+                },
+                {
+                  label: t("layout.navigation.members"),
+                  icon: <UsersIcon />,
+                  link: "/organization/members",
+                },
+              ]}
               navigationState={navigationState}
               onNavigationStateChange={setNavigationState}
             />
-            <div className="mt-auto px-2 group-data-[collapsible=icon]:hidden">
-              <PushNotificationsPanel />
-            </div>
           </>
         ),
         footer: (
-          <AppSidebarUser
-            user={session?.user}
-            onSignOut={onSignOut}
-            organizationSettingsPath={APP_ROUTES.organization.preferences}
-          />
+          // data-testid so e2e (and app tests) can assert on the signed-in user
+          <div data-testid="session-email" className="contents">
+            <AppSidebarUser user={session?.user} onSignOut={onSignOut} />
+          </div>
         ),
       }}
     />