react-client 1.0.20 → 1.0.22

package/README.md

@@ -59,7 +59,7 @@ import { defineConfig } from 'react-client/config';
 
 export default defineConfig({
   root: './src',
-  server: { port: 5173 },
+  server: { port: 2202 },
   build: { outDir: '.react-client/build' }
 });
 ```
@@ -89,7 +89,7 @@ Each template is pre-configured for esbuild, HMR, and fast bootstrapping.
 - 🔁 **React Fast Refresh (HMR)** — State-preserving reloads  
 - 💥 **Overlay** — Syntax-highlighted stack frames, clickable file links (`vscode://file`)  
 - 🔍 **Source Map Stack Mapping** — Maps runtime errors to original TS/JS source lines  
-- 💬 **Auto Port Detection** — Prompts when default port 5173 is occupied  
+- 💬 **Auto Port Detection** — Prompts when default port 2202 is occupied  
 - 🧠 **Smart Config Loader** — Detects project root, compiles `.ts` configs dynamically  
 - 🎨 **PrismJS Highlighting** — For pretty overlay code frames  
 - 🔌 **Plugin Hook System** — Extendable with `configResolved`, `transform`, `buildEnd`  
@@ -142,7 +142,7 @@ npm install react-refresh
 ### ⚠️ Port already in use
 CLI will auto-detect and prompt:
 ```
-Port 5173 is occupied. Use 5174 instead? (Y/n)
+Port 2202 is occupied. Use 5174 instead? (Y/n)
 ```
 
 ### ⚠️ Permission denied

package/dist/cli/commands/dev.js

@@ -1,4 +1,14 @@
 "use strict";
+/**
+ * 🚀 React Client Dev Server — Final Version
+ * ------------------------------------------
+ * ✅ Local overlay-runtime.js (Prism + stack mapping)
+ * ✅ Dynamic /@runtime/overlay-runtime.js alias
+ * ✅ Automatic HTML injection for overlay + HMR
+ * ✅ Prebundle cache (.react-client/deps)
+ * ✅ CSS HMR, relative & bare import handling
+ * ✅ Favicon & public assets serving
+ */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -15,111 +25,67 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const open_1 = __importDefault(require("open"));
 const child_process_1 = require("child_process");
 const chalk_1 = __importDefault(require("chalk"));
+const zlib_1 = __importDefault(require("zlib"));
+const crypto_1 = __importDefault(require("crypto"));
 const loadConfig_1 = require("../../utils/loadConfig");
 const broadcastManager_1 = require("../../server/broadcastManager");
-// 🧠 Browser polyfills for Node built-ins
-const NODE_POLYFILLS = {
-    buffer: 'buffer/',
-    process: 'process/browser',
-    path: 'path-browserify',
-    fs: 'browserify-fs',
-    os: 'os-browserify/browser',
-    stream: 'stream-browserify',
-    util: 'util/',
-    url: 'url/',
-    assert: 'assert/',
-    crypto: 'crypto-browserify',
-    events: 'events/',
-    constants: 'constants-browserify',
-    querystring: 'querystring-es3',
-    zlib: 'browserify-zlib',
+const computeHash = (content) => crypto_1.default.createHash('sha1').update(content).digest('hex');
+const getMimeType = (file) => {
+    const ext = path_1.default.extname(file).toLowerCase();
+    const mime = {
+        '.ico': 'image/x-icon',
+        '.png': 'image/png',
+        '.jpg': 'image/jpeg',
+        '.jpeg': 'image/jpeg',
+        '.gif': 'image/gif',
+        '.svg': 'image/svg+xml',
+        '.webp': 'image/webp',
+        '.json': 'application/json',
+        '.txt': 'text/plain',
+        '.js': 'application/javascript',
+        '.mjs': 'application/javascript',
+        '.css': 'text/css',
+        '.html': 'text/html',
+    };
+    return mime[ext] || 'application/octet-stream';
 };
-// List of NPM packages required for polyfills
-const POLYFILL_PACKAGES = [
-    'buffer',
-    'process',
-    'path-browserify',
-    'browserify-fs',
-    'os-browserify',
-    'stream-browserify',
-    'util',
-    'url',
-    'assert',
-    'crypto-browserify',
-    'events',
-    'constants-browserify',
-    'querystring-es3',
-    'browserify-zlib',
-];
 async function dev() {
     const root = process.cwd();
     const userConfig = await (0, loadConfig_1.loadReactClientConfig)(root);
     const appRoot = path_1.default.resolve(root, userConfig.root || '.');
     const defaultPort = userConfig.server?.port || 5173;
     const cacheDir = path_1.default.join(appRoot, '.react-client', 'deps');
+    const pkgFile = path_1.default.join(appRoot, 'package.json');
+    const indexHtml = path_1.default.join(appRoot, 'index.html');
     await fs_extra_1.default.ensureDir(cacheDir);
-    // Detect entry file
+    // ✅ Detect entry
     const possibleEntries = ['src/main.tsx', 'src/main.jsx'];
     const entry = possibleEntries.map((p) => path_1.default.join(appRoot, p)).find((p) => fs_extra_1.default.existsSync(p));
     if (!entry) {
         console.error(chalk_1.default.red('❌ No entry found: src/main.tsx or src/main.jsx'));
         process.exit(1);
     }
-    const indexHtml = path_1.default.join(appRoot, 'index.html');
-    // Detect available port
-    const availablePort = await (0, detect_port_1.default)(defaultPort);
-    const port = availablePort;
-    if (availablePort !== defaultPort) {
+    // ✅ Detect free port
+    const port = await (0, detect_port_1.default)(defaultPort);
+    if (port !== defaultPort) {
         const res = await (0, prompts_1.default)({
             type: 'confirm',
             name: 'useNewPort',
-            message: `Port ${defaultPort} is occupied. Use ${availablePort} instead?`,
+            message: `Port ${defaultPort} is occupied. Use ${port} instead?`,
             initial: true,
         });
-        if (!res.useNewPort) {
-            console.log('🛑 Dev server cancelled.');
+        if (!res.useNewPort)
             process.exit(0);
-        }
     }
-    // 🧩 Auto-install react-refresh
+    // ✅ Ensure react-refresh
     try {
         require.resolve('react-refresh/runtime');
     }
     catch {
-        console.warn(chalk_1.default.yellow('⚠️ react-refresh not found — installing...'));
-        (0, child_process_1.execSync)('npm install react-refresh --no-audit --no-fund --silent', {
-            cwd: root,
-            stdio: 'inherit',
-        });
-        console.log(chalk_1.default.green('✅ react-refresh installed successfully.'));
-    }
-    // 🧩 Auto-install missing polyfill packages
-    const missingPolyfills = POLYFILL_PACKAGES.filter((pkg) => {
-        try {
-            require.resolve(pkg, { paths: [appRoot] });
-            return false;
-        }
-        catch {
-            return true;
-        }
-    });
-    if (missingPolyfills.length > 0) {
-        console.log(chalk_1.default.yellow('⚙️ Installing missing polyfill packages...'));
-        console.log(chalk_1.default.gray('📦 ' + missingPolyfills.join(', ')));
-        try {
-            (0, child_process_1.execSync)(`npm install ${missingPolyfills.join(' ')} --no-audit --no-fund --silent`, {
-                cwd: appRoot,
-                stdio: 'inherit',
-            });
-            console.log(chalk_1.default.green('✅ Polyfills installed successfully.'));
-        }
-        catch (err) {
-            console.error(chalk_1.default.red('❌ Failed to install polyfills automatically.'));
-            console.error(err);
-            process.exit(1);
-        }
+        console.log(chalk_1.default.yellow('Installing react-refresh...'));
+        (0, child_process_1.execSync)('npm i react-refresh --silent', { cwd: root, stdio: 'inherit' });
     }
-    // --- Plugins
+    // ✅ Core + user plugins
     const corePlugins = [
         {
             name: 'css-hmr',
@@ -141,109 +107,141 @@ async function dev() {
     const userPlugins = Array.isArray(userConfig.plugins) ? userConfig.plugins : [];
     const plugins = [...corePlugins, ...userPlugins];
     const app = (0, connect_1.default)();
+    const server = http_1.default.createServer(app);
+    const broadcaster = new broadcastManager_1.BroadcastManager(server);
     const transformCache = new Map();
-    // 🧱 Polyfilled module builder
-    async function buildModuleWithSafeWrapper(id) {
-        const cacheFile = path_1.default.join(cacheDir, id.replace(/\//g, '_') + '.js');
-        if (await fs_extra_1.default.pathExists(cacheFile))
-            return fs_extra_1.default.readFile(cacheFile, 'utf8');
-        // 🧠 Polyfill detection
-        const polyId = NODE_POLYFILLS[id];
-        if (polyId) {
-            console.log(chalk_1.default.gray(`🧩 Using polyfill for ${id}: ${polyId}`));
-            const result = await esbuild_1.default.build({
-                entryPoints: [require.resolve(polyId, { paths: [appRoot] })],
-                bundle: true,
-                platform: 'browser',
-                format: 'esm',
-                target: 'es2020',
-                write: false,
-            });
-            const polyCode = result.outputFiles[0].text;
-            await fs_extra_1.default.writeFile(cacheFile, polyCode, 'utf8');
-            return polyCode;
-        }
-        // 🧱 Normal dependency
-        let entryPath = null;
-        try {
-            entryPath = require.resolve(id, { paths: [appRoot] });
-        }
-        catch {
-            const base = id.split('/')[0];
+    // 🧱 Persistent prebundle cache
+    async function prebundleDeps() {
+        if (!(await fs_extra_1.default.pathExists(pkgFile)))
+            return;
+        const pkg = JSON.parse(await fs_extra_1.default.readFile(pkgFile, 'utf8'));
+        const deps = Object.keys(pkg.dependencies || {});
+        if (!deps.length)
+            return;
+        const hash = computeHash(JSON.stringify(deps));
+        const metaFile = path_1.default.join(cacheDir, '_meta.json');
+        let prevHash = null;
+        if (await fs_extra_1.default.pathExists(metaFile))
+            prevHash = (await fs_extra_1.default.readJSON(metaFile)).hash;
+        if (prevHash === hash)
+            return;
+        console.log(chalk_1.default.cyan('📦 Rebuilding prebundle cache...'));
+        await Promise.all(deps.map(async (dep) => {
             try {
-                entryPath = require.resolve(base, { paths: [appRoot] });
+                const entryPath = require.resolve(dep, { paths: [appRoot] });
+                const outFile = path_1.default.join(cacheDir, dep + '.js');
+                await esbuild_1.default.build({
+                    entryPoints: [entryPath],
+                    bundle: true,
+                    platform: 'browser',
+                    format: 'esm',
+                    target: 'es2020',
+                    outfile: outFile,
+                    write: true,
+                });
+                const content = await fs_extra_1.default.readFile(outFile);
+                await fs_extra_1.default.writeFile(outFile + '.gz', zlib_1.default.gzipSync(content));
+                await fs_extra_1.default.writeFile(outFile + '.br', zlib_1.default.brotliCompressSync(content));
+                console.log(chalk_1.default.green(`✅ Cached ${dep}`));
+            }
+            catch (e) {
+                const err = e;
+                console.warn(chalk_1.default.yellow(`⚠️ Skipped ${dep}: ${err.message}`));
             }
-            catch {
-                entryPath = null;
+        }));
+        await fs_extra_1.default.writeJSON(metaFile, { hash });
+    }
+    await prebundleDeps();
+    chokidar_1.default.watch(pkgFile).on('change', prebundleDeps);
+    // 🧩 Serve local overlay runtime
+    app.use('/@runtime/overlay-runtime.js', async (req, res) => {
+        const overlayPath = path_1.default.join(appRoot, 'src/runtime/overlay-runtime.js');
+        try {
+            if (!(await fs_extra_1.default.pathExists(overlayPath))) {
+                res.writeHead(404);
+                return res.end(`// Overlay runtime not found: ${overlayPath}`);
             }
+            let code = await fs_extra_1.default.readFile(overlayPath, 'utf8');
+            // Transform bare imports → /@modules/*
+            code = code
+                .replace(/\bfrom\s+['"]([^'".\/][^'"]*)['"]/g, (_m, dep) => `from "/@modules/${dep}"`)
+                .replace(/\bimport\(['"]([^'".\/][^'"]*)['"]\)/g, (_m, dep) => `import("/@modules/${dep}")`);
+            const result = await esbuild_1.default.transform(code, {
+                loader: 'js',
+                sourcemap: 'inline',
+                target: 'es2020',
+            });
+            res.setHeader('Content-Type', 'application/javascript');
+            res.end(result.code);
         }
-        if (!entryPath)
-            throw new Error(`Module ${id} not found (resolve failed)`);
-        const result = await esbuild_1.default.build({
-            entryPoints: [entryPath],
-            bundle: true,
-            platform: 'browser',
-            format: 'esm',
-            target: 'es2020',
-            write: false,
-        });
-        const originalCode = result.outputFiles[0].text;
-        const isSubpath = id.includes('/');
-        let finalCode = originalCode;
-        if (isSubpath) {
-            const base = id.split('/')[0];
-            finalCode += `
-        // --- react-client auto wrapper for subpath: ${id}
-        import * as __base from '/@modules/${base}';
-        export const __rc_dynamic = __base;
-        export default __base.default || __base;
-      `;
+        catch (err) {
+            const e = err;
+            console.error(chalk_1.default.red(`❌ Failed to load overlay runtime: ${e.message}`));
+            res.writeHead(500);
+            res.end(`// Failed to load overlay runtime: ${e.message}`);
         }
-        await fs_extra_1.default.writeFile(cacheFile, finalCode, 'utf8');
-        return finalCode;
-    }
-    // --- /@modules/
+    });
+    // 🧠 Serve /@modules/
     app.use('/@modules/', async (req, res, next) => {
         const id = req.url?.replace(/^\/(@modules\/)?/, '');
         if (!id)
             return next();
         try {
-            const code = await buildModuleWithSafeWrapper(id);
+            const cacheFile = path_1.default.join(cacheDir, id.replace(/\//g, '_') + '.js');
+            if (await fs_extra_1.default.pathExists(cacheFile)) {
+                res.setHeader('Content-Type', 'application/javascript');
+                return res.end(await fs_extra_1.default.readFile(cacheFile));
+            }
+            const entryPath = require.resolve(id, { paths: [appRoot] });
+            const result = await esbuild_1.default.build({
+                entryPoints: [entryPath],
+                bundle: true,
+                platform: 'browser',
+                format: 'esm',
+                target: 'es2020',
+                write: false,
+            });
+            const code = result.outputFiles[0].text;
+            await fs_extra_1.default.writeFile(cacheFile, code, 'utf8');
             res.setHeader('Content-Type', 'application/javascript');
             res.end(code);
         }
-        catch (err) {
-            const e = err;
-            console.error(chalk_1.default.red(`❌ Failed to load module ${id}: ${e.message}`));
+        catch (e) {
+            const err = e;
+            console.error(chalk_1.default.red(`❌ Failed to load module ${id}: ${err.message}`));
             res.writeHead(500);
-            res.end(`// Failed to resolve module ${id}: ${e.message}`);
+            res.end(`// Failed to resolve module ${id}: ${err.message}`);
         }
     });
-    // --- Universal transform for all project files
+    // 🧩 Serve /src/ and .css files dynamically
     app.use(async (req, res, next) => {
-        const urlPath = decodeURIComponent(req.url.split('?')[0]);
-        if (urlPath.includes('node_modules'))
+        if (!req.url || (!req.url.startsWith('/src/') && !req.url.endsWith('.css')))
             return next();
-        let filePath = path_1.default.join(appRoot, urlPath);
-        const possibleExts = ['', '.tsx', '.ts', '.jsx', '.js', '.css'];
+        const rawPath = decodeURIComponent(req.url.split('?')[0]);
+        const filePath = path_1.default.join(appRoot, rawPath);
+        const possibleExts = ['', '.tsx', '.ts', '.jsx', '.js'];
+        let resolvedPath = null;
         for (const ext of possibleExts) {
-            if (await fs_extra_1.default.pathExists(filePath + ext)) {
-                filePath += ext;
+            const candidate = filePath + ext;
+            if (await fs_extra_1.default.pathExists(candidate)) {
+                resolvedPath = candidate;
                 break;
             }
         }
-        if (!(await fs_extra_1.default.pathExists(filePath)))
-            return next();
+        if (!resolvedPath) {
+            res.writeHead(404);
+            return res.end(`// File not found: ${filePath}`);
+        }
         try {
-            let code = await fs_extra_1.default.readFile(filePath, 'utf8');
-            // Rewrite bare imports
+            let code = await fs_extra_1.default.readFile(resolvedPath, 'utf8');
+            // Rewrite bare imports → /@modules/*
             code = code
                 .replace(/\bfrom\s+['"]([^'".\/][^'"]*)['"]/g, (_m, dep) => `from "/@modules/${dep}"`)
                 .replace(/\bimport\(['"]([^'".\/][^'"]*)['"]\)/g, (_m, dep) => `import("/@modules/${dep}")`);
             for (const p of plugins)
                 if (p.onTransform)
-                    code = await p.onTransform(code, filePath);
-            const ext = path_1.default.extname(filePath);
+                    code = await p.onTransform(code, resolvedPath);
+            const ext = path_1.default.extname(resolvedPath);
             let loader = 'js';
             if (ext === '.ts')
                 loader = 'ts';
@@ -256,7 +254,6 @@ async function dev() {
                 sourcemap: 'inline',
                 target: 'es2020',
             });
-            transformCache.set(filePath, result.code);
             res.setHeader('Content-Type', 'application/javascript');
             res.end(result.code);
         }
@@ -267,38 +264,31 @@ async function dev() {
             res.end(`// Error: ${e.message}`);
         }
     });
-    // --- index.html + overlay + HMR
+    // 🖼️ Serve static assets (favicon + public)
+    app.use(async (req, res, next) => {
+        if (!req.url)
+            return next();
+        const publicDir = path_1.default.join(appRoot, 'public');
+        const targetFile = path_1.default.join(publicDir, decodeURIComponent(req.url.split('?')[0]));
+        if (!(await fs_extra_1.default.pathExists(targetFile)))
+            return next();
+        const stat = await fs_extra_1.default.stat(targetFile);
+        if (!stat.isFile())
+            return next();
+        res.setHeader('Content-Type', getMimeType(targetFile));
+        fs_extra_1.default.createReadStream(targetFile).pipe(res);
+    });
+    // 🧩 Serve index.html + overlay + HMR
     app.use(async (req, res, next) => {
         if (req.url !== '/' && req.url !== '/index.html')
             return next();
-        if (!fs_extra_1.default.existsSync(indexHtml)) {
+        if (!(await fs_extra_1.default.pathExists(indexHtml))) {
             res.writeHead(404);
             return res.end('index.html not found');
         }
         let html = await fs_extra_1.default.readFile(indexHtml, 'utf8');
         html = html.replace('</body>', `
-      <script>
-        (() => {
-          const style = document.createElement('style');
-          style.textContent = \`
-            .rc-overlay {
-              position: fixed; inset: 0; background: rgba(0,0,0,0.9);
-              color: #ff5555; font-family: monospace;
-              padding: 2rem; overflow:auto; z-index: 999999;
-            }
-          \`;
-          document.head.appendChild(style);
-          window.showErrorOverlay = (err) => {
-            window.clearErrorOverlay?.();
-            const el = document.createElement('div');
-            el.className = 'rc-overlay';
-            el.innerHTML = '<h2>🚨 Error</h2><pre>' + (err.message || err) + '</pre>';
-            document.body.appendChild(el);
-            window.__overlay = el;
-          };
-          window.clearErrorOverlay = () => window.__overlay?.remove();
-        })();
-      </script>
+      <script type="module" src="/@runtime/overlay-runtime.js"></script>
       <script type="module">
         const ws = new WebSocket("ws://" + location.host);
         ws.onmessage = (e) => {
@@ -315,28 +305,26 @@ async function dev() {
         res.setHeader('Content-Type', 'text/html');
         res.end(html);
     });
-    // --- WebSocket + HMR
-    const server = http_1.default.createServer(app);
-    const broadcaster = new broadcastManager_1.BroadcastManager(server);
-    chokidar_1.default.watch(appRoot, { ignoreInitial: true }).on('change', async (file) => {
-        if (file.includes('node_modules') || file.includes('.react-client'))
-            return;
+    // ♻️ Watchers
+    chokidar_1.default.watch(path_1.default.join(appRoot, 'src'), { ignoreInitial: true }).on('change', (file) => {
         console.log(chalk_1.default.yellow(`🔄 Changed: ${file}`));
         transformCache.delete(file);
-        for (const p of plugins)
-            await p.onHotUpdate?.(file, { broadcast: (msg) => broadcaster.broadcast(msg) });
         broadcaster.broadcast({
             type: 'update',
             path: '/' + path_1.default.relative(appRoot, file).replace(/\\/g, '/'),
         });
     });
+    chokidar_1.default
+        .watch(path_1.default.join(appRoot, 'src/runtime/overlay-runtime.js'), { ignoreInitial: true })
+        .on('change', () => {
+        console.log(chalk_1.default.magenta('♻️ Overlay runtime updated — reloading browser...'));
+        broadcaster.broadcast({ type: 'reload' });
+    });
     server.listen(port, async () => {
         const url = `http://localhost:${port}`;
         console.log(chalk_1.default.cyan.bold('\n🚀 React Client Dev Server'));
         console.log(chalk_1.default.gray('──────────────────────────────'));
         console.log(chalk_1.default.green(`⚡ Running at: ${url}`));
-        if (port !== defaultPort)
-            console.log(chalk_1.default.yellow(`⚠️ Using alternate port (default ${defaultPort} occupied)`));
         await (0, open_1.default)(url, { newInstance: true });
     });
     process.on('SIGINT', () => {

package/dist/cli/commands/init.js

@@ -51,7 +51,7 @@ export default defineConfig({
 
   // ⚡ Dev server settings
   server: {
-    port: 5173,
+    port: 2202,
   },
 
   // 🏗️ Build options

package/dist/cli/commands/preview.js

@@ -4,54 +4,161 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = preview;
-const connect_1 = __importDefault(require("connect"));
-const serve_static_1 = __importDefault(require("serve-static"));
 const http_1 = __importDefault(require("http"));
 const path_1 = __importDefault(require("path"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const chalk_1 = __importDefault(require("chalk"));
 const detect_port_1 = __importDefault(require("detect-port"));
 const prompts_1 = __importDefault(require("prompts"));
-const chalk_1 = __importDefault(require("chalk"));
 const open_1 = __importDefault(require("open"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
 const loadConfig_1 = require("../../utils/loadConfig");
+const MIME = {
+    '.html': 'text/html; charset=utf-8',
+    '.js': 'application/javascript; charset=utf-8',
+    '.mjs': 'application/javascript; charset=utf-8',
+    '.json': 'application/json; charset=utf-8',
+    '.css': 'text/css; charset=utf-8',
+    '.png': 'image/png',
+    '.jpg': 'image/jpeg',
+    '.jpeg': 'image/jpeg',
+    '.gif': 'image/gif',
+    '.svg': 'image/svg+xml',
+    '.ico': 'image/x-icon',
+    '.woff': 'font/woff',
+    '.woff2': 'font/woff2',
+    '.ttf': 'font/ttf',
+    '.map': 'application/octet-stream',
+    '.txt': 'text/plain; charset=utf-8',
+};
+function contentType(file) {
+    return MIME[path_1.default.extname(file).toLowerCase()] || 'application/octet-stream';
+}
+function setCachingHeaders(res, stat) {
+    // Short cache for preview by default, but set ETag/Last-Modified so browsers behave nicely
+    const etag = `${stat.size}-${Date.parse(stat.mtime.toString())}`;
+    res.setHeader('ETag', etag);
+    res.setHeader('Last-Modified', stat.mtime.toUTCString());
+    res.setHeader('Cache-Control', 'public, max-age=0, must-revalidate');
+}
 async function preview() {
-    const root = process.cwd();
-    const config = await (0, loadConfig_1.loadReactClientConfig)(root);
-    const appRoot = path_1.default.resolve(root, config.root || '.');
-    const outDir = path_1.default.join(appRoot, config.build?.outDir || '.react-client/build');
-    const defaultPort = config.server?.port || 5173;
-    if (!fs_extra_1.default.existsSync(outDir)) {
-        console.error(chalk_1.default.red(`❌ Build output not found at: ${outDir}`));
-        console.log(chalk_1.default.gray('Please run `react-client build` first.'));
+    const cwd = process.cwd();
+    const config = await (0, loadConfig_1.loadReactClientConfig)(cwd);
+    const appRoot = path_1.default.resolve(cwd, config.root || '.');
+    const outDir = path_1.default.join(appRoot, config.build?.outDir || 'dist');
+    const indexHtml = path_1.default.join(outDir, 'index.html');
+    if (!(await fs_extra_1.default.pathExists(outDir))) {
+        console.error(chalk_1.default.red(`❌ Preview directory not found: ${outDir}`));
         process.exit(1);
     }
-    const availablePort = await (0, detect_port_1.default)(defaultPort);
-    const port = availablePort;
-    if (availablePort !== defaultPort) {
-        const res = await (0, prompts_1.default)({
+    if (!(await fs_extra_1.default.pathExists(indexHtml))) {
+        console.warn(chalk_1.default.yellow(`⚠️ index.html not found in ${outDir}. SPA fallback will be disabled.`));
+    }
+    const defaultPort = config.server?.port || 4173;
+    const port = await (0, detect_port_1.default)(defaultPort);
+    if (port !== defaultPort) {
+        const r = await (0, prompts_1.default)({
             type: 'confirm',
             name: 'useNewPort',
-            message: `Port ${defaultPort} is occupied. Use ${availablePort} instead?`,
             initial: true,
+            message: `Port ${defaultPort} is occupied. Use ${port} instead?`,
         });
-        if (!res.useNewPort) {
-            console.log(chalk_1.default.red('🛑 Preview server cancelled.'));
+        if (!r.useNewPort) {
+            console.log('🛑 Preview cancelled.');
             process.exit(0);
         }
     }
-    const app = (0, connect_1.default)();
-    app.use((0, serve_static_1.default)(outDir));
-    const server = http_1.default.createServer(app);
+    const server = http_1.default.createServer(async (req, res) => {
+        try {
+            const url = req.url || '/';
+            // normalize and protect
+            const relPath = decodeURIComponent(url.split('?')[0]);
+            if (relPath.includes('..')) {
+                res.writeHead(400);
+                return res.end('Invalid request');
+            }
+            // handle root -> index.html
+            let filePath = path_1.default.join(outDir, relPath);
+            const tryIndexFallback = async () => {
+                if (await fs_extra_1.default.pathExists(indexHtml)) {
+                    const stat = await fs_extra_1.default.stat(indexHtml);
+                    setCachingHeaders(res, stat);
+                    res.setHeader('Content-Type', 'text/html; charset=utf-8');
+                    return fs_extra_1.default.createReadStream(indexHtml).pipe(res);
+                }
+                else {
+                    res.writeHead(404);
+                    return res.end('Not found');
+                }
+            };
+            // If the request path is a directory, try index.html inside it
+            if (relPath.endsWith('/')) {
+                const candidate = path_1.default.join(filePath, 'index.html');
+                if (await fs_extra_1.default.pathExists(candidate)) {
+                    filePath = candidate;
+                }
+                else {
+                    return tryIndexFallback();
+                }
+            }
+            // If file doesn't exist, fallback to index.html for SPA routes
+            if (!(await fs_extra_1.default.pathExists(filePath))) {
+                // If request appears to be a static asset (has extension), return 404
+                if (path_1.default.extname(filePath)) {
+                    res.writeHead(404);
+                    return res.end('Not found');
+                }
+                return tryIndexFallback();
+            }
+            const stat = await fs_extra_1.default.stat(filePath);
+            if (!stat.isFile()) {
+                return tryIndexFallback();
+            }
+            // Compression/Precompressed support: prefer brotli -> gzip -> raw
+            const accept = (req.headers['accept-encoding'] || '');
+            const tryPrecompressed = async () => {
+                if (accept.includes('br') && (await fs_extra_1.default.pathExists(filePath + '.br'))) {
+                    res.setHeader('Content-Encoding', 'br');
+                    res.setHeader('Content-Type', contentType(filePath));
+                    setCachingHeaders(res, stat);
+                    return fs_extra_1.default.createReadStream(filePath + '.br').pipe(res);
+                }
+                if (accept.includes('gzip') && (await fs_extra_1.default.pathExists(filePath + '.gz'))) {
+                    res.setHeader('Content-Encoding', 'gzip');
+                    res.setHeader('Content-Type', contentType(filePath));
+                    setCachingHeaders(res, stat);
+                    return fs_extra_1.default.createReadStream(filePath + '.gz').pipe(res);
+                }
+                // default
+                res.setHeader('Content-Type', contentType(filePath));
+                setCachingHeaders(res, stat);
+                return fs_extra_1.default.createReadStream(filePath).pipe(res);
+            };
+            // ETag / If-None-Match handling
+            const etag = `${stat.size}-${Date.parse(stat.mtime.toString())}`;
+            const inm = req.headers['if-none-match'];
+            if (inm && inm.toString() === etag) {
+                res.writeHead(304);
+                return res.end();
+            }
+            return tryPrecompressed();
+        }
+        catch (err) {
+            const e = err;
+            console.error('Preview server error:', e);
+            res.writeHead(500);
+            res.end('Internal Server Error');
+        }
+    });
     server.listen(port, async () => {
         const url = `http://localhost:${port}`;
-        console.log(chalk_1.default.green(`\n🌐 Preview server running at ${url}`));
-        if (port !== defaultPort) {
-            console.log(chalk_1.default.yellow(`⚠️ Using alternate port (default ${defaultPort} was occupied).`));
-        }
+        console.log(chalk_1.default.cyan.bold('\n🔎 react-client preview'));
+        console.log(chalk_1.default.gray('────────────────────────'));
+        console.log(chalk_1.default.green(`Serving: ${outDir}`));
+        console.log(chalk_1.default.green(`Open: ${url}`));
         await (0, open_1.default)(url, { newInstance: true });
     });
     process.on('SIGINT', () => {
-        console.log(chalk_1.default.red('\n🛑 Shutting down preview server...'));
+        console.log(chalk_1.default.red('\n🛑 Shutting down preview...'));
         server.close();
         process.exit(0);
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-client",
-  "version": "1.0.20",
+  "version": "1.0.22",
   "description": "react-client is a lightweight CLI and runtime for building React apps with fast iteration.",
   "license": "MIT",
   "author": "Venkatesh Sundaram",