@qwik.dev/router 2.0.0-beta.4 → 2.0.0-beta.5

package/lib/index.qwik.cjs

@@ -802,8 +802,8 @@ const spaInit = core.event$((_, el) => {
     };
     win[scrollEnabled] = true;
     setTimeout(() => {
-      addEventListener("popstate", win[initPopstate]);
-      addEventListener("scroll", win[initScroll], {
+      win.addEventListener("popstate", win[initPopstate]);
+      win.addEventListener("scroll", win[initScroll], {
         passive: true
       });
       document.body.addEventListener("click", win[initAnchors]);

package/lib/index.qwik.mjs

@@ -784,8 +784,8 @@ const spaInit = event$((_, el) => {
     };
     win[scrollEnabled] = true;
     setTimeout(() => {
-      addEventListener("popstate", win[initPopstate]);
-      addEventListener("scroll", win[initScroll], {
+      win.addEventListener("popstate", win[initPopstate]);
+      win.addEventListener("scroll", win[initScroll], {
         passive: true
       });
       document.body.addEventListener("click", win[initAnchors]);

package/lib/middleware/request-handler/index.cjs

@@ -499,6 +499,12 @@ var getMenuLoader = (menus, pathname) => {
   }
 };
 
+// packages/qwik-router/src/middleware/request-handler/resolve-request-handlers.ts
+var import_internal4 = require("@qwik.dev/core/internal");
+
+// packages/qwik-router/src/middleware/request-handler/request-event.ts
+var import_internal3 = require("@qwik.dev/core/internal");
+
 // packages/qwik-router/src/middleware/request-handler/cache-control.ts
 function createCacheControl(cacheControl) {
   const controls = [];
@@ -819,6 +825,10 @@ function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, trail
             "You can not get the returned data of a loader that has not been executed for this request."
           );
         }
+        if (loaders[id] === import_internal3._UNINITIALIZED) {
+          const isDev = getRequestMode(requestEv) === "dev";
+          await getRouteLoaderPromise(loaderOrAction, loaders, requestEv, isDev, qwikSerializer);
+        }
       }
       return loaders[id];
     },
@@ -1197,6 +1207,8 @@ function loadersMiddleware(routeLoaders) {
         for (const loader of routeLoaders) {
           if (selectedLoaderIds.includes(loader.__id)) {
             currentLoaders.push(loader);
+          } else {
+            loaders[loader.__id] = import_internal4._UNINITIALIZED;
           }
         }
       } else {

package/lib/middleware/request-handler/index.d.ts

@@ -11,7 +11,7 @@ import type { RenderOptions } from '@qwik.dev/core/server';
 import { RequestEvent as RequestEvent_2 } from '@qwik.dev/router/middleware/request-handler';
 import type { RequestHandler as RequestHandler_2 } from '@qwik.dev/router/middleware/request-handler';
 import type { ResolveSyncValue as ResolveSyncValue_2 } from '@qwik.dev/router/middleware/request-handler';
-import type { SerializationStrategy } from '@qwik.dev/core/internal';
+import { SerializationStrategy } from '@qwik.dev/core/internal';
 import type { _serialize } from '@qwik.dev/core/internal';
 import type { ValueOrPromise } from '@qwik.dev/core';
 import type { _verifySerializable } from '@qwik.dev/core/internal';

package/lib/middleware/request-handler/index.mjs

@@ -457,6 +457,12 @@ var getMenuLoader = (menus, pathname) => {
   }
 };
 
+// packages/qwik-router/src/middleware/request-handler/resolve-request-handlers.ts
+import { _UNINITIALIZED as _UNINITIALIZED3 } from "@qwik.dev/core/internal";
+
+// packages/qwik-router/src/middleware/request-handler/request-event.ts
+import { _UNINITIALIZED as _UNINITIALIZED2 } from "@qwik.dev/core/internal";
+
 // packages/qwik-router/src/middleware/request-handler/cache-control.ts
 function createCacheControl(cacheControl) {
   const controls = [];
@@ -777,6 +783,10 @@ function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, trail
             "You can not get the returned data of a loader that has not been executed for this request."
           );
         }
+        if (loaders[id] === _UNINITIALIZED2) {
+          const isDev = getRequestMode(requestEv) === "dev";
+          await getRouteLoaderPromise(loaderOrAction, loaders, requestEv, isDev, qwikSerializer);
+        }
       }
       return loaders[id];
     },
@@ -1155,6 +1165,8 @@ function loadersMiddleware(routeLoaders) {
         for (const loader of routeLoaders) {
           if (selectedLoaderIds.includes(loader.__id)) {
             currentLoaders.push(loader);
+          } else {
+            loaders[loader.__id] = _UNINITIALIZED3;
           }
         }
       } else {

package/lib/vite/index.cjs

@@ -14677,6 +14677,12 @@ var getMenuLoader = (menus, pathname) => {
   }
 };
 
+// packages/qwik-router/src/middleware/request-handler/resolve-request-handlers.ts
+var import_internal4 = require("@qwik.dev/core/internal");
+
+// packages/qwik-router/src/middleware/request-handler/request-event.ts
+var import_internal3 = require("@qwik.dev/core/internal");
+
 // packages/qwik-router/src/middleware/request-handler/cache-control.ts
 function createCacheControl(cacheControl) {
   const controls = [];
@@ -14997,6 +15003,10 @@ function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, trail
             "You can not get the returned data of a loader that has not been executed for this request."
           );
         }
+        if (loaders[id] === import_internal3._UNINITIALIZED) {
+          const isDev = getRequestMode(requestEv) === "dev";
+          await getRouteLoaderPromise(loaderOrAction, loaders, requestEv, isDev, qwikSerializer);
+        }
       }
       return loaders[id];
     },
@@ -15378,6 +15388,8 @@ function loadersMiddleware(routeLoaders) {
         for (const loader of routeLoaders) {
           if (selectedLoaderIds.includes(loader.__id)) {
             currentLoaders.push(loader);
+          } else {
+            loaders[loader.__id] = import_internal4._UNINITIALIZED;
           }
         }
       } else {

package/lib/vite/index.mjs

@@ -14668,6 +14668,12 @@ var getMenuLoader = (menus, pathname) => {
   }
 };
 
+// packages/qwik-router/src/middleware/request-handler/resolve-request-handlers.ts
+import { _UNINITIALIZED as _UNINITIALIZED3 } from "@qwik.dev/core/internal";
+
+// packages/qwik-router/src/middleware/request-handler/request-event.ts
+import { _UNINITIALIZED as _UNINITIALIZED2 } from "@qwik.dev/core/internal";
+
 // packages/qwik-router/src/middleware/request-handler/cache-control.ts
 function createCacheControl(cacheControl) {
   const controls = [];
@@ -14988,6 +14994,10 @@ function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, trail
             "You can not get the returned data of a loader that has not been executed for this request."
           );
         }
+        if (loaders[id] === _UNINITIALIZED2) {
+          const isDev = getRequestMode(requestEv) === "dev";
+          await getRouteLoaderPromise(loaderOrAction, loaders, requestEv, isDev, qwikSerializer);
+        }
       }
       return loaders[id];
     },
@@ -15369,6 +15379,8 @@ function loadersMiddleware(routeLoaders) {
         for (const loader of routeLoaders) {
           if (selectedLoaderIds.includes(loader.__id)) {
             currentLoaders.push(loader);
+          } else {
+            loaders[loader.__id] = _UNINITIALIZED3;
           }
         }
       } else {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@qwik.dev/router",
   "description": "The router for Qwik.",
-  "version": "2.0.0-beta.4",
+  "version": "2.0.0-beta.5",
   "bugs": "https://github.com/QwikDev/qwik/issues",
   "dependencies": {
     "@mdx-js/mdx": "^3",
@@ -40,7 +40,7 @@
     "unist-util-visit": "5.0.0",
     "uvu": "0.5.6",
     "yaml": "2.4.5",
-    "@qwik.dev/core": "2.0.0-beta.4"
+    "@qwik.dev/core": "2.0.0-beta.5"
   },
   "engines": {
     "node": "^18.17.0 || ^20.3.0 || >=21.0.0"