vaderjs 1.4.2-kml56 → 1.4.2-ybml56

package/binaries/Kalix/index.js

@@ -444,6 +444,9 @@ export class Document {
      * @returns {HTMLElement}
      */
     createElement(nodeData) {
+        if(!nodeData){
+            return new HTMLElement("div", {}, [])
+        }
         if (typeof nodeData === 'string') {
             return new HTMLElement(nodeData, {}, [])
         }

package/binaries/compiler/main.js

@@ -261,7 +261,7 @@ export async function Compile(){
               }  
               copy = copy.replace(old, newLine)
             break;
-            case !line.includes('import') && line.includes('useState') && !line.includes('let useState'): 
+            case !line.includes('import') && line.includes('useState') && !line.includes('let useState') && !line.includes('var useState') && !line.includes('console'):
             let varType = line.split('[', 1)[0];
             let before =  line.split('useState(')[1].split(',')[0]; 
             let key = line.split('[')[1].split(',')[0]; 
@@ -443,7 +443,7 @@ if(process.env.hmr || process.env.mode === "production"){
   await Compile()
   let hasInitialized = [] 
   if(!process.env.wasLastRun){
-    console.group('\x1b[32m%s\x1b[0m', 'ready', '\x1b[0m', '-', `started ${config?.mode} at http://localhost:${config?.env?.PORT || 3000}`) 
+    console.group('\x1b[32m%s\x1b[0m', 'ready', '\x1b[0m', '-', `started server at http://localhost:${config?.env?.PORT || 3000}`) 
   } 
   if(process.env.mode !== "production"){ 
     Router.init() 

package/binaries/watcher/hmr.js

@@ -1,4 +1,5 @@
 import { watch } from 'fs'
+import fs from 'fs'
 globalThis.hasLogged = false
 export function watchDir(cwd, _){
     process.chdir(cwd)
@@ -12,6 +13,9 @@ export function watchDir(cwd, _){
     let paths = ['src', 'pages', 'public', 'routes', 'vader.config.ts']
     for(var i in paths){
         let path = paths[i]
+        if(!fs.existsSync(process.cwd() + '/' + path)){ 
+            continue;
+        }
         watch(process.cwd() + '/' + path, { recursive: true, absolute:true }, (event, filename) => { 
            if(filename && !filename.includes('node_modules') && !globalThis.hasLogged){ 
             console.log(`\x1b[36mwait \x1b[0m  - compiling (client and server)`)

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "vaderjs",
   "description": "A reactive framework for building fast and scalable web applications",
-  "version": "1.4.2-kml56",
-  "main": "vader.js",
+  "version": "1.4.2-ybml56", 
   "author": {
     "name": "Malikwhitten67",
     "email": "malikwhitterb@gmail.com"
@@ -14,7 +13,7 @@
   },
   "type": "module",
   "bin":{
-    "vader":"./vader.js"
+    "vader":"./vader_dev.js"
   },
   "dependencies": {
     "ws": "latest"

package/plugins/ssg/index.js

@@ -1,5 +1,5 @@
 import * as Bun from 'bun'
-import { Element, Document, DOMParser} from 'vaderjs/binaries/Kalix/index.js'
+import {  Document, DOMParser} from 'vaderjs/binaries/Kalix/index.js'
 import { renderToString } from '../../server'
 import fs from 'fs'
 let routes = new Bun.FileSystemRouter({
@@ -15,7 +15,10 @@ async function generate(){
   for(var i in routes){
     let path = i 
     let file = routes[i]
-    let comp =  require(file).default
+    let comp =  require(file).default 
+    if(!comp){
+        continue;
+    }
     let document = new Document()
     let div = document.createElement('div')
     div.setAttribute('id', 'root') 
@@ -24,7 +27,7 @@ async function generate(){
     dom = div.toString("outerHTML")   
     let folder = path.split('/pages')[0]
     let newPath = process.cwd() + '/build' + folder + '/index.html'
-    let name = comp.name
+    let name = comp.name || 'App'
     file = file.replace(/\\/g, '/').replace('\/\/', '/').replace(process.cwd().replace(/\\/g, '/'), '').split('/pages')[1].replace('.tsx', '.js').replace('.jsx', '.js')
     let isParamRoute = path.includes('[')
     let baseFolder = ''
@@ -33,6 +36,11 @@ async function generate(){
         let providerPath;
         switch(true){
             case provider === 'vercel':
+                 if(path.includes('[[catchall]]')){ 
+                    providerPath = `${baseFolder}/${path.replace('[[catchall]]', '*')}`
+                    providerRoutes.push({source: providerPath, destination: `${path}/index.html`})
+                    break;
+                 }
                  providerPath = `${baseFolder}:${path.split('[')[1].split(']')[0]}`
                  providerRoutes.push({source: providerPath, dest: `${path}/index.html`}) 
                  break;
@@ -40,6 +48,15 @@ async function generate(){
                 providerPath = `RewriteRule ^${baseFolder.replace('/', '')}.*$ ${path}/index.html [L]`
                 providerRoutes.push(providerPath)
                 break;
+            case provider === 'cloudflare':
+                if(path.includes('[[catchall]]')){ 
+                    providerPath = `${baseFolder}/${path.replace('[[catchall]]', '*')}`
+                    providerRoutes.push({source: providerPath, destination: `${path}/index.html`})
+                    break;
+                }
+                providerPath = `${baseFolder}/:${path.split('[')[1].split(']')[0]}`
+                providerRoutes.push({source: providerPath, destination: `${path}/index.html`}) 
+                break;
         }
     }else{
         let providerPath;
@@ -55,6 +72,10 @@ async function generate(){
                 providerPath = `RewriteRule ^${path.replace('/', '')}/$ ${path}/index.html [L]`
                 providerRoutes.push(providerPath)
                 break;
+            case provider === 'cloudflare':
+                providerPath = `${path}`
+                providerRoutes.push({source: providerPath, destination: `${path === '/' ? '' : '/'}/index.html`})  
+                break;
             
         }
     }
@@ -101,6 +122,13 @@ Header add x-powered-by "vaderjs"
         `
          fs.writeFileSync(process.cwd() + '/.htaccess', full)
         break;
+    case provider === 'cloudflare':
+        let cloudflare = process.cwd() + '/build/_redirects'
+        let data = providerRoutes.map((route) => {
+            return `${route.source} ${route.destination}`
+        }).join('\n')
+        fs.writeFileSync(cloudflare, data)
+        break;
   }
   console.log(`\x1b[32mSuccess\x1b[0m - Static files generated`)
 

package/router/index.ts

@@ -171,7 +171,7 @@ export default {
          if(!globalThis.isListening){ 
              let config = require(process.cwd() + '/vader.config.js').default  
              if(process.env.mode === 'production'){
-                console.log(`Listening at - http://${config.host.hostname}:${config.env.PORT}`)
+                console.log(`\x1b[32msuccess \x1b[0m- listening on port ${config.env.PORT || 3000}`)
                 spawnServer(config)
              }  
              config?.env?.SSR ? spawn_ssr_server(config ) : spawnServer(config)  

package/server/index.js

@@ -47,7 +47,7 @@ class Component {
     }
 
 }
-export async function renderToString(element, args = []) {  
+export async function renderToString(element, args = []) {   
     let data = typeof element === 'function' ? await element(args) : element
     let doc = new Document()
     let el = doc.createElement(data)