Merge branch 'main' into optimizeSetDOMProp

vuejs · Nov 30, 2024 · 375066e · 375066e
2 parents 07e7ab5 + f0361ba
commit 375066e
Showing 1 changed file with 31 additions and 25 deletions.
diff --git a/packages/runtime-vapor/src/apiRender.ts b/packages/runtime-vapor/src/apiRender.ts
@@ -55,32 +55,38 @@ export function setupComponent(instance: ComponentInternalInstance): void {
 
     let block: Block | undefined
 
-    if (
-      stateOrNode &&
-      (stateOrNode instanceof Node ||
-        isArray(stateOrNode) ||
-        fragmentKey in stateOrNode ||
-        componentKey in stateOrNode)
-    ) {
+    // Skip the type check for production since this is only for Dev HMR
+    if (__DEV__) {
+      if (
+        stateOrNode &&
+        (stateOrNode instanceof Node ||
+          isArray(stateOrNode) ||
+          fragmentKey in stateOrNode ||
+          componentKey in stateOrNode)
+      ) {
+        block = stateOrNode
+      } else if (isObject(stateOrNode)) {
+        instance.setupState = proxyRefs(stateOrNode)
+      }
+
+      if (!block && component.render) {
+        pauseTracking()
+        block = callWithErrorHandling(
+          component.render,
+          instance,
+          VaporErrorCodes.RENDER_FUNCTION,
+          [
+            instance.setupState, // _ctx
+            shallowReadonly(props), // $props
+            instance.emit, // $emit
+            getAttrsProxy(instance), // $attrs
+            getSlotsProxy(instance), // $slots
+          ],
+        )
+        resetTracking()
+      }
+    } else {
       block = stateOrNode
-    } else if (isObject(stateOrNode)) {
-      instance.setupState = proxyRefs(stateOrNode)
-    }
-    if (!block && component.render) {
-      pauseTracking()
-      block = callWithErrorHandling(
-        component.render,
-        instance,
-        VaporErrorCodes.RENDER_FUNCTION,
-        [
-          instance.setupState, // _ctx
-          __DEV__ ? shallowReadonly(props) : props, // $props
-          instance.emit, // $emit
-          __DEV__ ? getAttrsProxy(instance) : instance.attrs, // $attrs
-          __DEV__ ? getSlotsProxy(instance) : instance.slots, // $slots
-        ],
-      )
-      resetTracking()
     }
 
     if (!block) {