vaderjs 2.0.5 → 2.0.6

package/main.js

@@ -201,9 +201,9 @@ async function generateApp() {
 
             let r = routes.routes[route]
             let code = await Bun.file(r).text()
-            code = handleReplacements(code)
             let size = code.length / 1024
             r = r.replace(process.cwd().replace(/\\/g, '/') + '/app', '')
+            var beforeR = r
             r = r.replace('.jsx', '.js').replace('.tsx', '.js') 
             fs.mkdirSync(path.join(process.cwd() + '/dist', path.dirname(r)), { recursive: true })
             fs.writeFileSync(process.cwd() + '/dist/' + path.dirname(r) + '/' + path.basename(r), `
@@ -227,6 +227,7 @@ async function generateApp() {
             fs.writeFileSync(process.cwd() + '/dist/src/vader/index.js', await new Bun.Transpiler({
                 loader: 'ts',
             }).transformSync(await Bun.file(require.resolve('vaderjs')).text()))
+
             Bun.spawn({
                 cmd: ['bun', 'run', './dev/bundler.js'],
                 cwd: process.cwd(),
@@ -239,10 +240,12 @@ async function generateApp() {
                     DEV: mode === 'development',
                     size,
                     bindes: bindes.join('\n'),
+                    isTs: beforeR.endsWith(".tsx"),
                     filePath: r,
+
+                    isJsx: beforeR.endsWith('.tsx') || beforeR.endsWith(".jsx"),
                     isAppFile: true,
-                    isJsx: true,
-                    INPUT: `../app/${r.replace('.js', '.jsx').replace('.tsx', '.js')}`,
+                    INPUT: `../app/${beforeR}`,
                 },
                 onExit({ exitCode: code }) {
                     if (code === 0) {
@@ -302,7 +305,6 @@ async function generateApp() {
 function handleFiles() {
     return new Promise(async (resolve, reject) => {
         try {
-            console.log(Glob)
             let glob = new Glob('public/**/*')
             for await (var i of glob.scan()) {
                 let file = i
@@ -317,11 +319,11 @@ function handleFiles() {
                 var file = i
                 fs.mkdirSync(path.join(process.cwd() + '/dist', path.dirname(file)), { recursive: true })
                 // turn jsx to js
-                if (file.includes('.jsx') || file.includes('.tsx')) {
+                if (file.endsWith('.jsx') || file.endsWith('.tsx')) {
                     let code = await Bun.file(file).text()
 
                     code = handleReplacements(code)
-
+                    var url = file
                     file = file.replace('.jsx', '.js').replace('.tsx', '.js')
                     fs.writeFileSync(path.join(process.cwd() + '/dist', file.replace('.jsx', '.js').replace('.tsx', '.js')), code)
                     await Bun.spawn({
@@ -337,8 +339,9 @@ function handleFiles() {
                             DEV: mode === 'development',
                             size: code.length / 1024,
                             filePath: file.replace('.jsx', '.js'),
-                            isTs: file.includes('.tsx'),
-                            INPUT: path.join(process.cwd(), file.replace('.js', '.jsx').replace('.tsx', '.js')),
+                            isJsx: url.endsWith('.tsx') || url.endsWith(".jsx"),
+                            isAppFile: false,
+                            INPUT: path.join(process.cwd(), url),
                         },
                         onExit({ exitCode: code }) {
                             if (code === 0) {
@@ -348,7 +351,7 @@ function handleFiles() {
                             }
                         }
                     })
-                } else if (file.includes('.ts')) {
+                } else if (file.endsWith('.ts')) {
                     let code = await Bun.file(file).text()
                     code = handleReplacements(code)
                     file = file.replace('.ts', '.js')
@@ -389,8 +392,8 @@ function handleFiles() {
 globalThis.clients = []
 
 if (mode === 'development') {
-    await generateApp()
     await handleFiles()
+    await generateApp()
     const watcher = fs.watch(path.join(process.cwd() + '/'), { recursive: true })
     let isBuilding = false; // Flag to track build status
 
@@ -400,10 +403,10 @@ if (mode === 'development') {
     // Function to handle file changes with debounce
     const handleFileChangeDebounced = async (change, file) => {
         if (file.endsWith('.tsx') || file.endsWith('.jsx') || file.endsWith('.css') || file.endsWith('.ts')
-        && !file.includes('node_module')
+            && !file.includes('node_module')
         ) {
             // delete files cache
-            if (file.endsWith('vader.config.ts')){
+            if (file.endsWith('vader.config.ts')) {
                 delete require.cache[require.resolve(process.cwd() + '/vader.config.ts')]
 
                 config = require(process.cwd() + '/vader.config.ts').default
@@ -491,16 +494,16 @@ if (mode == 'development' || mode == 'serve') {
                 style: 'nextjs'
             })
             router.reload()
-            let route = router.match(url.pathname)
+            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
+            base = base.replace(path.join(process.cwd() + '/app').replace(/\\/g, '/'), '');
+            base = base.replace(/\\/g, '/').replace(/\/app(\/|$)/, '/dist$1');
+            base = process.cwd() + '/dist/' + base; 
             let data = await Bun.file(path.join(base, 'index.html')).text()
             if (mode == "development") {
                 return new Response(data + `
@@ -530,4 +533,4 @@ if (mode == 'development' || mode == 'serve') {
     })
 
     console.log(ansiColors.green('Server started at http://localhost:' + port || 8080))
-}
+}

package/package.json

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