vaderjs 1.3.3-12219a8b18b-hotfix → 1.3.3-1b2198a8b18b

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-12219a8b18b-hotfix",
+  "version": "1.3.3-1b2198a8b18b",
   "bin": {
     "vader": "./vader.js"
   },

package/vader.js

@@ -907,7 +907,9 @@ async function Build() {
           page.on('crash', () => {
             console.error(`Render process crashed for ${route.url}`)
           });
-         
+          page.on('requestfailed', request => {
+            console.error('REQUEST FAILED:', request.url(), request.failure().errorText);
+          });
           await page.goto(`http://localhost:${port}${route.url}`, { waitUntil: 'networkidle2' });
 
           page.evaluate(() => {
@@ -1163,12 +1165,8 @@ async function Build() {
   `;
     globalThis.routeDocuments.push({ url: route.url, document: document })
   })
- 
-  if(globalThis.devMode && !globalThis.oneAndDone){
-    ssg(globalThis.routes)
-    globalThis.oneAndDone = true
-    console.log('Prerendering...')
-  }
+
+  ssg(globalThis.routes)
 
 
   const scannedSourceFiles = await glob("**/**.{jsx,js,json}", {
@@ -1260,7 +1258,7 @@ async function Build() {
 
   return true
 }
-const s = (port) => {
+const s = () => {
 
   const server = http.createServer((req, res) => {
 
@@ -1345,9 +1343,10 @@ const s = (port) => {
         return 'application/octet-stream';
     }
   }
- 
-  server.listen(port, () => {
-    console.log(`Server is running on port ${port}`);
+
+  const PORT = process.env.PORT || 3000;
+  server.listen(PORT, () => {
+    console.log(`Server is running on port ${PORT}`);
     globalThis.ws = ws
   });
 
@@ -1360,15 +1359,11 @@ switch (true) {
 
     globalThis.devMode = true
     globalThis.isProduction = false
-    
-    let p = process.env.PORT || config.port || process.argv.includes('-p') ? process.argv[process.argv.indexOf('-p') + 1] : 3000
-    globalThis.oneAndDone = false
     console.log(`
 Vader.js v${fs.readFileSync(process.cwd() + '/node_modules/vaderjs/package.json', 'utf8').split('"version": "')[1].split('"')[0]}
 - Watching for changes in ./pages
 - Watching for changes in ./src
 - Watching for changes in ./public
-- Serving on port ${p}
 `)
     !globalThis.isBuilding ? Build() : null
 
@@ -1392,8 +1387,11 @@ Vader.js v${fs.readFileSync(process.cwd() + '/node_modules/vaderjs/package.json'
             Build()
           }
         }).on('error', (err) => console.log(err))
-    })  
-    s(p)
+    })
+    let p = process.argv[process.argv.indexOf('dev') + 1] || 3000
+
+    process.env.PORT = p
+    s()
 
     globalThis.listen = true;
 
@@ -1413,15 +1411,15 @@ Building to ./dist
 
     break;
   case process.argv.includes('start') && !process.argv.includes('dev') && !process.argv.includes('build'):
-    let port = process.env.PORT || config.port || process.argv.includes('-p') ? process.argv[process.argv.indexOf('-p') + 1] : 3000
-    console.log(port)
+    let port = process.argv[process.argv.indexOf('--serve') + 1] || 3000
+    process.env.PORT = port
     globalThis.devMode = false
     console.log(`
 Vader.js v1.3.3 
 Serving ./dist on port ${port}
 url: http://localhost:${port}
     `)
-    s(port)
+    s()
     break;
   default:
     // add color
@@ -1432,11 +1430,11 @@ Usage: vader <command>
     
 Commands:
 
-   vaderjs dev  -p <number>    Start the development server
+   vaderjs dev     Start the development server
     
    vaderjs build   Build the project to ./dist
     
-   vaderjs start  -p <number>  Production Mode (default 3000 or process.env.PORT)
+   vaderjs start  <port>   Production Mode (default 3000 or process.env.PORT)
       
 Learn more about vader:           https://vader-js.pages.dev/