@qwik.dev/core 2.0.0-beta.14 → 2.0.0-beta.16

package/dist/testing/index.mjs

@@ -1,6 +1,6 @@
 /**
  * @license
- * @qwik.dev/core/testing 2.0.0-beta.14-dev+1e7496d
+ * @qwik.dev/core/testing 2.0.0-beta.16-dev+a83ccf3
  * 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
@@ -23640,7 +23640,7 @@ error: ${text}`);
 });
 
 // packages/qwik/src/testing/vdom-diff.unit-util.ts
-import { Fragment as Fragment2, Slot as Slot2, _getDomContainer, isSignal as isSignal2 } from "../core.mjs";
+import { Fragment as Fragment2, Slot as Slot2, _getDomContainer, isSignal as isSignal2, untrack as untrack2 } from "../core.mjs";
 import { _isJSXNode, _isStringifiable } from "@qwik.dev/core/internal";
 import { expect } from "vitest";
 
@@ -24005,7 +24005,6 @@ var ELEMENT_PROPS = "q:props";
 var ELEMENT_SEQ = "q:seq";
 var ELEMENT_SEQ_IDX = "q:seqIdx";
 var ELEMENT_BACKPATCH_DATA = "qwik/backpatch";
-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";
@@ -24045,6 +24044,7 @@ var STORE_ALL_PROPS = Symbol("store.all");
 var _CONST_PROPS = Symbol("CONST");
 var _VAR_PROPS = Symbol("VAR");
 var _OWNER = Symbol("OWNER");
+var _PROPS_HANDLER = Symbol("PROPS_HANDLER");
 var _IMMUTABLE = Symbol("IMMUTABLE");
 var _UNINITIALIZED = Symbol("UNINITIALIZED");
 
@@ -24109,6 +24109,13 @@ var getEventDataFromHtmlAttribute = (htmlKey) => {
   }
   return ["document", htmlKey.substring(12)];
 };
+var getScopedEventName = (scope, eventName) => {
+  const suffix = ":" + eventName;
+  return scope ? scope + suffix : suffix;
+};
+var getLoaderScopedEventName = (scope, scopedEvent) => {
+  return scope ? "-" + scopedEvent : scopedEvent;
+};
 
 // packages/qwik/src/core/shared/utils/flyweight.ts
 var EMPTY_ARRAY = [];
@@ -24123,16 +24130,18 @@ function createPropsProxy(owner) {
 var PropsProxyHandler = class {
   constructor(owner) {
     this.owner = owner;
+    __publicField(this, "$effects$");
+    __publicField(this, "$container$", null);
   }
   get(_, prop) {
     if (prop === _CONST_PROPS) {
       return this.owner.constProps;
-    }
-    if (prop === _VAR_PROPS) {
+    } else if (prop === _VAR_PROPS) {
       return this.owner.varProps;
-    }
-    if (prop === _OWNER) {
+    } else if (prop === _OWNER) {
       return this.owner;
+    } else if (prop === _PROPS_HANDLER) {
+      return this;
     }
     let value;
     if (prop === "children") {
@@ -24145,6 +24154,9 @@ var PropsProxyHandler = class {
         }
       }
       value = directGetPropsProxyProp(this.owner, prop);
+      if (prop in this.owner.varProps) {
+        addPropsProxyEffect(this, prop);
+      }
     }
     return value instanceof WrappedSignalImpl && value.$flags$ & 4 /* UNWRAP */ ? value.value : value;
   }
@@ -24153,6 +24165,10 @@ var PropsProxyHandler = class {
       this.owner = value;
     } else if (prop === "children") {
       this.owner.children = value;
+    } else if (prop === _CONST_PROPS) {
+      this.owner.constProps = value;
+    } else if (prop === _VAR_PROPS) {
+      this.owner.varProps = value;
     } else {
       if (typeof prop === "string" && typeof this.owner.type === "string") {
         const attr = jsxEventToHtmlAttribute(prop);
@@ -24168,12 +24184,18 @@ var PropsProxyHandler = class {
       } else if (!(prop in this.owner.varProps)) {
         this.owner.toSort = true;
       }
-      this.owner.varProps[prop] = value;
+      if (this.owner.varProps[prop] !== value) {
+        this.owner.varProps[prop] = value;
+        triggerPropsProxyEffect(this, prop);
+      }
     }
     return true;
   }
   deleteProperty(_, prop) {
     let didDelete = delete this.owner.varProps[prop];
+    if (didDelete) {
+      triggerPropsProxyEffect(this, prop);
+    }
     if (this.owner.constProps) {
       didDelete = delete this.owner.constProps[prop] || didDelete;
     }
@@ -24189,13 +24211,19 @@ var PropsProxyHandler = class {
     } else if (prop === _CONST_PROPS || prop === _VAR_PROPS) {
       return true;
     }
-    if (typeof prop === "string" && typeof this.owner.type === "string") {
-      const attr = jsxEventToHtmlAttribute(prop);
-      if (attr) {
-        prop = attr;
+    const inVarProps = prop in this.owner.varProps;
+    if (typeof prop === "string") {
+      if (inVarProps) {
+        addPropsProxyEffect(this, prop);
+      }
+      if (typeof this.owner.type === "string") {
+        const attr = jsxEventToHtmlAttribute(prop);
+        if (attr) {
+          prop = attr;
+        }
       }
     }
-    return prop in this.owner.varProps || (this.owner.constProps ? prop in this.owner.constProps : false);
+    return inVarProps || (this.owner.constProps ? prop in this.owner.constProps : false);
   }
   getOwnPropertyDescriptor(_, p) {
     const value = p === "children" ? this.owner.children : this.owner.constProps && p in this.owner.constProps ? this.owner.constProps[p] : this.owner.varProps[p];
@@ -24220,6 +24248,39 @@ var PropsProxyHandler = class {
     return out;
   }
 };
+var addPropsProxyEffect = (propsProxy, prop) => {
+  const ctx = tryGetInvokeContext();
+  if (ctx) {
+    if (propsProxy.$container$ === null) {
+      if (ctx.$container$) {
+        propsProxy.$container$ = ctx.$container$;
+      }
+    } else {
+      assertTrue(
+        !ctx.$container$ || ctx.$container$ === propsProxy.$container$,
+        "Do not use props across containers"
+      );
+    }
+  }
+  const effectSubscriber = ctx?.$effectSubscriber$;
+  if (effectSubscriber) {
+    addStoreEffect(propsProxy.owner._proxy, prop, propsProxy, effectSubscriber);
+  }
+};
+var triggerPropsProxyEffect = (propsProxy, prop) => {
+  const effects = getEffects(propsProxy.$effects$, prop);
+  if (effects) {
+    propsProxy.$container$?.$scheduler$(
+      7 /* RECOMPUTE_AND_SCHEDULE_EFFECTS */,
+      void 0,
+      propsProxy,
+      effects
+    );
+  }
+};
+function getEffects(effects, prop) {
+  return effects?.get(prop);
+}
 var directGetPropsProxyProp = (jsx2, prop) => {
   return jsx2.constProps && prop in jsx2.constProps ? jsx2.constProps[prop] : jsx2.varProps[prop];
 };
@@ -24322,7 +24383,7 @@ var SignalImpl = class {
   constructor(container, value) {
     __publicField(this, "$untrackedValue$");
     /** Store a list of effects which are dependent on this signal. */
-    __publicField(this, "$effects$", null);
+    __publicField(this, "$effects$");
     __publicField(this, "$container$", null);
     __publicField(this, "$wrappedSignal$", null);
     this.$container$ = container;
@@ -24336,7 +24397,7 @@ var SignalImpl = class {
   force() {
     this.$container$?.$scheduler$(
       7 /* RECOMPUTE_AND_SCHEDULE_EFFECTS */,
-      null,
+      void 0,
       this,
       this.$effects$
     );
@@ -24361,7 +24422,7 @@ var SignalImpl = class {
       this.$untrackedValue$ = value;
       this.$container$?.$scheduler$(
         7 /* RECOMPUTE_AND_SCHEDULE_EFFECTS */,
-        null,
+        void 0,
         this,
         this.$effects$
       );
@@ -24427,7 +24488,7 @@ var ComputedSignalImpl = class extends (_b = SignalImpl, _a = _EFFECT_BACK_REF,
      */
     __publicField(this, "$computeQrl$");
     __publicField(this, "$flags$");
-    __publicField(this, _a, null);
+    __publicField(this, _a);
     this.$computeQrl$ = fn;
     this.$flags$ = flags;
   }
@@ -24435,7 +24496,7 @@ var ComputedSignalImpl = class extends (_b = SignalImpl, _a = _EFFECT_BACK_REF,
     this.$flags$ |= 1 /* INVALID */;
     this.$container$?.$scheduler$(
       7 /* RECOMPUTE_AND_SCHEDULE_EFFECTS */,
-      null,
+      void 0,
       this,
       this.$effects$
     );
@@ -24506,13 +24567,13 @@ var AsyncComputedSignalImpl = class extends (_b2 = ComputedSignalImpl, _a2 = _EF
   constructor(container, fn, flags = 1 /* INVALID */) {
     super(container, fn, flags);
     __publicField(this, "$untrackedLoading$", false);
-    __publicField(this, "$untrackedError$", null);
-    __publicField(this, "$loadingEffects$", null);
-    __publicField(this, "$errorEffects$", null);
+    __publicField(this, "$untrackedError$");
+    __publicField(this, "$loadingEffects$");
+    __publicField(this, "$errorEffects$");
     __publicField(this, "$destroy$");
     __publicField(this, "$promiseValue$", NEEDS_COMPUTATION);
     __publicField(this, "$promise$", null);
-    __publicField(this, _a2, null);
+    __publicField(this, _a2);
   }
   /**
    * Loading is true if the signal is still waiting for the promise to resolve, false if the promise
@@ -24530,7 +24591,7 @@ var AsyncComputedSignalImpl = class extends (_b2 = ComputedSignalImpl, _a2 = _EF
       this.$untrackedLoading$ = value;
       this.$container$?.$scheduler$(
         7 /* RECOMPUTE_AND_SCHEDULE_EFFECTS */,
-        null,
+        void 0,
         this,
         this.$loadingEffects$
       );
@@ -24552,7 +24613,7 @@ var AsyncComputedSignalImpl = class extends (_b2 = ComputedSignalImpl, _a2 = _EF
       this.$untrackedError$ = value;
       this.$container$?.$scheduler$(
         7 /* RECOMPUTE_AND_SCHEDULE_EFFECTS */,
-        null,
+        void 0,
         this,
         this.$errorEffects$
       );
@@ -24582,7 +24643,7 @@ var AsyncComputedSignalImpl = class extends (_b2 = ComputedSignalImpl, _a2 = _EF
     if (isPromise(untrackedValue)) {
       const isFirstComputation = this.$promiseValue$ === NEEDS_COMPUTATION;
       this.untrackedLoading = true;
-      this.untrackedError = null;
+      this.untrackedError = void 0;
       if (this.$promiseValue$ !== NEEDS_COMPUTATION) {
         cleanupDestroyable(this);
       }
@@ -24590,7 +24651,7 @@ var AsyncComputedSignalImpl = class extends (_b2 = ComputedSignalImpl, _a2 = _EF
         DEBUG3 && log3("Promise resolved", promiseValue);
         this.$promiseValue$ = promiseValue;
         this.untrackedLoading = false;
-        this.untrackedError = null;
+        this.untrackedError = void 0;
         if (this.setValue(promiseValue)) {
           DEBUG3 && log3("Scheduling effects for subscribers", this.$effects$?.size);
           scheduleEffects(this.$container$, this, this.$effects$);
@@ -24989,8 +25050,8 @@ var WrappedSignalImpl = class extends (_b3 = SignalImpl, _a3 = _EFFECT_BACK_REF,
     __publicField(this, "$func$");
     __publicField(this, "$funcStr$");
     __publicField(this, "$flags$");
-    __publicField(this, "$hostElement$", null);
-    __publicField(this, _a3, null);
+    __publicField(this, "$hostElement$");
+    __publicField(this, _a3);
     this.$args$ = args;
     this.$func$ = fn;
     this.$funcStr$ = fnStr;
@@ -25205,7 +25266,7 @@ var StoreHandler = class {
   constructor($flags$, $container$) {
     this.$flags$ = $flags$;
     this.$container$ = $container$;
-    __publicField(this, "$effects$", null);
+    __publicField(this, "$effects$");
   }
   toString() {
     return "[Store]";
@@ -25214,9 +25275,9 @@ var StoreHandler = class {
     const target = getStoreTarget(this);
     this.$container$?.$scheduler$(
       7 /* RECOMPUTE_AND_SCHEDULE_EFFECTS */,
-      null,
+      void 0,
       this,
-      getEffects(target, prop, this.$effects$)
+      getEffects2(target, prop, this.$effects$)
     );
   }
   get(target, prop) {
@@ -25288,9 +25349,9 @@ var StoreHandler = class {
     if (!Array.isArray(target)) {
       this.$container$?.$scheduler$(
         7 /* RECOMPUTE_AND_SCHEDULE_EFFECTS */,
-        null,
+        void 0,
         this,
-        getEffects(target, prop, this.$effects$)
+        getEffects2(target, prop, this.$effects$)
       );
     }
     return true;
@@ -25351,17 +25412,17 @@ function addStoreEffect(target, prop, store, effectSubscription) {
 }
 function setNewValueAndTriggerEffects(prop, value, target, currentStore) {
   target[prop] = value;
-  const effects = getEffects(target, prop, currentStore.$effects$);
+  const effects = getEffects2(target, prop, currentStore.$effects$);
   if (effects) {
     currentStore.$container$?.$scheduler$(
       7 /* RECOMPUTE_AND_SCHEDULE_EFFECTS */,
-      null,
+      void 0,
       currentStore,
       effects
     );
   }
 }
-function getEffects(target, prop, storeEffects) {
+function getEffects2(target, prop, storeEffects) {
   let effectsToTrigger;
   if (storeEffects) {
     if (Array.isArray(target)) {
@@ -25382,7 +25443,7 @@ function getEffects(target, prop, storeEffects) {
       effectsToTrigger.add(effect);
     }
   }
-  return effectsToTrigger || null;
+  return effectsToTrigger;
 }
 
 // packages/qwik/src/core/reactive-primitives/subscription-data.ts
@@ -25398,7 +25459,7 @@ var _a4;
 _a4 = _EFFECT_BACK_REF;
 var BackRef = class {
   constructor() {
-    __publicField(this, _a4, null);
+    __publicField(this, _a4);
   }
 };
 function clearAllEffects(container, consumer) {
@@ -25412,6 +25473,7 @@ function clearAllEffects(container, consumer) {
   for (const [, effect] of effects) {
     clearEffectSubscription(container, effect);
   }
+  effects.clear();
 }
 function clearEffectSubscription(container, effect) {
   const backRefs = effect[2 /* BACK_REF */];
@@ -25423,12 +25485,16 @@ function clearEffectSubscription(container, effect) {
       clearSignal(container, producer, effect);
     } else if (producer instanceof AsyncComputedSignalImpl) {
       clearAsyncComputedSignal(producer, effect);
+    } else if (isPropsProxy(producer)) {
+      const propsHandler = producer[_PROPS_HANDLER];
+      clearStoreOrProps(propsHandler, effect);
     } else if (container.$storeProxyMap$.has(producer)) {
       const target = container.$storeProxyMap$.get(producer);
       const storeHandler = getStoreHandler(target);
-      clearStore(storeHandler, effect);
+      clearStoreOrProps(storeHandler, effect);
     }
   }
+  backRefs.clear();
 }
 function clearSignal(container, producer, effect) {
   const effects = producer.$effects$;
@@ -25436,7 +25502,7 @@ function clearSignal(container, producer, effect) {
     effects.delete(effect);
   }
   if (producer instanceof WrappedSignalImpl) {
-    producer.$hostElement$ = null;
+    producer.$hostElement$ = void 0;
     clearAllEffects(container, producer);
   }
 }
@@ -25450,14 +25516,14 @@ function clearAsyncComputedSignal(producer, effect) {
     pendingEffects.delete(effect);
   }
 }
-function clearStore(producer, effect) {
+function clearStoreOrProps(producer, effect) {
   const effects = producer?.$effects$;
   if (effects) {
-    for (const [propKey, propEffects] of effects.entries()) {
+    for (const [prop, propEffects] of effects.entries()) {
       if (propEffects.has(effect)) {
         propEffects.delete(effect);
         if (propEffects.size === 0) {
-          effects.delete(propKey);
+          effects.delete(prop);
         }
       }
     }
@@ -25717,12 +25783,12 @@ var _jsxSplit = (type, varProps, constProps, children, flags, key, dev) => {
       for (const k in varProps) {
         if (k === "children") {
           children || (children = varProps.children);
-          varProps.children = void 0;
+          delete varProps.children;
         } else if (k === "key") {
           key || (key = varProps.key);
-          varProps.key = void 0;
+          delete varProps.key;
         } else if (constProps && k in constProps) {
-          varProps[k] = void 0;
+          delete varProps[k];
         }
       }
     }
@@ -26445,8 +26511,8 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
           } else if (isSignal(jsxValue)) {
             expectVirtual("S" /* WrappedSignal */, null);
             const unwrappedSignal = jsxValue instanceof WrappedSignalImpl ? jsxValue.$unwrapIfSignal$() : jsxValue;
-            const currentSignal = vCurrent?.[_EFFECT_BACK_REF]?.get("." /* VNODE */)?.[0 /* CONSUMER */];
-            if (currentSignal !== unwrappedSignal) {
+            const hasUnwrappedSignal = vCurrent?.[_EFFECT_BACK_REF]?.get("." /* VNODE */)?.[2 /* BACK_REF */]?.has(unwrappedSignal);
+            if (!hasUnwrappedSignal) {
               const vHost = vNewNode || vCurrent;
               descend(
                 resolveSignalAndDescend(
@@ -26802,14 +26868,15 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
         if (isHtmlAttributeAnEventName(key2)) {
           const data = getEventDataFromHtmlAttribute(key2);
           if (data) {
-            const scope = data[0];
-            const eventName = data[1];
+            const [scope, eventName] = data;
+            const scopedEvent = getScopedEventName(scope, eventName);
+            const loaderScopedEvent = getLoaderScopedEventName(scope, scopedEvent);
             if (eventName) {
-              vNewNode.setProp(HANDLER_PREFIX + ":" + scope + ":" + eventName, value);
+              vNewNode.setProp(HANDLER_PREFIX + ":" + scopedEvent, value);
               if (scope) {
                 vNewNode.setAttr(key2, "", journal);
               }
-              registerQwikLoaderEvent(eventName);
+              registerQwikLoaderEvent(loaderScopedEvent);
             }
           }
           needsQDispatchEventPatch = true;
@@ -26962,14 +27029,24 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
     let srcIdx = 0;
     let dstIdx = 0;
     let patchEventDispatch = false;
-    const setAttribute = (key, value, vHost) => {
-      vHost.setAttr(
-        key,
-        value !== null ? serializeAttribute(key, value, scopedStyleIdPrefix) : null,
-        journal
-      );
+    const setAttributeDirect = (vnode2, key, value, dstIdx2, isNewKey) => {
+      const serializedValue = value != null ? serializeAttribute(key, value, scopedStyleIdPrefix) : null;
+      if (isNewKey) {
+        if (serializedValue != null) {
+          dstAttrs.splice(dstIdx2, 0, key, serializedValue);
+          journal.push(2 /* SetAttribute */, vnode2.element, key, serializedValue);
+        }
+      } else {
+        if (serializedValue != null) {
+          dstAttrs[dstIdx2 + 1] = serializedValue;
+          journal.push(2 /* SetAttribute */, vnode2.element, key, serializedValue);
+        } else {
+          dstAttrs.splice(dstIdx2, 2);
+          journal.push(2 /* SetAttribute */, vnode2.element, key, null);
+        }
+      }
     };
-    const record = (key, value) => {
+    const record = (key, value, dstIdx2, isNewKey) => {
       if (key.startsWith(":")) {
         vnode.setProp(key, value);
         return;
@@ -27013,27 +27090,32 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
       }
       if (isPromise(value)) {
         const vHost = vnode;
-        const attributePromise = value.then(
-          (resolvedValue) => setAttribute(key, resolvedValue, vHost)
-        );
+        const attributePromise = value.then((resolvedValue) => {
+          const idx = mapApp_findIndx(dstAttrs, key, 0);
+          const isNewKey2 = idx < 0;
+          const currentDstIdx = isNewKey2 ? idx ^ -1 : idx;
+          setAttributeDirect(vHost, key, resolvedValue, currentDstIdx, isNewKey2);
+        });
         asyncAttributePromises.push(attributePromise);
         return;
       }
-      setAttribute(key, value, vnode);
+      setAttributeDirect(vnode, key, value, dstIdx2, isNewKey);
     };
     const recordJsxEvent = (key, value) => {
       const data = getEventDataFromHtmlAttribute(key);
       if (data) {
         const [scope, eventName] = data;
-        record(":" + scope + ":" + eventName, value);
-        registerQwikLoaderEvent(eventName);
+        const scopedEvent = getScopedEventName(scope, eventName);
+        const loaderScopedEvent = getLoaderScopedEventName(scope, scopedEvent);
+        record(":" + scopedEvent, value, 0, false);
+        registerQwikLoaderEvent(loaderScopedEvent);
         patchEventDispatch = true;
       }
     };
     while (srcIdx < srcAttrs.length || dstIdx < dstAttrs.length) {
       const srcKey = srcIdx < srcAttrs.length ? srcAttrs[srcIdx] : void 0;
       const dstKey = dstIdx < dstAttrs.length ? dstAttrs[dstIdx] : void 0;
-      if (dstKey?.startsWith(HANDLER_PREFIX) || dstKey?.startsWith(Q_PREFIX)) {
+      if (dstKey?.startsWith(HANDLER_PREFIX)) {
         dstIdx += 2;
         continue;
       }
@@ -27041,14 +27123,14 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
         if (isHtmlAttributeAnEventName(dstKey)) {
           dstIdx += 2;
         } else {
-          record(dstKey, null);
+          record(dstKey, null, dstIdx, false);
         }
       } else if (dstKey === void 0) {
         const srcValue = srcAttrs[srcIdx + 1];
         if (isHtmlAttributeAnEventName(srcKey)) {
           recordJsxEvent(srcKey, srcValue);
         } else {
-          record(srcKey, srcValue);
+          record(srcKey, srcValue, dstIdx, true);
         }
         srcIdx += 2;
         dstIdx += 2;
@@ -27060,7 +27142,7 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
           if (isEventHandler) {
             recordJsxEvent(srcKey, srcValue);
           } else {
-            record(srcKey, srcValue);
+            record(srcKey, srcValue, dstIdx, false);
           }
         } else if (isEventHandler && !vnode.element.qDispatchEvent) {
           recordJsxEvent(srcKey, srcValue);
@@ -27072,7 +27154,7 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
         if (isHtmlAttributeAnEventName(srcKey)) {
           recordJsxEvent(srcKey, srcValue);
         } else {
-          record(srcKey, srcValue);
+          record(srcKey, srcValue, dstIdx, true);
         }
         srcIdx += 2;
         dstIdx += 2;
@@ -27080,7 +27162,7 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
         if (isHtmlAttributeAnEventName(dstKey)) {
           dstIdx += 2;
         } else {
-          record(dstKey, null);
+          record(dstKey, null, dstIdx, false);
         }
       }
     }
@@ -27264,32 +27346,14 @@ var vnode_diff = (container, jsxNode, vStartNode, scopedStyleIdPrefix) => {
         deleteFromSideBuffer(null, lookupKey);
       }
       if (host) {
-        let vNodeProps = host.getProp(
+        const vNodeProps = host.getProp(
           ELEMENT_PROPS,
           container.$getObjectById$
         );
-        let propsAreDifferent = false;
         if (!shouldRender) {
-          propsAreDifferent = propsDiffer(
-            jsxProps[_CONST_PROPS],
-            vNodeProps?.[_CONST_PROPS]
-          ) || propsDiffer(
-            jsxProps[_VAR_PROPS],
-            vNodeProps?.[_VAR_PROPS]
-          );
-          shouldRender = shouldRender || propsAreDifferent;
+          shouldRender || (shouldRender = handleProps(host, jsxProps, vNodeProps, container));
         }
         if (shouldRender) {
-          if (propsAreDifferent) {
-            if (vNodeProps) {
-              vNodeProps[_CONST_PROPS] = jsxProps[_CONST_PROPS];
-              vNodeProps[_VAR_PROPS] = jsxProps[_VAR_PROPS];
-              vNodeProps[_OWNER] = jsxProps[_OWNER];
-            } else if (jsxProps) {
-              host.setProp(ELEMENT_PROPS, jsxProps);
-              vNodeProps = jsxProps;
-            }
-          }
           host.setProp(OnRenderProp, componentQRL);
           host.flags &= ~32 /* Deleted */;
           container.$scheduler$(6 /* COMPONENT */, host, componentQRL, vNodeProps);
@@ -27397,7 +27461,41 @@ function getComponentHash(vNode, getObject) {
 }
 function Projection() {
 }
-function propsDiffer(src, dst) {
+function handleProps(host, jsxProps, vNodeProps, container) {
+  let shouldRender = false;
+  let propsAreDifferent = false;
+  if (vNodeProps) {
+    const effects = vNodeProps[_PROPS_HANDLER].$effects$;
+    const constPropsDifferent = handleChangedProps(
+      jsxProps[_CONST_PROPS],
+      vNodeProps[_CONST_PROPS],
+      vNodeProps[_PROPS_HANDLER],
+      container,
+      false
+    );
+    propsAreDifferent = constPropsDifferent;
+    shouldRender || (shouldRender = constPropsDifferent);
+    if (effects && effects.size > 0) {
+      const varPropsDifferent = handleChangedProps(
+        jsxProps[_VAR_PROPS],
+        vNodeProps[_VAR_PROPS],
+        vNodeProps[_PROPS_HANDLER],
+        container
+      );
+      propsAreDifferent || (propsAreDifferent = varPropsDifferent);
+    }
+  }
+  if (propsAreDifferent) {
+    if (vNodeProps) {
+      vNodeProps[_OWNER] = jsxProps[_OWNER];
+    } else if (jsxProps) {
+      host.setProp(ELEMENT_PROPS, jsxProps);
+      vNodeProps = jsxProps;
+    }
+  }
+  return shouldRender;
+}
+function handleChangedProps(src, dst, propsHandler, container, triggerEffects = true) {
   const srcEmpty = isPropsEmpty(src);
   const dstEmpty = isPropsEmpty(dst);
   if (srcEmpty && dstEmpty) {
@@ -27425,15 +27523,22 @@ function propsDiffer(src, dst) {
   if (srcLen !== dstLen) {
     return true;
   }
+  let changed = false;
+  propsHandler.$container$ = container;
   for (const key of srcKeys) {
     if (key === "children" || key === QBackRefs) {
       continue;
     }
     if (!Object.prototype.hasOwnProperty.call(dst, key) || src[key] !== dst[key]) {
-      return true;
+      changed = true;
+      if (triggerEffects) {
+        triggerPropsProxyEffect(propsHandler, key);
+      } else {
+        return true;
+      }
     }
   }
-  return false;
+  return changed;
 }
 function isPropsEmpty(props) {
   if (!props) {
@@ -27774,7 +27879,7 @@ function findAncestorBlockingChore(chore, type) {
     const blockingChores = isNormalQueue ? current.chores : current.blockedChores;
     if (blockingChores) {
       for (const blockingChore of blockingChores) {
-        if (blockingChore.$type$ < 16 /* VISIBLE */ && blockingChore.$type$ !== 3 /* TASK */ && blockingChore.$type$ !== 1 /* QRL_RESOLVE */ && blockingChore.$type$ !== 2 /* RUN_QRL */) {
+        if (blockingChore.$type$ < 16 /* VISIBLE */ && blockingChore.$type$ !== 3 /* TASK */ && blockingChore.$type$ !== 1 /* QRL_RESOLVE */ && blockingChore.$type$ !== 2 /* RUN_QRL */ && blockingChore.$state$ === 0 /* NONE */) {
           return blockingChore;
         }
       }
@@ -27800,17 +27905,17 @@ function findBlockingChore(chore, choreQueue, blockedChores, runningChores, cont
       continue;
     }
     for (const candidate of choreQueue) {
-      if (candidate.$type$ === rule.blockingType && rule.match(chore, candidate, container)) {
+      if (candidate.$type$ === rule.blockingType && rule.match(chore, candidate, container) && candidate.$state$ === 0 /* NONE */) {
         return candidate;
       }
     }
     for (const candidate of blockedChores) {
-      if (candidate.$type$ === rule.blockingType && rule.match(chore, candidate, container)) {
+      if (candidate.$type$ === rule.blockingType && rule.match(chore, candidate, container) && candidate.$state$ === 0 /* NONE */) {
         return candidate;
       }
     }
     for (const candidate of runningChores) {
-      if (candidate.$type$ === rule.blockingType && rule.match(chore, candidate, container)) {
+      if (candidate.$type$ === rule.blockingType && rule.match(chore, candidate, container) && candidate.$state$ !== 2 /* FAILED */) {
         return candidate;
       }
     }
@@ -27836,7 +27941,7 @@ function findBlockingChoreForVisible(chore, runningChores, container) {
       continue;
     }
     for (const candidate of runningChores) {
-      if (candidate.$type$ === rule.blockingType && rule.match(chore, candidate, container)) {
+      if (candidate.$type$ === rule.blockingType && rule.match(chore, candidate, container) && candidate.$state$ !== 2 /* FAILED */) {
         return candidate;
       }
     }
@@ -28017,7 +28122,7 @@ function choreComparator(a, b) {
     }
     return 1;
   }
-  if (a.$type$ === 7 /* RECOMPUTE_AND_SCHEDULE_EFFECTS */ && b.$type$ === 7 /* RECOMPUTE_AND_SCHEDULE_EFFECTS */ && (a.$target$ instanceof StoreHandler && b.$target$ instanceof StoreHandler || a.$target$ instanceof AsyncComputedSignalImpl && b.$target$ instanceof AsyncComputedSignalImpl) && a.$payload$ !== b.$payload$) {
+  if (a.$type$ === 7 /* RECOMPUTE_AND_SCHEDULE_EFFECTS */ && b.$type$ === 7 /* RECOMPUTE_AND_SCHEDULE_EFFECTS */ && (a.$target$ instanceof StoreHandler && b.$target$ instanceof StoreHandler || a.$target$ instanceof PropsProxyHandler && b.$target$ instanceof PropsProxyHandler || a.$target$ instanceof AsyncComputedSignalImpl && b.$target$ instanceof AsyncComputedSignalImpl) && a.$payload$ !== b.$payload$) {
     return 1;
   }
   return 0;
@@ -28129,6 +28234,13 @@ This is often caused by modifying a signal in an already rendered component duri
     }
     const shouldBlock = chore.$type$ !== 1 /* QRL_RESOLVE */ && chore.$type$ !== 2 /* RUN_QRL */;
     if (shouldBlock) {
+      const runningChore = getRunningChore(chore);
+      if (runningChore) {
+        if (isResourceChore(runningChore)) {
+          addBlockedChore(chore, runningChore, blockedChores);
+        }
+        return chore;
+      }
       const blockingChore = findBlockingChore(
         chore,
         choreQueue,
@@ -28140,11 +28252,6 @@ This is often caused by modifying a signal in an already rendered component duri
         addBlockedChore(chore, blockingChore, blockedChores);
         return chore;
       }
-      const runningChore = getRunningChore(chore);
-      if (runningChore) {
-        addBlockedChore(chore, runningChore, blockedChores);
-        return chore;
-      }
     }
     addChoreAndIncrementBlockingCounter(chore, choreQueue);
     DEBUG6 && debugTrace(
@@ -28301,7 +28408,7 @@ This is often caused by modifying a signal in an already rendered component duri
           applyJournalFlush();
           const blockingChore = findBlockingChoreForVisible(chore, runningChores, container);
           if (blockingChore && blockingChore.$state$ === 1 /* RUNNING */) {
-            addBlockedChore(chore, blockingChore, blockedChores);
+            (blockingChore.$blockedChores$ || (blockingChore.$blockedChores$ = new ChoreArray())).add(chore);
             continue;
           }
         }
@@ -28577,8 +28684,14 @@ function addChore(chore, choreArray) {
 function vNodeAlreadyDeleted(chore) {
   return !!(chore.$host$ && vnode_isVNode(chore.$host$) && chore.$host$.flags & 32 /* Deleted */);
 }
+function isResourceChore(chore) {
+  return chore.$type$ === 3 /* TASK */ && !!chore.$payload$ && !!(chore.$payload$.$flags$ & 4 /* RESOURCE */);
+}
 function addBlockedChore(blockedChore, blockingChore, blockedChores) {
   var _a5;
+  if (!isResourceChore(blockedChore) && choreComparator(blockedChore, blockingChore) === 0) {
+    return;
+  }
   DEBUG6 && debugTrace(
     `blocked chore by ${debugChoreToString(blockingChore)}`,
     blockedChore,
@@ -28678,9 +28791,9 @@ function debugTrace(action, arg, queue2, blockedChores) {
       lines.push(line);
     }
   }
-  if (blockedChores && blockedChores.size > 0) {
+  if (blockedChores && blockedChores.length > 0) {
     lines.push("");
-    lines.push(`\u{1F6AB} Blocked Chores (${blockedChores.size} items):`);
+    lines.push(`\u{1F6AB} Blocked Chores (${blockedChores.length} items):`);
     Array.from(blockedChores).forEach((chore, index) => {
       const type = debugChoreTypeToString(chore.$type$);
       const host = String(chore.$host$).replaceAll(/\n.*/gim, "");
@@ -28867,15 +28980,15 @@ async function serialize(serializationContext) {
   const s11nWeakRefs = /* @__PURE__ */ new Map();
   let parent;
   const qrlMap = /* @__PURE__ */ new Map();
-  const outputArray = (value, keepNulls, writeFn) => {
+  const outputArray = (value, keepUndefined, writeFn) => {
     $writer$.write("[");
     let separator = false;
     let length;
-    if (keepNulls) {
+    if (keepUndefined) {
       length = value.length;
     } else {
       length = value.length - 1;
-      while (length >= 0 && value[length] === null) {
+      while (length >= 0 && value[length] === void 0) {
         length--;
       }
       length++;
@@ -28890,7 +29003,7 @@ async function serialize(serializationContext) {
     }
     $writer$.write("]");
   };
-  const output = (type, value, keepNulls) => {
+  const output = (type, value, keepUndefined) => {
     $writer$.write(`${type},`);
     if (typeof value === "number") {
       $writer$.write(value.toString());
@@ -28905,7 +29018,7 @@ async function serialize(serializationContext) {
       }
       $writer$.write(lastIdx === 0 ? s : s.slice(lastIdx));
     } else {
-      outputArray(value, keepNulls, (valueItem, idx) => {
+      outputArray(value, !!keepUndefined, (valueItem, idx) => {
         writeValue(valueItem, idx);
       });
     }
@@ -29061,7 +29174,12 @@ async function serialize(serializationContext) {
   const writeObjectValue = (value) => {
     if (isPropsProxy(value)) {
       const owner = value[_OWNER];
-      output(32 /* PropsProxy */, [_serializationWeakRef(owner), owner.varProps, owner.constProps]);
+      output(32 /* PropsProxy */, [
+        _serializationWeakRef(owner),
+        owner.varProps,
+        owner.constProps,
+        value[_PROPS_HANDLER].$effects$
+      ]);
     } else if (value instanceof SubscriptionData) {
       output(33 /* SubscriptionData */, [value.data.$scopedStyleIdPrefix$, value.data.$isConst$]);
     } else if (isStore(value)) {
@@ -29090,7 +29208,7 @@ async function serialize(serializationContext) {
           }
         }
         const out = [storeTarget, flags, effects, ...innerStores];
-        while (out[out.length - 1] == null) {
+        while (out[out.length - 1] === void 0) {
           out.pop();
         }
         output(29 /* Store */, out);
@@ -29099,7 +29217,13 @@ async function serialize(serializationContext) {
       const result2 = value[SerializerSymbol](value);
       if (isPromise(result2)) {
         const forwardRef = resolvePromise(result2, $addRoot$, (resolved, resolvedValue) => {
-          return new PromiseResult(28 /* SerializerSignal */, resolved, resolvedValue, null, null);
+          return new PromiseResult(
+            28 /* SerializerSignal */,
+            resolved,
+            resolvedValue,
+            void 0,
+            void 0
+          );
         });
         output(2 /* ForwardRef */, forwardRef);
       } else {
@@ -29128,10 +29252,9 @@ async function serialize(serializationContext) {
     } else if (value instanceof SignalImpl) {
       if (value instanceof SerializerSignalImpl) {
         addPreloadQrl(value.$computeQrl$);
-        const forwardRefId = resolvePromise(
-          getCustomSerializerPromise(value, value.$untrackedValue$),
-          $addRoot$,
-          (resolved, resolvedValue) => {
+        const maybeValue = getCustomSerializerPromise(value, value.$untrackedValue$);
+        if (isPromise(maybeValue)) {
+          const forwardRefId = resolvePromise(maybeValue, $addRoot$, (resolved, resolvedValue) => {
             return new PromiseResult(
               28 /* SerializerSignal */,
               resolved,
@@ -29139,9 +29262,11 @@ async function serialize(serializationContext) {
               value.$effects$,
               value.$computeQrl$
             );
-          }
-        );
-        output(2 /* ForwardRef */, forwardRefId);
+          });
+          output(2 /* ForwardRef */, forwardRefId);
+        } else {
+          output(28 /* SerializerSignal */, [value.$computeQrl$, value.$effects$, maybeValue]);
+        }
         return;
       }
       if (value instanceof WrappedSignalImpl) {
@@ -29176,12 +29301,22 @@ async function serialize(serializationContext) {
             value.$untrackedError$
           );
         }
+        let keepUndefined = false;
         if (v !== NEEDS_COMPUTATION) {
           out.push(v);
+          if (!isAsync && v === void 0) {
+            keepUndefined = true;
+          }
         }
-        output(isAsync ? 27 /* AsyncComputedSignal */ : 26 /* ComputedSignal */, out);
+        output(isAsync ? 27 /* AsyncComputedSignal */ : 26 /* ComputedSignal */, out, keepUndefined);
       } else {
-        output(24 /* Signal */, [value.$untrackedValue$, ...value.$effects$ || []]);
+        const v = value.$untrackedValue$;
+        const keepUndefined = v === void 0;
+        const out = [v];
+        if (value.$effects$) {
+          out.push(...value.$effects$);
+        }
+        output(24 /* Signal */, out, keepUndefined);
       }
     } else if (value instanceof URL) {
       output(6 /* URL */, value.href);
@@ -29248,9 +29383,9 @@ async function serialize(serializationContext) {
         value.varProps,
         value.constProps,
         value.children,
-        value.toSort || null
+        value.toSort || void 0
       ];
-      while (out[out.length - 1] == null) {
+      while (out[out.length - 1] === void 0) {
         out.pop();
       }
       output(31 /* JSXNode */, out);
@@ -29263,7 +29398,7 @@ async function serialize(serializationContext) {
         value[_EFFECT_BACK_REF],
         value.$state$
       ];
-      while (out[out.length - 1] == null) {
+      while (out[out.length - 1] === void 0) {
         out.pop();
       }
       output(21 /* Task */, out);
@@ -29367,7 +29502,7 @@ async function serialize(serializationContext) {
   await outputRoots();
 }
 var PromiseResult = class {
-  constructor($type$, $resolved$, $value$, $effects$ = null, $qrl$ = null) {
+  constructor($type$, $resolved$, $value$, $effects$ = void 0, $qrl$ = void 0) {
     this.$type$ = $type$;
     this.$resolved$ = $resolved$;
     this.$value$ = $value$;
@@ -29376,20 +29511,27 @@ var PromiseResult = class {
   }
 };
 function getCustomSerializerPromise(signal, value) {
-  return new Promise((resolve) => {
-    signal.$computeQrl$.resolve().then((arg) => {
+  if (value === NEEDS_COMPUTATION) {
+    return value;
+  }
+  return maybeThen(
+    signal.$computeQrl$.resolved || signal.$computeQrl$.resolve(),
+    (arg) => {
       let data;
+      if (typeof arg === "function") {
+        arg = arg();
+      }
       if (arg.serialize) {
         data = arg.serialize(value);
-      } else if (SerializerSymbol in value) {
+      } else if (typeof value === "object" && SerializerSymbol in value) {
         data = value[SerializerSymbol](value);
       }
       if (data === void 0) {
         data = NEEDS_COMPUTATION;
       }
-      resolve(data);
-    });
-  });
+      return data;
+    }
+  );
 }
 var discoverValuesForVNodeData = (vnodeData, callback) => {
   for (const value of vnodeData) {
@@ -29426,7 +29568,7 @@ function serializeWrappingFn(serializationContext, value) {
   return [syncFnId, value.$args$];
 }
 function filterEffectBackRefs(effectBackRef) {
-  let effectBackRefToSerialize = null;
+  let effectBackRefToSerialize = void 0;
   if (effectBackRef) {
     for (const [effectProp, effect] of effectBackRef) {
       if (effect[2 /* BACK_REF */]) {
@@ -29581,7 +29723,7 @@ var _SharedContainer = class {
       throw Error("Not implemented");
     };
     const choreQueue = new ChoreArray();
-    const blockedChores = /* @__PURE__ */ new Set();
+    const blockedChores = new ChoreArray();
     const runningChores = /* @__PURE__ */ new Set();
     this.$scheduler$ = createScheduler(
       this,
@@ -30090,7 +30232,7 @@ var inflate = (container, target, typeId, data) => {
       asyncComputed.$loadingEffects$ = new Set(d2[2]);
       asyncComputed.$errorEffects$ = new Set(d2[3]);
       asyncComputed.$untrackedLoading$ = d2[4];
-      asyncComputed.$untrackedError$ = d2[5] || null;
+      asyncComputed.$untrackedError$ = d2[5];
       const hasValue = d2.length > 6;
       if (hasValue) {
         asyncComputed.$untrackedValue$ = d2[6];
@@ -30105,7 +30247,9 @@ var inflate = (container, target, typeId, data) => {
       const computed = target;
       const d2 = data;
       computed.$computeQrl$ = d2[0];
-      computed.$effects$ = new Set(d2[1]);
+      if (d2[1]) {
+        computed.$effects$ = new Set(d2[1]);
+      }
       const hasValue = d2.length > 2;
       if (hasValue) {
         computed.$untrackedValue$ = d2[2];
@@ -30190,6 +30334,7 @@ var inflate = (container, target, typeId, data) => {
         owner._proxy = propsProxy;
       }
       propsProxy[_OWNER] = owner;
+      propsProxy[_PROPS_HANDLER].$effects$ = d[3];
       break;
     case 33 /* SubscriptionData */: {
       const effectData = target;
@@ -31077,9 +31222,6 @@ var DomContainer = class extends _SharedContainer {
     this.$setServerData$();
     element.setAttribute(QContainerAttr, "resumed" /* RESUMED */);
     element.qContainer = this;
-    if (!qTest && element.isConnected) {
-      element.dispatchEvent(new CustomEvent("qresume", { bubbles: true }));
-    }
     const qwikStates = element.querySelectorAll('script[type="qwik/state"]');
     if (qwikStates.length !== 0) {
       const lastState = qwikStates[qwikStates.length - 1];
@@ -31087,6 +31229,9 @@ var DomContainer = class extends _SharedContainer {
       preprocessState(this.$rawStateData$, this);
       this.$stateData$ = wrapDeserializerProxy(this, this.$rawStateData$);
     }
+    if (!qTest && element.isConnected) {
+      element.dispatchEvent(new CustomEvent("qresume", { bubbles: true }));
+    }
   }
   $setRawState$(id, vParent) {
     this.$stateData$[id] = vParent;
@@ -32015,19 +32160,18 @@ var vnode_applyJournal = (journal) => {
           key = "class";
         }
         const value = journal[idx++];
+        const shouldRemove = value == null || value === false;
         if (isBooleanAttr(element, key)) {
           element[key] = parseBoolean(value);
-        } else if (key === "value" && key in element) {
-          element.value = String(value);
         } else if (key === dangerouslySetInnerHTML) {
           element.innerHTML = value;
           element.setAttribute(QContainerAttr, "html" /* HTML */);
+        } else if (shouldRemove) {
+          element.removeAttribute(key);
+        } else if (key === "value" && key in element) {
+          element.value = String(value);
         } else {
-          if (value == null || value === false) {
-            element.removeAttribute(key);
-          } else {
-            element.setAttribute(key, String(value));
-          }
+          element.setAttribute(key, String(value));
         }
         break;
       case 3 /* HoistStyles */:
@@ -32659,6 +32803,7 @@ function materializeFromVNodeData(vParent, vData, element, child) {
     const nodeIsElement = isElement(node);
     return !nodeIsElement || nodeIsElement && shouldSkipElement(node);
   };
+  let components = null;
   processVNodeData2(vData, (peek, consumeValue, consume, getChar, nextToConsumeIdx) => {
     if (isNumber2(peek())) {
       while (shouldSkipNode(child)) {
@@ -32681,6 +32826,7 @@ function materializeFromVNodeData(vParent, vData, element, child) {
     } else if (peek() === VNodeDataChar.SCOPED_STYLE) {
       vParent.setAttr(QScopedStyle, consumeValue(), null);
     } else if (peek() === VNodeDataChar.RENDER_FN) {
+      (components || (components = [])).push(vParent);
       vParent.setAttr(OnRenderProp, consumeValue(), null);
     } else if (peek() === VNodeDataChar.ID) {
       if (!container) {
@@ -32762,6 +32908,15 @@ function materializeFromVNodeData(vParent, vData, element, child) {
       textIdx += length;
     }
   });
+  if (components) {
+    if (!container) {
+      container = getDomContainer(element);
+    }
+    for (const component of components) {
+      container.ensureProjectionResolved(component);
+    }
+    components = null;
+  }
   vParent.lastChild = vLast;
   return vFirst;
 }
@@ -33402,7 +33557,7 @@ function diffJsxVNode(received, expected, path = [], container, isSsr) {
       }
       const propLowerCased = prop.toLowerCase();
       let receivedValue = received.getAttr(prop) || received.getAttr(propLowerCased) || receivedElement?.getAttribute(prop) || receivedElement?.getAttribute(propLowerCased);
-      let expectedValue = prop === "key" || prop === ELEMENT_KEY ? receivedValue : expected.props[prop];
+      let expectedValue = prop === "key" || prop === ELEMENT_KEY ? receivedValue : untrack2(() => expected.props[prop]);
       if (typeof receivedValue === "boolean" || typeof receivedValue === "number") {
         receivedValue = serializeBooleanOrNumberAttribute(receivedValue);
       }
@@ -34450,7 +34605,7 @@ var preloaderPre = (container, options, nonce) => {
     ]);
     container.closeElement();
     const script2 = `let b=fetch("${bundleGraphPath}");import("${preloaderBundle}").then(({l})=>l(${JSON.stringify(base2)},b${optsStr}));`;
-    const scriptAttrs = ["type", "module", "async", true];
+    const scriptAttrs = ["type", "module", "async", true, "crossorigin", "anonymous"];
     if (nonce) {
       scriptAttrs.push("nonce", nonce);
     }