npm - @zenithbuild/cli - Versions diffs - 1.3.7 → 1.3.18 - Mend

@zenithbuild/cli 1.3.7 → 1.3.18

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 (8) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@zenithbuild/cli",
-  "version": "1.3.7",
+  "version": "1.3.18",
   "description": "CLI for Zenith framework - dev server, build tools, and plugin management",
   "type": "module",
   "bin": {
@@ -9,12 +9,12 @@
     "zen-build": "./dist/zen-build.js",
     "zen-preview": "./dist/zen-preview.js"
   },
-  "main": "./src/index.ts",
+  "main": "./dist/index.js",
   "types": "./src/index.ts",
   "exports": {
     ".": {
-      "types": "./src/index.ts",
-      "import": "./src/index.ts"
+      "types": "./dist/index.d.d.d.ts",
+      "import": "./dist/index.js"
     }
   },
   "files": [
@@ -50,16 +50,16 @@
   },
   "private": false,
   "peerDependencies": {
-    "@zenithbuild/core": "^1.3.0",
-    "@zenithbuild/compiler": "^1.3.0"
+    "@zenithbuild/core": "^1.3.17",
+    "@zenithbuild/compiler": "^1.3.17"
   },
   "devDependencies": {
     "@types/bun": "latest",
-    "@zenithbuild/compiler": "^1.3.15"
+    "@zenithbuild/compiler": "^1.3.17"
   },
   "dependencies": {
-    "@zenithbuild/bundler": "^1.3.15",
-    "@zenithbuild/router": "^1.3.8",
+    "@zenithbuild/bundler": "^1.3.17",
+    "@zenithbuild/router": "^1.3.17",
     "glob": "^13.0.0",
     "picocolors": "^1.0.0"
   }

package/src/commands/dev.ts CHANGED Viewed

@@ -208,11 +208,31 @@ export async function dev(options: DevOptions = {}): Promise<void> {
      * Generate dev HTML
      */
     async function generateDevHTML(page: CompiledPage): Promise<string> {
-        const scriptTag = `<script type="module">\n${page.script}\n</script>`
+        // Injection Block
+        const injection = `
+    <!-- Zenith Dev Injection -->
+    <link rel="stylesheet" href="/assets/styles.css">
+    <script>window.zenith = window.zenith || {};</script>
+    <script src="/runtime.js"></script>
+    <script type="importmap">
+    {
+      "imports": {
+        "zenith:core": "/zenith-core.js",
+        "@zenithbuild/core": "/zenith-core.js",
+        "@zenithbuild/runtime": "/zenith-core.js",
+        "@zenithbuild/router": "/zenith-router.js",
+        "gsap": "https://esm.sh/gsap"
+      }
+    }
+    </script>
+    <script type="module">
+${page.script}
+    </script>
+        `;
         let html = page.html.includes('</body>')
-            ? page.html.replace('</body>', `${scriptTag}\n</body>`)
-            : `${page.html}\n${scriptTag}`
+            ? page.html.replace('</body>', `${injection}\n</body>`)
+            : `${page.html}\n${injection}`
         if (!html.trimStart().toLowerCase().startsWith('<!doctype')) {
             html = `<!DOCTYPE html>\n${html}`
@@ -295,6 +315,27 @@ export async function dev(options: DevOptions = {}): Promise<void> {
             }
             // Handle Zenith assets
+            // 1. Intercept /assets/ requests and serve from disk (dist/assets or src/dist/assets)
+            if (pathname.startsWith('/assets/')) {
+                // Try standard dist/
+                let assetPath = path.join(rootDir, 'dist', pathname);
+                if (!fs.existsSync(assetPath)) {
+                    // Try src/dist/ (current project structure)
+                    assetPath = path.join(rootDir, 'src', 'dist', pathname);
+                }
+                if (fs.existsSync(assetPath)) {
+                    const content = fs.readFileSync(assetPath);
+                    const contentType = ext === '.css' ? 'text/css' :
+                        ext === '.js' ? 'application/javascript' :
+                            'application/octet-stream';
+                    return new Response(content, {
+                        headers: { 'Content-Type': contentType }
+                    });
+                }
+            }
             if (pathname === '/runtime.js') {
                 // Collect runtime payloads from ALL plugins
                 const payloads = await collectHookReturns('cli:runtime:collect', hookCtx)
@@ -307,8 +348,41 @@ export async function dev(options: DevOptions = {}): Promise<void> {
                 return response
             }
-            // Serve compiler-owned CSS (Tailwind compiled)
-            if (pathname === '/assets/styles.css') {
+            // DYNAMIC BUNDLING: Serve Core and Router directly from node_modules
+            if (pathname === '/zenith-core.js') {
+                try {
+                    const entry = require.resolve('@zenithbuild/core'); // or runtime/index.ts
+                    const build = await Bun.build({
+                        entrypoints: [entry],
+                        external: ['@zenithbuild/router'], // keep router external so it uses the map
+                        target: "browser",
+                        format: "esm"
+                    });
+                    if (build.success) {
+                        return new Response(build.outputs[0]);
+                    }
+                } catch (e) {
+                    logger.error('Failed to bundle zenith-core: ' + e);
+                }
+            }
+            if (pathname === '/zenith-router.js') {
+                try {
+                    const entry = require.resolve('@zenithbuild/router');
+                    const build = await Bun.build({
+                        entrypoints: [entry],
+                        target: "browser",
+                        format: "esm"
+                    });
+                    if (build.success) {
+                        return new Response(build.outputs[0]);
+                    }
+                } catch (e) {
+                    logger.error('Failed to bundle zenith-router: ' + e);
+                }
+            }
+            // Fallback: Serve compiler-owned CSS (Tailwind compiled) from memory if not on disk
+            if (pathname === '/assets/styles.css' && compiledCss) {
                 const response = new Response(compiledCss, {
                     headers: { 'Content-Type': 'text/css; charset=utf-8' }
                 })

package/src/serve.ts CHANGED Viewed

@@ -15,6 +15,15 @@ import { serve } from "bun"
 import path from "path"
 const distDir = path.resolve(process.cwd(), "dist")
+const srcDistDir = path.resolve(process.cwd(), "src/dist")
+// Determine which dist to use
+const finalDistDir = (await Bun.file(path.join(distDir, "index.html")).exists())
+    ? distDir
+    : (await Bun.file(path.join(srcDistDir, "index.html")).exists())
+        ? srcDistDir
+        : distDir // Fallback to root dist
 // File extensions that should be served as static assets
 const STATIC_EXTENSIONS = new Set([
@@ -42,49 +51,47 @@ serve({
         const url = new URL(req.url)
         const pathname = url.pathname
-        // Get file extension
-        const ext = path.extname(pathname).toLowerCase()
-        // Check if this is a static asset request
-        if (STATIC_EXTENSIONS.has(ext)) {
-            const filePath = path.join(distDir, pathname)
-            const file = Bun.file(filePath)
-            // Check if file exists
+        // 1. Root Route -> dist/index.html
+        if (pathname === "/" || pathname === "/index.html") {
+            const indexPath = path.join(finalDistDir, "index.html")
+            const file = Bun.file(indexPath)
             if (await file.exists()) {
-                return new Response(file)
+                return new Response(file, {
+                    headers: { "Content-Type": "text/html; charset=utf-8" }
+                })
             }
-            // Static file not found
-            return new Response("Not found", { status: 404 })
+            // No index.html found - likely need to run build first
+            return new Response(
+                `<html>
+            <head><title>Zenith - Build Required</title></head>
+            <body style="font-family: system-ui; padding: 2rem; text-align: center;">
+            <h1>Build Required</h1>
+            <p>Run <code>zenith build</code> first to compile the pages.</p>
+            <p>Checked: ${finalDistDir}</p>
+            </body>
+        </html>`,
+                {
+                    status: 500,
+                    headers: { "Content-Type": "text/html; charset=utf-8" }
+                }
+            )
         }
-        // For all other routes, serve index.html (SPA fallback)
-        const indexPath = path.join(distDir, "index.html")
-        const indexFile = Bun.file(indexPath)
+        // 2. Static Assets (js, css, etc.)
+        const filePath = path.join(finalDistDir, pathname)
+        const file = Bun.file(filePath)
-        if (await indexFile.exists()) {
-            return new Response(indexFile, {
-                headers: {
-                    "Content-Type": "text/html; charset=utf-8"
-                }
-            })
+        if (await file.exists()) {
+            // Force correct MIME types for critical files
+            const headers = new Headers();
+            if (pathname.endsWith(".css")) headers.set("Content-Type", "text/css");
+            if (pathname.endsWith(".js")) headers.set("Content-Type", "application/javascript");
+            return new Response(file, { headers })
         }
-        // No index.html found - likely need to run build first
-        return new Response(
-            `<html>
-        <head><title>Zenith - Build Required</title></head>
-        <body style="font-family: system-ui; padding: 2rem; text-align: center;">
-          <h1>Build Required</h1>
-          <p>Run <code>zenith build</code> first to compile the pages.</p>
-        </body>
-      </html>`,
-            {
-                status: 500,
-                headers: { "Content-Type": "text/html; charset=utf-8" }
-            }
-        )
+        // 3. 404 - Not Found (Do not fallback to SPA yet to verify strict static serving)
+        return new Response("Not Found", { status: 404 })
     }
 })

package/src/ssg-build.ts CHANGED Viewed

@@ -24,6 +24,7 @@
  */
 import fs from "fs"
+import path from 'path'
 import { compile } from "@zenithbuild/compiler"
 import { discoverComponents } from "./discovery/componentDiscovery"
 import { discoverPages, generateRouteDefinition } from "@zenithbuild/router/manifest"