vaderjs 1.3.3-alpha-82 → 1.3.3-alpha-84

package/package.json

@@ -2,7 +2,7 @@
   "name": "vaderjs",
   "description": "A Reactive library aimed to helping you build reactive applications inspired by react.js",
   "module": "vader.js",
-  "version": "1.3.3-alpha-82",
+  "version": "1.3.3-alpha-84",
   "bin": {
     "vader": "./vader.js"
   },

package/vader.js

@@ -25,8 +25,10 @@ Object.keys(dirs).map((key, index) => {
   }
 }).filter(Boolean)[0]
 
-
-
+if(process.env.isCloudflare){
+  let htmlFile = fs.readFileSync(process.cwd() + "/node_modules/vaderjs/runtime/index.html", 'utf8')
+  fs.writeFileSync(process.cwd() + "/dist/index.html", htmlFile)
+}
 
 function Compiler(func, file) {
   let string = func;
@@ -612,48 +614,53 @@ function Compiler(func, file) {
           let newImport = ''
           let name = match.split('import')[1].split('from')[0].trim()
 
-          if (path && path.includes('json')) {
-            path = path.replace(';', '')
-            newImport = `let ${name} = await fetch('${path}').then(res => res.json())`
-          } else if (path && path.includes('module.css')) {
-
-            path = path.replace(';', '')
-            path = path.replace(/'/g, '').trim().replace(/"/g, '').trim()
-            path = path.replaceAll('.jsx', '.js');
-            path = path.replaceAll('../', '');
-            
-            let css = fs.readFileSync(process.cwd() + '/' + path, 'utf8')
- 
-            css = css.replaceAll('.', '') 
-            newImport = `let ${name} = ${JSON.stringify(parse(css))}`
-            string = string.replace(beforeimport, newImport)
-          } else {
-            let beforePath = path
-            let deep = path.split('/').length - 1
-            for (let i = 0; i < deep; i++) {
-              path = path.split('../').join('')
-              path = path.split('./').join('')
-            }
-            path = path.replace(/'/g, '').trim().replace(/"/g, '').trim()
-            // remove double / from path
-            path = path.split('//').join('/') 
-            if (!path.startsWith('./') && !path.includes('/vader.js') && !path.startsWith('src') && !path.startsWith('public')) {
-              path.includes('src') ? path.split('src')[1] : null
-              path = '/src/' + path
-            } else if (path.startsWith('src') || path.startsWith('public')) {
-              path = '/' + path
-            }
-            console.log(path)
-            path = path.replaceAll('.jsx', '.js');
-
+          switch (true) {
+            case path && path.includes('json'):
+              path = path.replace(';', '')
+              newImport = `let ${name} = await fetch('${path}').then(res => res.json())`
 
-            string = string.replace(beforePath, "'" + path + "'")
+              break;
+            case path && path.includes('module.css'):
+              let css = fs.readFileSync(process.cwd() + path, 'utf8')
+              css = css.replaceAll('.', '')
+              newImport = `let ${name} = ${JSON.stringify(parse(css))}`
+              break;
+            case path && path.includes('.css'): 
+              newImport = ``
+              break;
+            default:
+              let beforePath = path
+              let deep = path.split('/').length - 1
+              for (let i = 0; i < deep; i++) {
+                path = path.split('../').join('')
+                path = path.split('./').join('')
+              }
+              path = path.replace(/'/g, '').trim().replace(/"/g, '').trim()
+              // remove double / from path
+              path = path.split('//').join('/') 
+              if (!path.startsWith('./') && !path.includes('/vader.js') && !path.startsWith('src') && !path.startsWith('public')) {
+                path.includes('src') ? path.split('src')[1] : null
+                path = '/src/' + path
+              } else if (path.startsWith('src') || path.startsWith('public')) {
+                path = '/' + path
+              } 
+              path = path.replaceAll('.jsx', '.js');
+  
+  
+              string = string.replace(beforePath, "'" + path + "'")
+              break;
+              
           }
+           
           let html = fs.existsSync(process.cwd() + '/dist/index.html') ? fs.readFileSync(process.cwd() + '/dist/index.html', 'utf8') : ''
           if (!html.includes(`<link rel="preload" href="${path.replace(/'/g, '').trim()}" as="${path.replace(/'/g, '').trim().includes('.css') ? 'style' : 'script'}">`)
-           && !path.includes('.module.css')
+           && !path.includes('.module.css') 
           ) { 
-            let preload = `${!path.trim().includes('.css') ? `<link rel="modulepreload" href="${path.trim()}">` : ''}<link rel="preload" href="${path.trim()}" as="${path.trim().includes('.css') ? 'style' : 'script'}">`
+            let preload = `
+            ${
+              path.trim().includes('.css') ? `<link rel="stylesheet" href="${path.trim()}">` : ''
+            }
+            ${!path.trim().includes('.css') ? `<link rel="modulepreload" href="${path.trim()}">` : ''}<link rel="preload" href="${path.trim()}" as="${path.trim().includes('.css') ? 'style' : 'script'}">`
             html = html.replace('</head>', `${preload}\n</head>`)
 
             fs.writeFileSync(process.cwd() + '/dist/index.html', html)
@@ -866,8 +873,7 @@ async function Build() {
 
     scannedFiles.forEach(async (file) => {
       file = file.split(process.cwd() + '/runtime/')[1]
-
-      console.log(file)
+ 
       let objCase = {
         ...file == "app.js" ? { exit: true } : null,
         ...file.includes("index.html") && fs.existsSync(process.cwd() + "/runtime/" + file) ? { exit: true } : null,
@@ -882,10 +888,7 @@ async function Build() {
       await writer(process.cwd() + "/dist/" + file, data);
     });
 
-  }else if(process.env.isCloudflare){
-      let htmlFile = fs.readFileSync(process.cwd() + "/node_modules/vaderjs/runtime/index.html", 'utf8')
-      fs.writeFileSync(process.cwd() + "/dist/index.html", htmlFile)
-  }
+  } 
 
   globalThis.isBuilding = false
   console.log(`Build complete! ${Math.round(bundleSize / 1000)}${bundleSize > 1000 ? 'kb' : 'bytes'} written to ./dist`)