create-avalon 0.1.10 → 0.1.12

package/dist/cli.js

@@ -1192,7 +1192,7 @@ async function collectProjectConfig(initialName) {
 
 // src/scaffold.ts
 import { mkdir, writeFile } from "node:fs/promises";
-import { join } from "node:path";
+import { join, dirname } from "node:path";
 
 // src/types.ts
 var INTEGRATION_PACKAGES = {
@@ -1254,6 +1254,8 @@ function generatePackageJson(config) {
       devDependencies["tailwindcss"] = "latest";
       devDependencies["@tailwindcss/vite"] = "latest";
       dependencies["@shadcn/ui"] = "latest";
+      dependencies["tailwind-merge"] = "^3.5.0";
+      dependencies["clsx"] = "^2.1.1";
       break;
   }
   const pkg = {
@@ -1282,20 +1284,33 @@ function generateTsConfig() {
       esModuleInterop: true,
       skipLibCheck: true,
       allowArbitraryExtensions: true,
+      allowImportingTsExtensions: true,
+      noEmit: true,
       jsx: "react-jsx",
       paths: {
         "@shared/*": ["./app/shared/*"],
         "@modules/*": ["./app/modules/*"]
       }
     },
-    include: ["app/**/*.ts", "app/**/*.tsx", "server/**/*.ts", "routes/**/*.ts", "middleware/**/*.ts"]
+    include: ["app/**/*.ts", "app/**/*.tsx", "app/**/*.d.ts", "server/**/*.ts", "routes/**/*.ts", "middleware/**/*.ts"]
   };
   return JSON.stringify(tsconfig, null, 2);
 }
+function generateEnvDts() {
+  return `/// <reference types="@useavalon/avalon/types" />
+
+// Virtual module declarations
+declare module 'virtual:avalon/config' {
+  const config: Record<string, unknown>;
+  export default config;
+}
+`;
+}
 
 // src/templates/vite-config.ts
 function generateViteConfig(config) {
   const imports = [
+    `import { resolve } from 'node:path';`,
     `import { defineConfig, type UserConfig } from 'vite';`,
     `import { avalon } from '@useavalon/avalon';`
   ];
@@ -1348,6 +1363,14 @@ function generateViteConfig(config) {
 `),
     `    ],`,
     ``,
+    `    resolve: {`,
+    `      alias: {`,
+    `        '@shared': resolve(__dirname, 'app/shared'),`,
+    `        '@modules': resolve(__dirname, 'app/modules'),`,
+    `        '@': resolve(__dirname, 'app'),`,
+    `      },`,
+    `    },`,
+    ``,
     `    server: {`,
     `      port: 3000,`,
     `    },`,
@@ -1453,91 +1476,32 @@ export default async function HomePage() {
 }
 
 // src/templates/middleware.ts
-function generateSampleMiddleware(config) {
-  switch (config.middleware) {
-    case "h3":
-      return generateH3Middleware();
-    case "hono":
-      return generateHonoMiddleware();
-    case "elysia":
-      return generateElysiaMiddleware();
-  }
-}
-function generateH3Middleware() {
-  return `import { defineHandler } from 'nitro/h3';
+function generateSampleMiddleware(_config) {
+  return `import { defineHandler } from 'nitro';
 
 export default defineHandler((event) => {
-  console.log(\`[\${new Date().toISOString()}] \${event.method} \${event.path}\`);
-});
-`;
-}
-function generateHonoMiddleware() {
-  return `import { Hono } from 'hono';
-
-const app = new Hono();
-
-app.use('*', async (c, next) => {
-  console.log(\`[\${new Date().toISOString()}] \${c.req.method} \${c.req.path}\`);
-  await next();
+  console.log(\`[\${new Date().toISOString()}] \${event.req.method} \${event.url.pathname}\`);
 });
-
-export default app;
-`;
-}
-function generateElysiaMiddleware() {
-  return `import { Elysia } from 'elysia';
-
-export default new Elysia()
-  .onBeforeHandle(({ request }) => {
-    console.log(\`[\${new Date().toISOString()}] \${request.method} \${new URL(request.url).pathname}\`);
-  });
 `;
 }
 
 // src/templates/api-routes.ts
-function generateHelloRoute(config) {
-  switch (config.middleware) {
-    case "h3":
-      return generateH3Route();
-    case "hono":
-      return generateHonoRoute();
-    case "elysia":
-      return generateElysiaRoute();
-  }
-}
-function generateH3Route() {
-  return `import { defineHandler } from 'nitro/h3';
+function generateHelloRoute(_config) {
+  return `import { defineHandler } from 'nitro';
 
 export default defineHandler(() => {
-  return { message: 'Hello from Avalon!' };
+  return Response.json({ message: 'Hello from Avalon!' });
 });
 `;
 }
-function generateHonoRoute() {
-  return `import { Hono } from 'hono';
-
-const app = new Hono();
-
-app.get('/', (c) => {
-  return c.json({ message: 'Hello from Avalon!' });
-});
-
-export default app;
-`;
-}
-function generateElysiaRoute() {
-  return `import { Elysia } from 'elysia';
-
-export default new Elysia()
-  .get('/', () => ({ message: 'Hello from Avalon!' }));
-`;
-}
 
 // src/templates/styling.ts
 function generateStylingFiles(config) {
   const files = new Map;
   files.set("app/shared/styles/main.css", generateMainCss(config));
-  files.set("app/shared/styles/reset.css", generateResetCss());
+  if (config.styling === "css-modules") {
+    files.set("app/shared/styles/reset.css", generateResetCss());
+  }
   switch (config.styling) {
     case "css-modules":
       files.set("app/shared/styles/tokens.css", generateTokensCss());
@@ -1547,19 +1511,21 @@ function generateStylingFiles(config) {
       break;
     case "tailwind":
       files.set("tailwind.config.js", generateTailwindConfig());
-      files.set("app/shared/styles/global.css", generateTailwindGlobalCss());
+      files.set("app/shared/styles/global.css", generateTailwindGlobalCss(config));
       break;
     case "shadcn":
       files.set("tailwind.config.js", generateTailwindConfig());
-      files.set("app/shared/styles/global.css", generateTailwindGlobalCss());
+      files.set("app/shared/styles/global.css", generateTailwindGlobalCss(config));
       files.set("components.json", generateShadcnComponentsJson(config));
+      files.set("app/shared/utils/cn.ts", generateCnUtil());
       break;
   }
   return files;
 }
 function generateMainCss(config) {
-  const imports = [`@import './reset.css';`];
+  const imports = [];
   if (config.styling === "css-modules") {
+    imports.push(`@import './reset.css';`);
     imports.push(`@import './tokens.css';`);
   } else {
     imports.push(`@import './global.css';`);
@@ -1667,8 +1633,47 @@ export default {
 };
 `;
 }
-function generateTailwindGlobalCss() {
-  return `@import "tailwindcss";
+function generateTailwindGlobalCss(config) {
+  const lines = [`@import "tailwindcss";`];
+  if (config.styling === "shadcn") {
+    lines.push("");
+    lines.push(`@theme inline {
+  --color-background: oklch(1 0 0);
+  --color-foreground: oklch(0.145 0 0);
+  --color-card: oklch(1 0 0);
+  --color-card-foreground: oklch(0.145 0 0);
+  --color-popover: oklch(1 0 0);
+  --color-popover-foreground: oklch(0.145 0 0);
+  --color-primary: oklch(0.205 0 0);
+  --color-primary-foreground: oklch(0.985 0 0);
+  --color-secondary: oklch(0.97 0 0);
+  --color-secondary-foreground: oklch(0.205 0 0);
+  --color-muted: oklch(0.97 0 0);
+  --color-muted-foreground: oklch(0.556 0 0);
+  --color-accent: oklch(0.97 0 0);
+  --color-accent-foreground: oklch(0.205 0 0);
+  --color-destructive: oklch(0.577 0.245 27.325);
+  --color-destructive-foreground: oklch(0.577 0.245 27.325);
+  --color-border: oklch(0.922 0 0);
+  --color-input: oklch(0.922 0 0);
+  --color-ring: oklch(0.708 0 0);
+  --radius-sm: 0.25rem;
+  --radius-md: 0.375rem;
+  --radius-lg: 0.5rem;
+  --radius-xl: 0.75rem;
+}`);
+  }
+  return lines.join(`
+`) + `
+`;
+}
+function generateCnUtil() {
+  return `import { clsx, type ClassValue } from 'clsx';
+import { twMerge } from 'tailwind-merge';
+
+export function cn(...inputs: ClassValue[]) {
+  return twMerge(clsx(inputs));
+}
 `;
 }
 function generateShadcnComponentsJson(config) {
@@ -1695,6 +1700,39 @@ function getFaviconBuffer() {
 }
 
 // src/scaffold.ts
+function generateHonoServerEntry() {
+  return `import { Hono } from 'hono';
+
+const app = new Hono();
+
+// Add your Hono middleware and routes here.
+// This file is the Nitro server entry using the web fetch interface.
+// Route files in routes/ still use defineHandler from 'nitro'.
+
+app.use('*', async (c, next) => {
+  console.log(\`[\${new Date().toISOString()}] \${c.req.method} \${c.req.path}\`);
+  await next();
+});
+
+export default app;
+`;
+}
+function generateElysiaServerEntry() {
+  return `import { Elysia } from 'elysia';
+
+const app = new Elysia();
+
+// Add your Elysia middleware and routes here.
+// This file is the Nitro server entry using the web fetch interface.
+// Route files in routes/ still use defineHandler from 'nitro'.
+
+app.onBeforeHandle(({ request }) => {
+  console.log(\`[\${new Date().toISOString()}] \${request.method} \${new URL(request.url).pathname}\`);
+});
+
+export default app;
+`;
+}
 async function scaffoldProject(config, targetDir) {
   await mkdir(targetDir, { recursive: true });
   for (const dir of BASE_DIRS) {
@@ -1708,13 +1746,20 @@ async function scaffoldProject(config, targetDir) {
   await writeFile(join(targetDir, "app/modules/home/pages/index.tsx"), generateHomePage(config));
   await writeFile(join(targetDir, "middleware/01.logger.ts"), generateSampleMiddleware(config));
   await writeFile(join(targetDir, "routes/api/hello.ts"), generateHelloRoute(config));
+  if (config.middleware === "hono") {
+    await writeFile(join(targetDir, "server.ts"), generateHonoServerEntry());
+  } else if (config.middleware === "elysia") {
+    await writeFile(join(targetDir, "server.ts"), generateElysiaServerEntry());
+  }
   const stylingFiles = generateStylingFiles(config);
   for (const [filePath, content] of stylingFiles) {
+    await mkdir(join(targetDir, dirname(filePath)), { recursive: true });
     await writeFile(join(targetDir, filePath), content);
   }
   await writeFile(join(targetDir, "public/favicon.ico"), getFaviconBuffer());
   await writeFile(join(targetDir, "server/env.d.ts"), `/// <reference types="nitro" />
 `);
+  await writeFile(join(targetDir, "app/env.d.ts"), generateEnvDts());
   await writeFile(join(targetDir, "server/renderer.ts"), [
     `import { createNitroRenderer } from '@useavalon/avalon/nitro/renderer';`,
     `import avalonConfig from 'virtual:avalon/config';`,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "create-avalon",
-	"version": "0.1.10",
+	"version": "0.1.12",
 	"description": "Scaffold a new Avalon project with multi-framework islands architecture",
 	"license": "MIT",
 	"type": "module",