vaderjs 1.8.2 → 1.8.4

package/main.js

@@ -179,7 +179,9 @@ const handleReplacements = (code) => {
     return c
 }
 
-
+if (!fs.existsSync(process.cwd() + '/dev/bundler.js')) {
+    fs.copyFileSync(process.cwd() + '/node_modules/vaderjs/dev/bundler.js', process.cwd() + '/dev/bundler.js')
+}
 let start = Date.now()
 async function generateApp() {
     globalThis.isBuilding = true;
@@ -223,9 +225,7 @@ async function generateApp() {
         \n${code}
         `)
             fs.mkdirSync(process.cwd() + '/dev', { recursive: true })
-            if (!fs.existsSync(process.cwd() + '/dev/bundler.js')) {
-                fs.copyFileSync(require.resolve('vaderjs/bundler/index.js'), process.cwd() + '/dev/bundler.js')
-            }
+             
 
             if (!fs.existsSync(process.cwd() + '/dev/readme.md')) {
                 fs.writeFileSync(process.cwd() + '/dev/readme.md', `# Please do not edit the bundler.js file in the dev directory. This file is automatically generated by the bundler. \n\n`)
@@ -457,101 +457,106 @@ else if (mode == 'production') {
 }
 else {
     if (isBuilding) console.log(`Build complete in ${Date.now() - start}ms at ${new Date().toLocaleTimeString()}`);
-    if (mode == 'development' || mode == 'serve') {
-        let server = Bun.serve({
-            port: port || 8080,
-            websocket: {
-                open(ws) {
-                    globalThis.clients.push(ws)
-                    ws.send('Connected')
-                },
-                message(ws, message) {
-                    globalThis.clients.forEach(c => {
-                        c.send(message)
-                    })
-                },
-    
+     
+}
+
+if (mode == 'development' || mode == 'serve') {
+    let server = Bun.serve({
+        port: port || 8080,
+        websocket: {
+            open(ws) {
+                globalThis.clients.push(ws)
+                ws.send('Connected')
             },
-            async fetch(req, res) {
-                if (res.upgrade(req)) {
-                    return new Response('Upgraded', { status: 101 })
-                }
-    
-                let url = new URL(req.url)
-                if (url.pathname.includes('.')) {
-                    let p = url.pathname.replaceAll("%5B", "[").replaceAll("%5D", "]")
-                    let file = await Bun.file(path.join(process.cwd() + '/dist' + p))
-                    if (!await file.exists()) return new Response('Not found', { status: 404 })
-                    let imageTypes = ['image/jpeg', 'image/png', 'image/gif', 'image/svg+xml', 'image/webp', 'image/tiff', 'image/bmp', 'image/ico', 'image/cur', 'image/jxr', 'image/jpg']
-    
-                    return new Response(imageTypes.includes(file.type) ? await file.arrayBuffer() : await file.text(), {
-                        headers: {
-                            'Content-Type': file.type,
-                            'Cache-Control': imageTypes.includes(file.type) ? 'max-age=31536000' : 'no-cache',
-                            'Access-Control-Allow-Origin': '*'
-                        }
-                    })
-                }
-                let router = new Bun.FileSystemRouter({
-                    dir: process.cwd() + '/app',
-                    style: 'nextjs'
+            message(ws, message) {
+                globalThis.clients.forEach(c => {
+                    c.send(message)
                 })
-                router.reload()
-                let route = router.match(url.pathname)
-                if (!route) {
-                    return new Response('Not found', { status: 404 })
-                }
-                let p = route.pathname;
-                let base = path.dirname(route.filePath)
-                base = base.replace(/\\/g, '/')
-                base = base.replace(path.join(process.cwd() + '/app').replace(/\\/g, '/'), '')
-                base = base.replace(/\\/g, '/').replace('/app', '/dist')
-                base = process.cwd() + "/dist/" + base
-                if(!fs.existsSync(path.join(base, 'index.html'))){
-                    return new Response(`
-                    <html>
-                    <head>
-                    <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
-                    <meta http-equiv="refresh" content="5">
-                    </head>
-                    <body>
-                    <h1>404 Not Found</h1>
-                    <p>Route not found</p>
-                    </body>    
-                    `, { status: 404 }, {
-                        headers: {
-                            'Content-Type': 'text/html'
-                        }
-                    })
-                }
-                let data = await Bun.file(path.join(base, 'index.html')).text()
-                if (mode == "development") {
-                    return new Response(data + `
-                <script>
-                let ws = new WebSocket('ws://localhost:${server.port}')
-                ws.onmessage = (e) => {
-                    if(e.data === 'reload'){
-                        console.log('Reloading to display changes from server')
-                        window.location.reload()
+            },
+
+        },
+        async fetch(req, res) {
+            if (res.upgrade(req)) {
+                return new Response('Upgraded', { status: 101 })
+            }
+
+            let url = new URL(req.url)
+            if (url.pathname.includes('.')) {
+                let p = url.pathname.replaceAll("%5B", "[").replaceAll("%5D", "]")
+                let file = await Bun.file(path.join(process.cwd() + '/dist' + p))
+                if (!await file.exists()) return new Response('Not found', { status: 404 })
+                let imageTypes = ['image/jpeg', 'image/png', 'image/gif', 'image/svg+xml', 'image/webp', 'image/tiff', 'image/bmp', 'image/ico', 'image/cur', 'image/jxr', 'image/jpg']
+
+                return new Response(imageTypes.includes(file.type) ? await file.arrayBuffer() : await file.text(), {
+                    headers: {
+                        'Content-Type': file.type,
+                        'Cache-Control': imageTypes.includes(file.type) ? 'max-age=31536000' : 'no-cache',
+                        'Access-Control-Allow-Origin': '*'
                     }
+                })
+            }
+            let router = new Bun.FileSystemRouter({
+                dir: process.cwd() + '/app',
+                style: 'nextjs'
+            })
+            router.reload()
+            let route = router.match(url.pathname)
+            if (!route) {
+                return new Response('Not found', { status: 404 })
+            }
+            let p = route.pathname;
+            let base = path.dirname(route.filePath)
+            base = base.replace(/\\/g, '/')
+            base = base.replace(path.join(process.cwd() + '/app').replace(/\\/g, '/'), '')
+            base = base.replace(/\\/g, '/').replace('/app', '/dist')
+            base = process.cwd() + "/dist/" + base
+            if(!fs.existsSync(path.join(base, 'index.html'))){
+                return new Response(`
+                <html>
+                <head>
+                <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+                <meta http-equiv="refresh" content="5">
+                </head>
+                <body>
+                <h1>404 Not Found</h1>
+                <p>Route not found</p>
+                </body>    
+                `, { status: 404 }, {
+                    headers: {
+                        'Content-Type': 'text/html'
+                    }
+                })
+            }
+            let data = await Bun.file(path.join(base, 'index.html')).text()
+            if (mode == "development") {
+                return new Response(data + `
+            <script>
+            let ws = new WebSocket('ws://localhost:${server.port}')
+            ws.onmessage = (e) => {
+                if(e.data === 'reload'){
+                    console.log('Reloading to display changes from server')
+                    window.location.reload()
                 }
-                </script>
-                `, {
-                        headers: {
-                            'Content-Type': 'text/html'
-                        }
-                    })
-                } else {
-                    return new Response(data, {
-                        headers: {
-                            'Content-Type': 'text/html'
-                        }
-                    })
-                }
-    
             }
-        })
-    
-        console.log(ansiColors.green('Server started at http://localhost:' + port || 8080))
-    }
+            </script>
+            `, {
+                    headers: {
+                        'Content-Type': 'text/html'
+                    }
+                })
+            } else {
+                return new Response(data, {
+                    headers: {
+                        'Content-Type': 'text/html'
+                    }
+                })
+            }
+
+        }
+    })
+
+    console.log(ansiColors.green('Server started at http://localhost:' + port || 8080))
 }
+
+
+ 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "vaderjs",
-    "version": "1.8.2",
+    "version": "1.8.4",
     "description": "A simple and powerful JavaScript library for building modern web applications.", 
     "bin": {
         "vaderjs": "./main.js"