From d46a9bc721c3d5630b48c8d34678e167976e7c49 Mon Sep 17 00:00:00 2001
From: yradex <11014207+Yradex@users.noreply.github.com>
Date: Thu, 30 Apr 2026 18:08:15 +0800
Subject: [PATCH] test(et): drop generic host render fallback

---
 .../render/render-to-opcodes.et.test.jsx      | 88 +++++++++++--------
 .../runtime/render/render-to-opcodes.ts       | 54 +++---------
 2 files changed, 59 insertions(+), 83 deletions(-)

diff --git a/packages/react/runtime/__test__/element-template/runtime/render/render-to-opcodes.et.test.jsx b/packages/react/runtime/__test__/element-template/runtime/render/render-to-opcodes.et.test.jsx
index fb9e763d9d..2458adcaaf 100644
--- a/packages/react/runtime/__test__/element-template/runtime/render/render-to-opcodes.et.test.jsx
+++ b/packages/react/runtime/__test__/element-template/runtime/render/render-to-opcodes.et.test.jsx
@@ -14,6 +14,7 @@ import {
   __OpText,
   renderToString,
 } from '../../../../src/element-template/runtime/render/render-to-opcodes';
+import { DIFFED, PARENT } from '../../../../src/shared/render-constants';
 
 describe('Element Template renderToOpcodes', () => {
   it('should export correct opcodes', () => {
@@ -27,7 +28,7 @@ describe('Element Template renderToOpcodes', () => {
   it('should emit slot opcodes for ET host slot arrays', () => {
     const Template = '_et_test_root';
     const opcodes = renderToString(
-      <Template children={[null, null, null, <text>marker</text>]} />,
+      <Template children={[null, null, null, 'marker']} />,
     );
 
     expect(opcodes[0]).toBe(__OpBegin);
@@ -58,36 +59,45 @@ describe('Element Template renderToOpcodes', () => {
     ]);
   });
 
-  it('renders generic host nodes while skipping non-renderable children', () => {
-    const opcodes = renderToString(
-      h(
-        'view',
-        { id: 'root', onTap: () => {} },
-        ['', 0, false, null, h('text', { key: 'marker' }, 'marker'), () => {}],
-      ),
+  it('ignores function values in render output', () => {
+    expect(renderToString(() => {})).toEqual([]);
+  });
+
+  it('throws in development when a plain host vnode reaches the ET render path', () => {
+    expect(() => renderToString(h('view', null))).toThrow(
+      'Element Template main-thread renderer received an uncompiled host vnode: view',
     );
+  });
 
-    const normalized = opcodes.map((item) => {
-      if (typeof item === 'object') {
-        return item.type;
-      }
-      return item;
-    });
-    expect(normalized).toEqual([
-      __OpBegin,
-      'view',
-      __OpAttr,
-      'id',
-      'root',
-      __OpText,
-      '0',
-      __OpBegin,
-      'text',
-      __OpText,
-      'marker',
-      __OpEnd,
-      __OpEnd,
-    ]);
+  it('throws in development when an invalid vnode reaches the ET render path', () => {
+    expect(() => renderToString({ type: null, props: {} })).toThrow(
+      'Element Template main-thread renderer received an invalid vnode.',
+    );
+  });
+
+  it('cleans vnodes before throwing development renderer invariant errors', () => {
+    const previousDiffed = options[DIFFED];
+    const cleaned = [];
+    const plainHostVNode = h('view', null);
+    const invalidVNode = { type: null, props: {} };
+    options[DIFFED] = vnode => {
+      cleaned.push(vnode);
+    };
+
+    try {
+      expect(() => renderToString(plainHostVNode)).toThrow(
+        'Element Template main-thread renderer received an uncompiled host vnode: view',
+      );
+      expect(() => renderToString(invalidVNode)).toThrow(
+        'Element Template main-thread renderer received an invalid vnode.',
+      );
+    } finally {
+      options[DIFFED] = previousDiffed;
+    }
+
+    expect(cleaned).toEqual([plainHostVNode, invalidVNode]);
+    expect(plainHostVNode[PARENT]).toBeUndefined();
+    expect(invalidVNode[PARENT]).toBeUndefined();
   });
 
   it('calls the unmount option while cleaning rendered vnodes', () => {
@@ -98,7 +108,7 @@ describe('Element Template renderToOpcodes', () => {
     };
 
     try {
-      renderToString(h('view', null, h('text', null, 'cleanup')));
+      renderToString(h('__et_builtin_raw_text__', { attributeSlots: ['cleanup'] }));
     } finally {
       options.unmount = previousUnmount;
     }
@@ -108,13 +118,13 @@ describe('Element Template renderToOpcodes', () => {
 
   it('renders direct fragments', () => {
     expect(renderToString(
-      h(Fragment, null, h('text', null, 'direct-fragment')),
+      h(Fragment, null, 'direct-fragment'),
     )).toContain('direct-fragment');
   });
 
   it('unwraps unkeyed top-level fragments returned from components', () => {
     function UnkeyedFragment() {
-      return h(Fragment, null, h('text', null, 'unkeyed-fragment'));
+      return h(Fragment, null, 'unkeyed-fragment');
     }
 
     expect(renderToString(h(UnkeyedFragment, null))).toContain('unkeyed-fragment');
@@ -133,7 +143,7 @@ describe('Element Template renderToOpcodes', () => {
       }
 
       render() {
-        return h('text', null, this.state.value);
+        return this.state.value;
       }
     }
 
@@ -163,17 +173,17 @@ describe('Element Template renderToOpcodes', () => {
       static contextType = ThemeContext;
 
       render() {
-        return h('text', null, this.context);
+        return this.context;
       }
     }
 
     function LegacyReader(_props, context) {
-      return h('text', null, context.legacyTheme);
+      return context.legacyTheme;
     }
 
     function FragmentWrapper() {
       return h(
-        h.Fragment,
+        Fragment,
         null,
         h(ModernReader, null),
         h(LegacyReader, null),
@@ -204,7 +214,7 @@ describe('Element Template renderToOpcodes', () => {
     const opcodes = renderToString(
       h(
         Suspense,
-        { fallback: h('text', null, 'loading') },
+        { fallback: 'loading' },
         h(AsyncText, null),
       ),
     );
@@ -218,7 +228,7 @@ describe('Element Template renderToOpcodes', () => {
       if (count === 0) {
         setCount(1);
       }
-      return h('text', null, String(count));
+      return String(count);
     }
 
     expect(renderToString(h(DirtyHookComponent, null))).toContain('0');
@@ -231,7 +241,7 @@ describe('Element Template renderToOpcodes', () => {
       static contextType = ThemeContext;
 
       render() {
-        return h('text', null, this.context);
+        return this.context;
       }
     }
 
diff --git a/packages/react/runtime/src/element-template/runtime/render/render-to-opcodes.ts b/packages/react/runtime/src/element-template/runtime/render/render-to-opcodes.ts
index 2b0cf86d29..57f5d490af 100644
--- a/packages/react/runtime/src/element-template/runtime/render/render-to-opcodes.ts
+++ b/packages/react/runtime/src/element-template/runtime/render/render-to-opcodes.ts
@@ -265,50 +265,14 @@ function renderCompiledEtHostVNode(vnode, props, context, opcodes) {
 }
 
 function renderStringHostVNode(type, vnode, props, context, opcodes) {
-  // TODO(element-template): remove this split once the remaining runtime-only
-  // fixtures stop sending plain string hosts through the ET render path.
-  if (isCompiledEtHostType(type)) {
-    renderCompiledEtHostVNode(vnode, props, context, opcodes);
-  } else {
-    renderGenericHostVNode(vnode, props, context, opcodes);
-  }
-}
-
-function renderGenericHostVNode(vnode, props, context, opcodes) {
-  opcodes.push(__OpBegin, vnode);
-
-  let children;
-  for (const name in props) {
-    const value = props[name];
-
-    switch (name) {
-      case 'children':
-        children = value;
-        continue;
-
-      /* c8 ignore next 5 */
-      case 'key':
-      case 'ref':
-      case '__self':
-      case '__source':
-        continue;
-
-      default: {}
-    }
-
-    if (value != null && value !== false && typeof value !== 'function') {
-      opcodes.push(__OpAttr, name, value);
-    }
-  }
-
-  if (typeof children === 'string' || typeof children === 'number') {
-    opcodes.push(__OpText, children);
-  } else if (children != null && children !== false && children !== true) {
-    _renderToString(children, context, vnode, opcodes);
+  if (__DEV__ && !isCompiledEtHostType(type)) {
+    cleanupVNode(vnode);
+    throw new Error(
+      `Element Template main-thread renderer received an uncompiled host vnode: ${type}`,
+    );
   }
 
-  cleanupVNode(vnode);
-  opcodes.push(__OpEnd);
+  renderCompiledEtHostVNode(vnode, props, context, opcodes);
 }
 
 /**
@@ -370,8 +334,10 @@ function _renderToString(
     return;
   }
 
-  renderGenericHostVNode(vnode, props, context, opcodes);
-  return;
+  if (__DEV__) {
+    cleanupVNode(vnode);
+    throw new Error('Element Template main-thread renderer received an invalid vnode.');
+  }
 }
 
 /** The `.render()` method for a PFC backing instance. */