create-questpie 1.0.0 → 2.0.1

package/templates/tanstack-start/src/questpie/server/globals/site-settings.global.ts

@@ -1,24 +1,19 @@
-import { qb } from "@/questpie/server/builder.js";
+import { global } from "#questpie/factories";
 
-export const siteSettings = qb
-	.global("site_settings")
-	.fields((f) => ({
-		siteName: f.text({
-			label: "Site Name",
-			required: true,
-			default: "{{projectName}}",
-		}),
-		description: f.textarea({
-			label: "Site Description",
-			default: "A QUESTPIE CMS powered site",
-		}),
+export const siteSettings = global("siteSettings")
+	.fields(({ f }) => ({
+		siteName: f.text().label("Site Name").required().default("{{projectName}}"),
+		description: f
+			.textarea()
+			.label("Site Description")
+			.default("A QUESTPIE powered site"),
 	}))
 	.admin(({ c }) => ({
 		label: "Site Settings",
 		icon: c.icon("ph:gear"),
 	}))
 	.form(({ v, f }) =>
-		v.form({
+		v.globalForm({
 			fields: [f.siteName, f.description],
 		}),
 	);

package/templates/tanstack-start/src/questpie/server/modules.ts

@@ -0,0 +1,10 @@
+/**
+ * Modules — static module dependencies for this project.
+ */
+import { adminModule } from "@questpie/admin/server";
+import { openApiModule } from "@questpie/openapi";
+
+export default [
+	adminModule,
+	openApiModule,
+] as const;

package/templates/tanstack-start/src/questpie/server/questpie.config.ts

@@ -0,0 +1,20 @@
+/**
+ * QUESTPIE Runtime Configuration
+ *
+ * Runtime-only configuration: database, adapters, secrets.
+ * Entity definitions (collections, globals, etc.) are codegen-generated.
+ * Admin sidebar, dashboard, and branding live in config/admin.ts.
+ */
+
+import { ConsoleAdapter, runtimeConfig } from "questpie";
+
+import { env } from "@/lib/env.js";
+
+export default runtimeConfig({
+	app: { url: env.APP_URL },
+	db: { url: env.DATABASE_URL },
+	storage: { basePath: "/api" },
+	email: {
+		adapter: new ConsoleAdapter({ logHtml: false }),
+	},
+});

package/templates/tanstack-start/src/router.tsx

@@ -1,10 +1,11 @@
 import { createRouter } from "@tanstack/react-router";
+
 import { routeTree } from "./routeTree.gen";
 
 export function getRouter() {
-  return createRouter({
-    routeTree,
-    scrollRestoration: true,
-    defaultPreloadStaleTime: 0,
-  });
+	return createRouter({
+		routeTree,
+		scrollRestoration: true,
+		defaultPreloadStaleTime: 0,
+	});
 }

package/templates/tanstack-start/src/routes/__root.tsx

@@ -1,16 +1,18 @@
+import "virtual:iconify-preload";
+
 import { createRootRoute } from "@tanstack/react-router";
 
 export const Route = createRootRoute({
-  head: () => ({
-    meta: [
-      { charSet: "utf-8" },
-      { name: "viewport", content: "width=device-width, initial-scale=1" },
-      { title: "{{projectName}}" },
-    ],
-  }),
-  shellComponent: RootDocument,
+	head: () => ({
+		meta: [
+			{ charSet: "utf-8" },
+			{ name: "viewport", content: "width=device-width, initial-scale=1" },
+			{ title: "{{projectName}}" },
+		],
+	}),
+	shellComponent: RootDocument,
 });
 
 function RootDocument({ children }: { children: React.ReactNode }) {
-  return <>{children}</>;
+	return <>{children}</>;
 }

package/templates/tanstack-start/src/routes/admin/$.tsx

@@ -1,21 +1,22 @@
-import { AdminRouter } from "@questpie/admin/client";
 import { createFileRoute, useNavigate } from "@tanstack/react-router";
 
+import { AdminRouter } from "@questpie/admin/client";
+
 function AdminCatchAll() {
-  const navigate = useNavigate();
-  const params = Route.useParams();
-  const splat = params._splat as string;
-  const segments = splat ? splat.split("/").filter(Boolean) : [];
+	const navigate = useNavigate();
+	const params = Route.useParams();
+	const splat = params._splat as string;
+	const segments = splat ? splat.split("/").filter(Boolean) : [];
 
-  return (
-    <AdminRouter
-      segments={segments}
-      navigate={(path) => navigate({ to: path })}
-      basePath="/admin"
-    />
-  );
+	return (
+		<AdminRouter
+			segments={segments}
+			navigate={(path) => navigate({ to: path })}
+			basePath="/admin"
+		/>
+	);
 }
 
 export const Route = createFileRoute("/admin/$")({
-  component: AdminCatchAll,
+	component: AdminCatchAll,
 });

package/templates/tanstack-start/src/routes/admin/index.tsx

@@ -1,18 +1,19 @@
-import { AdminRouter } from "@questpie/admin/client";
 import { createFileRoute, useNavigate } from "@tanstack/react-router";
 
+import { AdminRouter } from "@questpie/admin/client";
+
 function AdminDashboard() {
-  const navigate = useNavigate();
+	const navigate = useNavigate();
 
-  return (
-    <AdminRouter
-      segments={[]}
-      navigate={(path) => navigate({ to: path })}
-      basePath="/admin"
-    />
-  );
+	return (
+		<AdminRouter
+			segments={[]}
+			navigate={(path) => navigate({ to: path })}
+			basePath="/admin"
+		/>
+	);
 }
 
 export const Route = createFileRoute("/admin/")({
-  component: AdminDashboard,
+	component: AdminDashboard,
 });

package/templates/tanstack-start/src/routes/admin/login.tsx

@@ -1,17 +1,18 @@
-import { LoginPage } from "@questpie/admin/client";
 import { createFileRoute } from "@tanstack/react-router";
 
+import { LoginPage } from "@questpie/admin/client";
+
 export const Route = createFileRoute("/admin/login")({
-  component: AdminLoginPage,
+	component: AdminLoginPage,
 });
 
 function AdminLoginPage() {
-  return (
-    <LoginPage
-      title="Welcome back"
-      description="Sign in to access admin panel"
-      showForgotPassword={false}
-      showSignUp={false}
-    />
-  );
+	return (
+		<LoginPage
+			title="Welcome back"
+			description="Sign in to access admin panel"
+			showForgotPassword={false}
+			showSignUp={false}
+		/>
+	);
 }

package/templates/tanstack-start/src/routes/admin.tsx

@@ -1,68 +1,69 @@
-import { AdminLayoutProvider } from "@questpie/admin/client";
 import {
-  createFileRoute,
-  HeadContent,
-  Link,
-  Outlet,
-  Scripts,
-  useLocation,
+	createFileRoute,
+	HeadContent,
+	Link,
+	Outlet,
+	Scripts,
+	useLocation,
 } from "@tanstack/react-router";
-import { authClient } from "~/lib/auth-client";
-import { client } from "~/lib/cms-client";
-import { queryClient } from "~/lib/query-client";
-import { admin } from "~/questpie/admin/admin";
+
+import { authClient } from "@/lib/auth-client";
+import { client } from "@/lib/client";
+import { queryClient } from "@/lib/query-client";
+import { admin } from "@/questpie/admin/admin";
+import { AdminLayoutProvider } from "@questpie/admin/client";
 
 import adminCss from "../admin.css?url";
 
 function AdminLink({
-  to,
-  className,
-  children,
-  activeProps,
+	to,
+	className,
+	children,
+	activeProps,
 }: {
-  to: string;
-  className?: string;
-  children: React.ReactNode;
-  activeProps?: { className?: string };
+	to: string;
+	className?: string;
+	children: React.ReactNode;
+	activeProps?: { className?: string };
 }) {
-  return (
-    <Link to={to} className={className} activeProps={activeProps}>
-      {children}
-    </Link>
-  );
+	return (
+		<Link to={to} className={className} activeProps={activeProps}>
+			{children}
+		</Link>
+	);
 }
 
 export const Route = createFileRoute("/admin")({
-  head: () => ({
-    title: "Admin Panel",
-    links: [{ rel: "stylesheet", href: adminCss }],
-  }),
-  component: AdminLayout,
+	head: () => ({
+		title: "Admin Panel",
+		links: [{ rel: "stylesheet", href: adminCss }],
+	}),
+	component: AdminLayout,
 });
 
 function AdminLayout() {
-  const location = useLocation();
+	const location = useLocation();
 
-  return (
-    <html lang="en" className="dark">
-      <head>
-        <HeadContent />
-      </head>
-      <body>
-        <AdminLayoutProvider
-          admin={admin}
-          client={client}
-          queryClient={queryClient}
-          authClient={authClient}
-          LinkComponent={AdminLink}
-          activeRoute={location.pathname}
-          basePath="/admin"
-          useServerTranslations
-        >
-          <Outlet />
-        </AdminLayoutProvider>
-        <Scripts />
-      </body>
-    </html>
-  );
+	return (
+		<html lang="en" className="dark">
+			<head>
+				<HeadContent />
+			</head>
+			<body>
+				<AdminLayoutProvider
+					admin={admin}
+					client={client}
+					queryClient={queryClient}
+					authClient={authClient}
+					LinkComponent={AdminLink}
+					activeRoute={location.pathname}
+					basePath="/admin"
+					useServerTranslations
+				>
+					<Outlet />
+				</AdminLayoutProvider>
+				<Scripts />
+			</body>
+		</html>
+	);
 }

package/templates/tanstack-start/src/routes/api/{cms/$.ts → $.ts}

@@ -1,25 +1,11 @@
-import { withOpenApi } from "@questpie/openapi";
 import { createFileRoute } from "@tanstack/react-router";
 import { createFetchHandler } from "questpie";
-import { appRpc, cms } from "@/questpie/server/app.js";
 
-const handler = withOpenApi(
-	createFetchHandler(cms, {
-		basePath: "/api/cms",
-		rpc: appRpc,
-	}),
-	{
-		cms,
-		rpc: appRpc,
-		basePath: "/api/cms",
-		info: {
-			title: "{{projectName}} API",
-			version: "1.0.0",
-			description: "QUESTPIE CMS API",
-		},
-		scalar: { theme: "purple" },
-	},
-);
+import { app } from "@/questpie/server/app.js";
+
+const handler = createFetchHandler(app, {
+	basePath: "/api",
+});
 
 const handleCmsRequest = async (request: Request) => {
 	const response = await handler(request);
@@ -32,7 +18,7 @@ const handleCmsRequest = async (request: Request) => {
 	);
 };
 
-export const Route = createFileRoute("/api/cms/$")({
+export const Route = createFileRoute("/api/$")({
 	server: {
 		handlers: {
 			GET: ({ request }) => handleCmsRequest(request),

package/templates/tanstack-start/src/styles.css

@@ -4,122 +4,122 @@
 @custom-variant dark (&:is(.dark *));
 
 :root {
-  --background: oklch(0.985 0 0);
-  --foreground: oklch(0.145 0 0);
-  --card: oklch(1 0 0);
-  --card-foreground: oklch(0.145 0 0);
-  --popover: oklch(1 0 0);
-  --popover-foreground: oklch(0.145 0 0);
-  --primary: oklch(0.205 0 0);
-  --primary-foreground: oklch(0.985 0 0);
-  --secondary: oklch(0.97 0 0);
-  --secondary-foreground: oklch(0.205 0 0);
-  --muted: oklch(0.97 0 0);
-  --muted-foreground: oklch(0.556 0 0);
-  --accent: oklch(0.97 0 0);
-  --accent-foreground: oklch(0.205 0 0);
-  --destructive: oklch(0.58 0.22 27);
-  --destructive-foreground: oklch(0.985 0 0);
-  --border: oklch(0.922 0 0);
-  --input: oklch(0.922 0 0);
-  --ring: oklch(0.708 0 0);
-  --chart-1: oklch(0.75 0.18 25);
-  --chart-2: oklch(0.65 0.15 45);
-  --chart-3: oklch(0.55 0.12 65);
-  --chart-4: oklch(0.45 0.09 85);
-  --chart-5: oklch(0.35 0.06 105);
-  --radius: 0.5rem;
-  --sidebar: oklch(0.985 0 0);
-  --sidebar-foreground: oklch(0.145 0 0);
-  --sidebar-primary: oklch(0.205 0 0);
-  --sidebar-primary-foreground: oklch(0.985 0 0);
-  --sidebar-accent: oklch(0.97 0 0);
-  --sidebar-accent-foreground: oklch(0.205 0 0);
-  --sidebar-border: oklch(0.922 0 0);
-  --sidebar-ring: oklch(0.708 0 0);
+	--background: oklch(0.985 0 0);
+	--foreground: oklch(0.145 0 0);
+	--card: oklch(1 0 0);
+	--card-foreground: oklch(0.145 0 0);
+	--popover: oklch(1 0 0);
+	--popover-foreground: oklch(0.145 0 0);
+	--primary: oklch(0.205 0 0);
+	--primary-foreground: oklch(0.985 0 0);
+	--secondary: oklch(0.97 0 0);
+	--secondary-foreground: oklch(0.205 0 0);
+	--muted: oklch(0.97 0 0);
+	--muted-foreground: oklch(0.556 0 0);
+	--accent: oklch(0.97 0 0);
+	--accent-foreground: oklch(0.205 0 0);
+	--destructive: oklch(0.58 0.22 27);
+	--destructive-foreground: oklch(0.985 0 0);
+	--border: oklch(0.922 0 0);
+	--input: oklch(0.922 0 0);
+	--ring: oklch(0.708 0 0);
+	--chart-1: oklch(0.75 0.18 25);
+	--chart-2: oklch(0.65 0.15 45);
+	--chart-3: oklch(0.55 0.12 65);
+	--chart-4: oklch(0.45 0.09 85);
+	--chart-5: oklch(0.35 0.06 105);
+	--radius: 0.5rem;
+	--sidebar: oklch(0.985 0 0);
+	--sidebar-foreground: oklch(0.145 0 0);
+	--sidebar-primary: oklch(0.205 0 0);
+	--sidebar-primary-foreground: oklch(0.985 0 0);
+	--sidebar-accent: oklch(0.97 0 0);
+	--sidebar-accent-foreground: oklch(0.205 0 0);
+	--sidebar-border: oklch(0.922 0 0);
+	--sidebar-ring: oklch(0.708 0 0);
 }
 
 .dark {
-  --background: oklch(0.12 0 0);
-  --foreground: oklch(0.985 0 0);
-  --card: oklch(0.17 0 0);
-  --card-foreground: oklch(0.985 0 0);
-  --popover: oklch(0.17 0 0);
-  --popover-foreground: oklch(0.985 0 0);
-  --primary: oklch(0.985 0 0);
-  --primary-foreground: oklch(0.12 0 0);
-  --secondary: oklch(0.22 0 0);
-  --secondary-foreground: oklch(0.985 0 0);
-  --muted: oklch(0.22 0 0);
-  --muted-foreground: oklch(0.65 0 0);
-  --accent: oklch(0.27 0 0);
-  --accent-foreground: oklch(0.985 0 0);
-  --destructive: oklch(0.704 0.191 22.216);
-  --destructive-foreground: oklch(0.985 0 0);
-  --border: oklch(0.27 0 0);
-  --input: oklch(0.27 0 0);
-  --ring: oklch(0.45 0 0);
-  --chart-1: oklch(0.75 0.18 25);
-  --chart-2: oklch(0.65 0.15 45);
-  --chart-3: oklch(0.55 0.12 65);
-  --chart-4: oklch(0.45 0.09 85);
-  --chart-5: oklch(0.35 0.06 105);
-  --sidebar: oklch(0.17 0 0);
-  --sidebar-foreground: oklch(0.985 0 0);
-  --sidebar-primary: oklch(0.985 0 0);
-  --sidebar-primary-foreground: oklch(0.12 0 0);
-  --sidebar-accent: oklch(0.22 0 0);
-  --sidebar-accent-foreground: oklch(0.985 0 0);
-  --sidebar-border: oklch(0.27 0 0);
-  --sidebar-ring: oklch(0.45 0 0);
+	--background: oklch(0.12 0 0);
+	--foreground: oklch(0.985 0 0);
+	--card: oklch(0.17 0 0);
+	--card-foreground: oklch(0.985 0 0);
+	--popover: oklch(0.17 0 0);
+	--popover-foreground: oklch(0.985 0 0);
+	--primary: oklch(0.985 0 0);
+	--primary-foreground: oklch(0.12 0 0);
+	--secondary: oklch(0.22 0 0);
+	--secondary-foreground: oklch(0.985 0 0);
+	--muted: oklch(0.22 0 0);
+	--muted-foreground: oklch(0.65 0 0);
+	--accent: oklch(0.27 0 0);
+	--accent-foreground: oklch(0.985 0 0);
+	--destructive: oklch(0.704 0.191 22.216);
+	--destructive-foreground: oklch(0.985 0 0);
+	--border: oklch(0.27 0 0);
+	--input: oklch(0.27 0 0);
+	--ring: oklch(0.45 0 0);
+	--chart-1: oklch(0.75 0.18 25);
+	--chart-2: oklch(0.65 0.15 45);
+	--chart-3: oklch(0.55 0.12 65);
+	--chart-4: oklch(0.45 0.09 85);
+	--chart-5: oklch(0.35 0.06 105);
+	--sidebar: oklch(0.17 0 0);
+	--sidebar-foreground: oklch(0.985 0 0);
+	--sidebar-primary: oklch(0.985 0 0);
+	--sidebar-primary-foreground: oklch(0.12 0 0);
+	--sidebar-accent: oklch(0.22 0 0);
+	--sidebar-accent-foreground: oklch(0.985 0 0);
+	--sidebar-border: oklch(0.27 0 0);
+	--sidebar-ring: oklch(0.45 0 0);
 }
 
 @theme inline {
-  --font-sans: ui-sans-serif, system-ui, sans-serif;
-  --color-background: var(--background);
-  --color-foreground: var(--foreground);
-  --color-card: var(--card);
-  --color-card-foreground: var(--card-foreground);
-  --color-popover: var(--popover);
-  --color-popover-foreground: var(--popover-foreground);
-  --color-primary: var(--primary);
-  --color-primary-foreground: var(--primary-foreground);
-  --color-secondary: var(--secondary);
-  --color-secondary-foreground: var(--secondary-foreground);
-  --color-muted: var(--muted);
-  --color-muted-foreground: var(--muted-foreground);
-  --color-accent: var(--accent);
-  --color-accent-foreground: var(--accent-foreground);
-  --color-destructive: var(--destructive);
-  --color-destructive-foreground: var(--destructive-foreground);
-  --color-border: var(--border);
-  --color-input: var(--input);
-  --color-ring: var(--ring);
-  --color-chart-1: var(--chart-1);
-  --color-chart-2: var(--chart-2);
-  --color-chart-3: var(--chart-3);
-  --color-chart-4: var(--chart-4);
-  --color-chart-5: var(--chart-5);
-  --color-sidebar: var(--sidebar);
-  --color-sidebar-foreground: var(--sidebar-foreground);
-  --color-sidebar-primary: var(--sidebar-primary);
-  --color-sidebar-primary-foreground: var(--sidebar-primary-foreground);
-  --color-sidebar-accent: var(--sidebar-accent);
-  --color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
-  --color-sidebar-border: var(--sidebar-border);
-  --color-sidebar-ring: var(--sidebar-ring);
-  --radius-sm: calc(var(--radius) - 4px);
-  --radius-md: calc(var(--radius) - 2px);
-  --radius-lg: var(--radius);
-  --radius-xl: calc(var(--radius) + 4px);
-  --radius-2xl: calc(var(--radius) + 8px);
+	--font-sans: ui-sans-serif, system-ui, sans-serif;
+	--color-background: var(--background);
+	--color-foreground: var(--foreground);
+	--color-card: var(--card);
+	--color-card-foreground: var(--card-foreground);
+	--color-popover: var(--popover);
+	--color-popover-foreground: var(--popover-foreground);
+	--color-primary: var(--primary);
+	--color-primary-foreground: var(--primary-foreground);
+	--color-secondary: var(--secondary);
+	--color-secondary-foreground: var(--secondary-foreground);
+	--color-muted: var(--muted);
+	--color-muted-foreground: var(--muted-foreground);
+	--color-accent: var(--accent);
+	--color-accent-foreground: var(--accent-foreground);
+	--color-destructive: var(--destructive);
+	--color-destructive-foreground: var(--destructive-foreground);
+	--color-border: var(--border);
+	--color-input: var(--input);
+	--color-ring: var(--ring);
+	--color-chart-1: var(--chart-1);
+	--color-chart-2: var(--chart-2);
+	--color-chart-3: var(--chart-3);
+	--color-chart-4: var(--chart-4);
+	--color-chart-5: var(--chart-5);
+	--color-sidebar: var(--sidebar);
+	--color-sidebar-foreground: var(--sidebar-foreground);
+	--color-sidebar-primary: var(--sidebar-primary);
+	--color-sidebar-primary-foreground: var(--sidebar-primary-foreground);
+	--color-sidebar-accent: var(--sidebar-accent);
+	--color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
+	--color-sidebar-border: var(--sidebar-border);
+	--color-sidebar-ring: var(--sidebar-ring);
+	--radius-sm: calc(var(--radius) - 4px);
+	--radius-md: calc(var(--radius) - 2px);
+	--radius-lg: var(--radius);
+	--radius-xl: calc(var(--radius) + 4px);
+	--radius-2xl: calc(var(--radius) + 8px);
 }
 
 @layer base {
-  * {
-    @apply border-border outline-ring/50;
-  }
-  body {
-    @apply font-sans bg-background text-foreground;
-  }
+	* {
+		@apply border-border outline-ring/50;
+	}
+	body {
+		@apply bg-background text-foreground font-sans;
+	}
 }

package/templates/tanstack-start/tsconfig.json

@@ -1,27 +1,29 @@
 {
-  "include": ["src/**/*.ts", "src/**/*.tsx", "*.config.ts"],
-  "exclude": ["node_modules", "dist", "**/*.test.ts"],
-  "compilerOptions": {
-    "target": "ES2022",
-    "jsx": "react-jsx",
-    "module": "ESNext",
-    "lib": ["ES2022", "DOM", "DOM.Iterable"],
-    "types": ["vite/client"],
-    "moduleResolution": "bundler",
-    "resolveJsonModule": true,
-    "allowImportingTsExtensions": true,
-    "verbatimModuleSyntax": false,
-    "noEmit": true,
-    "skipLibCheck": true,
-    "strict": true,
-    "noUnusedLocals": false,
-    "noUnusedParameters": false,
-    "noFallthroughCasesInSwitch": true,
-    "noUncheckedSideEffectImports": true,
-    "baseUrl": ".",
-    "paths": {
-      "@/*": ["./src/*"],
-      "~/*": ["./src/*"]
-    }
-  }
+	"include": ["src/**/*.ts", "src/**/*.tsx", "*.config.ts"],
+	"exclude": ["node_modules", "dist", "**/*.test.ts"],
+	"compilerOptions": {
+		"target": "ES2022",
+		"jsx": "react-jsx",
+		"module": "ESNext",
+		"lib": ["ES2022", "DOM", "DOM.Iterable"],
+		"types": ["vite/client"],
+		"moduleResolution": "bundler",
+		"resolveJsonModule": true,
+		"allowImportingTsExtensions": true,
+		"verbatimModuleSyntax": false,
+		"noEmit": true,
+		"skipLibCheck": true,
+		"strict": true,
+		"noUnusedLocals": false,
+		"noUnusedParameters": false,
+		"noFallthroughCasesInSwitch": true,
+		"noUncheckedSideEffectImports": true,
+		"baseUrl": ".",
+		"paths": {
+			"@/*": ["./src/*"],
+			"~/*": ["./src/*"],
+			"#questpie": ["./src/questpie/server/.generated/index.ts"],
+			"#questpie/*": ["./src/questpie/server/.generated/*"]
+		}
+	}
 }