@qwik.dev/core 2.0.0-alpha.5 → 2.0.0-alpha.6

package/dist/build/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwik.dev/core/build",
-  "version": "2.0.0-alpha.5-dev+cb53bbd",
+  "version": "2.0.0-alpha.6-dev+d848ba5",
   "main": "index.mjs",
   "types": "index.d.ts",
   "private": true,

package/dist/cli.cjs

@@ -1,6 +1,6 @@
 /**
  * @license
- * @qwik.dev/core/cli 2.0.0-alpha.5-dev+cb53bbd
+ * @qwik.dev/core/cli 2.0.0-alpha.6-dev+d848ba5
  * 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
@@ -5321,26 +5321,6 @@ async function removeTsMorphFromPackageJson() {
   await writePackageJson(process.cwd(), packageJson);
 }
 
-// packages/qwik/src/cli/migrate-v2/update-configurations.ts
-var import_fs4 = require("fs");
-init_dist2();
-function updateConfigurations() {
-  try {
-    updateTsconfig();
-  } catch (error) {
-    f2.error("Failed to update tsconfig.json configuration.");
-  }
-}
-function updateTsconfig() {
-  const tsConfigPath = "tsconfig.json";
-  const tsConfig = JSON.parse((0, import_fs4.readFileSync)(tsConfigPath, "utf-8"));
-  if (!tsConfig) {
-    return;
-  }
-  tsConfig.compilerOptions.moduleResolution = "bundler";
-  (0, import_fs4.writeFileSync)(tsConfigPath, JSON.stringify(tsConfig, null, 2));
-}
-
 // packages/qwik/src/cli/migrate-v2/run-migration.ts
 async function runV2Migration(app) {
   oe(
@@ -5384,7 +5364,6 @@ ${bold(bgRed('Warning: migration tool is experimental and will migrate your appl
     if (installedTsMorph) {
       await removeTsMorphFromPackageJson();
     }
-    updateConfigurations();
     await updateDependencies();
     f2.success(`${green(`Your application has been successfully migrated to v2!`)}`);
   } catch (error) {
@@ -5534,7 +5513,7 @@ async function printHelp(app) {
   await runCommand2(Object.assign(app, { task: args[0], args }));
 }
 function printVersion() {
-  console.log("2.0.0-alpha.5-dev+cb53bbd");
+  console.log("2.0.0-alpha.6-dev+d848ba5");
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/core-internal.d.ts

@@ -2531,7 +2531,7 @@ declare type SpecialAttrs = {
          * For type: HTMLInputTypeAttribute, excluding 'button' | 'reset' | 'submit' | 'checkbox' |
          * 'radio'
          */
-        'bind:value'?: Signal<string | undefined>;
+        'bind:value'?: Signal<string | undefined | number>;
         enterKeyHint?: 'enter' | 'done' | 'go' | 'next' | 'previous' | 'search' | 'send' | undefined;
         height?: Size | undefined;
         max?: number | string | undefined;
@@ -3732,7 +3732,7 @@ export declare const _VAR_PROPS: unique symbol;
 export declare const _verifySerializable: <T>(value: T, preMessage?: string) => T;
 
 /**
- * 2.0.0-alpha.5-dev+cb53bbd
+ * 2.0.0-alpha.6-dev+d848ba5
  *
  * @public
  */

package/dist/core.cjs

@@ -1,6 +1,6 @@
 /**
  * @license
- * @qwik.dev/core 2.0.0-alpha.5-dev+cb53bbd
+ * @qwik.dev/core 2.0.0-alpha.6-dev+d848ba5
  * 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
@@ -165,7 +165,6 @@
                 "Element must have 'q:container' attribute.", // 42
                 'Unknown vnode type {{0}}.', // 43
                 'Materialize error: missing element: {{0}} {{1}} {{2}}', // 44
-                'SsrError: {{0}}', // 45
                 'Cannot coerce a Signal, use `.value` instead', // 46
                 'useComputedSignal$ QRL {{0}} {{1}} returned a Promise', // 47
                 'ComputedSignal is read-only', // 48
@@ -237,19 +236,130 @@
         QError[QError["elementWithoutContainer"] = 42] = "elementWithoutContainer";
         QError[QError["invalidVNodeType"] = 43] = "invalidVNodeType";
         QError[QError["materializeVNodeDataError"] = 44] = "materializeVNodeDataError";
-        QError[QError["serverHostMismatch"] = 45] = "serverHostMismatch";
-        QError[QError["cannotCoerceSignal"] = 46] = "cannotCoerceSignal";
-        QError[QError["computedNotSync"] = 47] = "computedNotSync";
-        QError[QError["computedReadOnly"] = 48] = "computedReadOnly";
-        QError[QError["wrappedReadOnly"] = 49] = "wrappedReadOnly";
-        QError[QError["promisesNotExpected"] = 50] = "promisesNotExpected";
-        QError[QError["unsafeAttr"] = 51] = "unsafeAttr";
+        QError[QError["cannotCoerceSignal"] = 45] = "cannotCoerceSignal";
+        QError[QError["computedNotSync"] = 46] = "computedNotSync";
+        QError[QError["computedReadOnly"] = 47] = "computedReadOnly";
+        QError[QError["wrappedReadOnly"] = 48] = "wrappedReadOnly";
+        QError[QError["promisesNotExpected"] = 49] = "promisesNotExpected";
+        QError[QError["unsafeAttr"] = 50] = "unsafeAttr";
     })(QError || (QError = {}));
     const qError = (code, errorMessageArgs = []) => {
         const text = codeToText(code, ...errorMessageArgs);
         return logErrorAndStop(text, ...errorMessageArgs);
     };
 
+    /**
+     * A friendly name tag for a VirtualVNode.
+     *
+     * Theses are used to give a name to a VirtualVNode. This is useful for debugging and testing.
+     *
+     * The name is only added in development mode and is not included in production builds.
+     */
+    const DEBUG_TYPE = 'q:type';
+    var VirtualType;
+    (function (VirtualType) {
+        VirtualType["Virtual"] = "V";
+        VirtualType["Fragment"] = "F";
+        VirtualType["WrappedSignal"] = "S";
+        VirtualType["Awaited"] = "A";
+        VirtualType["Component"] = "C";
+        VirtualType["InlineComponent"] = "I";
+        VirtualType["Projection"] = "P";
+    })(VirtualType || (VirtualType = {}));
+    const START = '\x1b[34m';
+    const END = '\x1b[0m';
+    const VirtualTypeName = {
+        [VirtualType.Virtual]: /* ********* */ START + 'Virtual' + END, //
+        [VirtualType.Fragment]: /* ******** */ START + 'Fragment' + END, //
+        [VirtualType.WrappedSignal]: /* *** */ START + 'Signal' + END, //
+        [VirtualType.Awaited]: /* ********* */ START + 'Awaited' + END, //
+        [VirtualType.Component]: /* ******* */ START + 'Component' + END, //
+        [VirtualType.InlineComponent]: /* * */ START + 'InlineComponent' + END, //
+        [VirtualType.Projection]: /* ****** */ START + 'Projection' + END, //
+    };
+    var QContainerValue;
+    (function (QContainerValue) {
+        QContainerValue["PAUSED"] = "paused";
+        QContainerValue["RESUMED"] = "resumed";
+        // these values below are used in the qwik loader as a plain text for the q:container selector
+        // standard dangerouslySetInnerHTML
+        QContainerValue["HTML"] = "html";
+        // textarea
+        QContainerValue["TEXT"] = "text";
+    })(QContainerValue || (QContainerValue = {}));
+
+    /** State factory of the component. */
+    const OnRenderProp = 'q:renderFn';
+    /** Component style content prefix */
+    const ComponentStylesPrefixContent = '⭐️';
+    /** `<some-element q:slot="...">` */
+    const QSlot = 'q:slot';
+    const QSlotParent = ':';
+    const QSlotRef = 'q:sref';
+    const QSlotS = 'q:s';
+    const QStyle = 'q:style';
+    const QStyleSelector = 'style[q\\:style]';
+    const QStyleSSelector = 'style[q\\:sstyle]';
+    const QStylesAllSelector = QStyleSelector + ',' + QStyleSSelector;
+    const QScopedStyle = 'q:sstyle';
+    const QCtxAttr = 'q:ctx';
+    const QSubscribers = 'q:subs';
+    const QFuncsPrefix = 'qFuncs_';
+    const getQFuncs = (document, hash) => {
+        return document[QFuncsPrefix + hash] || [];
+    };
+    const QBaseAttr = 'q:base';
+    const QLocaleAttr = 'q:locale';
+    const QManifestHashAttr = 'q:manifest-hash';
+    const QInstanceAttr = 'q:instance';
+    const QContainerIsland = 'q:container-island';
+    const QContainerIslandEnd = '/' + QContainerIsland;
+    const QIgnore = 'q:ignore';
+    const QIgnoreEnd = '/' + QIgnore;
+    const QContainerAttr = 'q:container';
+    const QContainerAttrEnd = '/' + QContainerAttr;
+    const QTemplate = 'q:template';
+    // the same selector should be inside the qwik loader
+    // and the same selector should be inside the qwik router spa-shim and spa-init
+    const QContainerSelector = '[q\\:container]:not([q\\:container=' +
+        QContainerValue.HTML +
+        ']):not([q\\:container=' +
+        QContainerValue.TEXT +
+        '])';
+    const HTML_NS = 'http://www.w3.org/1999/xhtml';
+    const SVG_NS = 'http://www.w3.org/2000/svg';
+    const MATH_NS = 'http://www.w3.org/1998/Math/MathML';
+    const ResourceEvent = 'qResource';
+    const RenderEvent = 'qRender';
+    const TaskEvent = 'qTask';
+    const QDefaultSlot = '';
+    /**
+     * Attribute to mark that this VNode has a pointer to itself from the `qwik/json` state.
+     *
+     * As the VNode get materialized the vnode now becomes eligible for mutation. Once the vnode mutates
+     * the `VNode` references from the `qwik/json` may become invalid. For this reason, these references
+     * need to be eagerly resolved. `VNODE_REF` stores a pointer to "this" vnode. This allows the system
+     * to eagerly resolve these pointes as the vnodes are materialized.
+     */
+    const ELEMENT_ID = 'q:id';
+    const ELEMENT_KEY = 'q:key';
+    const ELEMENT_PROPS = 'q:props';
+    const ELEMENT_SEQ = 'q:seq';
+    const ELEMENT_SEQ_IDX = 'q:seqIdx';
+    const Q_PREFIX = 'q:';
+    /** Non serializable markers - always begins with `:` character */
+    const NON_SERIALIZABLE_MARKER_PREFIX = ':';
+    const USE_ON_LOCAL = NON_SERIALIZABLE_MARKER_PREFIX + 'on';
+    const USE_ON_LOCAL_SEQ_IDX = NON_SERIALIZABLE_MARKER_PREFIX + 'onIdx';
+    const USE_ON_LOCAL_FLAGS = NON_SERIALIZABLE_MARKER_PREFIX + 'onFlags';
+    // comment nodes
+    const FLUSH_COMMENT = 'qkssr-f';
+    const STREAM_BLOCK_START_COMMENT = 'qkssr-pu';
+    const STREAM_BLOCK_END_COMMENT = 'qkssr-po';
+    const Q_PROPS_SEPARATOR = ':';
+    const dangerouslySetInnerHTML = 'dangerouslySetInnerHTML';
+    const qwikInspectorAttr = 'data-qwik-inspector';
+
     // keep this import from core/build so the cjs build works
     const createPlatform = () => {
         return {
@@ -310,7 +420,7 @@
      */
     const toUrl = (doc, containerEl, url) => {
         const baseURI = doc.baseURI;
-        const base = new URL(containerEl.getAttribute('q:base') ?? baseURI, baseURI);
+        const base = new URL(containerEl.getAttribute(QBaseAttr) ?? baseURI, baseURI);
         return new URL(url, base);
     };
     let _platform = /*#__PURE__ */ createPlatform();
@@ -402,15 +512,24 @@
             setTimeout(resolve, timeout);
         });
     };
+    // Retries a function that throws a promise.
     function retryOnPromise(fn, retryCount = 0) {
-        try {
-            return fn();
-        }
-        catch (e) {
+        const retryOrThrow = (e) => {
             if (isPromise(e) && retryCount < MAX_RETRY_ON_PROMISE_COUNT) {
                 return e.then(retryOnPromise.bind(null, fn, retryCount++));
             }
             throw e;
+        };
+        try {
+            const result = fn();
+            if (isPromise(result)) {
+                // not awaited promise is not caught by try/catch block
+                return result.catch((e) => retryOrThrow(e));
+            }
+            return result;
+        }
+        catch (e) {
+            return retryOrThrow(e);
         }
     }
 
@@ -453,118 +572,6 @@
         VNodeDataFlag[VNodeDataFlag["SERIALIZE"] = 16] = "SERIALIZE";
     })(VNodeDataFlag || (VNodeDataFlag = {}));
 
-    /**
-     * A friendly name tag for a VirtualVNode.
-     *
-     * Theses are used to give a name to a VirtualVNode. This is useful for debugging and testing.
-     *
-     * The name is only added in development mode and is not included in production builds.
-     */
-    const DEBUG_TYPE = 'q:type';
-    var VirtualType;
-    (function (VirtualType) {
-        VirtualType["Virtual"] = "V";
-        VirtualType["Fragment"] = "F";
-        VirtualType["WrappedSignal"] = "S";
-        VirtualType["Awaited"] = "A";
-        VirtualType["Component"] = "C";
-        VirtualType["InlineComponent"] = "I";
-        VirtualType["Projection"] = "P";
-    })(VirtualType || (VirtualType = {}));
-    const START = '\x1b[34m';
-    const END = '\x1b[0m';
-    const VirtualTypeName = {
-        [VirtualType.Virtual]: /* ********* */ START + 'Virtual' + END, //
-        [VirtualType.Fragment]: /* ******** */ START + 'Fragment' + END, //
-        [VirtualType.WrappedSignal]: /* *** */ START + 'Signal' + END, //
-        [VirtualType.Awaited]: /* ********* */ START + 'Awaited' + END, //
-        [VirtualType.Component]: /* ******* */ START + 'Component' + END, //
-        [VirtualType.InlineComponent]: /* * */ START + 'InlineComponent' + END, //
-        [VirtualType.Projection]: /* ****** */ START + 'Projection' + END, //
-    };
-    var QContainerValue;
-    (function (QContainerValue) {
-        QContainerValue["PAUSED"] = "paused";
-        QContainerValue["RESUMED"] = "resumed";
-        // these values below are used in the qwik loader as a plain text for the q:container selector
-        // standard dangerouslySetInnerHTML
-        QContainerValue["HTML"] = "html";
-        // textarea
-        QContainerValue["TEXT"] = "text";
-    })(QContainerValue || (QContainerValue = {}));
-
-    /** State factory of the component. */
-    const OnRenderProp = 'q:renderFn';
-    /** Component style content prefix */
-    const ComponentStylesPrefixContent = '⭐️';
-    /** `<some-element q:slot="...">` */
-    const QSlot = 'q:slot';
-    const QSlotParent = ':';
-    const QSlotRef = 'q:sref';
-    const QSlotS = 'q:s';
-    const QStyle = 'q:style';
-    const QStyleSelector = 'style[q\\:style]';
-    const QStyleSSelector = 'style[q\\:sstyle]';
-    const QStylesAllSelector = QStyleSelector + ',' + QStyleSSelector;
-    const QScopedStyle = 'q:sstyle';
-    const QCtxAttr = 'q:ctx';
-    const QSubscribers = 'q:subs';
-    const QFuncsPrefix = 'qFuncs_';
-    const getQFuncs = (document, hash) => {
-        return document[QFuncsPrefix + hash] || [];
-    };
-    const QBaseAttr = 'q:base';
-    const QLocaleAttr = 'q:locale';
-    const QManifestHashAttr = 'q:manifest-hash';
-    const QInstanceAttr = 'q:instance';
-    const QContainerIsland = 'q:container-island';
-    const QContainerIslandEnd = '/' + QContainerIsland;
-    const QIgnore = 'q:ignore';
-    const QIgnoreEnd = '/' + QIgnore;
-    const QContainerAttr = 'q:container';
-    const QContainerAttrEnd = '/' + QContainerAttr;
-    const QTemplate = 'q:template';
-    // the same selector should be inside the qwik loader
-    // and the same selector should be inside the qwik router spa-shim and spa-init
-    const QContainerSelector = '[q\\:container]:not([q\\:container=' +
-        QContainerValue.HTML +
-        ']):not([q\\:container=' +
-        QContainerValue.TEXT +
-        '])';
-    const HTML_NS = 'http://www.w3.org/1999/xhtml';
-    const SVG_NS = 'http://www.w3.org/2000/svg';
-    const MATH_NS = 'http://www.w3.org/1998/Math/MathML';
-    const ResourceEvent = 'qResource';
-    const RenderEvent = 'qRender';
-    const TaskEvent = 'qTask';
-    const QDefaultSlot = '';
-    /**
-     * Attribute to mark that this VNode has a pointer to itself from the `qwik/json` state.
-     *
-     * As the VNode get materialized the vnode now becomes eligible for mutation. Once the vnode mutates
-     * the `VNode` references from the `qwik/json` may become invalid. For this reason, these references
-     * need to be eagerly resolved. `VNODE_REF` stores a pointer to "this" vnode. This allows the system
-     * to eagerly resolve these pointes as the vnodes are materialized.
-     */
-    const ELEMENT_ID = 'q:id';
-    const ELEMENT_KEY = 'q:key';
-    const ELEMENT_PROPS = 'q:props';
-    const ELEMENT_SEQ = 'q:seq';
-    const ELEMENT_SEQ_IDX = 'q:seqIdx';
-    const Q_PREFIX = 'q:';
-    /** Non serializable markers - always begins with `:` character */
-    const NON_SERIALIZABLE_MARKER_PREFIX = ':';
-    const USE_ON_LOCAL = NON_SERIALIZABLE_MARKER_PREFIX + 'on';
-    const USE_ON_LOCAL_SEQ_IDX = NON_SERIALIZABLE_MARKER_PREFIX + 'onIdx';
-    const USE_ON_LOCAL_FLAGS = NON_SERIALIZABLE_MARKER_PREFIX + 'onFlags';
-    // comment nodes
-    const FLUSH_COMMENT = 'qkssr-f';
-    const STREAM_BLOCK_START_COMMENT = 'qkssr-pu';
-    const STREAM_BLOCK_END_COMMENT = 'qkssr-po';
-    const Q_PROPS_SEPARATOR = ':';
-    const dangerouslySetInnerHTML = 'dangerouslySetInnerHTML';
-    const qwikInspectorAttr = 'data-qwik-inspector';
-
     let _locale = undefined;
     /**
      * Retrieve the current locale.
@@ -1374,6 +1381,21 @@
             if (isStore(arg)) {
                 clearStoreEffects(getStoreHandler(arg), subscriber);
             }
+            else if (isPropsProxy(arg)) {
+                // Separate check for props proxy, because props proxy getter could call signal getter.
+                // To avoid that we need to get the constProps and varProps directly
+                // from the props proxy object and loop over them.
+                const constProps = arg[_CONST_PROPS];
+                const varProps = arg[_VAR_PROPS];
+                if (constProps) {
+                    for (const key in constProps) {
+                        clearArgEffect(constProps[key], subscriber, seenSet);
+                    }
+                }
+                for (const key in varProps) {
+                    clearArgEffect(varProps[key], subscriber, seenSet);
+                }
+            }
             else {
                 for (const key in arg) {
                     clearArgEffect(arg[key], subscriber, seenSet);
@@ -3583,6 +3605,108 @@
      */
     const createComputed$ = /*#__PURE__*/ implicit$FirstArg(createComputedQrl);
 
+    /// These global variables are used to avoid creating new arrays for each call to `vnode_documentPosition`.
+    const aVNodePath = [];
+    const bVNodePath = [];
+    /**
+     * Compare two VNodes and determine their document position relative to each other.
+     *
+     * @param a VNode to compare
+     * @param b VNode to compare
+     * @param rootVNode - Root VNode of a container
+     * @returns -1 if `a` is before `b`, 0 if `a` is the same as `b`, 1 if `a` is after `b`.
+     */
+    const vnode_documentPosition = (a, b, rootVNode) => {
+        if (a === b) {
+            return 0;
+        }
+        let aDepth = -1;
+        let bDepth = -1;
+        while (a) {
+            const vNode = (aVNodePath[++aDepth] = a);
+            a = (vNode[VNodeProps.parent] ||
+                (rootVNode && vnode_getProp(a, QSlotParent, (id) => vnode_locate(rootVNode, id))));
+        }
+        while (b) {
+            const vNode = (bVNodePath[++bDepth] = b);
+            b = (vNode[VNodeProps.parent] ||
+                (rootVNode && vnode_getProp(b, QSlotParent, (id) => vnode_locate(rootVNode, id))));
+        }
+        while (aDepth >= 0 && bDepth >= 0) {
+            a = aVNodePath[aDepth];
+            b = bVNodePath[bDepth];
+            if (a === b) {
+                // if the nodes are the same, we need to check the next level.
+                aDepth--;
+                bDepth--;
+            }
+            else {
+                // We found a difference so we need to scan nodes at this level.
+                let cursor = b;
+                do {
+                    cursor = vnode_getNextSibling(cursor);
+                    if (cursor === a) {
+                        return 1;
+                    }
+                } while (cursor);
+                cursor = b;
+                do {
+                    cursor = vnode_getPreviousSibling(cursor);
+                    if (cursor === a) {
+                        return -1;
+                    }
+                } while (cursor);
+                if (rootVNode && vnode_getProp(b, QSlotParent, (id) => vnode_locate(rootVNode, id))) {
+                    // The "b" node is a projection, so we need to set it after "a" node,
+                    // because the "a" node could be a context provider.
+                    return -1;
+                }
+                // The node is not in the list of siblings, that means it must be disconnected.
+                return 1;
+            }
+        }
+        return aDepth < bDepth ? -1 : 1;
+    };
+    /// These global variables are used to avoid creating new arrays for each call to `ssrNodeDocumentPosition`.
+    const aSsrNodePath = [];
+    const bSsrNodePath = [];
+    /**
+     * Compare two SSR nodes and determine their document position relative to each other. Compares only
+     * position between parent and child.
+     *
+     * @param a SSR node to compare
+     * @param b SSR node to compare
+     * @returns -1 if `a` is before `b`, 0 if `a` is the same as `b`, 1 if `a` is after `b`.
+     */
+    const ssrNodeDocumentPosition = (a, b) => {
+        if (a === b) {
+            return 0;
+        }
+        let aDepth = -1;
+        let bDepth = -1;
+        while (a) {
+            const ssrNode = (aSsrNodePath[++aDepth] = a);
+            a = ssrNode.currentComponentNode;
+        }
+        while (b) {
+            const ssrNode = (bSsrNodePath[++bDepth] = b);
+            b = ssrNode.currentComponentNode;
+        }
+        while (aDepth >= 0 && bDepth >= 0) {
+            a = aSsrNodePath[aDepth];
+            b = bSsrNodePath[bDepth];
+            if (a === b) {
+                // if the nodes are the same, we need to check the next level.
+                aDepth--;
+                bDepth--;
+            }
+            else {
+                return 1;
+            }
+        }
+        return aDepth < bDepth ? -1 : 1;
+    };
+
     /**
      * Scheduler is responsible for running application code in predictable order.
      *
@@ -3745,7 +3869,7 @@
             }
             while (choreQueue.length) {
                 const nextChore = choreQueue.shift();
-                const order = choreComparator(nextChore, runUptoChore, rootVNode, false);
+                const order = choreComparator(nextChore, runUptoChore, rootVNode);
                 if (order === null) {
                     continue;
                 }
@@ -3782,7 +3906,7 @@
                     returnValue = safeCall(() => executeComponent(container, host, host, chore.$target$, chore.$payload$), (jsx) => {
                         if (chore.$type$ === ChoreType.COMPONENT) {
                             const styleScopedId = container.getHostProp(host, QScopedStyle);
-                            return vnode_diff(container, jsx, host, addComponentStylePrefix(styleScopedId));
+                            return retryOnPromise(() => vnode_diff(container, jsx, host, addComponentStylePrefix(styleScopedId)));
                         }
                         else {
                             return jsx;
@@ -3813,7 +3937,7 @@
                     if (isSignal(jsx)) {
                         jsx = jsx.value;
                     }
-                    returnValue = vnode_diff(container, jsx, parentVirtualNode, null);
+                    returnValue = retryOnPromise(() => vnode_diff(container, jsx, parentVirtualNode, null));
                     break;
                 case ChoreType.NODE_PROP:
                     const virtualNode = chore.$host$;
@@ -3882,7 +4006,15 @@
             vnode_isVNode(chore.$host$) &&
             chore.$host$[VNodeProps.flags] & VNodeFlags.Deleted);
     }
-    function choreComparator(a, b, rootVNode, shouldThrowOnHostMismatch) {
+    /**
+     * Compares two chores to determine their execution order in the scheduler's queue.
+     *
+     * @param a - The first chore to compare
+     * @param b - The second chore to compare
+     * @returns A number indicating the relative order of the chores. A negative number means `a` runs
+     *   before `b`.
+     */
+    function choreComparator(a, b, rootVNode) {
         const macroTypeDiff = (a.$type$ & ChoreType.MACRO) - (b.$type$ & ChoreType.MACRO);
         if (macroTypeDiff !== 0) {
             return macroTypeDiff;
@@ -3909,11 +4041,11 @@
           You are attempting to change a state that has already been streamed to the client.
           This can lead to inconsistencies between Server-Side Rendering (SSR) and Client-Side Rendering (CSR).
           Problematic Node: ${aHost.toString()}`;
-                    if (shouldThrowOnHostMismatch) {
-                        throw qError(QError.serverHostMismatch, [errorMessage]);
-                    }
                     logWarn(errorMessage);
-                    return null;
+                    const hostDiff = ssrNodeDocumentPosition(aHost, bHost);
+                    if (hostDiff !== 0) {
+                        return hostDiff;
+                    }
                 }
             }
             const microTypeDiff = (a.$type$ & ChoreType.MICRO) - (b.$type$ & ChoreType.MICRO);
@@ -3944,7 +4076,7 @@
         while (bottom < top) {
             const middle = bottom + ((top - bottom) >> 1);
             const midChore = sortedArray[middle];
-            const comp = choreComparator(value, midChore, rootVNode, true);
+            const comp = choreComparator(value, midChore, rootVNode);
             if (comp < 0) {
                 top = middle;
             }
@@ -4966,7 +5098,7 @@
      *
      * @public
      */
-    const version = "2.0.0-alpha.5-dev+cb53bbd";
+    const version = "2.0.0-alpha.6-dev+d848ba5";
 
     /** @internal */
     class _SharedContainer {
@@ -7074,60 +7206,6 @@
         throw qError(QError.invalidVNodeType, [type]);
     };
     const isElement = (node) => node && typeof node == 'object' && fastNodeType(node) === /** Node.ELEMENT_NODE* */ 1;
-    /// These global variables are used to avoid creating new arrays for each call to `vnode_documentPosition`.
-    const aPath = [];
-    const bPath = [];
-    const vnode_documentPosition = (a, b, rootVNode) => {
-        if (a === b) {
-            return 0;
-        }
-        let aDepth = -1;
-        let bDepth = -1;
-        while (a) {
-            const vNode = (aPath[++aDepth] = a);
-            a = (vNode[VNodeProps.parent] ||
-                (rootVNode && vnode_getProp(a, QSlotParent, (id) => vnode_locate(rootVNode, id))));
-        }
-        while (b) {
-            const vNode = (bPath[++bDepth] = b);
-            b = (vNode[VNodeProps.parent] ||
-                (rootVNode && vnode_getProp(b, QSlotParent, (id) => vnode_locate(rootVNode, id))));
-        }
-        while (aDepth >= 0 && bDepth >= 0) {
-            a = aPath[aDepth];
-            b = bPath[bDepth];
-            if (a === b) {
-                // if the nodes are the same, we need to check the next level.
-                aDepth--;
-                bDepth--;
-            }
-            else {
-                // We found a difference so we need to scan nodes at this level.
-                let cursor = b;
-                do {
-                    cursor = vnode_getNextSibling(cursor);
-                    if (cursor === a) {
-                        return 1;
-                    }
-                } while (cursor);
-                cursor = b;
-                do {
-                    cursor = vnode_getPreviousSibling(cursor);
-                    if (cursor === a) {
-                        return -1;
-                    }
-                } while (cursor);
-                if (rootVNode && vnode_getProp(b, QSlotParent, (id) => vnode_locate(rootVNode, id))) {
-                    // The "b" node is a projection, so we need to set it after "a" node,
-                    // because the "a" node could be a context provider.
-                    return -1;
-                }
-                // The node is not in the list of siblings, that means it must be disconnected.
-                return 1;
-            }
-        }
-        return aDepth < bDepth ? -1 : 1;
-    };
     /**
      * Use this method to find the parent component for projection.
      *