bertui 0.1.8 → 0.2.0

package/index.js

@@ -32,5 +32,5 @@ export default {
     buildCSS,
     copyCSS,
     program,
-    version: "0.1.8"
+    version: "0.2.0"
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bertui",
-  "version": "0.1.8",
+  "version": "0.2.0",
   "description": "Lightning-fast React dev server powered by Bun and Elysia",
   "type": "module",
   "main": "./index.js",

package/src/client/compiler.js

@@ -40,7 +40,7 @@ export async function compileProject(root) {
   const stats = await compileDirectory(srcDir, outDir, root);
   const duration = Date.now() - startTime;
   
-  // Generate router AFTER compilation so we reference .js files
+  // Generate router AFTER compilation
   if (routes.length > 0) {
     await generateRouter(routes, outDir, root);
     logger.info('Generated router.js');
@@ -104,7 +104,6 @@ async function discoverRoutes(pagesDir) {
 async function generateRouter(routes, outDir, root) {
   const imports = routes.map((route, i) => {
     const componentName = `Page${i}`;
-    // CRITICAL FIX: Import .js files (compiled), not .jsx
     const importPath = `./pages/${route.file.replace(/\.(jsx|tsx|ts)$/, '.js')}`;
     return `import ${componentName} from '${importPath}';`;
   }).join('\n');
@@ -198,14 +197,14 @@ async function compileFile(srcPath, outDir, filename, relativePath) {
   try {
     let code = await Bun.file(srcPath).text();
     
-    // Remove bertui/styles imports completely
+    // Remove bertui/styles imports
     code = code.replace(/import\s+['"]bertui\/styles['"]\s*;?\s*/g, '');
     
-    // Replace bertui/router imports with CDN React Router (we'll use a simpler approach)
-    // For now, keep the import as-is and handle it differently
-    
     const transpiler = new Bun.Transpiler({ loader });
-    const compiled = await transpiler.transform(code);
+    let compiled = await transpiler.transform(code);
+    
+    // CRITICAL FIX: Add .js extensions to all relative imports
+    compiled = fixRelativeImports(compiled);
     
     const outFilename = filename.replace(/\.(jsx|tsx|ts)$/, '.js');
     const outPath = join(outDir, outFilename);
@@ -216,4 +215,22 @@ async function compileFile(srcPath, outDir, filename, relativePath) {
     logger.error(`Failed to compile ${relativePath}: ${error.message}`);
     throw error;
   }
+}
+
+function fixRelativeImports(code) {
+  // Match import statements with relative paths that don't already have extensions
+  // Matches: import X from './path' or import X from '../path' 
+  // But NOT: import X from './path.js' or import X from 'package'
+  
+  const importRegex = /from\s+['"](\.\.[\/\\]|\.\/)((?:[^'"]+?)(?<!\.js|\.jsx|\.ts|\.tsx|\.json))['"];?/g;
+  
+  code = code.replace(importRegex, (match, prefix, path) => {
+    // Don't add .js if path already has an extension or ends with /
+    if (path.endsWith('/') || /\.\w+$/.test(path)) {
+      return match;
+    }
+    return `from '${prefix}${path}.js';`;
+  });
+  
+  return code;
 }

package/src/router/Router.js

@@ -1,7 +1,5 @@
-// src/router/Router.jsx
 import { useState, useEffect, createContext, useContext } from 'react';
 
-// Router context
 const RouterContext = createContext(null);
 
 export function useRouter() {
@@ -12,20 +10,13 @@ export function useRouter() {
   return context;
 }
 
-export function useParams() {
-  const { params } = useRouter();
-  return params;
-}
-
-export function Router({ routes, children }) {
+export function Router({ routes }) {
   const [currentRoute, setCurrentRoute] = useState(null);
   const [params, setParams] = useState({});
 
   useEffect(() => {
-    // Match initial route
     matchAndSetRoute(window.location.pathname);
 
-    // Handle browser navigation
     const handlePopState = () => {
       matchAndSetRoute(window.location.pathname);
     };
@@ -35,7 +26,6 @@ export function Router({ routes, children }) {
   }, []);
 
   function matchAndSetRoute(pathname) {
-    // Try exact match first (static routes)
     for (const route of routes) {
       if (route.type === 'static' && route.path === pathname) {
         setCurrentRoute(route);
@@ -44,7 +34,6 @@ export function Router({ routes, children }) {
       }
     }
 
-    // Try dynamic routes
     for (const route of routes) {
       if (route.type === 'dynamic') {
         const pattern = route.path.replace(/\[([^\]]+)\]/g, '([^/]+)');
@@ -52,7 +41,6 @@ export function Router({ routes, children }) {
         const match = pathname.match(regex);
 
         if (match) {
-          // Extract params
           const paramNames = [...route.path.matchAll(/\[([^\]]+)\]/g)].map(m => m[1]);
           const extractedParams = {};
           paramNames.forEach((name, i) => {
@@ -66,7 +54,6 @@ export function Router({ routes, children }) {
       }
     }
 
-    // No match found - 404
     setCurrentRoute(null);
     setParams({});
   }
@@ -83,18 +70,16 @@ export function Router({ routes, children }) {
     pathname: window.location.pathname
   };
 
+  const Component = currentRoute?.component;
+
   return (
     <RouterContext.Provider value={routerValue}>
-      {currentRoute ? (
-        <currentRoute.component />
-      ) : (
-        children || <NotFound />
-      )}
+      {Component ? <Component params={params} /> : <NotFound />}
     </RouterContext.Provider>
   );
 }
 
-export function Link({ to, children, className, ...props }) {
+export function Link({ to, children, ...props }) {
   const { navigate } = useRouter();
 
   function handleClick(e) {
@@ -103,7 +88,7 @@ export function Link({ to, children, className, ...props }) {
   }
 
   return (
-    <a href={to} onClick={handleClick} className={className} {...props}>
+    <a href={to} onClick={handleClick} {...props}>
       {children}
     </a>
   );
@@ -117,7 +102,7 @@ function NotFound() {
       alignItems: 'center',
       justifyContent: 'center',
       minHeight: '100vh',
-      fontFamily: 'system-ui, sans-serif'
+      fontFamily: 'system-ui'
     }}>
       <h1 style={{ fontSize: '6rem', margin: 0 }}>404</h1>
       <p style={{ fontSize: '1.5rem', color: '#666' }}>Page not found</p>