npm - vaderjs - Versions diffs - 1.4.1-hyiuy47 → 1.4.1-lv56aadeg5 - Mend

vaderjs 1.4.1-hyiuy47 → 1.4.1-lv56aadeg5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/@integrations/ssg.js CHANGED Viewed

@@ -48,71 +48,43 @@ let server = http.createServer((req, res) => {
 });
 const generateHTML = (routeData) => {
+  console
-  let { path, file, isParam, params, query, pathname } = routeData;
+  let { path, file, isParam, params,kind, isCatchAll, query, pathname } = routeData;
+  console.log(path, file, isParam, isCatchAll, query, pathname)
   let baseFolder =  file.split('/').filter(f => f !== 'dist').join('/')
   if (file.includes('./dist')) {
     baseFolder = file.split('./dist')[1]
   }
-  let isCatchAll = false;
   let html = `
 <!DOCTYPE html>
   <html>
    <head>
-<title>Vaderjs v1.3.3</title>
-<meta name="description" content="Vader.js is a modern web framework for building web applications.">
-<link rel="shortcut icon" href="https://raw.githubusercontent.com/Postr-Inc/Vader.js/main/logo.png" type="image/x-icon">
-   </head>
-   <body>
-   <script id="v">
+<title>Vaderjs v1.3.3</title>
+<script id="v">
    window.$SERVER = true
    </script>
+</head>
+   <body>
    <div id="app"></div>
    <script id="router" type="module">
     import Router from '/router.js'
     const rt = new Router
-    ${Array.isArray(params)
-      ? params
-        .map((param) => {
-          if (!param.jsFile) return "";
-          let ranName = Math.random()
-            .toString(36)
-            .substring(7)
-            .replace(".", "");
-          let pd = Object.keys(param.paramData)[0];
-          let baseFolder = path
-            .split("/")
-            .filter((f) => f !== "pages")
-            .join("/");
-         if(pd === '$catchall'){
-            isCatchAll = true;
-            console.log('catchall')
-            return `
-            import c${ranName} from '${param.jsFile}'
-            rt.get($SERVER ? '/' : '/${baseFolder}/*', c${ranName})
-            `
-         }
+    ${Object.keys(routeData.params).length > 0 ? Object.keys(routeData.params).map((param, i) => {
+    return `rt.get('/${pathname}/:${param}', ' ${baseFolder}')`
+    }): ''}
-          return `
-      import c${ranName} from '${param.jsFile}'
-      rt.get('/${baseFolder}/:${pd}', c${ranName})
-      `;
-        })
-        .join("")
-      : ""
-    }
     let c = await import('${baseFolder}')
     if(Object.keys(c).includes('$prerender') && c.$prerender === false){
       document.head.setAttribute('prerender', 'false')
     }
     ${
-      !isCatchAll ? `rt.get($SERVER? '/' : '${pathname}', c)` : ``
+      !isCatchAll ? `rt.get($SERVER? '/' : '${pathname}', c)` :  `rt.get($SERVER? '/' : '${pathname}/*', c)`
     }
     rt.listen()
@@ -130,6 +102,9 @@ const generateHTML = (routeData) => {
 const ssg = async (config) => {
   return new Promise(async (resolve, reject) => {
     let { pages, output } = config;
+    if(!fs.existsSync(`${process.cwd()}/_dev/meta/routes.json`)){
+      process.exit()
+    }
     let routes = JSON.parse(fs.readFileSync(`${process.cwd()}/_dev/meta/routes.json`).toString())
     for (var i in routes) {
       let route = routes[i];
@@ -152,8 +127,7 @@ const ssg = async (config) => {
           document.querySelector("#app").innerHTML = "";
         }
       });
-      let content = await page.content();
-      console.log(`Writing ${routes[i].path} to ${output}/${routes[i].path}/index.html`)
+      let content = await page.content();
       if (output.includes('./dist')) {
         output = output.split('./dist')[1]
       }
@@ -171,19 +145,19 @@ const ssg = async (config) => {
     }
   })
 }
-if(context){
-  server.listen(8700);
-  await ssg({ pages: './pages', output: './dist' })
+if(context){
+server.listen(8700);
+await ssg({ pages: './pages', output: './dist' })
 }
 export default {
   name: 'Vaderjs Static Site Generator',
   version: '1.0.0',
   useRuntime: 'node',
   entryPoint: process.cwd() + '/node_modules/vaderjs/@integrations/ssg.js',
-  on: ['build', 'dev:change'],
+  on: ['build', 'dev'],
 }
+// Path:integrations/ssg.js

package/README.md CHANGED Viewed

@@ -33,7 +33,7 @@ Tip: Each folder can be deep nested up to 4 levels!
 /pages/index.jsx = /
 /pages/home/[page].jsx  = /home/:page
 /pages/path/index.jsx = /path/
-/pages/test/[...]/index.jsx = /path/test/*
+/pages/test/[[...catchall]]/index.jsx = /path/test/*
 /pages/route/[param1]/[param2].jsx = /path/route/:param1/:param2
 ```
 Keyword folders - all files are passed from these folders to the `dist` folder
@@ -80,7 +80,7 @@ vader's compiler automatically handles routing so you wont need to! - it uses a
 /pages/index.jsx = /
 /pages/home/[page].jsx  = /home/:page
 /pages/path/index.jsx = /path/
-/pages/path/[...].jsx = /path/*
+/pages/path/[[...catchall]].jsx = /path/*
 ```
 For pages that have [params] you can derive it using this.request
@@ -163,7 +163,7 @@ Vaderjs has two types of in javascript styling - css modules and inline jsx styl
 ```jsx
 // inline
-<button style={{color:'red'}}>Button</button>
+<button style={{color:'red', "@mobile":{color:'green'}}}>Button</button>
 // css module
@@ -203,12 +203,12 @@ export default class MyApp extends Component{
       console.log(ref.current) // p tag
     }, this)
     return  <>
-     <p ref={ref}>Count is {count}</p>
+     <p ref={ref}>Count is {count()}</p>
      {/**
        pass anything used from the toplevel render to the lowerlevel function params to be able to invoke!
       **/}
      <button onclick={()=>{
-      setCount(++count)
+      setCount(count() + 1)
      }}>Increment</button>
     </>