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

package/dist/testing/index.cjs

@@ -1,6 +1,6 @@
 /**
  * @license
- * @qwik.dev/core/testing 2.0.0-alpha.5-dev+cb53bbd
+ * @qwik.dev/core/testing 2.0.0-alpha.7-dev+a26598a
  * 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
@@ -22166,7 +22166,7 @@ var seal = (obj) => {
 };
 
 // packages/qwik/src/core/shared/qrl/qrl-class.ts
-var import_build8 = require("@qwik.dev/core/build");
+var import_build10 = require("@qwik.dev/core/build");
 
 // packages/qwik/src/core/shared/utils/log.ts
 var STYLE = qDev ? `background: #564CE0; color: white; padding: 2px 3px; border-radius: 2px; font-size: 0.8em;` : "";
@@ -22246,10 +22246,10 @@ var codeToText = (code2, ...parts) => {
     const MAP = [
       "Error while serializing class or style attributes",
       // 0
-      "",
-      // 1 unused
-      "",
-      // 2 unused
+      "Scheduler not found",
+      // 1
+      "track() received object, without prop to track",
+      // 2
       "Only primitive and object literals can be serialized. {{0}}",
       // 3
       "",
@@ -22335,20 +22335,16 @@ See https://qwik.dev/docs/components/tasks/#use-method-rules`,
       // 43
       "Materialize error: missing element: {{0}} {{1}} {{2}}",
       // 44
-      "SsrError: {{0}}",
-      // 45
       "Cannot coerce a Signal, use `.value` instead",
-      // 46
+      // 45
       "useComputedSignal$ QRL {{0}} {{1}} returned a Promise",
-      // 47
+      // 46
       "ComputedSignal is read-only",
-      // 48
+      // 47
       "WrappedSignal is read-only",
-      // 49
-      "SsrError: Promises not expected here.",
-      // 50
+      // 48
       "Attribute value is unsafe for SSR"
-      // 51
+      // 49
     ];
     let text = MAP[code2] ?? "";
     if (parts.length) {
@@ -22371,13 +22367,137 @@ var qError = (code2, errorMessageArgs = []) => {
 };
 
 // packages/qwik/src/core/shared/platform/platform.ts
+var import_build2 = require("@qwik.dev/core/build");
+
+// packages/qwik/src/core/shared/qrl/qrl-utils.ts
 var import_build = require("@qwik.dev/core/build");
+var SYNC_QRL = "<sync>";
+var isSyncQrl = (value) => {
+  return isQrl(value) && value.$symbol$ == SYNC_QRL;
+};
+var isQrl = (value) => {
+  return typeof value === "function" && typeof value.getSymbol === "function";
+};
+function assertQrl(qrl2) {
+  if (import_build.isDev) {
+    if (!isQrl(qrl2)) {
+      throw new Error("Not a QRL");
+    }
+  }
+}
+var getSymbolHash = (symbolName) => {
+  const index = symbolName.lastIndexOf("_");
+  if (index > -1) {
+    return symbolName.slice(index + 1);
+  }
+  return symbolName;
+};
+
+// packages/qwik/src/core/shared/types.ts
+var DEBUG_TYPE = "q:type";
+var START = "\x1B[34m";
+var END = "\x1B[0m";
+var VirtualTypeName = {
+  ["V" /* Virtual */]: (
+    /* ********* */
+    START + "Virtual" + END
+  ),
+  //
+  ["F" /* Fragment */]: (
+    /* ******** */
+    START + "Fragment" + END
+  ),
+  //
+  ["S" /* WrappedSignal */]: (
+    /* *** */
+    START + "Signal" + END
+  ),
+  //
+  ["A" /* Awaited */]: (
+    /* ********* */
+    START + "Awaited" + END
+  ),
+  //
+  ["C" /* Component */]: (
+    /* ******* */
+    START + "Component" + END
+  ),
+  //
+  ["I" /* InlineComponent */]: (
+    /* * */
+    START + "InlineComponent" + END
+  ),
+  //
+  ["P" /* Projection */]: (
+    /* ****** */
+    START + "Projection" + END
+  )
+  //
+};
+
+// packages/qwik/src/core/shared/utils/markers.ts
+var OnRenderProp = "q:renderFn";
+var ComponentStylesPrefixContent = "\u26A1\uFE0F";
+var QSlot = "q:slot";
+var QSlotParent = ":";
+var QSlotRef = "q:sref";
+var QSlotS = "q:s";
+var QStyle = "q:style";
+var QStyleSelector = "style[q\\:style]";
+var QStyleSSelector = "style[q\\:sstyle]";
+var QStylesAllSelector = QStyleSelector + "," + QStyleSSelector;
+var QScopedStyle = "q:sstyle";
+var QCtxAttr = "q:ctx";
+var QBackRefs = "q:brefs";
+var QFuncsPrefix = "qFuncs_";
+var getQFuncs = (document2, hash3) => {
+  return document2[QFuncsPrefix + hash3] || [];
+};
+var QRenderAttr = "q:render";
+var QRuntimeAttr = "q:runtime";
+var QVersionAttr = "q:version";
+var QBaseAttr = "q:base";
+var QLocaleAttr = "q:locale";
+var QManifestHashAttr = "q:manifest-hash";
+var QInstanceAttr = "q:instance";
+var QContainerIsland = "q:container-island";
+var QContainerIslandEnd = "/" + QContainerIsland;
+var QIgnore = "q:ignore";
+var QIgnoreEnd = "/" + QIgnore;
+var QContainerAttr = "q:container";
+var QContainerAttrEnd = "/" + QContainerAttr;
+var QTemplate = "q:template";
+var QContainerSelector = "[q\\:container]:not([q\\:container=" + "html" /* HTML */ + "]):not([q\\:container=" + "text" /* TEXT */ + "])";
+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 ResourceEvent = "qResource";
+var RenderEvent = "qRender";
+var TaskEvent = "qTask";
+var QDefaultSlot = "";
+var ELEMENT_ID = "q:id";
+var ELEMENT_KEY = "q:key";
+var ELEMENT_PROPS = "q:props";
+var ELEMENT_SEQ = "q:seq";
+var ELEMENT_SEQ_IDX = "q:seqIdx";
+var Q_PREFIX = "q:";
+var NON_SERIALIZABLE_MARKER_PREFIX = ":";
+var USE_ON_LOCAL = NON_SERIALIZABLE_MARKER_PREFIX + "on";
+var USE_ON_LOCAL_SEQ_IDX = NON_SERIALIZABLE_MARKER_PREFIX + "onIdx";
+var USE_ON_LOCAL_FLAGS = NON_SERIALIZABLE_MARKER_PREFIX + "onFlags";
+var FLUSH_COMMENT = "qkssr-f";
+var STREAM_BLOCK_START_COMMENT = "qkssr-pu";
+var STREAM_BLOCK_END_COMMENT = "qkssr-po";
+var Q_PROPS_SEPARATOR = ":";
+var dangerouslySetInnerHTML = "dangerouslySetInnerHTML";
+
+// packages/qwik/src/core/shared/platform/platform.ts
 var createPlatform = () => {
   return {
-    isServer: import_build.isServer,
+    isServer: import_build2.isServer,
     importSymbol(containerEl, url, symbolName) {
       var _a;
-      if (import_build.isServer) {
+      if (import_build2.isServer) {
         const hash3 = getSymbolHash(symbolName);
         const regSym = (_a = globalThis.__qwik_reg_symbols) == null ? void 0 : _a.get(hash3);
         if (regSym) {
@@ -22422,7 +22542,7 @@ var createPlatform = () => {
 };
 var 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);
 };
 var _platform = /* @__PURE__ */ createPlatform();
@@ -22465,9 +22585,6 @@ var safeCall = (call, thenFn, rejectFn) => {
 var maybeThen = (valueOrPromise, thenFn) => {
   return isPromise(valueOrPromise) ? valueOrPromise.then(thenFn, shouldNotError) : thenFn(valueOrPromise);
 };
-var maybeThenPassError = (valueOrPromise, thenFn) => {
-  return isPromise(valueOrPromise) ? valueOrPromise.then(thenFn) : thenFn(valueOrPromise);
-};
 var shouldNotError = (reason) => {
   throwErrorAndStop(reason);
 };
@@ -22477,13 +22594,20 @@ var delay = (timeout) => {
   });
 };
 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)) {
+      return result.catch((e) => retryOrThrow(e));
+    }
+    return result;
+  } catch (e) {
+    return retryOrThrow(e);
   }
 }
 
@@ -22506,105 +22630,7 @@ var isFunction = (v) => {
 };
 
 // packages/qwik/src/build/index.dev.ts
-var isDev = true;
-
-// packages/qwik/src/core/shared/types.ts
-var DEBUG_TYPE = "q:type";
-var START = "\x1B[34m";
-var END = "\x1B[0m";
-var VirtualTypeName = {
-  ["V" /* Virtual */]: (
-    /* ********* */
-    START + "Virtual" + END
-  ),
-  //
-  ["F" /* Fragment */]: (
-    /* ******** */
-    START + "Fragment" + END
-  ),
-  //
-  ["S" /* WrappedSignal */]: (
-    /* *** */
-    START + "Signal" + END
-  ),
-  //
-  ["A" /* Awaited */]: (
-    /* ********* */
-    START + "Awaited" + END
-  ),
-  //
-  ["C" /* Component */]: (
-    /* ******* */
-    START + "Component" + END
-  ),
-  //
-  ["I" /* InlineComponent */]: (
-    /* * */
-    START + "InlineComponent" + END
-  ),
-  //
-  ["P" /* Projection */]: (
-    /* ****** */
-    START + "Projection" + END
-  )
-  //
-};
-
-// packages/qwik/src/core/shared/utils/markers.ts
-var OnRenderProp = "q:renderFn";
-var ComponentStylesPrefixContent = "\u2B50\uFE0F";
-var QSlot = "q:slot";
-var QSlotParent = ":";
-var QSlotRef = "q:sref";
-var QSlotS = "q:s";
-var QStyle = "q:style";
-var QStyleSelector = "style[q\\:style]";
-var QStyleSSelector = "style[q\\:sstyle]";
-var QStylesAllSelector = QStyleSelector + "," + QStyleSSelector;
-var QScopedStyle = "q:sstyle";
-var QCtxAttr = "q:ctx";
-var QSubscribers = "q:subs";
-var QFuncsPrefix = "qFuncs_";
-var getQFuncs = (document2, hash3) => {
-  return document2[QFuncsPrefix + hash3] || [];
-};
-var QRenderAttr = "q:render";
-var QRuntimeAttr = "q:runtime";
-var QVersionAttr = "q:version";
-var QBaseAttr = "q:base";
-var QLocaleAttr = "q:locale";
-var QManifestHashAttr = "q:manifest-hash";
-var QInstanceAttr = "q:instance";
-var QContainerIsland = "q:container-island";
-var QContainerIslandEnd = "/" + QContainerIsland;
-var QIgnore = "q:ignore";
-var QIgnoreEnd = "/" + QIgnore;
-var QContainerAttr = "q:container";
-var QContainerAttrEnd = "/" + QContainerAttr;
-var QTemplate = "q:template";
-var QContainerSelector = "[q\\:container]:not([q\\:container=" + "html" /* HTML */ + "]):not([q\\:container=" + "text" /* TEXT */ + "])";
-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 ResourceEvent = "qResource";
-var RenderEvent = "qRender";
-var TaskEvent = "qTask";
-var QDefaultSlot = "";
-var ELEMENT_ID = "q:id";
-var ELEMENT_KEY = "q:key";
-var ELEMENT_PROPS = "q:props";
-var ELEMENT_SEQ = "q:seq";
-var ELEMENT_SEQ_IDX = "q:seqIdx";
-var Q_PREFIX = "q:";
-var NON_SERIALIZABLE_MARKER_PREFIX = ":";
-var USE_ON_LOCAL = NON_SERIALIZABLE_MARKER_PREFIX + "on";
-var USE_ON_LOCAL_SEQ_IDX = NON_SERIALIZABLE_MARKER_PREFIX + "onIdx";
-var USE_ON_LOCAL_FLAGS = NON_SERIALIZABLE_MARKER_PREFIX + "onFlags";
-var FLUSH_COMMENT = "qkssr-f";
-var STREAM_BLOCK_START_COMMENT = "qkssr-pu";
-var STREAM_BLOCK_END_COMMENT = "qkssr-po";
-var Q_PROPS_SEPARATOR = ":";
-var dangerouslySetInnerHTML = "dangerouslySetInnerHTML";
+var isDev2 = true;
 
 // packages/qwik/src/core/use/use-locale.ts
 var _locale = void 0;
@@ -22613,7 +22639,7 @@ function setLocale(locale) {
 }
 
 // packages/qwik/src/core/client/vnode.ts
-var import_build6 = require("@qwik.dev/core/build");
+var import_build8 = require("@qwik.dev/core/build");
 
 // packages/qwik/src/server/utils.ts
 var import_meta = {};
@@ -22647,7 +22673,7 @@ var versions = {
 };
 
 // packages/qwik/src/server/prefetch-strategy.ts
-var import_build2 = require("@qwik.dev/core/build");
+var import_build3 = require("@qwik.dev/core/build");
 function getPrefetchResources(qrls, opts, resolvedManifest) {
   if (!resolvedManifest) {
     return [];
@@ -22685,7 +22711,7 @@ function getAutoPrefetch(qrls, resolvedManifest, buildBase) {
   return prefetchResources;
 }
 function addBundle(manifest, urls, prefetchResources, buildBase, bundleFileName) {
-  const url = import_build2.isDev ? bundleFileName : buildBase + bundleFileName;
+  const url = import_build3.isDev ? bundleFileName : buildBase + bundleFileName;
   let prefetchResource = urls.get(url);
   if (!prefetchResource) {
     prefetchResource = {
@@ -22704,7 +22730,7 @@ function addBundle(manifest, urls, prefetchResources, buildBase, bundleFileName)
   }
   prefetchResources.push(prefetchResource);
 }
-var isQrl = (value) => {
+var isQrl2 = (value) => {
   return typeof value === "function" && typeof value.getSymbol === "function";
 };
 
@@ -22716,12 +22742,9 @@ Object.freeze(EMPTY_OBJ);
 
 // packages/qwik/src/core/shared/qrl/qrl.ts
 var inlinedQrl = (symbol, symbolName, lexicalScopeCapture = EMPTY_ARRAY) => {
-  return createQRL(null, symbolName, symbol, null, null, lexicalScopeCapture, null);
+  return createQRL(null, symbolName, symbol, null, null, lexicalScopeCapture);
 };
 
-// packages/qwik/src/core/ssr/ssr-render-jsx.ts
-var import_build5 = require("@qwik.dev/core/build");
-
 // packages/qwik/src/core/shared/jsx/slot.public.ts
 var Slot = (props) => {
   return _jsxSorted(Virtual, null, { [QSlotS]: "" }, props.children, 0, props.name ?? "");
@@ -22808,17 +22831,61 @@ function isPreventDefault(key) {
   return key.startsWith("preventdefault:");
 }
 
-// packages/qwik/src/core/shared/utils/unitless_number.ts
-var unitlessNumbers = /* @__PURE__ */ new Set([
-  "animationIterationCount",
-  "aspectRatio",
-  "borderImageOutset",
-  "borderImageSlice",
-  "borderImageWidth",
-  "boxFlex",
-  "boxFlexGroup",
-  "boxOrdinalGroup",
-  "columnCount",
+// packages/qwik/src/core/shared/utils/jsx-filename.ts
+function getFileLocationFromJsx(jsxDev) {
+  var _a;
+  if (!jsxDev) {
+    return null;
+  }
+  const sanitizedFileName = (_a = jsxDev.fileName) == null ? void 0 : _a.replace(/\\/g, "/");
+  if (sanitizedFileName) {
+    return `${sanitizedFileName}:${jsxDev.lineNumber}:${jsxDev.columnNumber}`;
+  }
+  return null;
+}
+
+// packages/qwik/src/core/shared/utils/scoped-styles.ts
+var styleContent = (styleId) => {
+  return ComponentStylesPrefixContent + styleId;
+};
+function hasClassAttr(props) {
+  for (const key in props) {
+    if (Object.prototype.hasOwnProperty.call(props, key) && isClassAttr(key)) {
+      return true;
+    }
+  }
+  return false;
+}
+function isClassAttr(key) {
+  return key === "class" || key === "className";
+}
+function convertScopedStyleIdsToArray(scopedStyleIds) {
+  return (scopedStyleIds == null ? void 0 : scopedStyleIds.split(" ")) ?? null;
+}
+function convertStyleIdsToString(scopedStyleIds) {
+  return Array.from(scopedStyleIds).join(" ");
+}
+var addComponentStylePrefix = (styleId) => {
+  if (styleId) {
+    let idx = 0;
+    do {
+      styleId = styleId.substring(0, idx) + styleContent(styleId.substring(idx));
+    } while ((idx = styleId.indexOf(" ", idx) + 1) !== 0);
+  }
+  return styleId || null;
+};
+
+// packages/qwik/src/core/shared/utils/unitless_number.ts
+var unitlessNumbers = /* @__PURE__ */ new Set([
+  "animationIterationCount",
+  "aspectRatio",
+  "borderImageOutset",
+  "borderImageSlice",
+  "borderImageWidth",
+  "boxFlex",
+  "boxFlexGroup",
+  "boxOrdinalGroup",
+  "columnCount",
   "columns",
   "flex",
   "flexGrow",
@@ -22945,37 +23012,6 @@ var setValueForStyle = (styleName, value) => {
 function isAriaAttribute(prop) {
   return prop.startsWith("aria-");
 }
-var styleContent = (styleId) => {
-  return ComponentStylesPrefixContent + styleId;
-};
-
-// packages/qwik/src/core/shared/utils/scoped-styles.ts
-function hasClassAttr(props) {
-  for (const key in props) {
-    if (Object.prototype.hasOwnProperty.call(props, key) && isClassAttr(key)) {
-      return true;
-    }
-  }
-  return false;
-}
-function isClassAttr(key) {
-  return key === "class" || key === "className";
-}
-function convertScopedStyleIdsToArray(scopedStyleIds) {
-  return (scopedStyleIds == null ? void 0 : scopedStyleIds.split(" ")) ?? null;
-}
-function convertStyleIdsToString(scopedStyleIds) {
-  return Array.from(scopedStyleIds).join(" ");
-}
-var addComponentStylePrefix = (styleId) => {
-  if (styleId) {
-    let idx = 0;
-    do {
-      styleId = styleId.substring(0, idx) + styleContent(styleId.substring(idx));
-    } while ((idx = styleId.indexOf(" ", idx) + 1) !== 0);
-  }
-  return styleId || null;
-};
 
 // packages/qwik/src/core/signal/store.ts
 var DEBUG = false;
@@ -23111,8 +23147,12 @@ var StoreHandler = class {
     return Reflect.ownKeys(target);
   }
   getOwnPropertyDescriptor(target, prop) {
+    const descriptor = Reflect.getOwnPropertyDescriptor(target, prop);
     if (Array.isArray(target) || typeof prop === "symbol") {
-      return Object.getOwnPropertyDescriptor(target, prop);
+      return descriptor;
+    }
+    if (descriptor && !descriptor.configurable) {
+      return descriptor;
     }
     return {
       enumerable: true,
@@ -23120,17 +23160,18 @@ var StoreHandler = class {
     };
   }
 };
-function addEffect(target, prop, store, effectSubscriber) {
-  const effectsMap = store.$effects$ ||= {};
-  const effects = Object.prototype.hasOwnProperty.call(effectsMap, prop) && effectsMap[prop] || (effectsMap[prop] = []);
-  ensureContainsEffect(effects, effectSubscriber);
-  ensureContains(effectSubscriber, target);
-  ensureEffectContainsSubscriber(
-    effectSubscriber[0 /* EFFECT */],
-    target,
-    store.$container$
-  );
-  DEBUG && log("sub", pad("\n" + store.$effects$.toString(), "  "));
+function addEffect(target, prop, store, effectSubscription) {
+  var _a;
+  const effectsMap = store.$effects$ ||= /* @__PURE__ */ new Map();
+  let effects = effectsMap.get(prop);
+  if (!effects) {
+    effects = /* @__PURE__ */ new Set();
+    effectsMap.set(prop, effects);
+  }
+  ensureContainsSubscription(effects, effectSubscription);
+  ensureContainsBackRef(effectSubscription, target);
+  addQrlToSerializationCtx(effectSubscription, store.$container$);
+  DEBUG && log("sub", pad("\n" + ((_a = store.$effects$) == null ? void 0 : _a.entries.toString()), "  "));
 }
 function setNewValueAndTriggerEffects(prop, value, target, currentStore) {
   target[prop] = value;
@@ -23141,15 +23182,87 @@ function setNewValueAndTriggerEffects(prop, value, target, currentStore) {
   );
 }
 function getEffects(target, prop, storeEffects) {
-  let effectsToTrigger = storeEffects ? Array.isArray(target) ? Object.values(storeEffects).flatMap((effects) => effects) : storeEffects[prop] : null;
-  const storeArrayValue = storeEffects == null ? void 0 : storeEffects[STORE_ARRAY_PROP];
+  let effectsToTrigger;
+  if (storeEffects) {
+    if (Array.isArray(target)) {
+      for (const effects of storeEffects.values()) {
+        effectsToTrigger ||= /* @__PURE__ */ new Set();
+        for (const effect of effects) {
+          effectsToTrigger.add(effect);
+        }
+      }
+    } else {
+      effectsToTrigger = storeEffects.get(prop);
+    }
+  }
+  const storeArrayValue = storeEffects == null ? void 0 : storeEffects.get(STORE_ARRAY_PROP);
   if (storeArrayValue) {
-    effectsToTrigger ||= [];
-    effectsToTrigger.push(...storeArrayValue);
+    effectsToTrigger ||= /* @__PURE__ */ new Set();
+    for (const effect of storeArrayValue) {
+      effectsToTrigger.add(effect);
+    }
+  }
+  return effectsToTrigger || null;
+}
+
+// packages/qwik/src/core/signal/flags.ts
+var NEEDS_COMPUTATION = Symbol("invalid");
+var _EFFECT_BACK_REF = Symbol("backRef");
+
+// packages/qwik/src/core/signal/signal-cleanup.ts
+var BackRef = class {
+  [_EFFECT_BACK_REF] = null;
+};
+function clearAllEffects(container, consumer) {
+  if (vnode_isVNode(consumer) && vnode_isElementVNode(consumer)) {
+    ensureMaterialized(consumer);
+  }
+  const effects = consumer[_EFFECT_BACK_REF];
+  if (!effects) {
+    return;
+  }
+  for (const [, effect] of effects) {
+    const backRefs = effect[2 /* BACK_REF */];
+    if (!backRefs) {
+      return;
+    }
+    for (const producer of backRefs) {
+      if (producer instanceof Signal) {
+        clearSignal(container, producer, effect);
+      } else if (container.$storeProxyMap$.has(producer)) {
+        const target = container.$storeProxyMap$.get(producer);
+        const storeHandler = getStoreHandler(target);
+        clearStore(storeHandler, effect);
+      }
+    }
+  }
+}
+function clearSignal(container, producer, effect) {
+  const effects = producer.$effects$;
+  if (effects) {
+    effects.delete(effect);
+  }
+  if (producer instanceof WrappedSignal) {
+    producer.$hostElement$ = null;
+    clearAllEffects(container, producer);
+  }
+}
+function clearStore(producer, effect) {
+  const effects = producer == null ? void 0 : producer.$effects$;
+  if (effects) {
+    for (const propEffects of effects.values()) {
+      propEffects.delete(effect);
+    }
   }
-  return effectsToTrigger;
 }
 
+// packages/qwik/src/core/shared/qrl/implicit_dollar.ts
+var implicit$FirstArg = (fn) => {
+  return function(first, ...rest) {
+    return fn.call(null, dollar(first), ...rest);
+  };
+};
+
 // packages/qwik/src/core/use/use-sequential-scope.ts
 var useSequentialScope = () => {
   const iCtx = useInvokeContext();
@@ -23182,160 +23295,41 @@ var useSequentialScope = () => {
   };
 };
 
-// packages/qwik/src/core/signal/signal-subscriber.ts
-var Subscriber = class {
-  $effectDependencies$ = null;
-};
-function isSubscriber(value) {
-  return value instanceof Subscriber || value instanceof WrappedSignal;
-}
-function clearVNodeEffectDependencies(container, value) {
-  if (vnode_isElementVNode(value)) {
-    ensureMaterialized(value);
-  }
-  const effects = vnode_getProp(value, QSubscribers, container.$getObjectById$);
-  if (!effects) {
-    return;
-  }
-  for (let i = effects.length - 1; i >= 0; i--) {
-    const subscriber = effects[i];
-    clearEffects(subscriber, value, effects, i, container);
-  }
-  if (effects.length === 0) {
-    vnode_setProp(value, QSubscribers, null);
-  }
-}
-function clearSubscriberEffectDependencies(container, value) {
-  if (value.$effectDependencies$) {
-    for (let i = value.$effectDependencies$.length - 1; i >= 0; i--) {
-      const subscriber = value.$effectDependencies$[i];
-      clearEffects(subscriber, value, value.$effectDependencies$, i, container);
-    }
-    if (value.$effectDependencies$.length === 0) {
-      value.$effectDependencies$ = null;
-    }
-  }
-}
-function clearEffects(subscriber, value, effectArray, indexToRemove, container) {
-  let subscriptionRemoved = false;
-  const seenSet = /* @__PURE__ */ new Set();
-  if (subscriber instanceof WrappedSignal) {
-    subscriptionRemoved = clearSignalEffects(subscriber, value, seenSet);
-  } else if (container.$storeProxyMap$.has(subscriber)) {
-    const store = container.$storeProxyMap$.get(subscriber);
-    const handler = getStoreHandler(store);
-    subscriptionRemoved = clearStoreEffects(handler, value);
-  }
-  if (subscriptionRemoved) {
-    effectArray.splice(indexToRemove, 1);
-  }
-}
-function clearSignalEffects(subscriber, value, seenSet) {
-  const effectSubscriptions = subscriber.$effects$;
-  let subscriptionRemoved = false;
-  if (effectSubscriptions) {
-    for (let i = effectSubscriptions.length - 1; i >= 0; i--) {
-      const effect = effectSubscriptions[i];
-      if (effect[0 /* EFFECT */] === value) {
-        effectSubscriptions.splice(i, 1);
-        subscriptionRemoved = true;
-      }
-    }
-  }
-  if (subscriber instanceof WrappedSignal) {
-    const hostElement = subscriber.$hostElement$;
-    if (hostElement && hostElement === value) {
-      subscriber.$hostElement$ = null;
-    }
-    const args = subscriber.$args$;
-    if (args) {
-      clearArgsEffects(args, subscriber, seenSet);
+// packages/qwik/src/core/signal/subscriber.ts
+var import_build4 = require("@qwik.dev/core/build");
+function getSubscriber(effect, prop, data) {
+  if (!effect[_EFFECT_BACK_REF]) {
+    if (import_build4.isServer && isSsrNode(effect)) {
+      effect.setProp(QBackRefs, /* @__PURE__ */ new Map());
+    } else {
+      effect[_EFFECT_BACK_REF] = /* @__PURE__ */ new Map();
     }
   }
-  return subscriptionRemoved;
-}
-function clearStoreEffects(storeHandler, value) {
-  const effectSubscriptions = storeHandler.$effects$;
-  if (!effectSubscriptions) {
-    return false;
-  }
-  let subscriptionRemoved = false;
-  for (const key in effectSubscriptions) {
-    const effects = effectSubscriptions[key];
-    for (let i = effects.length - 1; i >= 0; i--) {
-      const effect = effects[i];
-      if (effect[0 /* EFFECT */] === value) {
-        effects.splice(i, 1);
-        subscriptionRemoved = true;
-      }
-    }
-    if (effects.length === 0) {
-      delete effectSubscriptions[key];
-    }
+  const subMap = effect[_EFFECT_BACK_REF];
+  let sub = subMap.get(prop);
+  if (!sub) {
+    sub = [effect, prop];
+    subMap.set(prop, sub);
   }
-  return subscriptionRemoved;
-}
-function clearArgsEffects(args, subscriber, seenSet) {
-  for (let i = args.length - 1; i >= 0; i--) {
-    const arg = args[i];
-    clearArgEffect(arg, subscriber, seenSet);
+  if (data) {
+    sub[3 /* DATA */] = data;
   }
+  return sub;
 }
-function clearArgEffect(arg, subscriber, seenSet) {
-  if (seenSet.has(arg)) {
-    return;
-  }
-  seenSet.add(arg);
-  if (isSignal(arg)) {
-    clearSignalEffects(arg, subscriber, seenSet);
-  } else if (typeof arg === "object" && arg !== null) {
-    if (isStore(arg)) {
-      clearStoreEffects(getStoreHandler(arg), subscriber);
-    } else {
-      for (const key in arg) {
-        clearArgEffect(arg[key], subscriber, seenSet);
-      }
-    }
-  } else if (Array.isArray(arg)) {
-    clearArgsEffects(arg, subscriber, seenSet);
-  } else {
-  }
+function isSsrNode(value) {
+  return "__brand__" in value && "currentComponentNode" in value;
 }
 
-// packages/qwik/src/core/use/use-resource.ts
-var _createResourceReturn = (opts) => {
-  const resource = {
-    __brand: "resource",
-    value: void 0,
-    loading: isServerPlatform() ? false : true,
-    _resolved: void 0,
-    _error: void 0,
-    _state: "pending",
-    _timeout: (opts == null ? void 0 : opts.timeout) ?? -1,
-    _cache: 0
-  };
-  return resource;
-};
-var createResourceReturn = (container, opts, initialPromise) => {
-  const result = _createResourceReturn(opts);
-  result.value = initialPromise;
-  return createStore(container, result, 1 /* RECURSIVE */);
-};
-var runResource = (task, container, host) => {
+// packages/qwik/src/core/use/use-task.ts
+var runTask = (task, container, host) => {
   task.$flags$ &= ~8 /* DIRTY */;
   cleanupTask(task);
-  const iCtx = newInvokeContext(container.$locale$, host, void 0, ResourceEvent);
+  const iCtx = newInvokeContext(container.$locale$, host, void 0, TaskEvent);
   iCtx.$container$ = container;
-  const taskFn = task.$qrl$.getFn(iCtx, () => clearSubscriberEffectDependencies(container, task));
-  const resource = task.$state$;
-  assertDefined(
-    resource,
-    'useResource: when running a resource, "task.resource" must be a defined.',
-    task
-  );
+  const taskFn = task.$qrl$.getFn(iCtx, () => clearAllEffects(container, task));
   const track = (obj, prop) => {
     const ctx = newInvokeContext();
-    ctx.$effectSubscriber$ = [task, ":" /* COMPONENT */];
+    ctx.$effectSubscriber$ = getSubscriber(task, ":" /* COMPONENT */);
     ctx.$container$ = container;
     return invoke(ctx, () => {
       if (isFunction(obj)) {
@@ -23346,127 +23340,143 @@ var runResource = (task, container, host) => {
       } else if (isSignal(obj)) {
         return obj.value;
       } else {
-        return obj;
+        throw qError(2 /* trackObjectWithoutProp */);
       }
     });
   };
   const handleError = (reason) => container.handleError(reason, host);
-  const cleanups = [];
-  task.$destroy$ = noSerialize(() => {
-    cleanups.forEach((fn) => {
-      try {
-        fn();
-      } catch (err) {
-        handleError(err);
-      }
-    });
-    done = true;
-  });
-  const resourceTarget = unwrapStore(resource);
-  const opts = {
-    track,
-    cleanup(fn) {
-      if (typeof fn === "function") {
-        cleanups.push(fn);
+  let cleanupFns = null;
+  const cleanup2 = (fn) => {
+    if (typeof fn == "function") {
+      if (!cleanupFns) {
+        cleanupFns = [];
+        task.$destroy$ = noSerialize(() => {
+          task.$destroy$ = null;
+          cleanupFns.forEach((fn2) => {
+            try {
+              fn2();
+            } catch (err) {
+              handleError(err);
+            }
+          });
+        });
       }
-    },
-    cache(policy) {
-      let milliseconds = 0;
-      if (policy === "immutable") {
-        milliseconds = Infinity;
+      cleanupFns.push(fn);
+    }
+  };
+  const taskApi = { track, cleanup: cleanup2 };
+  const result = safeCall(
+    () => taskFn(taskApi),
+    cleanup2,
+    (err) => {
+      if (isPromise(err)) {
+        return err.then(() => runTask(task, container, host));
       } else {
-        milliseconds = policy;
-      }
-      resource._cache = milliseconds;
-    },
-    previous: resourceTarget._resolved
-  };
-  let resolve;
-  let reject;
-  let done = false;
-  const setState = (resolved, value) => {
-    if (!done) {
-      done = true;
-      if (resolved) {
-        done = true;
-        resource.loading = false;
-        resource._state = "resolved";
-        resource._resolved = value;
-        resource._error = void 0;
-        resolve(value);
-      } else {
-        done = true;
-        resource.loading = false;
-        resource._state = "rejected";
-        resource._error = value;
-        reject(value);
-      }
-      return true;
-    }
-    return false;
-  };
-  cleanups.push(() => {
-    if (untrack(() => resource.loading) === true) {
-      const value = untrack(() => resource._resolved);
-      setState(true, value);
-    }
-  });
-  invoke(iCtx, () => {
-    resource._state = "pending";
-    resource.loading = !isServerPlatform();
-    const promise2 = resource.value = new Promise((r, re) => {
-      resolve = r;
-      reject = re;
-    });
-    promise2.catch(ignoreErrorToPreventNodeFromCrashing);
-  });
-  const promise = safeCall(
-    () => Promise.resolve(taskFn(opts)),
-    (value) => {
-      setState(true, value);
-    },
-    (err) => {
-      if (isPromise(err)) {
-        return err.then(() => runResource(task, container, host));
-      } else {
-        setState(false, err);
+        throw err;
       }
     }
   );
-  const timeout = resourceTarget._timeout;
-  if (timeout > 0) {
-    return Promise.race([
-      promise,
-      delay(timeout).then(() => {
-        if (setState(false, new Error("timeout"))) {
-          cleanupTask(task);
-        }
-      })
-    ]);
+  return result;
+};
+var cleanupTask = (task) => {
+  const destroy = task.$destroy$;
+  if (destroy) {
+    task.$destroy$ = null;
+    try {
+      destroy();
+    } catch (err) {
+      logError(err);
+    }
   }
-  return promise;
 };
-var ignoreErrorToPreventNodeFromCrashing = (err) => {
+var Task = class extends BackRef {
+  constructor($flags$, $index$, $el$, $qrl$, $state$, $destroy$) {
+    super();
+    this.$flags$ = $flags$;
+    this.$index$ = $index$;
+    this.$el$ = $el$;
+    this.$qrl$ = $qrl$;
+    this.$state$ = $state$;
+    this.$destroy$ = $destroy$;
+  }
+};
+var isTask = (value) => {
+  return value instanceof Task;
 };
 
 // packages/qwik/src/core/client/vnode-diff.ts
-var import_build4 = require("@qwik.dev/core/build");
+var import_build7 = require("@qwik.dev/core/build");
+
+// packages/qwik/src/core/client/util-mapArray.ts
+var mapApp_findIndx = (elementVNode, key, start) => {
+  assertTrue(start % 2 === 0, "Expecting even number.");
+  let bottom = start >> 1;
+  let top = elementVNode.length - 2 >> 1;
+  while (bottom <= top) {
+    const mid = bottom + (top - bottom >> 1);
+    const midKey = elementVNode[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 = (elementVNode, key, value, start) => {
+  const indx = mapApp_findIndx(elementVNode, key, start);
+  if (indx >= 0) {
+    if (value == null) {
+      elementVNode.splice(indx, 2);
+    } else {
+      elementVNode[indx + 1] = value;
+    }
+  } else if (value != null) {
+    elementVNode.splice(indx ^ -1, 0, key, value);
+  }
+};
+var mapApp_remove = (elementVNode, key, start) => {
+  const indx = mapApp_findIndx(elementVNode, key, start);
+  let value = null;
+  if (indx >= 0) {
+    value = elementVNode[indx + 1];
+    elementVNode.splice(indx, 2);
+    return value;
+  }
+  return value;
+};
+var mapArray_get = (elementVNode, key, start) => {
+  const indx = mapApp_findIndx(elementVNode, key, start);
+  if (indx >= 0) {
+    return elementVNode[indx + 1];
+  } else {
+    return null;
+  }
+};
 
 // packages/qwik/src/core/client/vnode-namespace.ts
-var isForeignObjectElement = (elementName) => elementName.toLowerCase() === "foreignobject";
+var import_build5 = require("@qwik.dev/core/build");
+var isForeignObjectElement = (elementName) => {
+  return import_build5.isDev ? elementName.toLowerCase() === "foreignobject" : elementName === "foreignObject";
+};
 var isSvgElement = (elementName) => elementName === "svg" || isForeignObjectElement(elementName);
 var isMathElement = (elementName) => elementName === "math";
 var vnode_isDefaultNamespace = (vnode) => {
   const flags = vnode[0 /* flags */];
   return (flags & 192 /* NAMESPACE_MASK */) === 0;
 };
-var vnode_getElementNamespaceFlags = (elementName) => {
-  if (isSvgElement(elementName)) {
-    return 64 /* NS_svg */;
-  } else if (isMathElement(elementName)) {
-    return 128 /* NS_math */;
-  } else {
-    return 0 /* NS_html */;
+var vnode_getElementNamespaceFlags = (element) => {
+  const namespace = fastNamespaceURI(element);
+  switch (namespace) {
+    case SVG_NS:
+      return 64 /* NS_svg */;
+    case MATH_NS:
+      return 128 /* NS_math */;
+    default:
+      return 0 /* NS_html */;
   }
 };
 function vnode_getDomChildrenWithCorrectNamespacesToInsert(journal, domParentVNode, newChild) {
@@ -23622,21 +23632,28 @@ function getNewElementNamespaceData(domParentVNode, tagOrVNode) {
 }
 
 // packages/qwik/src/core/shared/component-execution.ts
-var import_build3 = require("@qwik.dev/core/build");
+var import_build6 = require("@qwik.dev/core/build");
 var executeComponent = (container, renderHost, subscriptionHost, componentQRL, props) => {
-  const iCtx = newInvokeContext(container.$locale$, subscriptionHost, void 0, RenderEvent);
-  iCtx.$effectSubscriber$ = [subscriptionHost, ":" /* COMPONENT */];
-  iCtx.$container$ = container;
+  const iCtx = newInvokeContext(
+    container.$locale$,
+    subscriptionHost || void 0,
+    void 0,
+    RenderEvent
+  );
+  if (subscriptionHost) {
+    iCtx.$effectSubscriber$ = getSubscriber(subscriptionHost, ":" /* COMPONENT */);
+    iCtx.$container$ = container;
+  }
   let componentFn;
   container.ensureProjectionResolved(renderHost);
   let isInlineComponent = false;
   if (componentQRL === null) {
-    componentQRL = componentQRL || container.getHostProp(renderHost, OnRenderProp);
+    componentQRL = container.getHostProp(renderHost, OnRenderProp);
     assertDefined(componentQRL, "No Component found at this location");
   }
-  if (isQrl2(componentQRL)) {
+  if (isQrl(componentQRL)) {
     props = props || container.getHostProp(renderHost, ELEMENT_PROPS) || EMPTY_OBJ;
-    if (props && props.children) {
+    if (props.children) {
       delete props.children;
     }
     componentFn = componentQRL.getFn(iCtx);
@@ -23653,19 +23670,17 @@ var executeComponent = (container, renderHost, subscriptionHost, componentQRL, p
       if (!isInlineComponent) {
         container.setHostProp(renderHost, ELEMENT_SEQ_IDX, null);
         container.setHostProp(renderHost, USE_ON_LOCAL_SEQ_IDX, null);
-        if (container.getHostProp(renderHost, ELEMENT_PROPS) !== props) {
-          container.setHostProp(renderHost, ELEMENT_PROPS, props);
-        }
+        container.setHostProp(renderHost, ELEMENT_PROPS, props);
       }
       if (vnode_isVNode(renderHost)) {
-        clearVNodeEffectDependencies(container, renderHost);
+        clearAllEffects(container, renderHost);
       }
       return componentFn(props);
     },
     (jsx4) => {
       const useOnEvents = container.getHostProp(renderHost, USE_ON_LOCAL);
       if (useOnEvents) {
-        return maybeThen(addUseOnEvents(jsx4, useOnEvents), () => jsx4);
+        return addUseOnEvents(jsx4, useOnEvents);
       }
       return jsx4;
     },
@@ -23683,6 +23698,7 @@ var executeComponent = (container, renderHost, subscriptionHost, componentQRL, p
 };
 function addUseOnEvents(jsx4, useOnEvents) {
   const jsxElement = findFirstStringJSX(jsx4);
+  let jsxResult = jsx4;
   return maybeThen(jsxElement, (jsxElement2) => {
     let isInvisibleComponent = false;
     if (!jsxElement2) {
@@ -23692,16 +23708,18 @@ function addUseOnEvents(jsx4, useOnEvents) {
       if (Object.prototype.hasOwnProperty.call(useOnEvents, key)) {
         if (isInvisibleComponent) {
           if (key === "onQvisible$") {
-            jsxElement2 = addScriptNodeForInvisibleComponents(jsx4);
-            if (jsxElement2) {
-              addUseOnEvent(jsxElement2, "document:onQinit$", useOnEvents[key]);
+            const [jsxElement3, jsx5] = addScriptNodeForInvisibleComponents(jsxResult);
+            jsxResult = jsx5;
+            if (jsxElement3) {
+              addUseOnEvent(jsxElement3, "document:onQinit$", useOnEvents[key]);
             }
           } else if (key.startsWith("document:") || key.startsWith("window:")) {
-            jsxElement2 = addScriptNodeForInvisibleComponents(jsx4);
-            if (jsxElement2) {
-              addUseOnEvent(jsxElement2, key, useOnEvents[key]);
+            const [jsxElement3, jsx5] = addScriptNodeForInvisibleComponents(jsxResult);
+            jsxResult = jsx5;
+            if (jsxElement3) {
+              addUseOnEvent(jsxElement3, key, useOnEvents[key]);
             }
-          } else if (import_build3.isDev) {
+          } else if (import_build6.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. '
             );
@@ -23711,7 +23729,7 @@ function addUseOnEvents(jsx4, useOnEvents) {
         }
       }
     }
-    return jsxElement2;
+    return jsxResult;
   });
 }
 function addUseOnEvent(jsxElement, key, value) {
@@ -23762,6 +23780,9 @@ function addScriptNodeForInvisibleComponents(jsx4) {
       null,
       3
     );
+    if (jsx4.type === Slot) {
+      return [jsxElement, _jsxSorted(Fragment, null, null, [jsx4, jsxElement], 0, null)];
+    }
     if (jsx4.children == null) {
       jsx4.children = jsxElement;
     } else if (Array.isArray(jsx4.children)) {
@@ -23769,13 +23790,19 @@ function addScriptNodeForInvisibleComponents(jsx4) {
     } else {
       jsx4.children = [jsx4.children, jsxElement];
     }
-    return jsxElement;
+    return [jsxElement, jsx4];
   } else if (Array.isArray(jsx4) && jsx4.length) {
-    return addScriptNodeForInvisibleComponents(jsx4[0]);
+    const [jsxElement, _] = addScriptNodeForInvisibleComponents(jsx4[0]);
+    return [jsxElement, jsx4];
   }
-  return null;
+  return [null, null];
 }
 
+// packages/qwik/src/core/shared/utils/constants.ts
+var _CONST_PROPS = Symbol("CONST");
+var _VAR_PROPS = Symbol("VAR");
+var _IMMUTABLE = Symbol("IMMUTABLE");
+
 // packages/qwik/src/core/shared/utils/prop.ts
 function isSlotProp(prop) {
   return !prop.startsWith("q:") && !prop.startsWith(NON_SERIALIZABLE_MARKER_PREFIX);
@@ -23814,19 +23841,6 @@ function escapeHTML(html) {
   }
 }
 
-// packages/qwik/src/core/shared/utils/jsx-filename.ts
-function getFileLocationFromJsx(jsxDev) {
-  var _a;
-  if (!jsxDev) {
-    return null;
-  }
-  const sanitizedFileName = (_a = jsxDev.fileName) == null ? void 0 : _a.replace(/\\/g, "/");
-  if (sanitizedFileName) {
-    return `${sanitizedFileName}:${jsxDev.lineNumber}:${jsxDev.columnNumber}`;
-  }
-  return null;
-}
-
 // packages/qwik/src/core/client/vnode-diff.ts
 var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
   let journal = container.$journal$;
@@ -23863,7 +23877,7 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
             descend(jsxValue, false);
           } else if (isSignal(jsxValue)) {
             if (vCurrent) {
-              clearVNodeEffectDependencies(container, vCurrent);
+              clearAllEffects(container, vCurrent);
             }
             expectVirtual("S" /* WrappedSignal */, null);
             descend(
@@ -24020,8 +24034,9 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
     };
     const projections = [];
     if (host) {
-      for (let i = vnode_getPropStartIndex(host); i < host.length; i = i + 2) {
-        const prop = host[i];
+      const props = vnode_getProps(host);
+      for (let i = 0; i < props.length; i = i + 2) {
+        const prop = props[i];
         if (isSlotProp(prop)) {
           const slotName = prop;
           projections.push(slotName);
@@ -24065,8 +24080,8 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
     );
     if (vCurrent == null) {
       vNewNode = vnode_newVirtual();
-      import_build4.isDev && vnode_setProp(vNewNode, DEBUG_TYPE, "P" /* Projection */);
-      import_build4.isDev && vnode_setProp(vNewNode, "q:code", "expectProjection");
+      import_build7.isDev && vnode_setProp(vNewNode, DEBUG_TYPE, "P" /* Projection */);
+      import_build7.isDev && vnode_setProp(vNewNode, "q:code", "expectProjection");
       vnode_setProp(vNewNode, QSlot, slotName);
       vnode_setProp(vNewNode, QSlotParent, vParent);
       vnode_setProp(vParent, slotName, vNewNode);
@@ -24092,8 +24107,8 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
       );
       vnode_setProp(vNewNode, QSlot, slotNameKey);
       vHost && vnode_setProp(vHost, slotNameKey, vNewNode);
-      import_build4.isDev && vnode_setProp(vNewNode, DEBUG_TYPE, "P" /* Projection */);
-      import_build4.isDev && vnode_setProp(vNewNode, "q:code", "expectSlot" + count++);
+      import_build7.isDev && vnode_setProp(vNewNode, DEBUG_TYPE, "P" /* Projection */);
+      import_build7.isDev && vnode_setProp(vNewNode, "q:code", "expectSlot" + count++);
       return false;
     } else if (vProjectedNode === vCurrent) {
     } else {
@@ -24105,8 +24120,8 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
       );
       vnode_setProp(vNewNode, QSlot, slotNameKey);
       vHost && vnode_setProp(vHost, slotNameKey, vNewNode);
-      import_build4.isDev && vnode_setProp(vNewNode, DEBUG_TYPE, "P" /* Projection */);
-      import_build4.isDev && vnode_setProp(vNewNode, "q:code", "expectSlot" + count++);
+      import_build7.isDev && vnode_setProp(vNewNode, DEBUG_TYPE, "P" /* Projection */);
+      import_build7.isDev && vnode_setProp(vNewNode, "q:code", "expectSlot" + count++);
     }
     return true;
   }
@@ -24177,14 +24192,20 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
         if (isJsxPropertyAnEventName(key2)) {
           const eventName = getEventNameFromJsxProp(key2);
           const scope = getEventNameScopeFromJsxProp(key2);
-          vnode_setProp(
-            vNewNode,
-            HANDLER_PREFIX + ":" + scope + ":" + eventName,
-            value
-          );
           if (eventName) {
+            vnode_setProp(
+              vNewNode,
+              HANDLER_PREFIX + ":" + scope + ":" + eventName,
+              value
+            );
             registerQwikLoaderEvent(eventName);
           }
+          if (scope) {
+            const htmlEvent = convertEventNameFromJsxPropToHtmlAttr(key2);
+            if (htmlEvent) {
+              vnode_setAttr(journal, vNewNode, htmlEvent, "");
+            }
+          }
           needsQDispatchEventPatch = true;
           continue;
         }
@@ -24195,12 +24216,14 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
           } else if (typeof value === "function") {
             value(element);
             continue;
+          } else if (value == null) {
+            continue;
           } else {
             throw qError(32 /* invalidRefValue */, [currentFile]);
           }
         }
         if (isSignal(value)) {
-          const signalData = new EffectPropData({
+          const signalData = new SubscriptionData({
             $scopedStyleIdPrefix$: scopedStyleIdPrefix,
             $isConst$: true
           });
@@ -24219,7 +24242,7 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
         }
         if (elementName === "textarea" && key2 === "value") {
           if (value && typeof value !== "string") {
-            if (import_build4.isDev) {
+            if (import_build7.isDev) {
               throw qError(40 /* wrongTextareaValue */, [currentFile, value]);
             }
             continue;
@@ -24300,7 +24323,12 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
           let returnValue = false;
           qrls.flat(2).forEach((qrl2) => {
             if (qrl2) {
-              const value = qrl2(event, element);
+              const value = container.$scheduler$(
+                2 /* RUN_QRL */,
+                vNode,
+                qrl2,
+                [event, element]
+              );
               returnValue = returnValue || value === true;
             }
           });
@@ -24311,10 +24339,10 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
   }
   function setBulkProps(vnode, srcAttrs, currentFile) {
     vnode_ensureElementInflated(vnode);
-    const dstAttrs = vnode;
+    const dstAttrs = vnode_getProps(vnode);
     let srcIdx = 0;
     const srcLength = srcAttrs.length;
-    let dstIdx = 8 /* PROPS_OFFSET */;
+    let dstIdx = 0;
     let dstLength = dstAttrs.length;
     let srcKey = srcIdx < srcLength ? srcAttrs[srcIdx++] : null;
     let dstKey = dstIdx < dstLength ? dstAttrs[dstIdx++] : null;
@@ -24332,12 +24360,14 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
         } else if (typeof value === "function") {
           value(element);
           return;
+        } else if (value == null) {
+          return;
         } else {
           throw qError(32 /* invalidRefValue */, [currentFile]);
         }
       }
       if (isSignal(value)) {
-        const signalData = new EffectPropData({
+        const signalData = new SubscriptionData({
           $scopedStyleIdPrefix$: scopedStyleIdPrefix,
           $isConst$: false
         });
@@ -24350,17 +24380,17 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
     };
     const recordJsxEvent = (key, value) => {
       const eventName = getEventNameFromJsxProp(key);
+      const scope = getEventNameScopeFromJsxProp(key);
       if (eventName) {
-        const scope = getEventNameScopeFromJsxProp(key);
         record(":" + scope + ":" + eventName, value);
-      }
-      const htmlEvent = convertEventNameFromJsxPropToHtmlAttr(key);
-      if (htmlEvent) {
-        record(htmlEvent, "");
-      }
-      if (eventName) {
         registerQwikLoaderEvent(eventName);
       }
+      if (scope) {
+        const htmlEvent = convertEventNameFromJsxPropToHtmlAttr(key);
+        if (htmlEvent) {
+          record(htmlEvent, "");
+        }
+      }
     };
     while (srcKey !== null || dstKey !== null) {
       if ((dstKey == null ? void 0 : dstKey.startsWith(HANDLER_PREFIX)) || (dstKey == null ? void 0 : dstKey.startsWith(Q_PREFIX))) {
@@ -24476,7 +24506,7 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
       vCurrent && getInsertBefore()
     );
     vnode_setProp(vNewNode, ELEMENT_KEY, jsxKey);
-    import_build4.isDev && vnode_setProp(vNewNode || vCurrent, DEBUG_TYPE, type);
+    import_build7.isDev && vnode_setProp(vNewNode || vCurrent, DEBUG_TYPE, type);
   }
   function expectComponent(component) {
     const componentMeta = component[SERIALIZABLE_STATE];
@@ -24504,9 +24534,6 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
       } else if (!hashesAreEqual) {
         insertNewComponent(host, componentQRL, jsxProps);
         if (vNewNode) {
-          if (host) {
-            vNewNode[0 /* flags */] = host[0 /* flags */];
-          }
           host = vNewNode;
           shouldRender = true;
         }
@@ -24516,7 +24543,7 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
         shouldRender = shouldRender || propsDiffer(jsxProps, vNodeProps);
         if (shouldRender) {
           host[0 /* flags */] &= ~32 /* Deleted */;
-          container.$scheduler$(7 /* COMPONENT */, host, componentQRL, jsxProps);
+          container.$scheduler$(6 /* COMPONENT */, host, componentQRL, jsxProps);
         }
       }
       descendContentToProject(jsxNode2.children, host);
@@ -24551,7 +24578,7 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
   }
   function insertNewComponent(host, componentQRL, jsxProps) {
     if (host) {
-      clearVNodeEffectDependencies(container, host);
+      clearAllEffects(container, host);
     }
     vnode_insertBefore(
       journal,
@@ -24560,7 +24587,7 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
       vCurrent && getInsertBefore()
     );
     const jsxNode2 = jsxValue;
-    import_build4.isDev && vnode_setProp(vNewNode, DEBUG_TYPE, "C" /* Component */);
+    import_build7.isDev && vnode_setProp(vNewNode, DEBUG_TYPE, "C" /* Component */);
     container.setHostProp(vNewNode, OnRenderProp, componentQRL);
     container.setHostProp(vNewNode, ELEMENT_PROPS, jsxProps);
     container.setHostProp(vNewNode, ELEMENT_KEY, jsxNode2.key);
@@ -24573,7 +24600,7 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
       vCurrent && getInsertBefore()
     );
     const jsxNode2 = jsxValue;
-    import_build4.isDev && vnode_setProp(vNewNode, DEBUG_TYPE, "I" /* InlineComponent */);
+    import_build7.isDev && vnode_setProp(vNewNode, DEBUG_TYPE, "I" /* InlineComponent */);
     vnode_setProp(vNewNode, ELEMENT_PROPS, jsxNode2.props);
     if (jsxNode2.key) {
       vnode_setProp(vNewNode, ELEMENT_KEY, jsxNode2.key);
@@ -24617,8 +24644,8 @@ function propsDiffer(src, dst) {
   if (!src || !dst) {
     return true;
   }
-  let srcKeys = removePropsKeys(Object.keys(src), ["children", QSubscribers]);
-  let dstKeys = removePropsKeys(Object.keys(dst), ["children", QSubscribers]);
+  let srcKeys = removePropsKeys(Object.keys(src), ["children", QBackRefs]);
+  let dstKeys = removePropsKeys(Object.keys(dst), ["children", QBackRefs]);
   if (srcKeys.length !== dstKeys.length) {
     return true;
   }
@@ -24652,7 +24679,7 @@ function cleanup(container, vNode) {
   do {
     const type = vCursor[0 /* flags */];
     if (type & 3 /* ELEMENT_OR_VIRTUAL_MASK */) {
-      clearVNodeEffectDependencies(container, vCursor);
+      clearAllEffects(container, vCursor);
       markVNodeAsDeleted(vCursor);
       if (type & 2 /* Virtual */) {
         const seq = container.getHostProp(vCursor, ELEMENT_SEQ);
@@ -24661,7 +24688,7 @@ function cleanup(container, vNode) {
             const obj = seq[i];
             if (isTask(obj)) {
               const task = obj;
-              clearSubscriberEffectDependencies(container, task);
+              clearAllEffects(container, task);
               if (task.$flags$ & 1 /* VISIBLE_TASK */) {
                 container.$scheduler$(48 /* CLEANUP_VISIBLE */, task);
               } else {
@@ -24673,8 +24700,8 @@ function cleanup(container, vNode) {
       }
       const isComponent = type & 2 /* Virtual */ && vnode_getProp(vCursor, OnRenderProp, null) !== null;
       if (isComponent) {
-        const attrs = vCursor;
-        for (let i = 6 /* PROPS_OFFSET */; i < attrs.length; i = i + 2) {
+        const attrs = vnode_getProps(vCursor);
+        for (let i = 0; i < attrs.length; i = i + 2) {
           const key = attrs[i];
           if (!isParentSlotProp(key) && isSlotProp(key)) {
             const value = attrs[i + 1];
@@ -24746,208 +24773,491 @@ function markVNodeAsDeleted(vCursor) {
 var HANDLER_PREFIX = ":";
 var count = 0;
 
-// packages/qwik/src/core/shared/qrl/implicit_dollar.ts
-var implicit$FirstArg = (fn) => {
-  return function(first, ...rest) {
-    return fn.call(null, dollar(first), ...rest);
+// packages/qwik/src/core/use/use-resource.ts
+var _createResourceReturn = (opts) => {
+  const resource = {
+    __brand: "resource",
+    value: void 0,
+    loading: isServerPlatform() ? false : true,
+    _resolved: void 0,
+    _error: void 0,
+    _state: "pending",
+    _timeout: (opts == null ? void 0 : opts.timeout) ?? -1,
+    _cache: 0
   };
+  return resource;
 };
-
-// packages/qwik/src/core/shared/scheduler.ts
-var DEBUG2 = false;
-var createScheduler = (container, scheduleDrain, journalFlush) => {
-  const choreQueue = [];
-  let currentChore = null;
-  let journalFlushScheduled = false;
-  return schedule;
-  function schedule(type, hostOrTask = null, targetOrQrl = null, payload = null) {
-    const runLater = type !== 255 /* WAIT_FOR_ALL */ && type !== 6 /* COMPONENT_SSR */;
-    const isTask2 = type === 3 /* TASK */ || type === 32 /* VISIBLE */ || type === 2 /* RESOURCE */ || type === 48 /* CLEANUP_VISIBLE */;
-    if (isTask2) {
-      hostOrTask.$flags$ |= 8 /* DIRTY */;
-    }
-    let chore = {
-      $type$: type,
-      $idx$: isTask2 ? hostOrTask.$index$ : typeof targetOrQrl === "string" ? targetOrQrl : 0,
-      $host$: isTask2 ? hostOrTask.$el$ : hostOrTask,
-      $target$: targetOrQrl,
-      $payload$: isTask2 ? hostOrTask : payload,
-      $resolve$: null,
-      $promise$: null,
-      $returnValue$: null,
-      $executed$: false
-    };
-    chore.$promise$ = new Promise((resolve) => chore.$resolve$ = resolve);
-    DEBUG2 && debugTrace("schedule", chore, currentChore, choreQueue);
-    chore = sortedInsert(choreQueue, chore, container.rootVNode || null);
-    if (!journalFlushScheduled && runLater) {
-      journalFlushScheduled = true;
-      schedule(16 /* JOURNAL_FLUSH */);
-      scheduleDrain();
-    }
-    if (runLater) {
-      return chore.$promise$;
-    } else {
-      return drainUpTo(chore, container.rootVNode || null);
-    }
-  }
-  function drainUpTo(runUptoChore, rootVNode) {
-    if (runUptoChore.$executed$) {
-      return runUptoChore.$returnValue$;
-    }
-    if (currentChore) {
-      return runUptoChore.$promise$;
-    }
-    while (choreQueue.length) {
-      const nextChore = choreQueue.shift();
-      const order = choreComparator(nextChore, runUptoChore, rootVNode, false);
-      if (order === null) {
-        continue;
-      }
-      if (order > 0) {
-        break;
-      }
-      const isDeletedVNode = vNodeAlreadyDeleted(nextChore);
-      if (isDeletedVNode && // we need to process cleanup tasks for deleted nodes
-      nextChore.$type$ !== 48 /* CLEANUP_VISIBLE */) {
-        DEBUG2 && debugTrace("skip chore", nextChore, currentChore, choreQueue);
-        continue;
+var createResourceReturn = (container, opts, initialPromise) => {
+  const result = _createResourceReturn(opts);
+  result.value = initialPromise;
+  return createStore(container, result, 1 /* RECURSIVE */);
+};
+var runResource = (task, container, host) => {
+  task.$flags$ &= ~8 /* DIRTY */;
+  cleanupTask(task);
+  const iCtx = newInvokeContext(container.$locale$, host, void 0, ResourceEvent);
+  iCtx.$container$ = container;
+  const taskFn = task.$qrl$.getFn(iCtx, () => clearAllEffects(container, task));
+  const resource = task.$state$;
+  assertDefined(
+    resource,
+    'useResource: when running a resource, "task.resource" must be a defined.',
+    task
+  );
+  const track = (obj, prop) => {
+    const ctx = newInvokeContext();
+    ctx.$effectSubscriber$ = getSubscriber(task, ":" /* COMPONENT */);
+    ctx.$container$ = container;
+    return invoke(ctx, () => {
+      if (isFunction(obj)) {
+        return obj();
       }
-      const returnValue = executeChore(nextChore);
-      if (isPromise(returnValue)) {
-        const promise = returnValue.then(() => drainUpTo(runUptoChore, rootVNode));
-        return promise;
+      if (prop) {
+        return obj[prop];
+      } else if (isSignal(obj)) {
+        return obj.value;
+      } else {
+        return obj;
       }
-    }
-    return runUptoChore.$returnValue$;
+    });
+  };
+  const handleError = (reason) => container.handleError(reason, host);
+  const cleanups = [];
+  task.$destroy$ = noSerialize(() => {
+    cleanups.forEach((fn) => {
+      try {
+        fn();
+      } catch (err) {
+        handleError(err);
+      }
+    });
+    done = true;
+  });
+  const resourceTarget = unwrapStore(resource);
+  const opts = {
+    track,
+    cleanup(fn) {
+      if (typeof fn === "function") {
+        cleanups.push(fn);
+      }
+    },
+    cache(policy) {
+      let milliseconds = 0;
+      if (policy === "immutable") {
+        milliseconds = Infinity;
+      } else {
+        milliseconds = policy;
+      }
+      resource._cache = milliseconds;
+    },
+    previous: resourceTarget._resolved
+  };
+  let resolve;
+  let reject;
+  let done = false;
+  const setState = (resolved, value) => {
+    if (!done) {
+      done = true;
+      if (resolved) {
+        done = true;
+        resource.loading = false;
+        resource._state = "resolved";
+        resource._resolved = value;
+        resource._error = void 0;
+        resolve(value);
+      } else {
+        done = true;
+        resource.loading = false;
+        resource._state = "rejected";
+        resource._error = value;
+        reject(value);
+      }
+      return true;
+    }
+    return false;
+  };
+  cleanups.push(() => {
+    if (untrack(() => resource.loading) === true) {
+      const value = untrack(() => resource._resolved);
+      setState(true, value);
+    }
+  });
+  invoke(iCtx, () => {
+    resource._state = "pending";
+    resource.loading = !isServerPlatform();
+    const promise2 = resource.value = new Promise((r, re) => {
+      resolve = r;
+      reject = re;
+    });
+    promise2.catch(ignoreErrorToPreventNodeFromCrashing);
+  });
+  const promise = safeCall(
+    () => Promise.resolve(taskFn(opts)),
+    (value) => {
+      setState(true, value);
+    },
+    (err) => {
+      if (isPromise(err)) {
+        return err.then(() => runResource(task, container, host));
+      } else {
+        setState(false, err);
+      }
+    }
+  );
+  const timeout = resourceTarget._timeout;
+  if (timeout > 0) {
+    return Promise.race([
+      promise,
+      delay(timeout).then(() => {
+        if (setState(false, new Error("timeout"))) {
+          cleanupTask(task);
+        }
+      })
+    ]);
   }
-  function executeChore(chore) {
-    var _a;
+  return promise;
+};
+var ignoreErrorToPreventNodeFromCrashing = (err) => {
+};
+
+// packages/qwik/src/core/shared/scheduler-document-position.ts
+var aVNodePath = [];
+var bVNodePath = [];
+var 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[1 /* parent */] || rootVNode && vnode_getProp(a, QSlotParent, (id) => vnode_locate(rootVNode, id));
+  }
+  while (b) {
+    const vNode = bVNodePath[++bDepth] = b;
+    b = vNode[1 /* 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) {
+      aDepth--;
+      bDepth--;
+    } else {
+      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))) {
+        return -1;
+      }
+      return 1;
+    }
+  }
+  return aDepth < bDepth ? -1 : 1;
+};
+var aSsrNodePath = [];
+var bSsrNodePath = [];
+var 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) {
+      aDepth--;
+      bDepth--;
+    } else {
+      return 1;
+    }
+  }
+  return aDepth < bDepth ? -1 : 1;
+};
+
+// packages/qwik/src/core/shared/scheduler.ts
+var DEBUG2 = false;
+var getPromise = (chore) => chore.$promise$ ||= new Promise((resolve) => {
+  chore.$resolve$ = resolve;
+});
+var createScheduler = (container, scheduleDrain, journalFlush) => {
+  const choreQueue = [];
+  const qrlRuns = [];
+  let currentChore = null;
+  let drainScheduled = false;
+  return schedule;
+  function schedule(type, hostOrTask = null, targetOrQrl = null, payload = null) {
+    var _a, _b;
+    const isServer4 = !isDomContainer(container);
+    const isComponentSsr = isServer4 && type === 6 /* COMPONENT */;
+    const runLater = type !== 255 /* WAIT_FOR_ALL */ && !isComponentSsr && type !== 2 /* RUN_QRL */;
+    const isTask2 = type === 3 /* TASK */ || type === 32 /* VISIBLE */ || type === 48 /* CLEANUP_VISIBLE */;
+    const isClientOnly = type === 16 /* JOURNAL_FLUSH */ || type === 4 /* NODE_DIFF */ || type === 5 /* NODE_PROP */;
+    if (isServer4 && isClientOnly) {
+      DEBUG2 && debugTrace(
+        `skip client chore ${debugChoreTypeToString(type)}`,
+        null,
+        currentChore,
+        choreQueue
+      );
+      return;
+    }
+    if (isTask2) {
+      hostOrTask.$flags$ |= 8 /* DIRTY */;
+    }
+    let chore = {
+      $type$: type,
+      $idx$: isTask2 ? hostOrTask.$index$ : typeof targetOrQrl === "string" ? targetOrQrl : 0,
+      $host$: isTask2 ? hostOrTask.$el$ : hostOrTask,
+      $target$: targetOrQrl,
+      $payload$: isTask2 ? hostOrTask : payload,
+      $resolve$: null,
+      $promise$: null,
+      $returnValue$: null,
+      $executed$: false
+    };
+    chore = sortedInsert(choreQueue, chore, container.rootVNode || null);
+    DEBUG2 && debugTrace("schedule", chore, currentChore, choreQueue);
+    if (!drainScheduled && runLater) {
+      drainScheduled = true;
+      schedule(16 /* JOURNAL_FLUSH */);
+      (_b = (_a = scheduleDrain()) == null ? void 0 : _a.catch) == null ? void 0 : _b.call(_a, () => {
+      });
+    }
+    if (runLater) {
+      return getPromise(chore);
+    } else {
+      return drainUpTo(chore, isServer4);
+    }
+  }
+  function drainUpTo(runUptoChore, isServer4) {
+    let maxRetries = 5e3;
+    while (choreQueue.length) {
+      if (maxRetries-- < 0) {
+        throw new Error("drainUpTo: max retries reached");
+      }
+      if (currentChore) {
+        return getPromise(currentChore).then(() => drainUpTo(runUptoChore, isServer4)).catch((e) => {
+          container.handleError(e, currentChore == null ? void 0 : currentChore.$host$);
+        });
+      }
+      const nextChore = choreQueue[0];
+      if (nextChore.$executed$) {
+        choreQueue.shift();
+        if (nextChore === runUptoChore) {
+          break;
+        }
+        continue;
+      }
+      if (vNodeAlreadyDeleted(nextChore) && // we need to process cleanup tasks for deleted nodes
+      nextChore.$type$ !== 48 /* CLEANUP_VISIBLE */) {
+        DEBUG2 && debugTrace("skip chore", nextChore, currentChore, choreQueue);
+        choreQueue.shift();
+        continue;
+      }
+      executeChore(nextChore, isServer4);
+    }
+    return runUptoChore.$returnValue$;
+  }
+  function executeChore(chore, isServer4) {
+    var _a, _b, _c;
     const host = chore.$host$;
     DEBUG2 && debugTrace("execute", chore, currentChore, choreQueue);
     assertEqual(currentChore, null, "Chore already running.");
     currentChore = chore;
     let returnValue = null;
-    switch (chore.$type$) {
-      case 16 /* JOURNAL_FLUSH */:
-        returnValue = journalFlush();
-        journalFlushScheduled = false;
-        break;
-      case 7 /* COMPONENT */:
-      case 6 /* COMPONENT_SSR */:
-        returnValue = safeCall(
-          () => executeComponent(
-            container,
-            host,
-            host,
-            chore.$target$,
-            chore.$payload$
-          ),
-          (jsx5) => {
-            if (chore.$type$ === 7 /* COMPONENT */) {
-              const styleScopedId = container.getHostProp(host, QScopedStyle);
-              return vnode_diff(
+    try {
+      switch (chore.$type$) {
+        case 255 /* WAIT_FOR_ALL */:
+          {
+            if (isServer4) {
+              drainScheduled = false;
+            }
+          }
+          break;
+        case 16 /* JOURNAL_FLUSH */:
+          {
+            returnValue = journalFlush();
+            drainScheduled = false;
+          }
+          break;
+        case 6 /* COMPONENT */:
+          {
+            returnValue = safeCall(
+              () => executeComponent(
                 container,
-                jsx5,
                 host,
-                addComponentStylePrefix(styleScopedId)
-              );
+                host,
+                chore.$target$,
+                chore.$payload$
+              ),
+              (jsx4) => {
+                if (isServer4) {
+                  return jsx4;
+                } else {
+                  const styleScopedId = container.getHostProp(host, QScopedStyle);
+                  return retryOnPromise(
+                    () => vnode_diff(
+                      container,
+                      jsx4,
+                      host,
+                      addComponentStylePrefix(styleScopedId)
+                    )
+                  );
+                }
+              },
+              (err) => container.handleError(err, host)
+            );
+          }
+          break;
+        case 2 /* RUN_QRL */:
+          {
+            const fn = chore.$target$.getFn();
+            const result = retryOnPromise(() => fn(...chore.$payload$));
+            if (isPromise(result)) {
+              const handled = result.finally(() => {
+                qrlRuns.splice(qrlRuns.indexOf(handled), 1);
+              }).catch((error) => {
+                container.handleError(error, chore.$host$);
+              });
+              qrlRuns.push(handled);
+              DEBUG2 && debugTrace("execute.DONE (but still running)", chore, currentChore, choreQueue);
+              chore.$returnValue$ = handled;
+              (_a = chore.$resolve$) == null ? void 0 : _a.call(chore, handled);
+              currentChore = null;
+              chore.$executed$ = true;
+              return;
+            }
+            returnValue = null;
+          }
+          break;
+        case 3 /* TASK */:
+        case 32 /* VISIBLE */:
+          {
+            const payload = chore.$payload$;
+            if (payload.$flags$ & 4 /* RESOURCE */) {
+              const result = runResource(payload, container, host);
+              returnValue = isServer4 ? result : null;
             } else {
-              return jsx5;
+              returnValue = runTask(payload, container, host);
             }
-          },
-          (err) => container.handleError(err, host)
-        );
-        break;
-      case 2 /* RESOURCE */:
-        const result = runResource(chore.$payload$, container, host);
-        returnValue = isDomContainer(container) ? null : result;
-        break;
-      case 3 /* TASK */:
-        returnValue = runTask(chore.$payload$, container, host);
-        break;
-      case 32 /* VISIBLE */:
-        returnValue = runTask(chore.$payload$, container, host);
-        break;
-      case 48 /* CLEANUP_VISIBLE */:
-        const task = chore.$payload$;
-        cleanupTask(task);
-        break;
-      case 4 /* NODE_DIFF */:
-        const parentVirtualNode = chore.$target$;
-        let jsx4 = chore.$payload$;
-        if (isSignal(jsx4)) {
-          jsx4 = jsx4.value;
-        }
-        returnValue = vnode_diff(container, jsx4, parentVirtualNode, null);
-        break;
-      case 5 /* NODE_PROP */:
-        const virtualNode = chore.$host$;
-        const payload = chore.$payload$;
-        let value = payload.$value$;
-        if (isSignal(value)) {
-          value = value.value;
-        }
-        const isConst = payload.$isConst$;
-        const journal = container.$journal$;
-        const property = chore.$idx$;
-        const serializedValue = serializeAttribute(property, value, payload.$scopedStyleIdPrefix$);
-        if (isConst) {
-          const element = virtualNode[6 /* element */];
-          journal.push(2 /* SetAttribute */, element, property, serializedValue);
-        } else {
-          vnode_setAttr(journal, virtualNode, property, serializedValue);
-        }
-        break;
-      case 1 /* QRL_RESOLVE */: {
-        const target = chore.$target$;
-        returnValue = !target.resolved ? target.resolve() : null;
-        break;
-      }
-      case 8 /* RECOMPUTE_AND_SCHEDULE_EFFECTS */: {
-        const target = chore.$target$;
-        const forceRunEffects = target.$forceRunEffects$;
-        target.$forceRunEffects$ = false;
-        if (!((_a = target.$effects$) == null ? void 0 : _a.length)) {
+          }
+          break;
+        case 48 /* CLEANUP_VISIBLE */:
+          {
+            const task = chore.$payload$;
+            cleanupTask(task);
+          }
+          break;
+        case 4 /* NODE_DIFF */:
+          {
+            const parentVirtualNode = chore.$target$;
+            let jsx4 = chore.$payload$;
+            if (isSignal(jsx4)) {
+              jsx4 = jsx4.value;
+            }
+            returnValue = retryOnPromise(
+              () => vnode_diff(container, jsx4, parentVirtualNode, null)
+            );
+          }
+          break;
+        case 5 /* NODE_PROP */:
+          {
+            const virtualNode = chore.$host$;
+            const payload = chore.$payload$;
+            let value = payload.$value$;
+            if (isSignal(value)) {
+              value = value.value;
+            }
+            const isConst = payload.$isConst$;
+            const journal = container.$journal$;
+            const property = chore.$idx$;
+            const serializedValue = serializeAttribute(
+              property,
+              value,
+              payload.$scopedStyleIdPrefix$
+            );
+            if (isConst) {
+              const element = virtualNode[6 /* element */];
+              journal.push(2 /* SetAttribute */, element, property, serializedValue);
+            } else {
+              vnode_setAttr(journal, virtualNode, property, serializedValue);
+            }
+          }
+          break;
+        case 1 /* QRL_RESOLVE */: {
+          {
+            const target = chore.$target$;
+            returnValue = !target.resolved ? target.resolve() : null;
+          }
           break;
         }
-        returnValue = retryOnPromise(() => {
-          if (target.$computeIfNeeded$() || forceRunEffects) {
-            triggerEffects(container, target, target.$effects$);
+        case 7 /* RECOMPUTE_AND_SCHEDULE_EFFECTS */: {
+          {
+            const target = chore.$target$;
+            const forceRunEffects = target.$forceRunEffects$;
+            target.$forceRunEffects$ = false;
+            if (!((_b = target.$effects$) == null ? void 0 : _b.size)) {
+              break;
+            }
+            returnValue = retryOnPromise(() => {
+              if (target.$computeIfNeeded$() || forceRunEffects) {
+                triggerEffects(container, target, target.$effects$);
+              }
+            });
           }
-        });
-        break;
+          break;
+        }
       }
+    } catch (e) {
+      returnValue = Promise.reject(e);
     }
-    return maybeThenPassError(returnValue, (value) => {
+    const after = (value, error) => {
       var _a2;
-      DEBUG2 && debugTrace("execute.DONE", null, currentChore, choreQueue);
-      if (currentChore) {
-        currentChore.$executed$ = true;
-        (_a2 = currentChore.$resolve$) == null ? void 0 : _a2.call(currentChore, value);
-      }
       currentChore = null;
-      return chore.$returnValue$ = value;
-    });
-  }
-};
-var toNumber = (value) => {
-  return typeof value === "number" ? value : -1;
-};
-var choreUpdate = (existing, newChore) => {
-  if (existing.$type$ === 4 /* NODE_DIFF */) {
-    existing.$payload$ = newChore.$payload$;
-  }
-};
-function vNodeAlreadyDeleted(chore) {
-  return !!(chore.$host$ && vnode_isVNode(chore.$host$) && chore.$host$[0 /* flags */] & 32 /* Deleted */);
-}
-function choreComparator(a, b, rootVNode, shouldThrowOnHostMismatch) {
-  const macroTypeDiff = (a.$type$ & 240 /* MACRO */) - (b.$type$ & 240 /* MACRO */);
-  if (macroTypeDiff !== 0) {
-    return macroTypeDiff;
+      chore.$executed$ = true;
+      if (error) {
+        DEBUG2 && debugTrace("execute.ERROR", chore, currentChore, choreQueue);
+        container.handleError(error, host);
+      } else {
+        chore.$returnValue$ = value;
+        DEBUG2 && debugTrace("execute.DONE", chore, currentChore, choreQueue);
+        (_a2 = chore.$resolve$) == null ? void 0 : _a2.call(chore, value);
+      }
+    };
+    if (isPromise(returnValue)) {
+      chore.$promise$ = returnValue.then(after, (error) => after(void 0, error));
+      (_c = chore.$resolve$) == null ? void 0 : _c.call(chore, chore.$promise$);
+      chore.$resolve$ = void 0;
+    } else {
+      after(returnValue);
+    }
   }
-  if (a.$type$ !== 16 /* JOURNAL_FLUSH */) {
+  function choreComparator(a, b, rootVNode) {
+    const macroTypeDiff = (a.$type$ & 240 /* MACRO */) - (b.$type$ & 240 /* MACRO */);
+    if (macroTypeDiff !== 0) {
+      return macroTypeDiff;
+    }
     const aHost = a.$host$;
     const bHost = b.$host$;
     if (aHost !== bHost && aHost !== null && bHost !== null) {
@@ -24957,15 +25267,17 @@ function choreComparator(a, b, rootVNode, shouldThrowOnHostMismatch) {
           return hostDiff;
         }
       } else {
+        assertFalse(vnode_isVNode(aHost), "expected aHost to be SSRNode but it is a VNode");
+        assertFalse(vnode_isVNode(bHost), "expected bHost to be SSRNode but it is a VNode");
         const errorMessage = `SERVER: during HTML streaming, re-running tasks on a different host is not allowed.
           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(45 /* serverHostMismatch */, [errorMessage]);
-        }
         logWarn(errorMessage);
-        return null;
+        const hostDiff = ssrNodeDocumentPosition(aHost, bHost);
+        if (hostDiff !== 0) {
+          return hostDiff;
+        }
       }
     }
     const microTypeDiff = (a.$type$ & 15 /* MICRO */) - (b.$type$ & 15 /* MICRO */);
@@ -24976,167 +25288,91 @@ function choreComparator(a, b, rootVNode, shouldThrowOnHostMismatch) {
     if (idxDiff !== 0) {
       return idxDiff;
     }
-    if (a.$target$ !== b.$target$ && (a.$type$ === 1 /* QRL_RESOLVE */ && b.$type$ === 1 /* QRL_RESOLVE */ || a.$type$ === 5 /* NODE_PROP */ && b.$type$ === 5 /* NODE_PROP */ || a.$type$ === 8 /* RECOMPUTE_AND_SCHEDULE_EFFECTS */ && b.$type$ === 8 /* RECOMPUTE_AND_SCHEDULE_EFFECTS */)) {
+    if (a.$target$ !== b.$target$ || a.$payload$ !== b.$payload$) {
+      return 1;
+    }
+    if (b === currentChore) {
       return 1;
     }
+    return 0;
   }
-  return 0;
-}
-function sortedFindIndex(sortedArray, value, rootVNode) {
-  let bottom = 0;
-  let top = sortedArray.length;
-  while (bottom < top) {
-    const middle = bottom + (top - bottom >> 1);
-    const midChore = sortedArray[middle];
-    const comp = choreComparator(value, midChore, rootVNode, true);
-    if (comp < 0) {
-      top = middle;
-    } else if (comp > 0) {
-      bottom = middle + 1;
-    } else {
-      return middle;
+  function sortedFindIndex(sortedArray, value, rootVNode) {
+    let bottom = 0;
+    let top = sortedArray.length;
+    while (bottom < top) {
+      const middle = bottom + (top - bottom >> 1);
+      const midChore = sortedArray[middle];
+      const comp = choreComparator(value, midChore, rootVNode);
+      if (comp < 0) {
+        top = middle;
+      } else if (comp > 0) {
+        bottom = middle + 1;
+      } else {
+        return middle;
+      }
     }
+    return ~bottom;
   }
-  return ~bottom;
-}
-function sortedInsert(sortedArray, value, rootVNode) {
-  const idx = sortedFindIndex(sortedArray, value, rootVNode);
-  if (idx < 0) {
-    sortedArray.splice(~idx, 0, value);
-    return value;
+  function sortedInsert(sortedArray, value, rootVNode) {
+    const idx = sortedFindIndex(sortedArray, value, rootVNode);
+    if (idx < 0) {
+      sortedArray.splice(~idx, 0, value);
+      return value;
+    }
+    const existing = sortedArray[idx];
+    if (existing.$type$ === 4 /* NODE_DIFF */) {
+      existing.$payload$ = value.$payload$;
+    }
+    if (existing.$executed$) {
+      existing.$executed$ = false;
+    }
+    return existing;
   }
-  const existing = sortedArray[idx];
-  choreUpdate(existing, value);
-  return existing;
+};
+var toNumber = (value) => {
+  return typeof value === "number" ? value : -1;
+};
+function vNodeAlreadyDeleted(chore) {
+  return !!(chore.$host$ && vnode_isVNode(chore.$host$) && chore.$host$[0 /* flags */] & 32 /* Deleted */);
 }
-function debugChoreToString(chore) {
-  var _a;
-  const type = {
+function debugChoreTypeToString(type) {
+  return {
     [1 /* QRL_RESOLVE */]: "QRL_RESOLVE",
-    [2 /* RESOURCE */]: "RESOURCE",
+    [2 /* RUN_QRL */]: "RUN_QRL",
     [3 /* TASK */]: "TASK",
     [4 /* NODE_DIFF */]: "NODE_DIFF",
     [5 /* NODE_PROP */]: "NODE_PROP",
-    [7 /* COMPONENT */]: "COMPONENT",
-    [6 /* COMPONENT_SSR */]: "COMPONENT_SSR",
-    [8 /* RECOMPUTE_AND_SCHEDULE_EFFECTS */]: "RECOMPUTE_SIGNAL",
+    [6 /* COMPONENT */]: "COMPONENT",
+    [7 /* RECOMPUTE_AND_SCHEDULE_EFFECTS */]: "RECOMPUTE_SIGNAL",
     [16 /* JOURNAL_FLUSH */]: "JOURNAL_FLUSH",
     [32 /* VISIBLE */]: "VISIBLE",
     [48 /* CLEANUP_VISIBLE */]: "CLEANUP_VISIBLE",
     [255 /* WAIT_FOR_ALL */]: "WAIT_FOR_ALL"
-  }[chore.$type$] || "UNKNOWN: " + chore.$type$;
+  }[type] || "UNKNOWN: " + type;
+}
+function debugChoreToString(chore) {
+  var _a;
+  const type = debugChoreTypeToString(chore.$type$);
   const host = String(chore.$host$).replaceAll(/\n.*/gim, "");
   const qrlTarget = (_a = chore.$target$) == null ? void 0 : _a.$symbol$;
-  return `Chore(${type} ${chore.$type$ === 1 /* QRL_RESOLVE */ ? qrlTarget : host} ${chore.$idx$})`;
+  return `Chore(${type} ${chore.$type$ === 1 /* QRL_RESOLVE */ || chore.$type$ === 2 /* RUN_QRL */ ? qrlTarget : host} ${chore.$idx$})`;
 }
 function debugTrace(action, arg, currentChore, queue) {
-  const lines = ["Scheduler: " + action];
-  if (arg) {
-    lines.push(
-      "    arg: " + ("$type$" in arg ? debugChoreToString(arg) : String(arg).replaceAll(/\n.*/gim, ""))
-    );
-  }
-  if (currentChore) {
-    lines.push("running: " + debugChoreToString(currentChore));
+  const lines = ["===========================\nScheduler: " + action];
+  if (arg && !("$type$" in arg)) {
+    lines.push("      arg: " + String(arg).replaceAll(/\n.*/gim, ""));
   }
   if (queue) {
-    queue.forEach((chore, idx) => {
-      lines.push((idx == 0 ? "  queue: " : "         ") + debugChoreToString(chore));
+    queue.forEach((chore) => {
+      const active = chore === arg ? ">>>" : "   ";
+      lines.push(
+        `     ${active} > ` + (chore === currentChore ? "[running] " : "") + debugChoreToString(chore)
+      );
     });
   }
-  console.log(lines.join("\n  ") + "\n");
+  console.log(lines.join("\n") + "\n");
 }
 
-// packages/qwik/src/core/use/use-task.ts
-var runTask = (task, container, host) => {
-  task.$flags$ &= ~8 /* DIRTY */;
-  cleanupTask(task);
-  const iCtx = newInvokeContext(container.$locale$, host, void 0, TaskEvent);
-  iCtx.$container$ = container;
-  const taskFn = task.$qrl$.getFn(
-    iCtx,
-    () => clearSubscriberEffectDependencies(container, task)
-  );
-  const track = (obj, prop) => {
-    const ctx = newInvokeContext();
-    ctx.$effectSubscriber$ = [task, ":" /* COMPONENT */];
-    ctx.$container$ = container;
-    return invoke(ctx, () => {
-      if (isFunction(obj)) {
-        return obj();
-      }
-      if (prop) {
-        return obj[prop];
-      } else if (isSignal(obj)) {
-        return obj.value;
-      } else {
-        return obj;
-      }
-    });
-  };
-  const handleError = (reason) => container.handleError(reason, host);
-  let cleanupFns = null;
-  const cleanup2 = (fn) => {
-    if (typeof fn == "function") {
-      if (!cleanupFns) {
-        cleanupFns = [];
-        task.$destroy$ = noSerialize(() => {
-          task.$destroy$ = null;
-          cleanupFns.forEach((fn2) => {
-            try {
-              fn2();
-            } catch (err) {
-              handleError(err);
-            }
-          });
-        });
-      }
-      cleanupFns.push(fn);
-    }
-  };
-  const taskApi = { track, cleanup: cleanup2 };
-  const result = safeCall(
-    () => taskFn(taskApi),
-    cleanup2,
-    (err) => {
-      if (isPromise(err)) {
-        return err.then(() => runTask(task, container, host));
-      } else {
-        return handleError(err);
-      }
-    }
-  );
-  return result;
-};
-var cleanupTask = (task) => {
-  const destroy = task.$destroy$;
-  if (destroy) {
-    task.$destroy$ = null;
-    try {
-      destroy();
-    } catch (err) {
-      logError(err);
-    }
-  }
-};
-var Task = class extends Subscriber {
-  constructor($flags$, $index$, $el$, $qrl$, $state$, $destroy$) {
-    super();
-    this.$flags$ = $flags$;
-    this.$index$ = $index$;
-    this.$el$ = $el$;
-    this.$qrl$ = $qrl$;
-    this.$state$ = $state$;
-    this.$destroy$ = $destroy$;
-  }
-};
-var isTask = (value) => {
-  return value instanceof Task;
-};
-
-// packages/qwik/src/core/signal/flags.ts
-var NEEDS_COMPUTATION = Symbol("invalid");
-
 // packages/qwik/src/core/signal/signal.ts
 var DEBUG3 = false;
 var log2 = (...args) => console.log("SIGNAL", ...args.map(qwikDebugToString));
@@ -25149,7 +25385,7 @@ var throwIfQRLNotResolved = (qrl2) => {
 var isSignal = (value) => {
   return value instanceof Signal;
 };
-var EffectPropData = class {
+var SubscriptionData = class {
   data;
   constructor(data) {
     this.data = data;
@@ -25188,16 +25424,10 @@ var Signal = class {
       }
       const effectSubscriber = ctx.$effectSubscriber$;
       if (effectSubscriber) {
-        const effects = this.$effects$ ||= [];
-        ensureContainsEffect(effects, effectSubscriber);
-        ensureContains(effectSubscriber, this);
-        if (isSubscriber(this)) {
-          ensureEffectContainsSubscriber(
-            effectSubscriber[0 /* EFFECT */],
-            this,
-            this.$container$
-          );
-        }
+        const effects = this.$effects$ ||= /* @__PURE__ */ new Set();
+        ensureContainsSubscription(effects, effectSubscriber);
+        ensureContainsBackRef(effectSubscriber, this);
+        addQrlToSerializationCtx(effectSubscriber, this.$container$);
         DEBUG3 && log2("read->sub", pad("\n" + this.toString(), "  "));
       }
     }
@@ -25213,119 +25443,89 @@ var Signal = class {
   // prevent accidental use as value
   valueOf() {
     if (qDev) {
-      throw qError(46 /* cannotCoerceSignal */);
+      throw qError(45 /* cannotCoerceSignal */);
     }
   }
   toString() {
-    var _a;
-    return `[${this.constructor.name}${this.$invalid$ ? " INVALID" : ""} ${String(this.$untrackedValue$)}]` + (((_a = this.$effects$) == null ? void 0 : _a.map((e) => "\n -> " + pad(qwikDebugToString(e[0]), "    ")).join("\n")) || "");
+    return `[${this.constructor.name}${this.$invalid$ ? " INVALID" : ""} ${String(this.$untrackedValue$)}]` + (Array.from(this.$effects$ || []).map((e) => "\n -> " + pad(qwikDebugToString(e[0]), "    ")).join("\n") || "");
   }
   toJSON() {
     return { value: this.$untrackedValue$ };
   }
 };
-var ensureContains = (array, value) => {
-  const isMissing = array.indexOf(value) === -1;
-  if (isMissing) {
-    array.push(value);
-  }
-};
-var ensureContainsEffect = (array, effectSubscriptions) => {
-  for (let i = 0; i < array.length; i++) {
-    const existingEffect = array[i];
-    if (existingEffect[0] === effectSubscriptions[0] && existingEffect[1] === effectSubscriptions[1]) {
-      return;
-    }
-  }
-  array.push(effectSubscriptions);
-};
-var ensureEffectContainsSubscriber = (effect, subscriber, container) => {
-  if (isSubscriber(effect)) {
-    effect.$effectDependencies$ ||= [];
-    if (subscriberExistInSubscribers(effect.$effectDependencies$, subscriber)) {
-      return;
-    }
-    effect.$effectDependencies$.push(subscriber);
-  } else if (vnode_isVNode(effect) && !vnode_isTextVNode(effect)) {
-    let subscribers = vnode_getProp(
-      effect,
-      QSubscribers,
-      container ? container.$getObjectById$ : null
-    );
-    subscribers ||= [];
-    if (subscriberExistInSubscribers(subscribers, subscriber)) {
-      return;
-    }
-    subscribers.push(subscriber);
-    vnode_setProp(effect, QSubscribers, subscribers);
-  } else if (isSSRNode(effect)) {
-    let subscribers = effect.getProp(QSubscribers);
-    subscribers ||= [];
-    if (subscriberExistInSubscribers(subscribers, subscriber)) {
-      return;
-    }
-    subscribers.push(subscriber);
-    effect.setProp(QSubscribers, subscribers);
-  }
+var ensureContainsSubscription = (array, effectSubscription) => {
+  array.add(effectSubscription);
 };
-var isSSRNode = (effect) => {
-  return "setProp" in effect && "getProp" in effect && "removeProp" in effect && "id" in effect;
+var ensureContainsBackRef = (array, value) => {
+  array[2 /* BACK_REF */] ||= /* @__PURE__ */ new Set();
+  array[2 /* BACK_REF */].add(value);
 };
-var subscriberExistInSubscribers = (subscribers, subscriber) => {
-  for (let i = 0; i < subscribers.length; i++) {
-    if (subscribers[i] === subscriber) {
-      return true;
+var addQrlToSerializationCtx = (effectSubscriber, container) => {
+  if (!!container && !isDomContainer(container)) {
+    const effect = effectSubscriber[0 /* CONSUMER */];
+    const property = effectSubscriber[1 /* PROPERTY */];
+    let qrl2 = null;
+    if (isTask(effect)) {
+      qrl2 = effect.$qrl$;
+    } else if (effect instanceof ComputedSignal) {
+      qrl2 = effect.$computeQrl$;
+    } else if (property === ":" /* COMPONENT */) {
+      qrl2 = container.getHostProp(effect, OnRenderProp);
+    }
+    if (qrl2) {
+      container.serializationCtx.$eventQrls$.add(qrl2);
     }
   }
-  return false;
 };
 var triggerEffects = (container, signal, effects) => {
+  const isBrowser2 = isDomContainer(container);
   if (effects) {
-    const scheduleEffect = (effectSubscriptions) => {
-      const effect = effectSubscriptions[0 /* EFFECT */];
-      const property = effectSubscriptions[1 /* PROPERTY */];
+    const scheduleEffect = (effectSubscription) => {
+      const consumer = effectSubscription[0 /* CONSUMER */];
+      const property = effectSubscription[1 /* PROPERTY */];
       assertDefined(container, "Container must be defined.");
-      if (isTask(effect)) {
-        effect.$flags$ |= 8 /* DIRTY */;
-        DEBUG3 && log2("schedule.effect.task", pad("\n" + String(effect), "  "));
+      if (isTask(consumer)) {
+        consumer.$flags$ |= 8 /* DIRTY */;
+        DEBUG3 && log2("schedule.consumer.task", pad("\n" + String(consumer), "  "));
         let choreType = 3 /* TASK */;
-        if (effect.$flags$ & 1 /* VISIBLE_TASK */) {
+        if (consumer.$flags$ & 1 /* VISIBLE_TASK */) {
           choreType = 32 /* VISIBLE */;
-        } else if (effect.$flags$ & 4 /* RESOURCE */) {
-          choreType = 2 /* RESOURCE */;
         }
-        container.$scheduler$(choreType, effect);
-      } else if (effect instanceof Signal) {
-        if (effect instanceof ComputedSignal) {
-          if (!effect.$computeQrl$.resolved) {
-            container.$scheduler$(1 /* QRL_RESOLVE */, null, effect.$computeQrl$);
+        container.$scheduler$(choreType, consumer);
+      } else if (consumer instanceof Signal) {
+        if (consumer instanceof ComputedSignal) {
+          if (!consumer.$computeQrl$.resolved) {
+            container.$scheduler$(1 /* QRL_RESOLVE */, null, consumer.$computeQrl$);
           }
         }
-        effect.$invalidate$();
+        consumer.$invalidate$();
       } else if (property === ":" /* COMPONENT */) {
-        const host = effect;
+        const host = consumer;
         const qrl2 = container.getHostProp(host, OnRenderProp);
         assertDefined(qrl2, "Component must have QRL");
         const props = container.getHostProp(host, ELEMENT_PROPS);
-        container.$scheduler$(7 /* COMPONENT */, host, qrl2, props);
-      } else if (property === "." /* VNODE */) {
-        const host = effect;
-        const target = host;
-        container.$scheduler$(4 /* NODE_DIFF */, host, target, signal);
-      } else {
-        const host = effect;
-        const effectData = effectSubscriptions[2 /* FIRST_BACK_REF_OR_DATA */];
-        if (effectData instanceof EffectPropData) {
-          const data = effectData.data;
-          const payload = {
-            ...data,
-            $value$: signal
-          };
-          container.$scheduler$(5 /* NODE_PROP */, host, property, payload);
+        container.$scheduler$(6 /* COMPONENT */, host, qrl2, props);
+      } else if (isBrowser2) {
+        if (property === "." /* VNODE */) {
+          const host = consumer;
+          container.$scheduler$(4 /* NODE_DIFF */, host, host, signal);
+        } else {
+          const host = consumer;
+          const effectData = effectSubscription[3 /* DATA */];
+          if (effectData instanceof SubscriptionData) {
+            const data = effectData.data;
+            const payload = {
+              ...data,
+              $value$: signal
+            };
+            container.$scheduler$(5 /* NODE_PROP */, host, property, payload);
+          }
         }
       }
     };
-    effects.forEach(scheduleEffect);
+    for (const effect of effects) {
+      scheduleEffect(effect);
+    }
   }
   DEBUG3 && log2("done scheduling");
 };
@@ -25349,7 +25549,7 @@ var ComputedSignal = class extends Signal {
     var _a;
     this.$invalid$ = true;
     this.$forceRunEffects$ = false;
-    (_a = this.$container$) == null ? void 0 : _a.$scheduler$(8 /* RECOMPUTE_AND_SCHEDULE_EFFECTS */, null, this);
+    (_a = this.$container$) == null ? void 0 : _a.$scheduler$(7 /* RECOMPUTE_AND_SCHEDULE_EFFECTS */, null, this);
   }
   /**
    * Use this to force running subscribers, for example when the calculated value has mutated but
@@ -25376,11 +25576,11 @@ var ComputedSignal = class extends Signal {
     throwIfQRLNotResolved(computeQrl);
     const ctx = tryGetInvokeContext();
     const previousEffectSubscription = ctx == null ? void 0 : ctx.$effectSubscriber$;
-    ctx && (ctx.$effectSubscriber$ = [this, "." /* VNODE */]);
+    ctx && (ctx.$effectSubscriber$ = getSubscriber(this, "." /* VNODE */));
     try {
       const untrackedValue = computeQrl.getFn(ctx)();
       if (isPromise(untrackedValue)) {
-        throw qError(47 /* computedNotSync */, [
+        throw qError(46 /* computedNotSync */, [
           computeQrl.dev ? computeQrl.dev.file : "",
           computeQrl.$hash$
         ]);
@@ -25403,7 +25603,7 @@ var ComputedSignal = class extends Signal {
     return super.value;
   }
   set value(_) {
-    throw qError(48 /* computedReadOnly */);
+    throw qError(47 /* computedReadOnly */);
   }
 };
 var WrappedSignal = class extends Signal {
@@ -25413,9 +25613,9 @@ var WrappedSignal = class extends Signal {
   // We need a separate flag to know when the computation needs running because
   // we need the old value to know if effects need running after computation
   $invalid$ = true;
-  $effectDependencies$ = null;
   $hostElement$ = null;
   $forceRunEffects$ = false;
+  [_EFFECT_BACK_REF] = null;
   constructor(container, fn, args, fnStr) {
     super(container, NEEDS_COMPUTATION);
     this.$args$ = args;
@@ -25427,7 +25627,7 @@ var WrappedSignal = class extends Signal {
     this.$invalid$ = true;
     this.$forceRunEffects$ = false;
     (_a = this.$container$) == null ? void 0 : _a.$scheduler$(
-      8 /* RECOMPUTE_AND_SCHEDULE_EFFECTS */,
+      7 /* RECOMPUTE_AND_SCHEDULE_EFFECTS */,
       this.$hostElement$,
       this
     );
@@ -25470,7 +25670,7 @@ var WrappedSignal = class extends Signal {
     return super.value;
   }
   set value(_) {
-    throw qError(49 /* wrappedReadOnly */);
+    throw qError(48 /* wrappedReadOnly */);
   }
 };
 
@@ -25516,16 +25716,6 @@ var _SharedContainer = class {
   }
 };
 
-// packages/qwik/src/core/shared/utils/constants.ts
-var QObjectRecursive = 1 << 0;
-var QObjectImmutable = 1 << 1;
-var QObjectTargetSymbol = Symbol("proxy target");
-var QObjectFlagsSymbol = Symbol("proxy flags");
-var QObjectManagerSymbol = Symbol("proxy manager");
-var _CONST_PROPS = Symbol("CONST");
-var _VAR_PROPS = Symbol("VAR");
-var _IMMUTABLE = Symbol("IMMUTABLE");
-
 // packages/qwik/src/core/shared-types.ts
 function isStringifiable(value) {
   return value === null || typeof value === "string" || typeof value === "number" || typeof value === "boolean";
@@ -25717,7 +25907,7 @@ function qwikDebugToString(value) {
     return String(value);
   } else if (isTask(value)) {
     return `Task(${qwikDebugToString(value.$qrl$)})`;
-  } else if (isQrl(value)) {
+  } else if (isQrl2(value)) {
     return `Qrl(${value.$symbol$})`;
   } else if (typeof value === "object" || typeof value === "function") {
     if (stringifyPath.includes(value)) {
@@ -26046,13 +26236,13 @@ var VNodeDataChar = {
     /* **** */
     "^"
   ),
-  SUBS: (
-    /* *************** */
+  BACK_REFS: (
+    /* ********** */
     96
   ),
-  // '`' - `q:subs' - Effect dependencies/subscriptions
-  SUBS_CHAR: (
-    /* ******* */
+  // '`' - `q:brefs' - Effect dependencies/subscriptions
+  BACK_REFS_CHAR: (
+    /* ** */
     "`"
   ),
   SEPARATOR: (
@@ -26075,6 +26265,14 @@ var VNodeDataChar = {
   )
 };
 
+// packages/qwik/src/core/shared/utils/maps.ts
+var mergeMaps = (map1, map2) => {
+  for (const [k, v] of map2) {
+    map1.set(k, v);
+  }
+  return map1;
+};
+
 // packages/qwik/src/core/client/vnode.ts
 var vnode_newElement = (element, elementName) => {
   assertEqual(fastNodeType(element), 1, "Expecting element node.");
@@ -26236,6 +26434,7 @@ var vnode_ensureElementInflated = (vnode) => {
     elementVNode[0 /* flags */] ^= 8 /* Inflated */;
     const element = elementVNode[6 /* element */];
     const attributes = element.attributes;
+    const props = vnode_getProps(elementVNode);
     for (let idx = 0; idx < attributes.length; idx++) {
       const attr = attributes[idx];
       const key = attr.name;
@@ -26243,23 +26442,13 @@ var vnode_ensureElementInflated = (vnode) => {
         break;
       } else if (key.startsWith(QContainerAttr)) {
         if (attr.value === "html" /* HTML */) {
-          mapArray_set(
-            elementVNode,
-            dangerouslySetInnerHTML,
-            element.innerHTML,
-            8 /* PROPS_OFFSET */
-          );
+          mapArray_set(props, dangerouslySetInnerHTML, element.innerHTML, 0);
         } else if (attr.value === "text" /* TEXT */ && "value" in element) {
-          mapArray_set(
-            elementVNode,
-            "value",
-            element.value,
-            8 /* PROPS_OFFSET */
-          );
+          mapArray_set(props, "value", element.value, 0);
         }
       } else if (!key.startsWith("on:")) {
         const value = attr.value;
-        mapArray_set(elementVNode, key, value, 8 /* PROPS_OFFSET */);
+        mapArray_set(props, key, value, 0);
       }
     }
   }
@@ -26588,59 +26777,14 @@ var vnode_applyJournal = (journal) => {
   }
   journal.length = 0;
 };
-var mapApp_findIndx = (elementVNode, key, start) => {
-  assertTrue(start % 2 === 0, "Expecting even number.");
-  let bottom = start >> 1;
-  let top = elementVNode.length - 2 >> 1;
-  while (bottom <= top) {
-    const mid = bottom + (top - bottom >> 1);
-    const midKey = elementVNode[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 = (elementVNode, key, value, start) => {
-  const indx = mapApp_findIndx(elementVNode, key, start);
-  if (indx >= 0) {
-    if (value == null) {
-      elementVNode.splice(indx, 2);
-    } else {
-      elementVNode[indx + 1] = value;
-    }
-  } else if (value != null) {
-    elementVNode.splice(indx ^ -1, 0, key, value);
-  }
-};
-var mapApp_remove = (elementVNode, key, start) => {
-  const indx = mapApp_findIndx(elementVNode, key, start);
-  let value = null;
-  if (indx >= 0) {
-    value = elementVNode[indx + 1];
-    elementVNode.splice(indx, 2);
-    return value;
-  }
-  return value;
-};
-var mapArray_get = (elementVNode, key, start) => {
-  const indx = mapApp_findIndx(elementVNode, key, start);
-  if (indx >= 0) {
-    return elementVNode[indx + 1];
-  } else {
-    return null;
-  }
-};
 var vnode_insertBefore = (journal, parent, newChild, insertBefore) => {
   ensureElementOrVirtualVNode(parent);
   if (vnode_isElementVNode(parent)) {
     ensureMaterialized(parent);
   }
+  if (newChild === insertBefore) {
+    insertBefore = null;
+  }
   let adjustedInsertBefore = null;
   if (insertBefore == null) {
     if (vnode_isVirtualVNode(parent)) {
@@ -26743,8 +26887,10 @@ var vnode_getElementName = (vnode) => {
   const elementVNode = ensureElementVNode(vnode);
   let elementName = elementVNode[7 /* elementName */];
   if (elementName === void 0) {
-    elementName = elementVNode[7 /* elementName */] = elementVNode[6 /* element */].nodeName.toLowerCase();
-    elementVNode[0 /* flags */] |= vnode_getElementNamespaceFlags(elementName);
+    const element = elementVNode[6 /* element */];
+    const nodeName = import_build8.isDev ? fastNodeName(element).toLowerCase() : fastNodeName(element);
+    elementName = elementVNode[7 /* elementName */] = nodeName;
+    elementVNode[0 /* flags */] |= vnode_getElementNamespaceFlags(element);
   }
   return elementName;
 };
@@ -26913,6 +27059,20 @@ var fastFirstChild = (node) => {
   }
   return node;
 };
+var _fastNamespaceURI = null;
+var fastNamespaceURI = (element) => {
+  if (!_fastNamespaceURI) {
+    _fastNamespaceURI = fastGetter(element, "namespaceURI");
+  }
+  return _fastNamespaceURI.call(element);
+};
+var _fastNodeName = null;
+var fastNodeName = (element) => {
+  if (!_fastNodeName) {
+    _fastNodeName = fastGetter(element, "nodeName");
+  }
+  return _fastNodeName.call(element);
+};
 var fastGetter = (prototype, name) => {
   var _a;
   let getter;
@@ -26969,9 +27129,12 @@ var materializeFromDOM = (vParent, firstChild, vData) => {
         }
         const id = consumeValue();
         container.$setRawState$(parseInt(id), vParent);
-        import_build6.isDev && vnode_setAttr(null, vParent, ELEMENT_ID, id);
-      } else if (peek() === VNodeDataChar.SUBS) {
-        vnode_setProp(vParent, QSubscribers, consumeValue());
+        import_build8.isDev && vnode_setAttr(null, vParent, ELEMENT_ID, id);
+      } else if (peek() === VNodeDataChar.BACK_REFS) {
+        if (!container) {
+          container = getDomContainer(vParent[6 /* element */]);
+        }
+        setEffectBackRefFromVNodeData(vParent, consumeValue(), container);
       } else {
         consumeValue();
       }
@@ -26979,6 +27142,17 @@ var materializeFromDOM = (vParent, firstChild, vData) => {
   }
   return vFirstChild;
 };
+function setEffectBackRefFromVNodeData(vParent, value, container) {
+  const deserializedSubMap = container.$getObjectById$(value);
+  if (!vParent[_EFFECT_BACK_REF]) {
+    Object.defineProperty(vParent, _EFFECT_BACK_REF, {
+      value: deserializedSubMap
+    });
+  } else {
+    const subMap = vParent[_EFFECT_BACK_REF];
+    mergeMaps(subMap, deserializedSubMap);
+  }
+}
 var processVNodeData = (vData, callback) => {
   let nextToConsumeIdx = 0;
   let ch = 0;
@@ -27019,8 +27193,9 @@ var vnode_getAttrKeys = (vnode) => {
   if ((type & 3 /* ELEMENT_OR_VIRTUAL_MASK */) !== 0) {
     vnode_ensureElementInflated(vnode);
     const keys = [];
-    for (let i = vnode_getPropStartIndex(vnode); i < vnode.length; i = i + 2) {
-      const key = vnode[i];
+    const props = vnode_getProps(vnode);
+    for (let i = 0; i < props.length; i = i + 2) {
+      const key = props[i];
       if (!key.startsWith(Q_PROPS_SEPARATOR)) {
         keys.push(key);
       }
@@ -27033,19 +27208,20 @@ var vnode_setAttr = (journal, vnode, key, value) => {
   const type = vnode[0 /* flags */];
   if ((type & 3 /* ELEMENT_OR_VIRTUAL_MASK */) !== 0) {
     vnode_ensureElementInflated(vnode);
-    const idx = mapApp_findIndx(vnode, key, vnode_getPropStartIndex(vnode));
+    const props = vnode_getProps(vnode);
+    const idx = mapApp_findIndx(props, key, 0);
     if (idx >= 0) {
-      if (vnode[idx + 1] != value && (type & 1 /* Element */) !== 0) {
+      if (props[idx + 1] != value && (type & 1 /* Element */) !== 0) {
         const element = vnode[6 /* element */];
         journal && journal.push(2 /* SetAttribute */, element, key, value);
       }
       if (value == null) {
-        vnode.splice(idx, 2);
+        props.splice(idx, 2);
       } else {
-        vnode[idx + 1] = value;
+        props[idx + 1] = value;
       }
     } else if (value != null) {
-      vnode.splice(idx ^ -1, 0, key, value);
+      props.splice(idx ^ -1, 0, key, value);
       if ((type & 1 /* Element */) !== 0) {
         const element = vnode[6 /* element */];
         journal && journal.push(2 /* SetAttribute */, element, key, value);
@@ -27057,7 +27233,8 @@ var vnode_getAttr = (vnode, key) => {
   const type = vnode[0 /* flags */];
   if ((type & 3 /* ELEMENT_OR_VIRTUAL_MASK */) !== 0) {
     vnode_ensureElementInflated(vnode);
-    return mapArray_get(vnode, key, vnode_getPropStartIndex(vnode));
+    const props = vnode_getProps(vnode);
+    return mapArray_get(props, key, 0);
   }
   return null;
 };
@@ -27065,11 +27242,12 @@ var vnode_getProp = (vnode, key, getObject) => {
   const type = vnode[0 /* flags */];
   if ((type & 3 /* ELEMENT_OR_VIRTUAL_MASK */) !== 0) {
     type & 1 /* Element */ && vnode_ensureElementInflated(vnode);
-    const idx = mapApp_findIndx(vnode, key, vnode_getPropStartIndex(vnode));
+    const props = vnode_getProps(vnode);
+    const idx = mapApp_findIndx(props, key, 0);
     if (idx >= 0) {
-      let value = vnode[idx + 1];
+      let value = props[idx + 1];
       if (typeof value === "string" && getObject) {
-        vnode[idx + 1] = value = getObject(value);
+        props[idx + 1] = value = getObject(value);
       }
       return value;
     }
@@ -27078,11 +27256,12 @@ var vnode_getProp = (vnode, key, getObject) => {
 };
 var vnode_setProp = (vnode, key, value) => {
   ensureElementOrVirtualVNode(vnode);
-  const idx = mapApp_findIndx(vnode, key, vnode_getPropStartIndex(vnode));
+  const props = vnode_getProps(vnode);
+  const idx = mapApp_findIndx(props, key, 0);
   if (idx >= 0) {
-    vnode[idx + 1] = value;
+    props[idx + 1] = value;
   } else if (value != null) {
-    vnode.splice(idx ^ -1, 0, key, value);
+    props.splice(idx ^ -1, 0, key, value);
   }
 };
 var vnode_getPropStartIndex = (vnode) => {
@@ -27094,6 +27273,9 @@ var vnode_getPropStartIndex = (vnode) => {
   }
   throw qError(43 /* invalidVNodeType */, [type]);
 };
+var vnode_getProps = (vnode) => {
+  return vnode[vnode_getPropStartIndex(vnode)];
+};
 var vnode_getParent = (vnode) => {
   return vnode[1 /* parent */] || null;
 };
@@ -27232,7 +27414,7 @@ function materializeFromVNodeData(vParent, vData, element, child) {
       }
       const id = consumeValue();
       container.$setRawState$(parseInt(id), vParent);
-      import_build6.isDev && vnode_setAttr(null, vParent, ELEMENT_ID, id);
+      import_build8.isDev && vnode_setAttr(null, vParent, ELEMENT_ID, id);
     } else if (peek() === VNodeDataChar.PROPS) {
       vnode_setAttr(null, vParent, ELEMENT_PROPS, consumeValue());
     } else if (peek() === VNodeDataChar.SLOT_REF) {
@@ -27243,8 +27425,11 @@ function materializeFromVNodeData(vParent, vData, element, child) {
       vnode_setAttr(null, vParent, ELEMENT_SEQ, consumeValue());
     } else if (peek() === VNodeDataChar.SEQ_IDX) {
       vnode_setAttr(null, vParent, ELEMENT_SEQ_IDX, consumeValue());
-    } else if (peek() === VNodeDataChar.SUBS) {
-      vnode_setProp(vParent, QSubscribers, consumeValue());
+    } else if (peek() === VNodeDataChar.BACK_REFS) {
+      if (!container) {
+        container = getDomContainer(element);
+      }
+      setEffectBackRefFromVNodeData(vParent, consumeValue(), container);
     } else if (peek() === VNodeDataChar.CONTEXT) {
       vnode_setAttr(null, vParent, QCtxAttr, consumeValue());
     } else if (peek() === VNodeDataChar.OPEN) {
@@ -27304,51 +27489,6 @@ var vnode_getType = (vnode) => {
 };
 var isElement = (node) => node && typeof node == "object" && fastNodeType(node) === /** Node.ELEMENT_NODE* */
 1;
-var aPath = [];
-var bPath = [];
-var 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[1 /* parent */] || rootVNode && vnode_getProp(a, QSlotParent, (id) => vnode_locate(rootVNode, id));
-  }
-  while (b) {
-    const vNode = bPath[++bDepth] = b;
-    b = vNode[1 /* 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) {
-      aDepth--;
-      bDepth--;
-    } else {
-      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))) {
-        return -1;
-      }
-      return 1;
-    }
-  }
-  return aDepth < bDepth ? -1 : 1;
-};
 var vnode_getProjectionParentComponent = (vHost, rootVNode) => {
   let projectionDepth = 1;
   while (projectionDepth--) {
@@ -27372,24 +27512,38 @@ var vnode_getProjectionParentComponent = (vHost, rootVNode) => {
 };
 var VNodeArray = class VNode extends Array {
   static createElement(flags, parent, previousSibling, nextSibling, firstChild, lastChild, element, elementName) {
-    const vnode = new VNode(flags, parent, previousSibling, nextSibling);
-    vnode.push(firstChild, lastChild, element, elementName);
+    const vnode = new VNode(
+      flags,
+      parent,
+      previousSibling,
+      nextSibling,
+      firstChild,
+      lastChild,
+      element,
+      elementName,
+      []
+    );
     return vnode;
   }
   static createText(flags, parent, previousSibling, nextSibling, textNode, text) {
-    const vnode = new VNode(flags, parent, previousSibling, nextSibling);
-    vnode.push(textNode, text);
+    const vnode = new VNode(flags, parent, previousSibling, nextSibling, textNode, text);
     return vnode;
   }
   static createVirtual(flags, parent, previousSibling, nextSibling, firstChild, lastChild) {
-    const vnode = new VNode(flags, parent, previousSibling, nextSibling);
-    vnode.push(firstChild, lastChild);
+    const vnode = new VNode(
+      flags,
+      parent,
+      previousSibling,
+      nextSibling,
+      firstChild,
+      lastChild,
+      []
+    );
     return vnode;
   }
-  constructor(flags, parent, previousSibling, nextSibling) {
-    super();
-    this.push(flags, parent, previousSibling, nextSibling);
-    if (import_build6.isDev) {
+  constructor(flags, parent, previousSibling, nextSibling, ...rest) {
+    super(flags, parent, previousSibling, nextSibling, ...rest);
+    if (import_build8.isDev) {
       this.toString = vnode_toString;
     }
   }
@@ -27434,10 +27588,12 @@ function invokeApply(context, fn, args) {
   return returnValue;
 }
 var newInvokeContextFromTuple = ([element, event, url]) => {
-  const container = element.closest(QContainerSelector);
+  const domContainer = getDomContainer(element);
+  const container = domContainer.element;
+  const vNode = container ? vnode_locate(domContainer.rootVNode, element) : void 0;
   const locale = (container == null ? void 0 : container.getAttribute(QLocaleAttr)) || void 0;
   locale && setLocale(locale);
-  return newInvokeContext(locale, void 0, element, event, url);
+  return newInvokeContext(locale, vNode, element, event, url);
 };
 var newInvokeContext = (locale, hostElement, element, event, url) => {
   const $locale$ = locale || (typeof event === "object" && event && "locale" in event ? event.locale : void 0);
@@ -27468,10 +27624,7 @@ var trackSignal = (fn, subscriber, property, container, data) => {
   const previousSubscriber = trackInvocation.$effectSubscriber$;
   const previousContainer = trackInvocation.$container$;
   try {
-    trackInvocation.$effectSubscriber$ = [subscriber, property];
-    if (data) {
-      trackInvocation.$effectSubscriber$.push(data);
-    }
+    trackInvocation.$effectSubscriber$ = getSubscriber(subscriber, property, data);
     trackInvocation.$container$ = container;
     return invoke(trackInvocation, fn);
   } finally {
@@ -27826,9 +27979,9 @@ var DomContainer = class extends _SharedContainer {
   $storeProxyMap$ = /* @__PURE__ */ new WeakMap();
   $qFuncs$;
   $instanceHash$;
-  stateData;
+  vNodeLocate = (id) => vnode_locate(this.rootVNode, id);
+  $stateData$;
   $styleIds$ = null;
-  $vnodeLocate$ = (id) => vnode_locate(this.rootVNode, id);
   $renderCount$ = 0;
   constructor(element) {
     super(
@@ -27857,29 +28010,29 @@ var DomContainer = class extends _SharedContainer {
     this.qManifestHash = element.getAttribute("q:manifest-hash");
     this.rootVNode = vnode_newUnMaterializedElement(this.element);
     this.$rawStateData$ = null;
-    this.stateData = null;
+    this.$stateData$ = null;
     const document2 = this.element.ownerDocument;
     if (!document2.qVNodeData) {
       processVNodeData2(document2);
     }
     this.$rawStateData$ = [];
-    this.stateData = [];
+    this.$stateData$ = [];
     const qwikStates = element.querySelectorAll('script[type="qwik/state"]');
     if (qwikStates.length !== 0) {
       const lastState = qwikStates[qwikStates.length - 1];
       this.$rawStateData$ = JSON.parse(lastState.textContent);
-      this.stateData = wrapDeserializerProxy(this, this.$rawStateData$);
+      this.$stateData$ = wrapDeserializerProxy(this, this.$rawStateData$);
     }
     this.$qFuncs$ = getQFuncs(document2, this.$instanceHash$) || EMPTY_ARRAY;
   }
   $setRawState$(id, vParent) {
-    this.stateData[id] = vParent;
+    this.$stateData$[id] = vParent;
   }
   parseQRL(qrl2) {
     return inflateQRL(this, parseQRL(qrl2));
   }
   handleError(err, host) {
-    if (qDev) {
+    if (qDev && host) {
       if (typeof document !== "undefined") {
         const vHost = host;
         const errorDiv = document.createElement("errored-host");
@@ -27902,7 +28055,7 @@ var DomContainer = class extends _SharedContainer {
         throw err;
       }
     }
-    const errorStore = this.resolveContext(host, ERROR_CONTEXT);
+    const errorStore = host && this.resolveContext(host, ERROR_CONTEXT);
     if (!errorStore) {
       throw err;
     }
@@ -27936,7 +28089,7 @@ var DomContainer = class extends _SharedContainer {
           return vNode;
         }
         vNode = vnode_getParent(vNode) || // If virtual node, than it could be a slot so we need to read its parent.
-        vnode_getProp(vNode, QSlotParent, this.$vnodeLocate$);
+        vnode_getProp(vNode, QSlotParent, this.vNodeLocate);
       } else {
         vNode = vnode_getParent(vNode);
       }
@@ -27955,7 +28108,7 @@ var DomContainer = class extends _SharedContainer {
       case ELEMENT_PROPS:
       case OnRenderProp:
       case QCtxAttr:
-      case QSubscribers:
+      case QBackRefs:
         getObjectById = this.$getObjectById$;
         break;
       case ELEMENT_SEQ_IDX:
@@ -27968,7 +28121,9 @@ var DomContainer = class extends _SharedContainer {
   scheduleRender() {
     this.$renderCount$++;
     this.renderDone ||= getPlatform().nextTick(() => this.processChores());
-    return this.renderDone;
+    return this.renderDone.finally(
+      () => emitEvent("qrender", { instanceHash: this.$instanceHash$, renderCount: this.$renderCount$ })
+    );
   }
   processChores() {
     let renderCount = this.$renderCount$;
@@ -27991,12 +28146,13 @@ var DomContainer = class extends _SharedContainer {
   ensureProjectionResolved(vNode) {
     if ((vNode[0 /* flags */] & 16 /* Resolved */) === 0) {
       vNode[0 /* flags */] |= 16 /* Resolved */;
-      for (let i = vnode_getPropStartIndex(vNode); i < vNode.length; i = i + 2) {
-        const prop = vNode[i];
+      const props = vnode_getProps(vNode);
+      for (let i = 0; i < props.length; i = i + 2) {
+        const prop = props[i];
         if (isSlotProp(prop)) {
-          const value = vNode[i + 1];
+          const value = props[i + 1];
           if (typeof value == "string") {
-            vNode[i + 1] = this.$vnodeLocate$(value);
+            props[i + 1] = this.vNodeLocate(value);
           }
         }
       }
@@ -28010,7 +28166,7 @@ var DomContainer = class extends _SharedContainer {
       id < this.$rawStateData$.length / 2,
       `Invalid reference: ${id} >= ${this.$rawStateData$.length / 2}`
     );
-    return this.stateData[id];
+    return this.$stateData$[id];
   };
   getSyncFn(id) {
     const fn = this.$qFuncs$[id];
@@ -28073,8 +28229,7 @@ var DeserializationHandler = class {
     }
     const i = typeof property === "number" ? property : typeof property === "string" ? parseInt(property, 10) : NaN;
     if (Number.isNaN(i) || i < 0 || i >= this.$length$) {
-      const out = Reflect.get(target, property, receiver);
-      return out;
+      return Reflect.get(target, property, receiver);
     }
     const idx = i * 2;
     const typeId = this.$data$[idx];
@@ -28172,7 +28327,7 @@ var inflate = (container, target, typeId, data) => {
       task.$flags$ = v[1];
       task.$index$ = v[2];
       task.$el$ = v[3];
-      task.$effectDependencies$ = v[4];
+      task[_EFFECT_BACK_REF] = v[4];
       task.$state$ = v[5];
       break;
     case 20 /* Resource */:
@@ -28194,12 +28349,9 @@ var inflate = (container, target, typeId, data) => {
       break;
     case 25 /* Store */:
     case 26 /* StoreArray */: {
-      const [value, flags, effects2, storeEffect] = data;
+      const [value, flags, effects2] = data;
       const store = getOrCreateStore(value, flags, container);
       const storeHandler = getStoreHandler(store);
-      if (storeEffect) {
-        effects2[STORE_ARRAY_PROP] = storeEffect;
-      }
       storeHandler.$effects$ = effects2;
       target = store;
       break;
@@ -28208,7 +28360,7 @@ var inflate = (container, target, typeId, data) => {
       const signal = target;
       const d = data;
       signal.$untrackedValue$ = d[0];
-      signal.$effects$ = d.slice(1);
+      signal.$effects$ = new Set(d.slice(1));
       break;
     }
     case 23 /* WrappedSignal */: {
@@ -28216,10 +28368,10 @@ var inflate = (container, target, typeId, data) => {
       const d = data;
       signal.$func$ = container.getSyncFn(d[0]);
       signal.$args$ = d[1];
-      signal.$effectDependencies$ = d[2];
+      signal[_EFFECT_BACK_REF] = d[2];
       signal.$untrackedValue$ = d[3];
       signal.$hostElement$ = d[4];
-      signal.$effects$ = d.slice(5);
+      signal.$effects$ = new Set(d.slice(5));
       break;
     }
     case 24 /* ComputedSignal */: {
@@ -28334,6 +28486,7 @@ var _constants = [
   EMPTY_ARRAY,
   EMPTY_OBJ,
   NEEDS_COMPUTATION,
+  STORE_ARRAY_PROP,
   Slot,
   Fragment,
   NaN,
@@ -28352,6 +28505,7 @@ var _constantNames = [
   "EMPTY_ARRAY",
   "EMPTY_OBJ",
   "NEEDS_COMPUTATION",
+  "STORE_ARRAY_PROP",
   "Slot",
   "Fragment",
   "NaN",
@@ -28433,6 +28587,8 @@ var allocate = (container, typeId, value) => {
         reject = rej;
       });
       resolvers.set(promise, [resolve, reject]);
+      promise.catch(() => {
+      });
       return promise;
     case 17 /* Uint8Array */:
       const encodedLength = value.length;
@@ -28442,12 +28598,9 @@ var allocate = (container, typeId, value) => {
       return new Uint8Array(decodedLength);
     case 29 /* PropsProxy */:
       return createPropsProxy(null, null);
-    case 9 /* RefVNode */:
     case 8 /* VNode */:
-      const vnodeOrDocument = retrieveVNodeOrDocument(container, value);
-      if (typeId === 8 /* VNode */) {
-        return vnodeOrDocument;
-      }
+      return retrieveVNodeOrDocument(container, value);
+    case 9 /* RefVNode */:
       const vNode = retrieveVNodeOrDocument(container, value);
       if (vnode_isVNode(vNode)) {
         return vnode_getNode(vNode);
@@ -28455,7 +28608,7 @@ var allocate = (container, typeId, value) => {
         throw qError(34 /* serializeErrorExpectedVNode */, [typeof vNode]);
       }
     case 30 /* EffectData */:
-      return new EffectPropData({});
+      return new SubscriptionData({});
     default:
       throw qError(35 /* serializeErrorCannotAllocate */, [typeId]);
   }
@@ -28472,12 +28625,12 @@ function parseQRL(qrl2) {
   const symbol = captureStart > -1 ? qrl2.slice(hashIdx + 1, captureStart) : qrl2.slice(hashIdx + 1);
   const captureIds = captureStart > -1 && captureEnd > -1 ? qrl2.slice(captureStart + 1, captureEnd).split(" ").filter((v) => v.length).map((s) => parseInt(s, 10)) : null;
   let qrlRef = null;
-  if (isDev && chunk === QRL_RUNTIME_CHUNK) {
+  if (isDev2 && chunk === QRL_RUNTIME_CHUNK) {
     const backChannel = globalThis[QRL_RUNTIME_CHUNK];
     assertDefined(backChannel, "Missing QRL_RUNTIME_CHUNK");
     qrlRef = backChannel.get(symbol);
   }
-  return createQRL(chunk, symbol, qrlRef, null, captureIds, null, null);
+  return createQRL(chunk, symbol, qrlRef, null, captureIds, null);
 }
 function inflateQRL(container, qrl2) {
   const captureIds = qrl2.$capture$;
@@ -28511,13 +28664,13 @@ var createSerializationContext = (NodeConstructor, DomRefConstructor, symbolToCh
     }
     return id;
   };
-  const isSsrNode = NodeConstructor ? (obj) => obj instanceof NodeConstructor : () => false;
+  const isSsrNode2 = NodeConstructor ? (obj) => obj instanceof NodeConstructor : () => false;
   isDomRef = DomRefConstructor ? (obj) => obj instanceof DomRefConstructor : () => false;
   return {
     $serialize$() {
       serialize(this);
     },
-    $isSsrNode$: isSsrNode,
+    $isSsrNode$: isSsrNode2,
     $isDomRef$: isDomRef,
     $symbolToChunkResolver$: symbolToChunkResolver,
     $wasSeen$,
@@ -28573,7 +28726,7 @@ var createSerializationContext = (NodeConstructor, DomRefConstructor, symbolToCh
     const promises = [];
     const visit = (obj) => {
       if (typeof obj === "function") {
-        if (isQrl2(obj)) {
+        if (isQrl(obj)) {
           if (obj.$captureRef$) {
             discoveredValues.push(...obj.$captureRef$);
           }
@@ -28583,7 +28736,7 @@ var createSerializationContext = (NodeConstructor, DomRefConstructor, symbolToCh
         }
       } else if (
         // skip as these are primitives
-        typeof obj !== "object" || obj === null || obj instanceof URL || obj instanceof Date || obj instanceof RegExp || obj instanceof Uint8Array || obj instanceof URLSearchParams || typeof FormData !== "undefined" && obj instanceof FormData || // Ignore the no serialize objects
+        typeof obj !== "object" || obj === null || obj instanceof URL || obj instanceof Date || obj instanceof RegExp || obj instanceof Uint8Array || obj instanceof URLSearchParams || vnode_isVNode(obj) || typeof FormData !== "undefined" && obj instanceof FormData || // Ignore the no serialize objects
         fastSkipSerialize(obj)
       ) {
       } else if (obj instanceof Error) {
@@ -28591,8 +28744,7 @@ var createSerializationContext = (NodeConstructor, DomRefConstructor, symbolToCh
       } else if (isStore(obj)) {
         const target = getStoreTarget(obj);
         const effects = getStoreHandler(obj).$effects$;
-        const storeEffect = (effects == null ? void 0 : effects[STORE_ARRAY_PROP]) ?? null;
-        discoveredValues.push(target, effects, storeEffect);
+        discoveredValues.push(target, effects);
         for (const prop in target) {
           const propValue = target[prop];
           if (storeProxyMap.has(propValue)) {
@@ -28614,9 +28766,7 @@ var createSerializationContext = (NodeConstructor, DomRefConstructor, symbolToCh
           discoveredValues.push(...obj.$effects$);
         }
         if (obj instanceof WrappedSignal) {
-          if (obj.$effectDependencies$) {
-            discoveredValues.push(...obj.$effectDependencies$);
-          }
+          discoverEffectBackRefs(obj[_EFFECT_BACK_REF], discoveredValues);
           if (obj.$args$) {
             discoveredValues.push(...obj.$args$);
           }
@@ -28627,8 +28777,9 @@ var createSerializationContext = (NodeConstructor, DomRefConstructor, symbolToCh
           discoveredValues.push(obj.$computeQrl$);
         }
       } else if (obj instanceof Task) {
-        discoveredValues.push(obj.$el$, obj.$qrl$, obj.$state$, obj.$effectDependencies$);
-      } else if (isSsrNode(obj)) {
+        discoveredValues.push(obj.$el$, obj.$qrl$, obj.$state$);
+        discoverEffectBackRefs(obj[_EFFECT_BACK_REF], discoveredValues);
+      } else if (isSsrNode2(obj)) {
         discoverValuesForVNodeData(obj.vnodeData, discoveredValues);
         if (obj.childrenVNodeData && obj.childrenVNodeData.length) {
           for (const data of obj.childrenVNodeData) {
@@ -28641,7 +28792,7 @@ var createSerializationContext = (NodeConstructor, DomRefConstructor, symbolToCh
         discoveredValues.push(obj.type, obj.props, obj.constProps, obj.children);
       } else if (Array.isArray(obj)) {
         discoveredValues.push(...obj);
-      } else if (isQrl2(obj)) {
+      } else if (isQrl(obj)) {
         obj.$captureRef$ && obj.$captureRef$.length && discoveredValues.push(...obj.$captureRef$);
       } else if (isPropsProxy(obj)) {
         discoveredValues.push(obj[_VAR_PROPS], obj[_CONST_PROPS]);
@@ -28657,7 +28808,7 @@ var createSerializationContext = (NodeConstructor, DomRefConstructor, symbolToCh
           }
         );
         promises.push(obj);
-      } else if (obj instanceof EffectPropData) {
+      } else if (obj instanceof SubscriptionData) {
         discoveredValues.push(obj.data);
       } else if (isObjectLiteral(obj)) {
         Object.entries(obj).forEach(([key, value]) => {
@@ -28694,15 +28845,30 @@ var discoverValuesForVNodeData = (vnodeData, discoveredValues) => {
   for (const value of vnodeData) {
     if (isSsrAttrs(value)) {
       for (let i = 1; i < value.length; i += 2) {
-        if (value[i - 1] === ELEMENT_KEY) {
+        const attrValue = value[i];
+        if (typeof attrValue === "string") {
           continue;
         }
-        const attrValue = value[i];
         discoveredValues.push(attrValue);
       }
     }
   }
 };
+var discoverEffectBackRefs = (effectsBackRefs, discoveredValues) => {
+  if (effectsBackRefs) {
+    let hasBackRefs = false;
+    for (const [, effect] of effectsBackRefs) {
+      const backRefs = effect[2 /* BACK_REF */];
+      if (backRefs) {
+        hasBackRefs = true;
+        break;
+      }
+    }
+    if (hasBackRefs) {
+      discoveredValues.push(effectsBackRefs);
+    }
+  }
+};
 var promiseResults = /* @__PURE__ */ new WeakMap();
 function serialize(serializationContext) {
   const { $writer$, $isSsrNode$, $isDomRef$, $setProp$, $storeProxyMap$ } = serializationContext;
@@ -28751,10 +28917,10 @@ function serialize(serializationContext) {
       output(1 /* Constant */, value ? 2 /* True */ : 3 /* False */);
     } else if (typeof value === "function") {
       if (value === Slot) {
-        output(1 /* Constant */, 8 /* Slot */);
+        output(1 /* Constant */, 9 /* Slot */);
       } else if (value === Fragment) {
-        output(1 /* Constant */, 9 /* Fragment */);
-      } else if (isQrl2(value)) {
+        output(1 /* Constant */, 10 /* Fragment */);
+      } else if (isQrl(value)) {
         const qrl2 = qrlToString(serializationContext, value);
         const id = serializationContext.$addRoot$(qrl2);
         output(18 /* QRL */, id);
@@ -28768,18 +28934,18 @@ function serialize(serializationContext) {
       }
     } else if (typeof value === "number") {
       if (Number.isNaN(value)) {
-        output(1 /* Constant */, 10 /* NaN */);
+        output(1 /* Constant */, 11 /* NaN */);
       } else if (!Number.isFinite(value)) {
         output(
           1 /* Constant */,
-          value < 0 ? 12 /* NegativeInfinity */ : 11 /* PositiveInfinity */
+          value < 0 ? 13 /* NegativeInfinity */ : 12 /* PositiveInfinity */
         );
       } else if (value === Number.MAX_SAFE_INTEGER) {
-        output(1 /* Constant */, 13 /* MaxSafeInt */);
+        output(1 /* Constant */, 14 /* MaxSafeInt */);
       } else if (value === Number.MAX_SAFE_INTEGER - 1) {
-        output(1 /* Constant */, 14 /* AlmostMaxSafeInt */);
+        output(1 /* Constant */, 15 /* AlmostMaxSafeInt */);
       } else if (value === Number.MIN_SAFE_INTEGER) {
-        output(1 /* Constant */, 15 /* MinSafeInt */);
+        output(1 /* Constant */, 16 /* MinSafeInt */);
       } else {
         output(2 /* Number */, value);
       }
@@ -28812,6 +28978,8 @@ function serialize(serializationContext) {
       output(1 /* Constant */, 0 /* Undefined */);
     } else if (value === NEEDS_COMPUTATION) {
       output(1 /* Constant */, 7 /* NEEDS_COMPUTATION */);
+    } else if (value === STORE_ARRAY_PROP) {
+      output(1 /* Constant */, 8 /* STORE_ARRAY_PROP */);
     } else {
       throw qError(37 /* serializeErrorUnknownType */, [typeof value]);
     }
@@ -28831,7 +28999,7 @@ function serialize(serializationContext) {
       const constProps = value[_CONST_PROPS];
       const out = constProps ? [varProps, constProps] : Object.keys(varProps).length ? [varProps] : 0;
       output(29 /* PropsProxy */, out);
-    } else if (value instanceof EffectPropData) {
+    } else if (value instanceof SubscriptionData) {
       output(30 /* EffectData */, [value.data.$scopedStyleIdPrefix$, value.data.$isConst$]);
     } else if (isStore(value)) {
       if (isResource(value)) {
@@ -28846,7 +29014,6 @@ function serialize(serializationContext) {
         const storeTarget = getStoreTarget(value);
         const flags = storeHandler.$flags$;
         const effects = storeHandler.$effects$;
-        const storeEffect = (effects == null ? void 0 : effects[STORE_ARRAY_PROP]) ?? null;
         const innerStores = [];
         for (const prop in storeTarget) {
           const propValue = storeTarget[prop];
@@ -28856,7 +29023,7 @@ function serialize(serializationContext) {
             serializationContext.$addRoot$(innerStore);
           }
         }
-        const out = [storeTarget, flags, effects, storeEffect, ...innerStores];
+        const out = [storeTarget, flags, effects, ...innerStores];
         while (out[out.length - 1] == null) {
           out.pop();
         }
@@ -28882,7 +29049,7 @@ function serialize(serializationContext) {
       if (value instanceof WrappedSignal) {
         output(23 /* WrappedSignal */, [
           ...serializeWrappingFn(serializationContext, value),
-          value.$effectDependencies$,
+          filterEffectBackRefs(value[_EFFECT_BACK_REF]),
           v,
           value.$hostElement$,
           ...value.$effects$ || []
@@ -28912,7 +29079,7 @@ function serialize(serializationContext) {
       if (extraProps.length) {
         out.push(extraProps);
       }
-      if (isDev) {
+      if (isDev2) {
         out.push(value.stack);
       }
       output(12 /* Error */, out);
@@ -28969,7 +29136,7 @@ function serialize(serializationContext) {
         value.$flags$,
         value.$index$,
         value.$el$,
-        value.$effectDependencies$,
+        value[_EFFECT_BACK_REF],
         value.$state$
       ];
       while (out[out.length - 1] == null) {
@@ -28989,12 +29156,26 @@ function serialize(serializationContext) {
       }
       const out = btoa(buf).replace(/=+$/, "");
       output(17 /* Uint8Array */, out);
+    } else if (vnode_isVNode(value)) {
+      output(1 /* Constant */, 0 /* Undefined */);
     } else {
       throw qError(37 /* serializeErrorUnknownType */, [typeof value]);
     }
   };
   writeValue(serializationContext.$roots$, -1);
 }
+function filterEffectBackRefs(effectBackRef) {
+  let effectBackRefToSerialize = null;
+  if (effectBackRef) {
+    for (const [effectProp, effect] of effectBackRef) {
+      if (effect[2 /* BACK_REF */]) {
+        effectBackRefToSerialize ||= /* @__PURE__ */ new Map();
+        effectBackRefToSerialize.set(effectProp, effect);
+      }
+    }
+  }
+  return effectBackRefToSerialize;
+}
 function serializeWrappingFn(serializationContext, value) {
   if (value.$funcStr$ && value.$funcStr$[0] === "{") {
     value.$funcStr$ = `(${value.$funcStr$})`;
@@ -29010,15 +29191,12 @@ function qrlToString(serializationContext, value) {
   var _a;
   let symbol = value.$symbol$;
   let chunk = value.$chunk$;
-  const refSymbol = value.$refSymbol$ ?? symbol;
   const platform = getPlatform();
   if (platform) {
-    const result = platform.chunkForSymbol(refSymbol, chunk, (_a = value.dev) == null ? void 0 : _a.file);
+    const result = platform.chunkForSymbol(symbol, chunk, (_a = value.dev) == null ? void 0 : _a.file);
     if (result) {
       chunk = result[1];
-      if (!value.$refSymbol$) {
-        symbol = result[0];
-      }
+      symbol = result[0];
     }
   }
   const isSync = isSyncQrl(value);
@@ -29026,7 +29204,7 @@ function qrlToString(serializationContext, value) {
     if (!chunk) {
       chunk = serializationContext.$symbolToChunkResolver$(value.$hash$);
     }
-    if (isDev) {
+    if (isDev2) {
       let backChannel = globalThis[QRL_RUNTIME_CHUNK];
       if (!backChannel) {
         backChannel = globalThis[QRL_RUNTIME_CHUNK] = /* @__PURE__ */ new Map();
@@ -29092,26 +29270,33 @@ function isResource(value) {
   return "__brand" in value && value.__brand === "resource";
 }
 var frameworkType = (obj) => {
-  return typeof obj === "object" && obj !== null && (obj instanceof Signal || obj instanceof Task || isJSXNode(obj)) || isQrl2(obj);
+  return typeof obj === "object" && obj !== null && (obj instanceof Signal || obj instanceof Task || isJSXNode(obj)) || isQrl(obj);
 };
-var canSerialize = (value) => {
+var canSerialize = (value, seen = /* @__PURE__ */ new WeakSet()) => {
   if (value == null || typeof value === "string" || typeof value === "number" || typeof value === "boolean" || typeof value === "bigint") {
     return true;
   } else if (typeof value === "object") {
+    if (seen.has(value)) {
+      return true;
+    }
+    seen.add(value);
     const proto = Object.getPrototypeOf(value);
     if (isStore(value)) {
       value = getStoreTarget(value);
     }
     if (proto == Object.prototype) {
       for (const key in value) {
-        if (!canSerialize(untrack(() => value[key]))) {
+        if (!canSerialize(
+          untrack(() => value[key]),
+          seen
+        )) {
           return false;
         }
       }
       return true;
     } else if (proto == Array.prototype) {
       for (let i = 0; i < value.length; i++) {
-        if (!canSerialize(value[i])) {
+        if (!canSerialize(value[i], seen)) {
           return false;
         }
       }
@@ -29146,7 +29331,7 @@ var canSerialize = (value) => {
       return true;
     }
   } else if (typeof value === "function") {
-    if (isQrl2(value) || isQwikComponent(value)) {
+    if (isQrl(value) || isQwikComponent(value)) {
       return true;
     }
   }
@@ -29264,7 +29449,7 @@ var constantToName = (code2) => {
 
 // packages/qwik/src/core/shared/utils/serialize-utils.ts
 var verifySerializable = (value, preMessage) => {
-  const seen = /* @__PURE__ */ new Set();
+  const seen = /* @__PURE__ */ new WeakSet();
   return _verifySerializable(value, seen, "_", preMessage);
 };
 var _verifySerializable = (value, seen, ctx, preMessage) => {
@@ -29273,10 +29458,12 @@ var _verifySerializable = (value, seen, ctx, preMessage) => {
     return value;
   }
   if (shouldSerialize(unwrapped)) {
-    if (seen.has(unwrapped)) {
-      return value;
+    if (typeof unwrapped === "object") {
+      if (seen.has(unwrapped)) {
+        return value;
+      }
+      seen.add(unwrapped);
     }
-    seen.add(unwrapped);
     if (isSignal(unwrapped)) {
       return value;
     }
@@ -29358,14 +29545,7 @@ var noSerialize = (input) => {
 };
 
 // packages/qwik/src/core/shared/qrl/qrl-class.ts
-var isQrl2 = (value) => {
-  return typeof value === "function" && typeof value.getSymbol === "function";
-};
-var SYNC_QRL = "<sync>";
-var isSyncQrl = (value) => {
-  return isQrl2(value) && value.$symbol$ == SYNC_QRL;
-};
-var createQRL = (chunk, symbol, symbolRef, symbolFn, capture, captureRef, refSymbol) => {
+var createQRL = (chunk, symbol, symbolRef, symbolFn, capture, captureRef) => {
   if (qDev && qSerialize) {
     if (captureRef) {
       for (const item of captureRef) {
@@ -29386,9 +29566,14 @@ var createQRL = (chunk, symbol, symbolRef, symbolFn, capture, captureRef, refSym
     return _containerEl;
   };
   function bindFnToContext(currentCtx, beforeFn) {
-    return (...args) => maybeThen(resolveLazy(), (fn) => {
-      if (!isFunction(fn)) {
-        throw qError(10 /* qrlIsNotFunction */);
+    const bound = (...args) => {
+      if (!qrl2.resolved) {
+        return qrl2.resolve().then((fn) => {
+          if (!isFunction(fn)) {
+            throw qError(10 /* qrlIsNotFunction */);
+          }
+          return bound(...args);
+        });
       }
       if (beforeFn && beforeFn() === false) {
         return;
@@ -29399,12 +29584,13 @@ var createQRL = (chunk, symbol, symbolRef, symbolFn, capture, captureRef, refSym
       context.$qrl$ = qrl2;
       context.$event$ ||= this;
       try {
-        return invoke.call(this, context, fn, ...args);
+        return invoke.call(this, context, symbolRef, ...args);
       } finally {
         context.$qrl$ = prevQrl;
         context.$event$ = prevEvent;
       }
-    });
+    };
+    return bound;
   }
   const resolveLazy = (containerEl) => {
     return symbolRef !== null ? symbolRef : resolve(containerEl);
@@ -29414,9 +29600,19 @@ var createQRL = (chunk, symbol, symbolRef, symbolFn, capture, captureRef, refSym
       return fn;
     }
     return function(...args) {
+      var _a;
       let context = tryGetInvokeContext();
       if (context) {
-        return fn.apply(this, args);
+        if (((_a = context.$qrl$) == null ? void 0 : _a.$symbol$) === qrl2.$symbol$) {
+          return fn.apply(this, args);
+        }
+        const prevQrl = context.$qrl$;
+        context.$qrl$ = qrl2;
+        try {
+          return fn.apply(this, args);
+        } finally {
+          context.$qrl$ = prevQrl;
+        }
       }
       context = newInvokeContext();
       context.$qrl$ = qrl2;
@@ -29441,10 +29637,12 @@ var createQRL = (chunk, symbol, symbolRef, symbolFn, capture, captureRef, refSym
     const start = now();
     const ctx = tryGetInvokeContext();
     if (symbolFn !== null) {
-      symbolRef = symbolFn().then((module2) => qrl2.resolved = symbolRef = wrapFn(module2[symbol]));
+      symbolRef = symbolFn().then(
+        (module2) => qrl2.resolved = wrapFn(symbolRef = module2[symbol])
+      );
     } else {
       const imported = getPlatform().importSymbol(_containerEl, chunk, symbol);
-      symbolRef = maybeThen(imported, (ref) => qrl2.resolved = symbolRef = wrapFn(ref));
+      symbolRef = maybeThen(imported, (ref) => qrl2.resolved = wrapFn(symbolRef = ref));
     }
     if (typeof symbolRef === "object" && isPromise(symbolRef)) {
       symbolRef.then(
@@ -29467,10 +29665,9 @@ var createQRL = (chunk, symbol, symbolRef, symbolFn, capture, captureRef, refSym
       return invoke2;
     }
   };
-  const resolvedSymbol = refSymbol ?? symbol;
-  const hash3 = getSymbolHash(resolvedSymbol);
+  const hash3 = getSymbolHash(symbol);
   Object.assign(qrl2, {
-    getSymbol: () => resolvedSymbol,
+    getSymbol: () => symbol,
     getHash: () => hash3,
     getCaptured: () => captureRef,
     resolve,
@@ -29478,7 +29675,6 @@ var createQRL = (chunk, symbol, symbolRef, symbolFn, capture, captureRef, refSym
     $setContainer$: setContainer,
     $chunk$: chunk,
     $symbol$: symbol,
-    $refSymbol$: refSymbol,
     $hash$: hash3,
     getFn: bindFnToContext,
     $capture$: capture,
@@ -29487,9 +29683,9 @@ var createQRL = (chunk, symbol, symbolRef, symbolFn, capture, captureRef, refSym
     resolved: void 0
   });
   if (symbolRef) {
-    symbolRef = maybeThen(symbolRef, (resolved) => qrl2.resolved = symbolRef = wrapFn(resolved));
+    symbolRef = maybeThen(symbolRef, (resolved) => qrl2.resolved = wrapFn(symbolRef = resolved));
   }
-  if (import_build8.isDev) {
+  if (import_build10.isDev) {
     Object.defineProperty(qrl2, "_devOnlySymbolRef", {
       get() {
         return symbolRef;
@@ -29501,20 +29697,6 @@ var createQRL = (chunk, symbol, symbolRef, symbolFn, capture, captureRef, refSym
   }
   return qrl2;
 };
-var getSymbolHash = (symbolName) => {
-  const index = symbolName.lastIndexOf("_");
-  if (index > -1) {
-    return symbolName.slice(index + 1);
-  }
-  return symbolName;
-};
-function assertQrl(qrl2) {
-  if (qDev) {
-    if (!isQrl2(qrl2)) {
-      throw new Error("Not a QRL");
-    }
-  }
-}
 var EMITTED = /* @__PURE__ */ new Set();
 var emitUsedSymbol = (symbol, element, reqTime) => {
   if (!EMITTED.has(symbol)) {
@@ -29554,7 +29736,7 @@ var $ = (expression) => {
       "Optimizer should replace all usages of $() with some special syntax. If you need to create a QRL manually, use inlinedQrl() instead."
     );
   }
-  return createQRL(null, "s" + runtimeSymbolId++, expression, null, null, null, null);
+  return createQRL(null, "s" + runtimeSymbolId++, expression, null, null, null);
 };
 var dollar = $;
 var eventQrl = (qrl2) => {
@@ -29581,9 +29763,6 @@ var isQwikComponent = (component) => {
   return typeof component == "function" && component[SERIALIZABLE_STATE] !== void 0;
 };
 
-// packages/qwik/src/core/index.ts
-var import_build10 = require("@qwik.dev/core/build");
-
 // packages/qwik/src/core/shared/qrl/qrl.public.dollar.ts
 var event$ = implicit$FirstArg(eventQrl);
 
@@ -29770,9 +29949,6 @@ var useComputedQrl = (qrl2) => {
 // packages/qwik/src/core/use/use-computed-dollar.ts
 var useComputed$ = implicit$FirstArg(useComputedQrl);
 
-// packages/qwik/src/core/shared/prefetch-service-worker/prefetch.ts
-var import_build9 = require("@qwik.dev/core/build");
-
 // packages/qwik/src/testing/vdom-diff.unit-util.ts
 var import_vitest = require("vitest");
 var import_prettier = require("prettier");
@@ -29885,7 +30061,7 @@ import_vitest.expect.extend({
     };
   }
 });
-var ignoredAttributes = [QSubscribers, ELEMENT_ID, "", Q_PROPS_SEPARATOR];
+var ignoredAttributes = [QBackRefs, ELEMENT_ID, "", Q_PROPS_SEPARATOR];
 function getContainerElement(vNode) {
   let maybeParent;
   do {
@@ -30314,7 +30490,6 @@ function attrsEqual(expectedValue, receivedValue) {
 }
 
 // packages/qwik/src/testing/element-fixture.ts
-var import_vitest2 = require("vitest");
 var import_core2 = require("../core.cjs");
 
 // packages/qwik/src/testing/platform.ts
@@ -30492,7 +30667,6 @@ var dispatch = async (element, attrName, event, scope) => {
   const isDocumentOrWindow = isDocumentOrWindowEvent(event.type);
   const preventAttributeName = PREVENT_DEFAULT + (isDocumentOrWindow ? event.type.substring(1) : event.type);
   const stopPropagationName = STOP_PROPAGATION + event.type;
-  const collectListeners = [];
   while (element) {
     const preventDefault = element.hasAttribute(preventAttributeName);
     const stopPropagation = element.hasAttribute(stopPropagationName);
@@ -30509,15 +30683,21 @@ var dispatch = async (element, attrName, event, scope) => {
     } else if (element.hasAttribute(attrName)) {
       const container = (0, import_core2.getDomContainer)(element);
       const qrl2 = element.getAttribute(attrName);
-      qrl2.split("\n").map((qrl3) => container.parseQRL(qrl3.trim())).map((qrl3) => qrl3(event, element));
+      const ctx = newInvokeContextFromTuple([element, event]);
+      try {
+        await Promise.all(
+          qrl2.split("\n").map((qrl3) => container.parseQRL(qrl3.trim())).map((qrl3) => {
+            return invokeApply(ctx, qrl3, [event, element]);
+          })
+        );
+      } catch (error) {
+        console.error("!!! qrl error", qrl2, error);
+        throw error;
+      }
       return;
     }
     element = element.parentElement;
   }
-  for (let i = 0; i < collectListeners.length; i++) {
-    const { element: element2, qrl: qrl2 } = collectListeners[i];
-    await qrl2.getFn([element2, event], () => element2.isConnected)(event, element2);
-  }
 };
 
 // packages/qwik/src/testing/library.ts
@@ -30544,20 +30724,34 @@ var getQwik = async () => {
 };
 
 // packages/qwik/src/testing/expect-dom.tsx
-var import_vitest3 = require("vitest");
+var import_vitest2 = require("vitest");
 var import_prettier2 = require("prettier");
 async function expectDOM(actual, expected) {
   const options = { parser: "html", htmlWhitespaceSensitivity: "ignore" };
-  import_vitest3.assert.equal(await (0, import_prettier2.format)(actual.outerHTML, options), await (0, import_prettier2.format)(expected, options));
+  import_vitest2.assert.equal(await (0, import_prettier2.format)(actual.outerHTML, options), await (0, import_prettier2.format)(expected, options));
 }
 
 // packages/qwik/src/testing/rendering.unit-util.tsx
 var import_core8 = require("../core.cjs");
-var import_vitest4 = require("vitest");
+var import_vitest3 = require("vitest");
 
 // packages/qwik/src/server/platform.ts
 var import_core3 = require("../core.cjs");
-var SYNC_QRL2 = "<sync>";
+
+// packages/qwik/src/optimizer/src/versions.ts
+var versions2 = {
+  qwik: globalThis.QWIK_VERSION
+};
+
+// packages/qwik/src/optimizer/src/manifest.ts
+function getValidManifest(manifest) {
+  if (manifest != null && manifest.mapping != null && typeof manifest.mapping === "object" && manifest.symbols != null && typeof manifest.symbols === "object" && manifest.bundles != null && typeof manifest.bundles === "object") {
+    return manifest;
+  }
+  return void 0;
+}
+
+// packages/qwik/src/server/platform.ts
 function createPlatform3(opts, resolvedManifest) {
   const mapper = resolvedManifest == null ? void 0 : resolvedManifest.mapper;
   const mapperFn = opts.symbolMapper ? opts.symbolMapper : (symbolName, _chunk, parent) => {
@@ -30566,7 +30760,7 @@ function createPlatform3(opts, resolvedManifest) {
       const hash3 = getSymbolHash2(symbolName);
       const result = mapper[hash3];
       if (!result) {
-        if (hash3 === SYNC_QRL2) {
+        if (hash3 === SYNC_QRL) {
           return [hash3, ""];
         }
         const isRegistered = (_a = globalThis.__qwik_reg_symbols) == null ? void 0 : _a.has(hash3);
@@ -30629,19 +30823,6 @@ var getSymbolHash2 = (symbolName) => {
   return symbolName;
 };
 
-// packages/qwik/src/optimizer/src/versions.ts
-var versions2 = {
-  qwik: globalThis.QWIK_VERSION
-};
-
-// packages/qwik/src/optimizer/src/manifest.ts
-function getValidManifest(manifest) {
-  if (manifest != null && manifest.mapping != null && typeof manifest.mapping === "object" && manifest.symbols != null && typeof manifest.symbols === "object" && manifest.bundles != null && typeof manifest.bundles === "object") {
-    return manifest;
-  }
-  return void 0;
-}
-
 // packages/qwik/src/server/ssr-container.ts
 var import_core6 = require("../core.cjs");
 var import_build12 = require("@qwik.dev/core/build");
@@ -30662,7 +30843,8 @@ function prefetchUrlsEventScript(base, prefetchResources) {
     bundles: flattenPrefetchResources(prefetchResources).map((u) => u.split("/").pop())
   };
   const args = JSON.stringify(["prefetch", base, ...data.bundles]);
-  return `(window.qwikPrefetchSW||(window.qwikPrefetchSW=[])).push(${args});`;
+  return `document.dispatchEvent(new CustomEvent("qprefetch",{detail:${JSON.stringify(data)}}));
+          (window.qwikPrefetchSW||(window.qwikPrefetchSW=[])).push(${args});`;
 }
 function flattenPrefetchResources(prefetchResources) {
   const urls = [];
@@ -30853,6 +31035,9 @@ var SsrNode = class {
   locals = null;
   currentComponentNode;
   childrenVNodeData = null;
+  get [import_core4._EFFECT_BACK_REF]() {
+    return this.getProp(QBackRefs);
+  }
   setProp(name, value) {
     if (this.attrs === import_core4._EMPTY_ARRAY) {
       this.attrs = [];
@@ -31431,7 +31616,13 @@ var SSRContainer = class extends import_core6._SharedContainer {
   $noMoreRoots$ = false;
   constructor(opts) {
     super(
-      () => null,
+      () => {
+        try {
+          return this.$scheduler$(255 /* WAIT_FOR_ALL */);
+        } catch (e) {
+          this.handleError(e, null);
+        }
+      },
       () => null,
       opts.renderOptions.serverData ?? EMPTY_OBJ2,
       opts.locale
@@ -31457,15 +31648,14 @@ var SSRContainer = class extends import_core6._SharedContainer {
     this.renderOptions = opts.renderOptions;
     this.$processInjectionsFromManifest$();
   }
-  ensureProjectionResolved(host) {
+  ensureProjectionResolved(_host) {
   }
-  handleError(err, $host$) {
+  handleError(err, _$host$) {
     throw err;
   }
   async render(jsx4) {
     this.openContainer();
     await (0, import_core6._walkJSX)(this, jsx4, {
-      allowPromises: true,
       currentStyleScoped: null,
       parentComponentFrame: this.getComponentFrame()
     });
@@ -31879,8 +32069,8 @@ var SSRContainer = class extends import_core6._SharedContainer {
           case ELEMENT_SEQ_IDX:
             write(VNodeDataChar.SEQ_IDX_CHAR);
             break;
-          case QSubscribers:
-            write(VNodeDataChar.SUBS_CHAR);
+          case QBackRefs:
+            write(VNodeDataChar.BACK_REFS_CHAR);
             break;
           // Skipping `\` character for now because it is used for escaping.
           case QCtxAttr:
@@ -32090,7 +32280,6 @@ var SSRContainer = class extends import_core6._SharedContainer {
             }
             ssrComponentNode == null ? void 0 : ssrComponentNode.setProp(value, lastNode.id);
             await (0, import_core6._walkJSX)(this, children, {
-              allowPromises: true,
               currentStyleScoped: scopedStyleId,
               parentComponentFrame: null
             });
@@ -32209,7 +32398,7 @@ var SSRContainer = class extends import_core6._SharedContainer {
         let styleScopedId = null;
         if (isSSRUnsafeAttr(key)) {
           if (import_build12.isDev) {
-            throw qError(51 /* unsafeAttr */);
+            throw qError(49 /* unsafeAttr */);
           }
           continue;
         }
@@ -32226,6 +32415,8 @@ var SSRContainer = class extends import_core6._SharedContainer {
           } else if (typeof value === "function") {
             value(new DomRef(lastNode));
             continue;
+          } else if (value == null) {
+            continue;
           } else {
             throw qError(32 /* invalidRefValue */, [currentFile]);
           }
@@ -32549,7 +32740,7 @@ async function ssrRenderToDom(jsx4, opts = {}) {
   const platform = getPlatform();
   try {
     const jsxToRender = opts.raw ? jsx4 : [
-      /* @__PURE__ */ (0, import_core7.jsx)("head", { children: /* @__PURE__ */ (0, import_core7.jsx)("title", { children: import_vitest4.expect.getState().testPath }) }),
+      /* @__PURE__ */ (0, import_core7.jsx)("head", { children: /* @__PURE__ */ (0, import_core7.jsx)("title", { children: import_vitest3.expect.getState().testPath }) }),
       /* @__PURE__ */ (0, import_core7.jsx)("body", { children: jsx4 })
     ];
     const result = await renderToString(jsxToRender);
@@ -32594,7 +32785,7 @@ async function ssrRenderToDom(jsx4, opts = {}) {
     let child = firstContainerChild;
     let insertBefore = null;
     while (child) {
-      if (vnode_isElementVNode(child) && (vnode_getElementName(child) === "script" && vnode_getAttr(child, "type") === "qwik/state" || vnode_getElementName(child) === "q:template")) {
+      if (vnode_isElementVNode(child) && (vnode_getElementName(child) === "script" && (vnode_getAttr(child, "type") === "qwik/state" || vnode_getAttr(child, "id") === "qwikloader") || vnode_getElementName(child) === "q:template")) {
         insertBefore = child;
         break;
       }
@@ -32654,14 +32845,16 @@ function renderStyles(getStyles) {
     console.log(START2 + key + ": " + END2 + value);
   });
 }
-async function rerenderComponent(element) {
+async function rerenderComponent(element, flush) {
   const container = (0, import_core8._getDomContainer)(element);
   const vElement = vnode_locate(container.rootVNode, element);
   const host = getHostVNode(vElement);
   const qrl2 = container.getHostProp(host, OnRenderProp);
   const props = container.getHostProp(host, ELEMENT_PROPS);
-  await container.$scheduler$(7 /* COMPONENT */, host, qrl2, props);
-  await getTestPlatform().flush();
+  container.$scheduler$(6 /* COMPONENT */, host, qrl2, props);
+  if (flush) {
+    await getTestPlatform().flush();
+  }
 }
 function getHostVNode(vElement) {
   while (vElement != null) {