@webqit/webflo 0.20.42 → 0.20.44

package/package.json

@@ -12,7 +12,7 @@
     "vanila-javascript"
   ],
   "homepage": "https://webqit.io/tooling/webflo",
-  "version": "0.20.42",
+  "version": "0.20.44",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -50,7 +50,7 @@
     "@webqit/fetch-plus": "^0.1.24",
     "@webqit/keyval": "^0.2.17",
     "@webqit/observer": "^3.8.14",
-    "@webqit/oohtml-ssr": "^2.2.2",
+    "@webqit/oohtml-ssr": "^2.2.4",
     "@webqit/port-plus": "^0.1.19",
     "@webqit/url-plus": "^0.1.4",
     "@webqit/use-live": "^0.5.49",

package/src/webflo-runtime/webflo-client/DeviceViewport.js

@@ -13,7 +13,7 @@ export class DeviceViewport {
     };
 
     constructor() {
-        const initialState = { _isInitial: true };
+        const initialState = { _priority: 1 };
 
         // 1. Ingest Viewport
         const vMeta = document.querySelector('meta[name="viewport"]');
@@ -152,10 +152,17 @@ export class DeviceViewport {
         return [k.replace(/-([a-z])/g, g => g[1].toUpperCase()), v || true];
     }));
 
-    push(id, config) {
+    push(id, config, priority = 1) {
         if (!id) throw new Error("push() requires a unique ID");
         if (this.#stack.some(e => e.id === id)) return;
-        this.#stack.push({ ...this.peek(), ...config, id, _isInitial: false });
+
+        const peek = this.peek();
+        if (peek._priority - priority >= 0.2) {
+            this.#stack.push({ ...config, ...peek, id, _priority: priority });
+        } else {
+            this.#stack.push({ ...peek, ...config, id, _priority: priority });
+        }
+        
         this.#scheduleRender();
     }
 

package/src/webflo-runtime/webflo-routing/WebfloRouter111.js

@@ -17,6 +17,7 @@ export class WebfloRouter111 {
         const $this = this;
         const callWebfloDefault = async (thisContext, thisTick) => {
             let returnValue;
+
             if (_default) {
                 returnValue = await _default.call(thisContext, thisTick.event, remoteFetch);
             }

package/src/webflo-runtime/webflo-server/WebfloServer.js

@@ -937,7 +937,7 @@ export class WebfloServer extends AppRuntime {
                 document.body.append(dataScript);
             }
 
-            const rendering = window.toString();
+            const rendering = window.document.toString();
             document.documentElement.remove();
             document.writeln('');
 

package/src/webflo-runtime/webflo-worker/WebfloWorker.js

@@ -88,7 +88,7 @@ export class WebfloWorker extends AppRuntime {
 		// ONFETCH
 		const fetchHandler = (event) => {
 			// Handle special requests
-			if (!event.request.url.startsWith('http') || event.request.mode === 'navigate') {
+			if (!event.request.url.startsWith('http')) {
 				return event.respondWith(fetch(event.request));
 			}
 			// Handle external requests
@@ -96,7 +96,8 @@ export class WebfloWorker extends AppRuntime {
 				return event.respondWith(this.remoteFetch(event.request));
 			}
 			event.respondWith((async (event) => {
-				const response = await this.navigate(event.request.url, event.request, { event });
+				let request = event.request;
+				const response = await this.navigate(request.url, request, { event });
 				return response;
 			})(event));
 		};
@@ -278,9 +279,9 @@ export class WebfloWorker extends AppRuntime {
 	}
 
 	async getRequestCache(request) {
-		const cacheName = request.headers.get('X-Powered-By') === '@webqit/webflo'
-			? this.config.WORKER.cache_name + '_csr'
+		const cacheName = request.headers.get('Accept') === 'application/json'
+			? this.config.WORKER.cache_name + '_json'
 			: this.config.WORKER.cache_name;
 		return self.caches.open(cacheName);
 	}
-}
+}