@qwik.dev/core 2.0.0-beta.4 → 2.0.0-beta.6

package/dist/starters/adapters/vercel-edge/adapters/vercel-edge/vite.config.mts

@@ -7,7 +7,7 @@ export default extendConfig(baseConfig, () => {
     build: {
       ssr: true,
       rollupOptions: {
-        input: ["src/entry.vercel-edge.tsx", "@qwik-router-config"],
+        input: ["src/entry.vercel-edge.tsx"],
       },
       outDir: ".vercel/output/functions/_qwik-router.func",
     },

package/dist/starters/adapters/vercel-edge/src/entry.vercel-edge.tsx

@@ -7,7 +7,6 @@
  * - https://qwik.dev/docs/deployments/vercel-edge/
  *
  */
-import qwikRouterConfig from "@qwik-router-config";
 import {
   createQwikRouter,
   type PlatformVercel,
@@ -18,4 +17,4 @@ declare global {
   interface QwikRouterPlatform extends PlatformVercel {}
 }
 
-export default createQwikRouter({ render, qwikRouterConfig });
+export default createQwikRouter({ render });

package/dist/starters/adapters/vercel-edge/vercel.json

@@ -10,7 +10,7 @@
       ]
     },
     {
-      "source": "/(assets|build)/.*",
+      "source": "/(assets|build)/(.*)",
       "headers": [
         {
           "key": "Cache-Control",

package/dist/testing/index.cjs

@@ -1,6 +1,6 @@
 /**
  * @license
- * @qwik.dev/core/testing 2.0.0-beta.4-dev+9849dcf
+ * @qwik.dev/core/testing 2.0.0-beta.6-dev+c42693f
  * Copyright QwikDev. All Rights Reserved.
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://github.com/QwikDev/qwik/blob/main/LICENSE
@@ -22259,6 +22259,9 @@ var isString = (v) => {
 var isFunction = (v) => {
   return typeof v === "function";
 };
+var isPrimitive = (v) => {
+  return typeof v !== "object" && typeof v !== "function" && v !== null && v !== void 0;
+};
 
 // packages/qwik/src/core/shared/error/error.ts
 var codeToText = (code2, ...parts) => {
@@ -22490,6 +22493,8 @@ var QContainerSelector = "[q\\:container]:not([q\\:container=" + "html" /* HTML
 var HTML_NS = "http://www.w3.org/1999/xhtml";
 var SVG_NS = "http://www.w3.org/2000/svg";
 var MATH_NS = "http://www.w3.org/1998/Math/MathML";
+var XLINK_NS = "http://www.w3.org/1999/xlink";
+var XML_NS = "http://www.w3.org/XML/1998/namespace";
 var ResourceEvent = "qResource";
 var RenderEvent = "qRender";
 var TaskEvent = "qTask";
@@ -23285,6 +23290,59 @@ var inlinedQrl = (symbol, symbolName, lexicalScopeCapture = EMPTY_ARRAY) => {
   return createQRL(null, symbolName, symbol, null, null, lexicalScopeCapture);
 };
 
+// packages/qwik/src/core/client/util-mapArray.ts
+var mapApp_findIndx = (array, key, start) => {
+  assertTrue(start % 2 === 0, "Expecting even number.");
+  let bottom = start >> 1;
+  let top = array.length - 2 >> 1;
+  while (bottom <= top) {
+    const mid = bottom + (top - bottom >> 1);
+    const midKey = array[mid << 1];
+    if (midKey === key) {
+      return mid << 1;
+    }
+    if (midKey < key) {
+      bottom = mid + 1;
+    } else {
+      top = mid - 1;
+    }
+  }
+  return bottom << 1 ^ -1;
+};
+var mapArray_set = (array, key, value, start) => {
+  const indx = mapApp_findIndx(array, key, start);
+  if (indx >= 0) {
+    if (value == null) {
+      array.splice(indx, 2);
+    } else {
+      array[indx + 1] = value;
+    }
+  } else if (value != null) {
+    array.splice(indx ^ -1, 0, key, value);
+  }
+};
+var mapApp_remove = (array, key, start) => {
+  const indx = mapApp_findIndx(array, key, start);
+  let value = null;
+  if (indx >= 0) {
+    value = array[indx + 1];
+    array.splice(indx, 2);
+    return value;
+  }
+  return value;
+};
+var mapArray_get = (array, key, start) => {
+  const indx = mapApp_findIndx(array, key, start);
+  if (indx >= 0) {
+    return array[indx + 1];
+  } else {
+    return null;
+  }
+};
+var mapArray_has = (array, key, start) => {
+  return mapApp_findIndx(array, key, start) >= 0;
+};
+
 // packages/qwik/src/core/shared/utils/constants.ts
 var _CONST_PROPS = Symbol("CONST");
 var _VAR_PROPS = Symbol("VAR");
@@ -23899,59 +23957,6 @@ var addComponentStylePrefix = (styleId) => {
   return styleId || null;
 };
 
-// packages/qwik/src/core/client/util-mapArray.ts
-var mapApp_findIndx = (array, key, start) => {
-  assertTrue(start % 2 === 0, "Expecting even number.");
-  let bottom = start >> 1;
-  let top = array.length - 2 >> 1;
-  while (bottom <= top) {
-    const mid = bottom + (top - bottom >> 1);
-    const midKey = array[mid << 1];
-    if (midKey === key) {
-      return mid << 1;
-    }
-    if (midKey < key) {
-      bottom = mid + 1;
-    } else {
-      top = mid - 1;
-    }
-  }
-  return bottom << 1 ^ -1;
-};
-var mapArray_set = (array, key, value, start) => {
-  const indx = mapApp_findIndx(array, key, start);
-  if (indx >= 0) {
-    if (value == null) {
-      array.splice(indx, 2);
-    } else {
-      array[indx + 1] = value;
-    }
-  } else if (value != null) {
-    array.splice(indx ^ -1, 0, key, value);
-  }
-};
-var mapApp_remove = (array, key, start) => {
-  const indx = mapApp_findIndx(array, key, start);
-  let value = null;
-  if (indx >= 0) {
-    value = array[indx + 1];
-    array.splice(indx, 2);
-    return value;
-  }
-  return value;
-};
-var mapArray_get = (array, key, start) => {
-  const indx = mapApp_findIndx(array, key, start);
-  if (indx >= 0) {
-    return array[indx + 1];
-  } else {
-    return null;
-  }
-};
-var mapArray_has = (array, key, start) => {
-  return mapApp_findIndx(array, key, start) >= 0;
-};
-
 // packages/qwik/src/core/client/vnode-namespace.ts
 var import_build7 = require("@qwik.dev/core/build");
 var isForeignObjectElement = (elementName) => {
@@ -24125,6 +24130,24 @@ function getNewElementNamespaceData(domParentVNode, tagOrVNode) {
     elementNamespaceFlag
   };
 }
+function getAttributeNamespace(attributeName) {
+  switch (attributeName) {
+    case "xlink:href":
+    case "xlink:actuate":
+    case "xlink:arcrole":
+    case "xlink:role":
+    case "xlink:show":
+    case "xlink:title":
+    case "xlink:type":
+      return XLINK_NS;
+    case "xml:base":
+    case "xml:lang":
+    case "xml:space":
+      return XML_NS;
+    default:
+      return null;
+  }
+}
 
 // packages/qwik/src/core/shared/component-execution.ts
 var import_build8 = require("@qwik.dev/core/build");
@@ -24194,35 +24217,41 @@ var executeComponent = (container, renderHost, subscriptionHost, componentQRL, p
   return executeComponentWithPromiseExceptionRetry();
 };
 function addUseOnEvents(jsx3, useOnEvents) {
-  const jsxElement = findFirstStringJSX(jsx3);
+  const jsxElement = findFirstElementNode(jsx3);
   let jsxResult = jsx3;
+  const qVisibleEvent = "onQvisible$";
   return maybeThen(jsxElement, (jsxElement2) => {
-    let isInvisibleComponent = false;
-    if (!jsxElement2) {
-      isInvisibleComponent = true;
-    }
+    const isHeadless = !jsxElement2;
+    let placeholderElement = null;
     for (const key in useOnEvents) {
       if (Object.prototype.hasOwnProperty.call(useOnEvents, key)) {
-        if (isInvisibleComponent) {
-          if (key === "onQvisible$") {
-            const [jsxElement3, jsx4] = addScriptNodeForInvisibleComponents(jsxResult);
-            jsxResult = jsx4;
-            if (jsxElement3) {
-              addUseOnEvent(jsxElement3, "document:onQinit$", useOnEvents[key]);
-            }
-          } else if (key.startsWith("document:") || key.startsWith("window:")) {
-            const [jsxElement3, jsx4] = addScriptNodeForInvisibleComponents(jsxResult);
-            jsxResult = jsx4;
-            if (jsxElement3) {
-              addUseOnEvent(jsxElement3, key, useOnEvents[key]);
-            }
-          } else if (import_build8.isDev) {
+        let targetElement = jsxElement2;
+        let eventKey = key;
+        if (isHeadless) {
+          if (key === qVisibleEvent || key.startsWith("document:on" /* document */) || key.startsWith("window:on" /* window */)) {
+            if (!placeholderElement) {
+              const [createdElement, newJsx] = injectPlaceholderElement(jsxResult);
+              jsxResult = newJsx;
+              placeholderElement = createdElement;
+            }
+            targetElement = placeholderElement;
+          } else {
+            if (import_build8.isDev) {
+              logWarn(
+                'You are trying to add an event "' + key + '" using `useOn` hook, but a node to which you can add an event is not found. Please make sure that the component has a valid element node. '
+              );
+            }
+            continue;
+          }
+        }
+        if (targetElement) {
+          if (targetElement.type === "script" && key === qVisibleEvent) {
+            eventKey = "document:onQinit$";
             logWarn(
-              'You are trying to add an event "' + key + '" using `useOn` hook, but a node to which you can add an event is not found. Please make sure that the component has a valid element node. '
+              'You are trying to add an event "' + key + '" using `useVisibleTask$` hook, but a node to which you can add an event is not found. Using document:onQinit$ instead.'
             );
           }
-        } else if (jsxElement2) {
-          addUseOnEvent(jsxElement2, key, useOnEvents[key]);
+          addUseOnEvent(targetElement, eventKey, useOnEvents[key]);
         }
       }
     }
@@ -24243,7 +24272,7 @@ function addUseOnEvent(jsxElement, key, value) {
   propValue.push(...value);
   props[key] = propValue;
 }
-function findFirstStringJSX(jsx3) {
+function findFirstElementNode(jsx3) {
   const queue2 = [jsx3];
   while (queue2.length) {
     const jsx4 = queue2.shift();
@@ -24252,47 +24281,55 @@ function findFirstStringJSX(jsx3) {
         return jsx4;
       }
       queue2.push(jsx4.children);
-    } else if (Array.isArray(jsx4)) {
+    } else if (isArray(jsx4)) {
       queue2.push(...jsx4);
     } else if (isPromise(jsx4)) {
       return maybeThen(
         jsx4,
-        (jsx5) => findFirstStringJSX(jsx5)
+        (jsx5) => findFirstElementNode(jsx5)
       );
     } else if (isSignal(jsx4)) {
-      return findFirstStringJSX(untrack(() => jsx4.value));
+      return findFirstElementNode(untrack(() => jsx4.value));
     }
   }
   return null;
 }
-function addScriptNodeForInvisibleComponents(jsx3) {
+function injectPlaceholderElement(jsx3) {
   if (isJSXNode(jsx3)) {
-    const jsxElement = new JSXNodeImpl(
-      "script",
-      {},
-      {
-        type: "placeholder",
-        hidden: ""
-      },
-      null,
-      3
-    );
+    const placeholder = createPlaceholderScriptNode();
     if (jsx3.type === Slot) {
-      return [jsxElement, _jsxSorted(Fragment, null, null, [jsx3, jsxElement], 0, null)];
+      return [placeholder, _jsxSorted(Fragment, null, null, [jsx3, placeholder], 0, null)];
     }
     if (jsx3.children == null) {
-      jsx3.children = jsxElement;
-    } else if (Array.isArray(jsx3.children)) {
-      jsx3.children.push(jsxElement);
+      jsx3.children = placeholder;
+    } else if (isArray(jsx3.children)) {
+      jsx3.children.push(placeholder);
     } else {
-      jsx3.children = [jsx3.children, jsxElement];
+      jsx3.children = [jsx3.children, placeholder];
     }
-    return [jsxElement, jsx3];
-  } else if (Array.isArray(jsx3) && jsx3.length) {
-    const [jsxElement, _] = addScriptNodeForInvisibleComponents(jsx3[0]);
-    return [jsxElement, jsx3];
+    return [placeholder, jsx3];
+  }
+  if (isPrimitive(jsx3)) {
+    const placeholder = createPlaceholderScriptNode();
+    return [placeholder, _jsxSorted(Fragment, null, null, [jsx3, placeholder], 0, null)];
+  }
+  if (isArray(jsx3) && jsx3.length > 0) {
+    const [createdElement, _] = injectPlaceholderElement(jsx3[0]);
+    return [createdElement, jsx3];
   }
-  return [null, null];
+  return [null, jsx3];
+}
+function createPlaceholderScriptNode() {
+  return new JSXNodeImpl(
+    "script",
+    {},
+    {
+      type: "placeholder",
+      hidden: ""
+    },
+    null,
+    3
+  );
 }
 
 // packages/qwik/src/core/shared/utils/prop.ts
@@ -24882,6 +24919,13 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
         }
         value = serializeAttribute(key2, value, scopedStyleIdPrefix);
         if (value != null) {
+          if (vNewNode[0 /* flags */] & 64 /* NS_svg */) {
+            const namespace = getAttributeNamespace(key2);
+            if (namespace) {
+              element.setAttributeNS(namespace, key2, String(value));
+              continue;
+            }
+          }
           element.setAttribute(key2, String(value));
         }
       }
@@ -26687,6 +26731,7 @@ var allocate = (container, typeId, value) => {
     case 11 /* RefVNode */:
       const vNode = retrieveVNodeOrDocument(container, value);
       if (vnode_isVNode(vNode)) {
+        ensureMaterialized(vNode);
         return vnode_getNode(vNode);
       } else {
         throw qError(17 /* serializeErrorExpectedVNode */, [typeof vNode]);
@@ -31212,6 +31257,7 @@ var import_vitest3 = require("vitest");
 
 // packages/qwik/src/server/platform.ts
 var import_core3 = require("../core.cjs");
+var import_build14 = require("@qwik.dev/core/build");
 
 // packages/qwik/src/core/preloader/queue.ts
 var import_build13 = require("@qwik.dev/core/build");
@@ -31489,13 +31535,32 @@ if (import_build13.isBrowser) {
 }
 
 // packages/qwik/src/server/platform.ts
+var import_meta = {};
+var getDevSegmentPath = (mapper, hash3, symbolName, parent) => {
+  const existing = mapper == null ? void 0 : mapper[hash3];
+  if (existing) {
+    return existing;
+  }
+  if (symbolName === SYNC_QRL) {
+    return [symbolName, ""];
+  }
+  if (!parent) {
+    if (symbolName.startsWith("_") && symbolName.length < 6) {
+      return [symbolName, `${import_meta.env.BASE_URL}@qwik-handlers`];
+    }
+    console.error("qwik symbolMapper: unknown qrl requested without parent:", symbolName);
+    return [symbolName, `${import_meta.env.BASE_URL}${symbolName}.js`];
+  }
+  const qrlFile = `${import_meta.env.BASE_URL}${parent.startsWith("/") ? parent.slice(1) : parent}_${symbolName}.js`;
+  return [symbolName, qrlFile];
+};
 function createPlatform3(opts, resolvedManifest) {
   const mapper = resolvedManifest == null ? void 0 : resolvedManifest.mapper;
   const mapperFn = opts.symbolMapper ? opts.symbolMapper : (symbolName, _chunk, parent) => {
     var _a;
-    if (mapper) {
+    if (mapper || import_build14.isDev && import_meta.env.MODE !== "test") {
       const hash3 = getSymbolHash2(symbolName);
-      const result = mapper[hash3];
+      const result = !import_build14.isDev ? mapper[hash3] : getDevSegmentPath(mapper, hash3, symbolName, parent);
       if (!result) {
         if (hash3 === SYNC_QRL) {
           return [hash3, ""];
@@ -31504,9 +31569,6 @@ function createPlatform3(opts, resolvedManifest) {
         if (isRegistered) {
           return [symbolName, "_"];
         }
-        if (parent) {
-          return [symbolName, `${parent}?qrl=${symbolName}`];
-        }
         console.error("Cannot resolve symbol", symbolName, "in", mapper, parent);
       }
       return result;
@@ -31561,7 +31623,7 @@ var getSymbolHash2 = (symbolName) => {
 };
 
 // packages/qwik/src/server/utils.ts
-var import_meta = {};
+var import_meta2 = {};
 function createTimer() {
   if (typeof performance === "undefined") {
     return () => 0;
@@ -31584,7 +31646,7 @@ function getBuildBase(opts) {
     }
     return base2;
   }
-  return `${import_meta.env.BASE_URL || "/"}build/`;
+  return `${import_meta2.env.BASE_URL || "/"}build/`;
 }
 var versions = {
   qwik: globalThis.QWIK_VERSION,
@@ -31593,7 +31655,7 @@ var versions = {
 
 // packages/qwik/src/server/ssr-container.ts
 var import_core6 = require("../core.cjs");
-var import_build15 = require("@qwik.dev/core/build");
+var import_build16 = require("@qwik.dev/core/build");
 
 // packages/qwik/src/server/scripts.ts
 var QWIK_LOADER_DEFAULT_MINIFIED = globalThis.QWIK_LOADER_DEFAULT_MINIFIED;
@@ -31606,7 +31668,7 @@ var QWIK_PREFETCH_DEBUG = globalThis.QWIK_PREFETCH_DEBUG;
 
 // packages/qwik/src/server/ssr-node.ts
 var import_core4 = require("../core.cjs");
-var import_build14 = require("@qwik.dev/core/build");
+var import_build15 = require("@qwik.dev/core/build");
 var SsrNode = class {
   constructor(parentSsrNode, id, attributesIndex, cleanupQueue, vnodeData) {
     this.attributesIndex = attributesIndex;
@@ -31617,7 +31679,7 @@ var SsrNode = class {
     (_a = this.parentSsrNode) == null ? void 0 : _a.addChild(this);
     this.id = id;
     this.attrs = this.attributesIndex >= 0 ? this.vnodeData[this.attributesIndex] : import_core4._EMPTY_ARRAY;
-    if (import_build14.isDev && id.indexOf("undefined") != -1) {
+    if (import_build15.isDev && id.indexOf("undefined") != -1) {
       throw new Error(`Invalid SSR node id: ${id}`);
     }
   }
@@ -31937,7 +31999,7 @@ var expandBundles = (names, resolvedManifest) => {
 };
 
 // packages/qwik/src/server/preload-impl.ts
-var import_meta2 = {};
+var import_meta3 = {};
 var simplifyPath = (base2, path) => {
   if (path == null) {
     return null;
@@ -31955,8 +32017,8 @@ var simplifyPath = (base2, path) => {
 };
 var getBase = (container) => {
   let base2 = container.$buildBase$;
-  if (import_meta2.env.DEV && !import_meta2.env.TEST) {
-    base2 = import_meta2.env.BASE_URL;
+  if (import_meta3.env.DEV && !import_meta3.env.TEST) {
+    base2 = import_meta3.env.BASE_URL;
   }
   return base2;
 };
@@ -31967,7 +32029,7 @@ var preloaderPre = (container, options, nonce) => {
   const preloaderBundle = simplifyPath(base2, (_a = resolvedManifest == null ? void 0 : resolvedManifest.manifest) == null ? void 0 : _a.preloader);
   let bundleGraphPath = resolvedManifest == null ? void 0 : resolvedManifest.manifest.bundleGraphAsset;
   if (bundleGraphPath) {
-    bundleGraphPath = (import_meta2.env.BASE_URL || "/") + bundleGraphPath;
+    bundleGraphPath = (import_meta3.env.BASE_URL || "/") + bundleGraphPath;
   }
   if (preloaderBundle && bundleGraphPath && options !== false) {
     const preloaderOpts = typeof options === "object" ? {
@@ -32265,7 +32327,7 @@ var SSRContainer = class extends import_core6._SharedContainer {
     containerAttributes[QContainerAttr] = "paused" /* PAUSED */;
     containerAttributes[QRuntimeAttr] = "2";
     containerAttributes[QVersionAttr] = this.$version$ ?? "dev";
-    containerAttributes[QRenderAttr] = (qRender ? qRender + "-" : "") + (import_build15.isDev ? "ssr-dev" : "ssr");
+    containerAttributes[QRenderAttr] = (qRender ? qRender + "-" : "") + (import_build16.isDev ? "ssr-dev" : "ssr");
     containerAttributes[QBaseAttr] = this.$buildBase$ || "";
     containerAttributes[QLocaleAttr] = this.$locale$;
     containerAttributes[QManifestHashAttr] = this.resolvedManifest.manifest.manifestHash;
@@ -32300,7 +32362,7 @@ var SSRContainer = class extends import_core6._SharedContainer {
       innerHTML = this.writeAttrs(elementName, varAttrs, false, currentFile);
     }
     this.write(" " + Q_PROPS_SEPARATOR);
-    import_build15.isDev && this.write('=""');
+    import_build16.isDev && this.write('=""');
     if (constAttrs && constAttrs.length) {
       innerHTML = this.writeAttrs(elementName, constAttrs, true, currentFile) || innerHTML;
     }
@@ -32711,7 +32773,7 @@ var SSRContainer = class extends import_core6._SharedContainer {
         const qwikLoaderScript = getQwikLoaderScript({
           debug: this.renderOptions.debug
         });
-        const scriptAttrs = ["id", "qwikloader", "async", true];
+        const scriptAttrs = ["id", "qwikloader", "async", true, "type", "module"];
         const nonce = (_a = this.renderOptions.serverData) == null ? void 0 : _a.nonce;
         if (nonce) {
           scriptAttrs.push("nonce", nonce);
@@ -32763,7 +32825,7 @@ var SSRContainer = class extends import_core6._SharedContainer {
             }
             this.unclaimedProjectionComponentFrameQueue.shift();
             this.openFragment(
-              import_build15.isDev ? [DEBUG_TYPE, "P" /* Projection */, QSlotParent, ssrComponentNode.id] : [QSlotParent, ssrComponentNode.id]
+              import_build16.isDev ? [DEBUG_TYPE, "P" /* Projection */, QSlotParent, ssrComponentNode.id] : [QSlotParent, ssrComponentNode.id]
             );
             const lastNode = this.getOrCreateLastNode();
             if (lastNode.vnodeData) {
@@ -32812,7 +32874,7 @@ var SSRContainer = class extends import_core6._SharedContainer {
   }
   createAndPushFrame(elementName, depthFirstElementIdx, currentFile) {
     let tagNesting = 10 /* ANYTHING */;
-    if (import_build15.isDev) {
+    if (import_build16.isDev) {
       if (!this.currentElementFrame) {
         tagNesting = initialTag(elementName);
       } else {
@@ -32888,7 +32950,7 @@ var SSRContainer = class extends import_core6._SharedContainer {
         let value = attrs[i];
         let styleScopedId = null;
         if (isSSRUnsafeAttr(key)) {
-          if (import_build15.isDev) {
+          if (import_build16.isDev) {
             throw qError(32 /* unsafeAttr */);
           }
           continue;
@@ -32930,7 +32992,7 @@ var SSRContainer = class extends import_core6._SharedContainer {
         }
         if (tag === "textarea" && key === "value") {
           if (value && typeof value !== "string") {
-            if (import_build15.isDev) {
+            if (import_build16.isDev) {
               throw qError(23 /* wrongTextareaValue */, [currentFile, value]);
             }
             continue;