@qwik.dev/router 2.0.0-beta.30 → 2.0.0-beta.32

package/lib/chunks/fs.mjs

@@ -99,7 +99,7 @@ function isIndexModule(extlessName) {
   return /^index(|!|@.+)$/.test(extlessName);
 }
 function isPluginModule(extlessName) {
-  return /^plugin(|@.+)$/.test(extlessName);
+  return /^plugin(|@.+)$/.test(extlessName) && !/\.(test|unit|spec)(\.[jt]s)?$/.test(extlessName);
 }
 function isLayoutModule(extlessName) {
   return /^layout(|!|-.+)$/.test(extlessName);

package/lib/chunks/routing.qwik.mjs

@@ -248,7 +248,7 @@ const resolveDocumentHead = (resolvedHead, updatedHead) => {
   mergeArray(resolvedHead.scripts, updatedHead.scripts);
   Object.assign(resolvedHead.frontmatter, updatedHead.frontmatter);
 };
-const createDocumentHead = (defaults) => ({
+const createDocumentHead = (defaults, manifestHash) => ({
   title: defaults?.title || "",
   meta: [
     ...defaults?.meta || []
@@ -264,7 +264,8 @@ const createDocumentHead = (defaults) => ({
   ],
   frontmatter: {
     ...defaults?.frontmatter
-  }
+  },
+  manifestHash: manifestHash || "dev"
 });
 const resolveRouteConfig = (resolveValue, routeLocation, contentModules, locale, status, defaults) => withLocale(locale, () => {
   const head = createDocumentHead(defaults);
@@ -508,7 +509,7 @@ function findChild(node, part, partLower, parts, partIndex, params) {
   return void 0;
 }
 function findIndexNode(node) {
-  if (node._I || node._G) {
+  if (node._I || node._G != null) {
     return {
       target: node,
       groups: []
@@ -528,7 +529,7 @@ function findIndexNode(node) {
   return void 0;
 }
 function resolveLoaders(root, node, gatheredLayouts) {
-  if (node._G) {
+  if (node._G != null) {
     const keys = node._G.split("/").filter((p) => p.length > 0);
     const target = walkTrieKeys(root, keys);
     if (!target) {
@@ -536,7 +537,7 @@ function resolveLoaders(root, node, gatheredLayouts) {
     }
     let targetNode = target.node;
     const targetLayouts = target.layouts;
-    if (!targetNode._I && !targetNode._G) {
+    if (!targetNode._I && targetNode._G == null) {
       const indexResult = findIndexNode(targetNode);
       if (indexResult) {
         for (const g of indexResult.groups) {
@@ -649,14 +650,14 @@ function matchRouteTree(root = {}, pathname) {
     collectNodeMeta(node, found.groups, layouts, errorLoaderRef, notFoundLoaderRef, menuLoaderRef);
   }
   if (matched && !done && i === len) {
-    if (!node._I && !node._G) {
+    if (!node._I && node._G == null) {
       const indexResult = findIndexNode(node);
       if (indexResult) {
         collectNodeMeta(indexResult.target, indexResult.groups, layouts, errorLoaderRef, notFoundLoaderRef, menuLoaderRef);
         node = indexResult.target;
       }
     }
-    if (!node._I && !node._G && node._A) {
+    if (!node._I && node._G == null && node._A) {
       const next = node._A;
       const paramName = next._P;
       params[paramName] = "";
@@ -669,7 +670,7 @@ function matchRouteTree(root = {}, pathname) {
         menuLoaderRef.v = node._N;
       }
     }
-    if (!node._I && !node._G) {
+    if (!node._I && node._G == null) {
       const restInfo = findRestNode(node);
       if (restInfo) {
         const next = restInfo.next;
@@ -817,4 +818,4 @@ const loadRoute = async (routes, cacheModules, pathname, isInternal) => {
   };
 };
 
-export { CLIENT_DATA_CACHE as C, DEFAULT_LOADERS_SERIALIZATION_STRATEGY as D, Q_ROUTE as Q, createDocumentHead as a, isSameOrigin as b, createLoaderSignal as c, clientNavigate as d, loadRoute as e, toPath as f, getClientNavPath as g, QFN_KEY as h, isSamePath as i, QACTION_KEY as j, QDATA_KEY as k, loadClientData as l, resolveRouteConfig as m, QLOADER_KEY as n, isPromise as o, preloadRouteBundles as p, resolveHead as r, shouldPreload as s, toUrl as t };
+export { CLIENT_DATA_CACHE as C, DEFAULT_LOADERS_SERIALIZATION_STRATEGY as D, Q_ROUTE as Q, createDocumentHead as a, loadRoute as b, createLoaderSignal as c, isSameOrigin as d, clientNavigate as e, toPath as f, getClientNavPath as g, QFN_KEY as h, isSamePath as i, QACTION_KEY as j, QDATA_KEY as k, loadClientData as l, resolveRouteConfig as m, QLOADER_KEY as n, isPromise as o, preloadRouteBundles as p, resolveHead as r, shouldPreload as s, toUrl as t };

package/lib/chunks/{mime-types.mjs → url.mjs}

@@ -49,4 +49,13 @@ const MIME_TYPES = {
   zip: "application/zip"
 };
 
-export { MIME_TYPES as M };
+const LEADING_DOUBLE_SLASH_REG = /^[\\/]{2,}/;
+function normalizeRequestUrl(url, base) {
+  const DOUBLE_SLASH_REG = /\/\/|\\\\/g;
+  const queryOrHashIndex = url.search(/[?#]/);
+  const path = queryOrHashIndex === -1 ? url : url.slice(0, queryOrHashIndex);
+  const suffix = queryOrHashIndex === -1 ? "" : url.slice(queryOrHashIndex);
+  return new URL(`${path.replace(LEADING_DOUBLE_SLASH_REG, "/").replace(DOUBLE_SLASH_REG, "/")}${suffix}`, base);
+}
+
+export { MIME_TYPES as M, normalizeRequestUrl as n };

package/lib/chunks/worker-thread.qwik.mjs

@@ -35,7 +35,7 @@ const resolveDocumentHead = (resolvedHead, updatedHead) => {
   mergeArray(resolvedHead.scripts, updatedHead.scripts);
   Object.assign(resolvedHead.frontmatter, updatedHead.frontmatter);
 };
-const createDocumentHead = (defaults) => ({
+const createDocumentHead = (defaults, manifestHash) => ({
   title: defaults?.title || "",
   meta: [
     ...defaults?.meta || []
@@ -51,7 +51,8 @@ const createDocumentHead = (defaults) => ({
   ],
   frontmatter: {
     ...defaults?.frontmatter
-  }
+  },
+  manifestHash: manifestHash || "dev"
 });
 const resolveRouteConfig = (resolveValue, routeLocation, contentModules, locale, status, defaults) => withLocale(locale, () => {
   const head = createDocumentHead(defaults);
@@ -279,7 +280,7 @@ function findChild(node, part, partLower, parts, partIndex, params) {
   return void 0;
 }
 function findIndexNode(node) {
-  if (node._I || node._G) {
+  if (node._I || node._G != null) {
     return {
       target: node,
       groups: []
@@ -299,7 +300,7 @@ function findIndexNode(node) {
   return void 0;
 }
 function resolveLoaders(root, node, gatheredLayouts) {
-  if (node._G) {
+  if (node._G != null) {
     const keys = node._G.split("/").filter((p) => p.length > 0);
     const target = walkTrieKeys(root, keys);
     if (!target) {
@@ -307,7 +308,7 @@ function resolveLoaders(root, node, gatheredLayouts) {
     }
     let targetNode = target.node;
     const targetLayouts = target.layouts;
-    if (!targetNode._I && !targetNode._G) {
+    if (!targetNode._I && targetNode._G == null) {
       const indexResult = findIndexNode(targetNode);
       if (indexResult) {
         for (const g of indexResult.groups) {
@@ -420,14 +421,14 @@ function matchRouteTree(root = {}, pathname) {
     collectNodeMeta(node, found.groups, layouts, errorLoaderRef, notFoundLoaderRef, menuLoaderRef);
   }
   if (matched && !done && i === len) {
-    if (!node._I && !node._G) {
+    if (!node._I && node._G == null) {
       const indexResult = findIndexNode(node);
       if (indexResult) {
         collectNodeMeta(indexResult.target, indexResult.groups, layouts, errorLoaderRef, notFoundLoaderRef, menuLoaderRef);
         node = indexResult.target;
       }
     }
-    if (!node._I && !node._G && node._A) {
+    if (!node._I && node._G == null && node._A) {
       const next = node._A;
       const paramName = next._P;
       params[paramName] = "";
@@ -440,7 +441,7 @@ function matchRouteTree(root = {}, pathname) {
         menuLoaderRef.v = node._N;
       }
     }
-    if (!node._I && !node._G) {
+    if (!node._I && node._G == null) {
       const restInfo = findRestNode(node);
       if (restInfo) {
         const next = restInfo.next;
@@ -1183,7 +1184,7 @@ function createResolveRequestHandlers(deps) {
     const routeLoaders = [];
     const routeActions = [];
     const requestHandlers = [];
-    const isPageRoute = !!(route && isLastModulePageRoute(route.$mods$));
+    const isPageRoute = !!isLastModulePageRoute(route.$mods$);
     if (isInternal) {
       requestHandlers.push(handleQDataRedirect);
     }
@@ -1193,36 +1194,36 @@ function createResolveRequestHandlers(deps) {
     if (serverPlugins) {
       _resolveRequestHandlers(routeLoaders, routeActions, requestHandlers, serverPlugins, isPageRoute, method);
     }
-    if (route) {
-      const routeModules = route.$mods$;
-      _resolveRequestHandlers(routeLoaders, routeActions, requestHandlers, routeModules, isPageRoute, method);
-      const routeName = route.$routeName$;
-      if (checkOrigin && (method === "POST" || method === "PUT" || method === "PATCH" || method === "DELETE")) {
-        if (checkOrigin === "lax-proto") {
-          requestHandlers.unshift(csrfLaxProtoCheckMiddleware);
-        } else {
-          requestHandlers.unshift(csrfCheckMiddleware);
-        }
+    const routeModules = route.$mods$;
+    _resolveRequestHandlers(routeLoaders, routeActions, requestHandlers, routeModules, isPageRoute, method);
+    const routeName = route.$routeName$;
+    if (checkOrigin && (method === "POST" || method === "PUT" || method === "PATCH" || method === "DELETE")) {
+      if (checkOrigin === "lax-proto") {
+        requestHandlers.unshift(csrfLaxProtoCheckMiddleware);
+      } else {
+        requestHandlers.unshift(csrfCheckMiddleware);
       }
-      if (isPageRoute) {
-        if (method === "POST" || method === "GET") {
-          requestHandlers.push(runServerFunction);
-        }
+    }
+    if (isPageRoute) {
+      if (method === "POST" || method === "GET") {
+        requestHandlers.push(runServerFunction);
+      }
+      if (!route.$notFound$) {
         requestHandlers.push(fixTrailingSlash);
-        if (isInternal) {
-          requestHandlers.push(renderQData);
-        }
       }
-      if (isPageRoute) {
-        requestHandlers.push((ev) => {
-          ev.sharedMap.set(deps.RequestRouteName, routeName);
-        });
-        requestHandlers.push(actionsMiddleware(routeActions));
-        requestHandlers.push(loadersMiddleware(routeLoaders));
-        requestHandlers.push(eTagMiddleware(route));
-        requestHandlers.push(renderHandler);
+      if (isInternal) {
+        requestHandlers.push(renderQData);
       }
     }
+    if (isPageRoute) {
+      requestHandlers.push((ev) => {
+        ev.sharedMap.set(deps.RequestRouteName, routeName);
+      });
+      requestHandlers.push(actionsMiddleware(routeActions));
+      requestHandlers.push(loadersMiddleware(routeLoaders));
+      requestHandlers.push(eTagMiddleware(route));
+      requestHandlers.push(renderHandler);
+    }
     return requestHandlers;
   };
   const _resolveRequestHandlers = (routeLoaders, routeActions, requestHandlers, routeModules, collectActions, method) => {

package/lib/index.d.ts

@@ -400,8 +400,6 @@ export declare interface FormProps<O, I> extends Omit<QwikJSX.IntrinsicElements[
      * Defaults to `false`
      */
     spaReset?: boolean;
-    /** Event handler executed right when the form is submitted. */
-    onSubmit$?: QRLEventHandlerMulti<SubmitEvent, HTMLFormElement> | undefined;
     /** Event handler executed right after the action is executed successfully and returns some data. */
     onSubmitCompleted$?: QRLEventHandlerMulti<CustomEvent<FormSubmitSuccessDetail<O>>, HTMLFormElement> | undefined;
     key?: string | number | null;
@@ -740,7 +738,10 @@ export { RequestEventLoader }
 export { RequestHandler }
 
 /** @public */
-export declare type ResolvedDocumentHead<FrontMatter extends Record<string, any> = Record<string, unknown>> = Required<DocumentHeadValue<FrontMatter>>;
+export declare type ResolvedDocumentHead<FrontMatter extends Record<string, any> = Record<string, unknown>> = Required<DocumentHeadValue<FrontMatter>> & {
+    /** The build's manifest hash, used for per-loader data URLs. Always defined (`'dev'` in dev). */
+    readonly manifestHash: string;
+};
 
 /** @public */
 export declare const routeAction$: ActionConstructor;