npm - weifuwu - Versions diffs - 0.27.7 → 0.27.9 - Mend

weifuwu 0.27.7 → 0.27.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/cli.js CHANGED Viewed

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 // cli.ts
-import { mkdir, writeFile } from "node:fs/promises";
+import { mkdir, writeFile, readFile, cp } from "node:fs/promises";
 import { existsSync } from "node:fs";
 import { execSync } from "node:child_process";
 import { join, dirname, resolve } from "node:path";
@@ -65,226 +65,14 @@ async function generateMinimal(targetDir, name, version, skipInstall) {
   await finishInit(targetDir, skipInstall);
 }
 async function generateFull(targetDir, name, version, skipInstall) {
-  await mkdir(targetDir, { recursive: true });
-  await mkdir(join(targetDir, "ui", "app"), { recursive: true });
-  await mkdir(join(targetDir, "ui", "lib"), { recursive: true });
-  await mkdir(join(targetDir, "locales"), { recursive: true });
+  const templateDir = existsSync(join(__dirname, "cli", "template")) ? join(__dirname, "cli", "template") : join(__dirname, "template");
+  await cp(templateDir, targetDir, { recursive: true });
+  const pkgPath = join(targetDir, "package.json");
+  const pkgContent = await readFile(pkgPath, "utf-8");
   await writeFile(
-    join(targetDir, "app.ts"),
-    [
-      `import { Router, layout, view, theme, i18n, cssContext, cssRouter, assetRouter } from 'weifuwu'`,
-      ``,
-      `export const app = new Router()`,
-      ``,
-      `// Middleware`,
-      `app.use(theme())`,
-      `app.use(i18n({ dir: './locales' }))`,
-      `app.use(cssContext('./ui'))`,
-      ``,
-      `// Layout \u2014 wraps all pages`,
-      `app.use(layout('./ui/app/layout.ts'))`,
-      ``,
-      `// Static assets (HTMX, Alpine)`,
-      `app.use('/', assetRouter())`,
-      ``,
-      `// CSS serving`,
-      `app.use('/', cssRouter('./ui'))`,
-      ``,
-      `// Pages`,
-      `app.get('/', view('./ui/app/page.ts'))`,
-      ``,
-      `// API route`,
-      `app.get('/api/ping', () => Response.json({ pong: true, time: new Date().toISOString() }))`,
-      ``
-    ].join("\n")
+    pkgPath,
+    pkgContent.replace("__PROJECT_NAME__", name).replace("__VERSION__", version)
   );
-  await writeFile(
-    join(targetDir, "index.ts"),
-    [
-      `import { loadEnv, serve } from 'weifuwu'`,
-      `import { app } from './app.ts'`,
-      ``,
-      `loadEnv()`,
-      `const port = Number(process.env.PORT) || 3000`,
-      `serve(app.handler(), { port })`,
-      ``
-    ].join("\n")
-  );
-  await writeFile(
-    join(targetDir, "ui", "app", "globals.css"),
-    [`@import "tailwindcss";`, `@custom-variant dark (&:is(.dark *));`, ``].join("\n")
-  );
-  await writeFile(
-    join(targetDir, "ui", "app", "layout.ts"),
-    [
-      `import { html, raw, assetScripts } from 'weifuwu'`,
-      ``,
-      `export default function(body: string, ctx: any) {`,
-      `  // Theme: resolve before paint to prevent flash`,
-      `  const themeScript = raw(\`<script>`,
-      `!function(){`,
-      `var t=(document.cookie.match(/(?:^|;\\s*)theme=([^;]+)/)||[])[1]||'system';`,
-      `if(t==='system')t=window.matchMedia('(prefers-color-scheme:dark)').matches?'dark':'light';`,
-      `document.documentElement.classList.toggle('dark',t==='dark');`,
-      `}()`,
-      `</script>\`)`,
-      ``,
-      `  // i18n: set lang attribute`,
-      `  const lang = ctx.i18n?.locale || 'en'`,
-      ``,
-      `  // CSS: include compiled stylesheet`,
-      `  const cssLink = ctx.css?.url`,
-      `    ? raw(\`<link rel="stylesheet" href="\${ctx.css.url}">\`)`,
-      `    : ''`,
-      ``,
-      `  return html\`<!DOCTYPE html>`,
-      `<html lang="\${lang}">`,
-      `<head>`,
-      `  <meta charset="utf-8" />`,
-      `  <meta name="viewport" content="width=device-width, initial-scale=1" />`,
-      `  \${themeScript}`,
-      `  \${assetScripts()}`,
-      `  \${cssLink}`,
-      `</head>`,
-      `<body class="min-h-screen bg-white text-gray-900 dark:bg-gray-950 dark:text-gray-100">`,
-      `  \${raw(body)}`,
-      `</body>`,
-      `</html>\``,
-      `}`,
-      ``
-    ].join("\n")
-  );
-  await writeFile(
-    join(targetDir, "ui", "app", "page.ts"),
-    [
-      `import { html } from 'weifuwu'`,
-      ``,
-      `export default function(ctx: any) {`,
-      `  const t = ctx.i18n?.t || ((k: string) => k)`,
-      `  const theme = ctx.theme?.value || 'system'`,
-      `  const locale = ctx.i18n?.locale || 'en'`,
-      ``,
-      `  return html\`<div x-data="{ open: false }" class="min-h-screen">`,
-      `    <!-- Navbar -->`,
-      `    <nav class="border-b border-gray-200 dark:border-gray-800">`,
-      `      <div class="max-w-5xl mx-auto flex items-center justify-between h-14 px-4">`,
-      `        <span class="font-bold text-lg">weifuwu</span>`,
-      `        <div class="flex items-center gap-3 text-sm">`,
-      `          <!-- Locale toggle -->`,
-      `          <a href="/__lang/\${locale === 'en' ? 'zh-CN' : 'en'}"`,
-      `             class="px-2 py-1 rounded border border-gray-300 dark:border-gray-600`,
-      `                    hover:bg-gray-100 dark:hover:bg-gray-800 transition">`,
-      `            \${locale === 'en' ? '\u4E2D\u6587' : 'EN'}`,
-      `          </a>`,
-      `          <!-- Theme toggle -->`,
-      `          <a href="/__theme/\${theme === 'dark' ? 'light' : 'dark'}"`,
-      `             class="px-2 py-1 rounded border border-gray-300 dark:border-gray-600`,
-      `                    hover:bg-gray-100 dark:hover:bg-gray-800 transition">`,
-      `            \${theme === 'dark' ? '\u2600\uFE0F' : '\u{1F319}'}`,
-      `          </a>`,
-      `        </div>`,
-      `      </div>`,
-      `    </nav>`,
-      ``,
-      `    <!-- Hero -->`,
-      `    <section class="max-w-3xl mx-auto px-4 py-16 text-center">`,
-      `      <h1 class="text-4xl font-bold tracking-tight mb-3">\${t('hero.title')}</h1>`,
-      `      <p class="text-gray-500 dark:text-gray-400 text-lg mb-8">`,
-      `        Pure Node.js, no build step`,
-      `      </p>`,
-      ``,
-      `      <div class="flex justify-center gap-3">`,
-      `        <button @click="open = !open"`,
-      `                class="rounded-md bg-gray-900 px-4 py-2 text-sm font-medium text-white`,
-      `                       hover:bg-gray-700 dark:bg-gray-100 dark:text-gray-900 dark:hover:bg-gray-300">`,
-      `          \${t('hero.cta')}`,
-      `        </button>`,
-      `        <a href="/docs"`,
-      `           class="rounded-md border border-gray-300 px-4 py-2 text-sm font-medium`,
-      `                  hover:bg-gray-100 dark:border-gray-600 dark:hover:bg-gray-800">`,
-      `          \${t('hero.docs')}`,
-      `        </a>`,
-      `      </div>`,
-      ``,
-      `      <!-- Alpine demo: click to reveal -->`,
-      `      <div x-show="open" x-cloak`,
-      `           class="mt-6 p-4 bg-gray-100 dark:bg-gray-800 rounded-lg text-sm text-left">`,
-      `        \${t('demo.alpine')}`,
-      `      </div>`,
-      `    </section>`,
-      `  </div>\``,
-      `}`,
-      ``
-    ].join("\n")
-  );
-  await writeFile(
-    join(targetDir, "ui", "lib", "utils.ts"),
-    [
-      `/**`,
-      ` * cn() \u2014 Merge class names, handling conditional and array inputs.`,
-      ` * Lightweight alternative to clsx + tailwind-merge.`,
-      ` */`,
-      `export function cn(...classes: (string | false | null | undefined)[]): string {`,
-      `  return classes.filter(Boolean).join(' ')`,
-      `}`,
-      ``
-    ].join("\n")
-  );
-  await writeFile(
-    join(targetDir, "locales", "en.json"),
-    JSON.stringify(
-      {
-        "hero.title": "Build APIs & UI, Zero Build Step",
-        "hero.cta": "Try Alpine",
-        "hero.docs": "Documentation",
-        "demo.alpine": "This is Alpine.js in action \u2014 click-toggled content, zero JavaScript written."
-      },
-      null,
-      2
-    ) + "\n"
-  );
-  await writeFile(
-    join(targetDir, "locales", "zh-CN.json"),
-    JSON.stringify(
-      {
-        "hero.title": "\u96F6\u7F16\u8BD1\u6784\u5EFA API \u548C UI",
-        "hero.cta": "\u4F53\u9A8C Alpine",
-        "hero.docs": "\u6587\u6863",
-        "demo.alpine": "\u8FD9\u662F Alpine.js \u7684\u6F14\u793A\u2014\u2014\u70B9\u51FB\u5207\u6362\u5185\u5BB9\uFF0C\u4E0D\u9700\u8981\u5199 JavaScript\u3002"
-      },
-      null,
-      2
-    ) + "\n"
-  );
-  await writePackageJson(targetDir, name, version, {
-    dependencies: {
-      weifuwu: `^${version}`
-    },
-    devDependencies: {}
-  });
-  await writeFile(
-    join(targetDir, "tsconfig.json"),
-    JSON.stringify(
-      {
-        compilerOptions: {
-          target: "ESNext",
-          module: "NodeNext",
-          moduleResolution: "NodeNext",
-          strict: true,
-          skipLibCheck: true,
-          noEmit: true,
-          allowImportingTsExtensions: true,
-          paths: {
-            "@/*": ["./ui/*"]
-          }
-        },
-        include: ["*.ts", "ui/**/*.ts"]
-      },
-      null,
-      2
-    ) + "\n"
-  );
-  await writeCommonFiles(targetDir);
   await finishInit(targetDir, skipInstall);
 }
 async function writePackageJson(targetDir, name, version, extra) {

package/dist/index.js CHANGED Viewed

@@ -2460,8 +2460,8 @@ function postgres(opts) {
   const stmtTimeout = options.statementTimeout ?? 3e4;
   let connStr = typeof connection === "string" ? connection : "";
   if (stmtTimeout > 0 && typeof connection === "string") {
-    const sep2 = connStr.includes("?") ? "&" : "?";
-    connStr = `${connStr}${sep2}options=-c%20statement_timeout%3D${stmtTimeout}`;
+    const sep3 = connStr.includes("?") ? "&" : "?";
+    connStr = `${connStr}${sep3}options=-c%20statement_timeout%3D${stmtTimeout}`;
   }
   const sql = postgresFactory(connStr, {
     max: options.max,
@@ -3592,15 +3592,37 @@ function view(path, options) {
 // ssr/css.ts
 import { createHash } from "node:crypto";
 import { existsSync, readFileSync as readFileSync2 } from "node:fs";
-import { join as join3, resolve as resolve6 } from "node:path";
+import { join as join3, resolve as resolve6, sep as sep2 } from "node:path";
 import tailwindPlugin from "@tailwindcss/postcss";
 import postcss from "postcss";
 var cssCache = /* @__PURE__ */ new Map();
+function findTailwindDir() {
+  const hoisted = resolve6(process.cwd(), "node_modules", "tailwindcss");
+  if (existsSync(hoisted)) return hoisted;
+  let dir = process.cwd();
+  const root = sep2 === "/" ? "/" : "";
+  while (dir !== root) {
+    const wfwDir = resolve6(dir, "node_modules", "weifuwu");
+    if (existsSync(wfwDir)) {
+      const nested = resolve6(wfwDir, "node_modules", "tailwindcss");
+      if (existsSync(nested)) return nested;
+      const parent = resolve6(dir, "..", "node_modules", "tailwindcss");
+      if (existsSync(parent)) return parent;
+    }
+    dir = resolve6(dir, "..");
+  }
+  return null;
+}
 async function compileCSS(cssPath, sourceDir) {
   if (!existsSync(cssPath)) {
     return { css: "", hash: "empty", url: "" };
   }
-  const raw2 = readFileSync2(cssPath, "utf-8");
+  let raw2 = readFileSync2(cssPath, "utf-8");
+  const tailwindDir = findTailwindDir();
+  if (tailwindDir && raw2.includes('@import "tailwindcss"')) {
+    const tailwindCss = readFileSync2(join3(tailwindDir, "index.css"), "utf-8");
+    raw2 = raw2.replace('@import "tailwindcss"', tailwindCss);
+  }
   const src = `@source "${sourceDir}";
 ${raw2}`;
   const result = await postcss([tailwindPlugin()]).process(src, { from: cssPath });

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "weifuwu",
   "type": "module",
-  "version": "0.27.7",
+  "version": "0.27.9",
   "description": "Web-standard HTTP microframework for Node.js — (req, ctx) => Response",
   "exports": {
     ".": "./dist/index.js"