bertui 1.1.5 → 1.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bertui",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "Lightning-fast React dev server powered by Bun and Elysia - Now with TypeScript support!",
   "type": "module",
   "main": "./index.js",

package/src/build.js

@@ -1,9 +1,8 @@
-// bertui/src/build.js - FORCE PRODUCTION MODE
+// bertui/src/build.js - CLEANED (No PageBuilder)
 import { join } from 'path';
-import { existsSync, mkdirSync, rmSync, writeFileSync } from 'fs';
+import { existsSync, mkdirSync, rmSync } from 'fs';
 import logger from './logger/logger.js';
 import { loadEnvVariables } from './utils/env.js';
-import { runPageBuilder } from './pagebuilder/core.js';
 
 import { compileForBuild } from './build/compiler/index.js';
 import { buildAllCSS } from './build/processors/css-builder.js';
@@ -37,11 +36,6 @@ export async function buildProduction(options = {}) {
     const { loadConfig } = await import('./config/loadConfig.js');
     const config = await loadConfig(root);
     
-    if (config.pageBuilder) {
-      logger.info('Step 0.5: Running Page Builder...');
-      await runPageBuilder(root, config);
-    }
-    
     logger.info('Step 1: Compiling and detecting Server Islands...');
     const { routes, serverIslands, clientRoutes } = await compileForBuild(root, buildDir, envVars);
     
@@ -94,7 +88,6 @@ export async function buildProduction(options = {}) {
 
 async function bundleJavaScript(buildEntry, outDir, envVars, buildDir) {
   try {
-    // Change to build directory where bunfig.toml is
     const originalCwd = process.cwd();
     process.chdir(buildDir);
     
@@ -172,4 +165,4 @@ function showBuildSummary(routes, serverIslands, clientRoutes, duration) {
   }
   
   logger.bigLog('READY TO DEPLOY 🚀', { color: 'green' });
-}
+}

package/src/client/compiler.js

@@ -1,4 +1,7 @@
-// bertui/src/client/compiler.js - FIXED: jsxDEV error
+// ============================================
+// FILE: bertui/src/client/compiler.js (UPDATED - Skip templates/)
+// ============================================
+
 import { existsSync, mkdirSync, readdirSync, statSync } from 'fs';
 import { join, extname, relative, dirname } from 'path';
 import logger from '../logger/logger.js';
@@ -127,9 +130,7 @@ const RouterContext = createContext(null);
 
 export function useRouter() {
   const context = useContext(RouterContext);
-  if (!context) {
-    throw new Error('useRouter must be used within a Router component');
-  }
+  if (!context) throw new Error('useRouter must be used within a Router');
   return context;
 }
 
@@ -194,24 +195,13 @@ export function Link({ to, children, ...props }) {
 }
 
 function NotFound() {
-  return React.createElement(
-    'div',
-    {
-      style: {
-        display: 'flex',
-        flexDirection: 'column',
-        alignItems: 'center',
-        justifyContent: 'center',
-        minHeight: '100vh',
-        fontFamily: 'system-ui'
-      }
-    },
+  return React.createElement('div', {
+    style: { display: 'flex', flexDirection: 'column', alignItems: 'center', 
+             justifyContent: 'center', minHeight: '100vh', fontFamily: 'system-ui' }
+  },
     React.createElement('h1', { style: { fontSize: '6rem', margin: 0 } }, '404'),
     React.createElement('p', { style: { fontSize: '1.5rem', color: '#666' } }, 'Page not found'),
-    React.createElement('a', { 
-      href: '/', 
-      style: { color: '#10b981', textDecoration: 'none', fontSize: '1.2rem' } 
-    }, 'Go home')
+    React.createElement('a', { href: '/', style: { color: '#10b981', textDecoration: 'none' } }, 'Go home')
   );
 }
 
@@ -219,11 +209,9 @@ ${imports}
 
 export const routes = [
 ${routeConfigs}
-];
-`;
+];`;
   
-  const routerPath = join(outDir, 'router.js');
-  await Bun.write(routerPath, routerComponentCode);
+  await Bun.write(join(outDir, 'router.js'), routerComponentCode);
 }
 
 async function compileDirectory(srcDir, outDir, root, envVars) {
@@ -235,6 +223,12 @@ async function compileDirectory(srcDir, outDir, root, envVars) {
     const stat = statSync(srcPath);
     
     if (stat.isDirectory()) {
+      // ✅ NEW: Skip templates directory
+      if (file === 'templates') {
+        logger.debug('⏭️  Skipping src/templates/ (PageBuilder templates only)');
+        continue;
+      }
+      
       const subOutDir = join(outDir, file);
       mkdirSync(subOutDir, { recursive: true });
       const subStats = await compileDirectory(srcPath, subOutDir, root, envVars);
@@ -295,12 +289,11 @@ async function compileFile(srcPath, outDir, filename, relativePath, root, envVar
     const outPath = join(outDir, filename.replace(/\.(jsx|tsx|ts)$/, '.js'));
     code = fixRouterImports(code, outPath, root);
     
-    // ✅ CRITICAL FIX: Force React.createElement instead of jsxDEV
     const transpiler = new Bun.Transpiler({ 
       loader,
       tsconfig: {
         compilerOptions: {
-          jsx: 'react', // ✅ Use 'react' instead of 'react-jsx'
+          jsx: 'react',
           jsxFactory: 'React.createElement',
           jsxFragmentFactory: 'React.Fragment'
         }
@@ -369,4 +362,4 @@ function fixRelativeImports(code) {
   });
   
   return code;
-}
+}

package/src/config/defaultConfig.js

@@ -1,12 +1,8 @@
-// bertui/src/config/defaultConfig.js
-// Default configuration used when bertui.config.js is not present
-
+// bertui/src/config/defaultConfig.js - CLEANED
 export const defaultConfig = {
-  // Site information (used for sitemap generation)
   siteName: "BertUI App",
-  baseUrl: "http://localhost:3000", // Default to localhost
+  baseUrl: "http://localhost:3000",
   
-  // HTML Meta Tags (SEO)
   meta: {
     title: "BertUI - Lightning Fast React",
     description: "Build lightning-fast React applications with file-based routing powered by Bun",
@@ -14,23 +10,19 @@ export const defaultConfig = {
     author: "Pease Ernest",
     themeColor: "#667eea",
     lang: "en",
-    
-    // Open Graph for social sharing
     ogTitle: "BertUI - Lightning Fast React Framework",
     ogDescription: "Build lightning-fast React apps with zero config",
     ogImage: "/og-image.png"
   },
   
-  // App Shell Configuration
   appShell: {
     loading: true,
     loadingText: "Loading...",
     backgroundColor: "#ffffff"
   },
   
-  // robots.txt Configuration
   robots: {
-    disallow: [], // No paths blocked by default
-    crawlDelay: null // No crawl delay by default
+    disallow: [],
+    crawlDelay: null
   }
 };

package/src/dev.js

@@ -1,13 +1,16 @@
-// src/dev.js
+// bertui/src/dev.js - CLEANED (No PageBuilder)
 import { compileProject } from './client/compiler.js';
 import { startDevServer } from './server/dev-server.js';
 import logger from './logger/logger.js';
+import { loadConfig } from './config/loadConfig.js';
 
 export async function startDev(options = {}) {
   const root = options.root || process.cwd();
   const port = options.port || 3000;
   
   try {
+    const config = await loadConfig(root);
+    
     // Step 1: Compile project
     logger.info('Step 1: Compiling project...');
     await compileProject(root);

package/types/config.d.ts

@@ -1,80 +1,33 @@
-// bertui/types/config.d.ts
+// bertui/types/config.d.ts - CLEANED
 declare module 'bertui/config' {
-  /**
-   * BertUI Configuration
-   */
   export interface BertuiConfig {
-    /** Site name for SEO */
     siteName?: string;
-    
-    /** Base URL for sitemap generation (e.g., "https://example.com") */
     baseUrl?: string;
     
-    /** HTML meta tags configuration */
     meta?: {
-      /** Page title */
       title?: string;
-      /** Meta description */
       description?: string;
-      /** Meta keywords */
       keywords?: string;
-      /** Author name */
       author?: string;
-      /** Open Graph image URL */
       ogImage?: string;
-      /** Open Graph title */
       ogTitle?: string;
-      /** Open Graph description */
       ogDescription?: string;
-      /** Theme color */
       themeColor?: string;
-      /** Language code (e.g., "en") */
       lang?: string;
     };
     
-    /** App shell configuration */
     appShell?: {
-      /** Show loading indicator */
       loading?: boolean;
-      /** Loading text */
       loadingText?: string;
-      /** Background color */
       backgroundColor?: string;
     };
     
-    /** robots.txt configuration */
     robots?: {
-      /** Paths to disallow in robots.txt */
       disallow?: string[];
-      /** Crawl delay in seconds */
       crawlDelay?: number;
     };
   }
 
-  /**
-   * Page meta configuration (exported from page files)
-   */
-  export interface PageMeta {
-    title?: string;
-    description?: string;
-    keywords?: string;
-    author?: string;
-    ogTitle?: string;
-    ogDescription?: string;
-    ogImage?: string;
-    themeColor?: string;
-    lang?: string;
-    publishedDate?: string;
-    updatedDate?: string;
-  }
-
-  /**
-   * Default BertUI configuration
-   */
   export const defaultConfig: BertuiConfig;
-
-  /**
-   * Load BertUI configuration from bertui.config.js
-   */
   export function loadConfig(root: string): Promise<BertuiConfig>;
 }

package/src/pagebuilder/core.js

@@ -1,191 +0,0 @@
-// bertui/src/pagebuilder/core.js
-import { join } from 'path';
-import { existsSync, mkdirSync } from 'fs';
-import logger from '../logger/logger.js';
-
-/**
- * Run page builder to generate pages from config
- * @param {string} root - Project root directory
- * @param {Object} config - BertUI configuration
- */
-export async function runPageBuilder(root, config) {
-  const pagesDir = join(root, 'src', 'pages');
-  
-  if (!config.pageBuilder || typeof config.pageBuilder !== 'object') {
-    logger.debug('No page builder configuration found');
-    return;
-  }
-  
-  const { pages } = config.pageBuilder;
-  
-  if (!pages || !Array.isArray(pages) || pages.length === 0) {
-    logger.debug('No pages defined in page builder');
-    return;
-  }
-  
-  logger.info(`📄 Page Builder: Generating ${pages.length} page(s)...`);
-  
-  // Ensure pages directory exists
-  const generatedDir = join(pagesDir, 'generated');
-  if (!existsSync(generatedDir)) {
-    mkdirSync(generatedDir, { recursive: true });
-  }
-  
-  for (const page of pages) {
-    try {
-      await generatePage(page, generatedDir);
-      logger.success(`✅ Generated: ${page.name}`);
-    } catch (error) {
-      logger.error(`❌ Failed to generate ${page.name}: ${error.message}`);
-    }
-  }
-}
-
-/**
- * Generate a single page from configuration
- * @param {Object} pageConfig - Page configuration
- * @param {string} outputDir - Output directory
- */
-async function generatePage(pageConfig, outputDir) {
-  const { name, type, data } = pageConfig;
-  
-  if (!name) {
-    throw new Error('Page name is required');
-  }
-  
-  let pageContent = '';
-  
-  switch (type) {
-    case 'markdown':
-      pageContent = generateMarkdownPage(name, data);
-      break;
-    
-    case 'json':
-      pageContent = generateJsonPage(name, data);
-      break;
-    
-    case 'custom':
-      pageContent = data.template || generateDefaultPage(name, data);
-      break;
-    
-    default:
-      pageContent = generateDefaultPage(name, data);
-  }
-  
-  // Write the generated page
-  const filename = name.toLowerCase().replace(/\s+/g, '-') + '.jsx';
-  const filepath = join(outputDir, filename);
-  
-  await Bun.write(filepath, pageContent);
-}
-
-/**
- * Generate a default React page
- */
-function generateDefaultPage(name, data) {
-  const title = data?.title || name;
-  const content = data?.content || `<p>Welcome to ${name}</p>`;
-  
-  return `// Auto-generated page: ${name}
-import React from 'react';
-
-export const title = "${title}";
-export const description = "${data?.description || `${name} page`}";
-
-export default function ${sanitizeComponentName(name)}() {
-  return (
-    <div>
-      <h1>${title}</h1>
-      ${content}
-    </div>
-  );
-}
-`;
-}
-
-/**
- * Generate a page from Markdown data
- */
-function generateMarkdownPage(name, data) {
-  const title = data?.title || name;
-  const markdown = data?.markdown || '';
-  
-  // Simple markdown to JSX conversion
-  const jsxContent = convertMarkdownToJSX(markdown);
-  
-  return `// Auto-generated markdown page: ${name}
-import React from 'react';
-
-export const title = "${title}";
-export const description = "${data?.description || `${name} page`}";
-
-export default function ${sanitizeComponentName(name)}() {
-  return (
-    <div className="markdown-content">
-      ${jsxContent}
-    </div>
-  );
-}
-`;
-}
-
-/**
- * Generate a page from JSON data
- */
-function generateJsonPage(name, data) {
-  const title = data?.title || name;
-  const items = data?.items || [];
-  
-  return `// Auto-generated JSON page: ${name}
-import React from 'react';
-
-export const title = "${title}";
-export const description = "${data?.description || `${name} page`}";
-
-const items = ${JSON.stringify(items, null, 2)};
-
-export default function ${sanitizeComponentName(name)}() {
-  return (
-    <div>
-      <h1>${title}</h1>
-      <ul>
-        {items.map((item, index) => (
-          <li key={index}>{item.title || item.name || item}</li>
-        ))}
-      </ul>
-    </div>
-  );
-}
-`;
-}
-
-/**
- * Convert markdown to JSX (basic implementation)
- */
-function convertMarkdownToJSX(markdown) {
-  let jsx = markdown
-    // Headers
-    .replace(/^### (.*$)/gm, '<h3>$1</h3>')
-    .replace(/^## (.*$)/gm, '<h2>$1</h2>')
-    .replace(/^# (.*$)/gm, '<h1>$1</h1>')
-    // Bold
-    .replace(/\*\*(.+?)\*\*/g, '<strong>$1</strong>')
-    // Italic
-    .replace(/\*(.+?)\*/g, '<em>$1</em>')
-    // Paragraphs
-    .split('\n\n')
-    .map(para => para.trim() ? `<p>${para}</p>` : '')
-    .join('\n      ');
-  
-  return jsx;
-}
-
-/**
- * Sanitize component name (must be valid React component name)
- */
-function sanitizeComponentName(name) {
-  return name
-    .replace(/[^a-zA-Z0-9]/g, '')
-    .replace(/^[0-9]/, 'Page$&')
-    .replace(/^./, c => c.toUpperCase());
-}