vaderjs 1.3.3-alpha-138 → 1.3.3-alpha-139

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-138",
+  "version": "1.3.3-alpha-139",
   "bin": {
     "vader": "./vader.js"
   },

package/runtime/router.js

@@ -75,8 +75,8 @@ class VaderRouter{
        window.onpopstate = async (e) => {   
         let route = window.location.pathname  
         let baseRoute = `/${route.split('/')[1]}` 
-        if(!routes.find((route)=>route.url === baseRoute)){ 
-          console.error(`Route ${route} not found`);
+        if(!this.checkroute(route) && !window.devMode){
+          route = '/404'
         }
         let html =  new DOMParser().parseFromString(await fetch(baseRoute, {
           cache: 'reload'
@@ -145,22 +145,22 @@ class VaderRouter{
     }
   
     checkroute(hash){ 
-      let route = this.routes.find((route) => { 
-        if (route.path === hash) { 
+      let route = window.routes.find((route) => { 
+        if (route.url === hash) { 
           return true;
         }
 
-        if(hash === '' && route.path === '/'){
+        if(hash === '' && route.url === '/'){
           return true
         }
     
         if(hash.includes('?')){
            hash = hash.split('?')[0]
         } 
-        if (route.path.includes('*') || route.path.includes(':')) {
-          const routeParts = route.path.split('/').filter((part) => part !== '');
+        if (route.url.includes('*') || route.url.includes(':')) {
+          const routeParts = route.url.split('/').filter((part) => part !== '');
           const hashParts = hash.split('/').filter((part) => part !== '');  
-          if (routeParts.length !== hashParts.length && !route.path.endsWith('*')) { 
+          if (routeParts.length !== hashParts.length && !route.url.endsWith('*')) { 
             return false;
           }
     
@@ -203,7 +203,8 @@ class VaderRouter{
       if (!route) {
         route = window.routes.find((errorRoute) => {
           if (errorRoute.url.includes('/404') && !this.error && !window.devMode) {   
-             console.log(this.routes)
+            window.history.pushState({}, '', '/404');
+            window.dispatchEvent(new Event('popstate'));
             this.error = true;  
             return false