From 5f222c738a8858cf826002680cedd590f591bd17 Mon Sep 17 00:00:00 2001
From: Moir <ys0514@yeah.net>
Date: Tue, 15 Apr 2025 14:46:11 +0800
Subject: [PATCH 01/21] fix(create-rspeedy): monorepo type error

---
 packages/rspeedy/create-rspeedy/template-react-ts/tsconfig.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rspeedy/create-rspeedy/template-react-ts/tsconfig.json b/packages/rspeedy/create-rspeedy/template-react-ts/tsconfig.json
index 802b9e24d8..dbd117d264 100644
--- a/packages/rspeedy/create-rspeedy/template-react-ts/tsconfig.json
+++ b/packages/rspeedy/create-rspeedy/template-react-ts/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "jsx": "preserve",
+    "jsx": "react-jsx",
 
     "module": "node16",
     "moduleResolution": "node16",

From 73945ffe589deea05c3acd17e9fa52fe57e304b7 Mon Sep 17 00:00:00 2001
From: Moir <ys0514@yeah.net>
Date: Wed, 16 Apr 2025 14:13:41 +0800
Subject: [PATCH 02/21] feat(react):standalone namespace JSX

---
 packages/react/runtime/jsx-dev-runtime/index.d.ts    | 12 ++++++++++++
 packages/react/runtime/jsx-runtime/index.d.ts        | 12 ++++++++++++
 .../create-rspeedy/template-react-ts/tsconfig.json   |  2 +-
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/packages/react/runtime/jsx-dev-runtime/index.d.ts b/packages/react/runtime/jsx-dev-runtime/index.d.ts
index fc78a67e03..e96dc9255a 100644
--- a/packages/react/runtime/jsx-dev-runtime/index.d.ts
+++ b/packages/react/runtime/jsx-dev-runtime/index.d.ts
@@ -3,3 +3,15 @@
 // LICENSE file in the root directory of this source tree.
 export { jsxDEV, Fragment } from 'react/jsx-dev-runtime';
 export { jsx, jsxs } from 'react/jsx-runtime';
+import { JSX as _JSX } from 'react';
+
+export namespace JSX {
+  interface IntrinsicElements extends _IntrinsicElements {
+  }
+
+  interface IntrinsicAttributes {
+    ref?: unknown | ((e: unknown) => void) | undefined;
+  }
+
+  type Element = _JSX.Element;
+}
diff --git a/packages/react/runtime/jsx-runtime/index.d.ts b/packages/react/runtime/jsx-runtime/index.d.ts
index 756bbc4128..86f3d23233 100644
--- a/packages/react/runtime/jsx-runtime/index.d.ts
+++ b/packages/react/runtime/jsx-runtime/index.d.ts
@@ -2,3 +2,15 @@
 // Licensed under the Apache License Version 2.0 that can be found in the
 // LICENSE file in the root directory of this source tree.
 export { jsx, jsxs, Fragment } from 'react/jsx-runtime';
+import { JSX as _JSX } from 'react';
+
+export namespace JSX {
+  interface IntrinsicElements extends _IntrinsicElements {
+  }
+
+  interface IntrinsicAttributes {
+    ref?: unknown | ((e: unknown) => void) | undefined;
+  }
+
+  type Element = _JSX.Element;
+}
diff --git a/packages/rspeedy/create-rspeedy/template-react-ts/tsconfig.json b/packages/rspeedy/create-rspeedy/template-react-ts/tsconfig.json
index dbd117d264..156bf57426 100644
--- a/packages/rspeedy/create-rspeedy/template-react-ts/tsconfig.json
+++ b/packages/rspeedy/create-rspeedy/template-react-ts/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "jsx": "react-jsx",
-
+    "jsxImportSource": "@lynx-js/react",
     "module": "node16",
     "moduleResolution": "node16",
 

From 95c595a90b7d2f490be8b3b9113f6f3879b1b8fa Mon Sep 17 00:00:00 2001
From: Moir <ys0514@yeah.net>
Date: Wed, 16 Apr 2025 14:29:17 +0800
Subject: [PATCH 03/21] chore: import types

---
 packages/react/runtime/jsx-dev-runtime/index.d.ts | 1 +
 packages/react/runtime/jsx-runtime/index.d.ts     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/react/runtime/jsx-dev-runtime/index.d.ts b/packages/react/runtime/jsx-dev-runtime/index.d.ts
index e96dc9255a..7336436a89 100644
--- a/packages/react/runtime/jsx-dev-runtime/index.d.ts
+++ b/packages/react/runtime/jsx-dev-runtime/index.d.ts
@@ -3,6 +3,7 @@
 // LICENSE file in the root directory of this source tree.
 export { jsxDEV, Fragment } from 'react/jsx-dev-runtime';
 export { jsx, jsxs } from 'react/jsx-runtime';
+import { IntrinsicElements as _IntrinsicElements } from '@lynx-js/types';
 import { JSX as _JSX } from 'react';
 
 export namespace JSX {
diff --git a/packages/react/runtime/jsx-runtime/index.d.ts b/packages/react/runtime/jsx-runtime/index.d.ts
index 86f3d23233..b0017aba36 100644
--- a/packages/react/runtime/jsx-runtime/index.d.ts
+++ b/packages/react/runtime/jsx-runtime/index.d.ts
@@ -2,6 +2,7 @@
 // Licensed under the Apache License Version 2.0 that can be found in the
 // LICENSE file in the root directory of this source tree.
 export { jsx, jsxs, Fragment } from 'react/jsx-runtime';
+import { IntrinsicElements as _IntrinsicElements } from '@lynx-js/types';
 import { JSX as _JSX } from 'react';
 
 export namespace JSX {

From 8e182ebe49612b004a43c9a93eef6b7c494dd822 Mon Sep 17 00:00:00 2001
From: Moir <ys0514@yeah.net>
Date: Wed, 16 Apr 2025 19:33:28 +0800
Subject: [PATCH 04/21] chore: remove ref types , WIP

---
 packages/react/runtime/jsx-dev-runtime/index.d.ts | 11 ++++-------
 packages/react/runtime/jsx-runtime/index.d.ts     | 11 ++++-------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/packages/react/runtime/jsx-dev-runtime/index.d.ts b/packages/react/runtime/jsx-dev-runtime/index.d.ts
index 7336436a89..a37f64a191 100644
--- a/packages/react/runtime/jsx-dev-runtime/index.d.ts
+++ b/packages/react/runtime/jsx-dev-runtime/index.d.ts
@@ -3,16 +3,13 @@
 // LICENSE file in the root directory of this source tree.
 export { jsxDEV, Fragment } from 'react/jsx-dev-runtime';
 export { jsx, jsxs } from 'react/jsx-runtime';
-import { IntrinsicElements as _IntrinsicElements } from '@lynx-js/types';
-import { JSX as _JSX } from 'react';
+import { IntrinsicElements as _IntrinsicElements, type NodesRef } from '@lynx-js/types';
+import { JSX as _JSX, type Ref } from 'react';
 
 export namespace JSX {
-  interface IntrinsicElements extends _IntrinsicElements {
-  }
+  interface IntrinsicElements extends _IntrinsicElements {}
 
-  interface IntrinsicAttributes {
-    ref?: unknown | ((e: unknown) => void) | undefined;
-  }
+  interface IntrinsicAttributes {}
 
   type Element = _JSX.Element;
 }
diff --git a/packages/react/runtime/jsx-runtime/index.d.ts b/packages/react/runtime/jsx-runtime/index.d.ts
index b0017aba36..717d6a63b5 100644
--- a/packages/react/runtime/jsx-runtime/index.d.ts
+++ b/packages/react/runtime/jsx-runtime/index.d.ts
@@ -2,16 +2,13 @@
 // Licensed under the Apache License Version 2.0 that can be found in the
 // LICENSE file in the root directory of this source tree.
 export { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import { IntrinsicElements as _IntrinsicElements } from '@lynx-js/types';
-import { JSX as _JSX } from 'react';
+import { IntrinsicElements as _IntrinsicElements, type NodesRef } from '@lynx-js/types';
+import { JSX as _JSX, type Ref } from 'react';
 
 export namespace JSX {
-  interface IntrinsicElements extends _IntrinsicElements {
-  }
+  interface IntrinsicElements extends _IntrinsicElements {}
 
-  interface IntrinsicAttributes {
-    ref?: unknown | ((e: unknown) => void) | undefined;
-  }
+  interface IntrinsicAttributes {}
 
   type Element = _JSX.Element;
 }

From 381b5ca5dfe3aa9558436ba055846eed2caad149 Mon Sep 17 00:00:00 2001
From: Moir <ys0514@yeah.net>
Date: Wed, 16 Apr 2025 22:28:00 +0800
Subject: [PATCH 05/21] chore: add typecheck

---
 .../__test__/typecheck/jsx-runtime.test-d.tsx | 21 +++++++++++++++++++
 .../react/runtime/jsx-dev-runtime/index.d.ts  |  2 +-
 packages/react/runtime/jsx-runtime/index.d.ts |  2 +-
 packages/react/runtime/package.json           |  3 ++-
 packages/react/runtime/tsconfig.json          |  3 ++-
 5 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 packages/react/runtime/__test__/typecheck/jsx-runtime.test-d.tsx

diff --git a/packages/react/runtime/__test__/typecheck/jsx-runtime.test-d.tsx b/packages/react/runtime/__test__/typecheck/jsx-runtime.test-d.tsx
new file mode 100644
index 0000000000..ca68fe920a
--- /dev/null
+++ b/packages/react/runtime/__test__/typecheck/jsx-runtime.test-d.tsx
@@ -0,0 +1,21 @@
+// Copyright 2024 The Lynx Authors. All rights reserved.
+// Licensed under the Apache License Version 2.0 that can be found in the
+// LICENSE file in the root directory of this source tree.
+import { assertType, describe, test } from 'vitest';
+import { JSX } from '../../jsx-runtime/index';
+import React from 'react';
+
+describe('JSX Runtime Types', () => {
+  test('should support basic JSX element', () => {
+    const viewEle = <view></view>;
+    assertType<JSX.Element>(viewEle);
+  });
+
+  test('should validate the required props for raw-text', () => {
+    // @ts-expect-error: Missing required prop 'text'
+    const shouldError = <raw-text></raw-text>;
+
+    const rawTextELe = <raw-text text={'text'}></raw-text>;
+    assertType<JSX.Element>(rawTextELe);
+  });
+});
diff --git a/packages/react/runtime/jsx-dev-runtime/index.d.ts b/packages/react/runtime/jsx-dev-runtime/index.d.ts
index a37f64a191..6cd54f88a2 100644
--- a/packages/react/runtime/jsx-dev-runtime/index.d.ts
+++ b/packages/react/runtime/jsx-dev-runtime/index.d.ts
@@ -3,7 +3,7 @@
 // LICENSE file in the root directory of this source tree.
 export { jsxDEV, Fragment } from 'react/jsx-dev-runtime';
 export { jsx, jsxs } from 'react/jsx-runtime';
-import { IntrinsicElements as _IntrinsicElements, type NodesRef } from '@lynx-js/types';
+import { IntrinsicElements as _IntrinsicElements } from '@lynx-js/types';
 import { JSX as _JSX, type Ref } from 'react';
 
 export namespace JSX {
diff --git a/packages/react/runtime/jsx-runtime/index.d.ts b/packages/react/runtime/jsx-runtime/index.d.ts
index 717d6a63b5..f0b2117c87 100644
--- a/packages/react/runtime/jsx-runtime/index.d.ts
+++ b/packages/react/runtime/jsx-runtime/index.d.ts
@@ -2,7 +2,7 @@
 // Licensed under the Apache License Version 2.0 that can be found in the
 // LICENSE file in the root directory of this source tree.
 export { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import { IntrinsicElements as _IntrinsicElements, type NodesRef } from '@lynx-js/types';
+import { IntrinsicElements as _IntrinsicElements } from '@lynx-js/types';
 import { JSX as _JSX, type Ref } from 'react';
 
 export namespace JSX {
diff --git a/packages/react/runtime/package.json b/packages/react/runtime/package.json
index 7d1678a9b5..1154249f6e 100644
--- a/packages/react/runtime/package.json
+++ b/packages/react/runtime/package.json
@@ -15,7 +15,8 @@
     "src"
   ],
   "scripts": {
-    "test": "vitest run --coverage"
+    "test": "vitest run --coverage",
+    "test:type": "vitest --typecheck.only"
   },
   "devDependencies": {
     "@lynx-js/react": "workspace:*",
diff --git a/packages/react/runtime/tsconfig.json b/packages/react/runtime/tsconfig.json
index 8be65ccae3..6370ce3dd1 100644
--- a/packages/react/runtime/tsconfig.json
+++ b/packages/react/runtime/tsconfig.json
@@ -5,7 +5,8 @@
     "outDir": "./lib",
     "baseUrl": "./",
     "rootDir": "./src",
-    "jsx": "preserve",
+    "jsx": "react-jsx",
+    "jsxImportSource": "./",
   },
   "references": [{
     "path": "../worklet-runtime/tsconfig.json",

From 044353b4bb38a4a71116bc069e69b830d48707f5 Mon Sep 17 00:00:00 2001
From: Moir <ys0514@yeah.net>
Date: Wed, 16 Apr 2025 22:44:52 +0800
Subject: [PATCH 06/21] style: remove redundant imports

---
 packages/react/runtime/jsx-dev-runtime/index.d.ts | 2 +-
 packages/react/runtime/jsx-runtime/index.d.ts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react/runtime/jsx-dev-runtime/index.d.ts b/packages/react/runtime/jsx-dev-runtime/index.d.ts
index 6cd54f88a2..ac0b7bdb09 100644
--- a/packages/react/runtime/jsx-dev-runtime/index.d.ts
+++ b/packages/react/runtime/jsx-dev-runtime/index.d.ts
@@ -4,7 +4,7 @@
 export { jsxDEV, Fragment } from 'react/jsx-dev-runtime';
 export { jsx, jsxs } from 'react/jsx-runtime';
 import { IntrinsicElements as _IntrinsicElements } from '@lynx-js/types';
-import { JSX as _JSX, type Ref } from 'react';
+import { JSX as _JSX } from 'react';
 
 export namespace JSX {
   interface IntrinsicElements extends _IntrinsicElements {}
diff --git a/packages/react/runtime/jsx-runtime/index.d.ts b/packages/react/runtime/jsx-runtime/index.d.ts
index f0b2117c87..886c6ce243 100644
--- a/packages/react/runtime/jsx-runtime/index.d.ts
+++ b/packages/react/runtime/jsx-runtime/index.d.ts
@@ -3,7 +3,7 @@
 // LICENSE file in the root directory of this source tree.
 export { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { IntrinsicElements as _IntrinsicElements } from '@lynx-js/types';
-import { JSX as _JSX, type Ref } from 'react';
+import { JSX as _JSX } from 'react';
 
 export namespace JSX {
   interface IntrinsicElements extends _IntrinsicElements {}

From 6ddd58f2b3c6d1c9e3f798a548ff416e22e8eb3a Mon Sep 17 00:00:00 2001
From: Moir <ys0514@yeah.net>
Date: Wed, 16 Apr 2025 22:55:52 +0800
Subject: [PATCH 07/21] chore: export JSX

---
 .../runtime/__test__/typecheck/jsx-runtime.test-d.tsx  | 10 ++++++++++
 packages/react/runtime/src/index.ts                    |  1 +
 2 files changed, 11 insertions(+)

diff --git a/packages/react/runtime/__test__/typecheck/jsx-runtime.test-d.tsx b/packages/react/runtime/__test__/typecheck/jsx-runtime.test-d.tsx
index ca68fe920a..b6e6287322 100644
--- a/packages/react/runtime/__test__/typecheck/jsx-runtime.test-d.tsx
+++ b/packages/react/runtime/__test__/typecheck/jsx-runtime.test-d.tsx
@@ -18,4 +18,14 @@ describe('JSX Runtime Types', () => {
     const rawTextELe = <raw-text text={'text'}></raw-text>;
     assertType<JSX.Element>(rawTextELe);
   });
+
+  test('should support JSX element with children', () => {
+    function App() {
+      function renderFoo(): JSX.Element {
+        return <text></text>;
+      }
+      return renderFoo();
+    }
+    assertType<JSX.Element>(App());
+  });
 });
diff --git a/packages/react/runtime/src/index.ts b/packages/react/runtime/src/index.ts
index 23f30b5665..562713f000 100644
--- a/packages/react/runtime/src/index.ts
+++ b/packages/react/runtime/src/index.ts
@@ -87,3 +87,4 @@ export {
 };
 
 export * from './lynx-api.js';
+export type { JSX } from '../jsx-runtime/index.d.ts';

From afcb43663410fa82967b3965a2620bf6c7809e00 Mon Sep 17 00:00:00 2001
From: Moir <ys0514@yeah.net>
Date: Wed, 16 Apr 2025 23:01:18 +0800
Subject: [PATCH 08/21] chore: some text...

---
 .../react/runtime/__test__/typecheck/jsx-runtime.test-d.tsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react/runtime/__test__/typecheck/jsx-runtime.test-d.tsx b/packages/react/runtime/__test__/typecheck/jsx-runtime.test-d.tsx
index b6e6287322..a0d303863d 100644
--- a/packages/react/runtime/__test__/typecheck/jsx-runtime.test-d.tsx
+++ b/packages/react/runtime/__test__/typecheck/jsx-runtime.test-d.tsx
@@ -19,7 +19,7 @@ describe('JSX Runtime Types', () => {
     assertType<JSX.Element>(rawTextELe);
   });
 
-  test('should support JSX element with children', () => {
+  test('should support JSX.Elements', () => {
     function App() {
       function renderFoo(): JSX.Element {
         return <text></text>;

From 306b051844a2e4a39e099b50ce15aa54580d2c70 Mon Sep 17 00:00:00 2001
From: Moir <ys0514@yeah.net>
Date: Thu, 17 Apr 2025 11:57:13 +0800
Subject: [PATCH 09/21] fix: export JSX

---
 packages/react/runtime/src/index.ts | 1 -
 packages/react/types/react.d.ts     | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/react/runtime/src/index.ts b/packages/react/runtime/src/index.ts
index 084e5ac3da..387feb890c 100644
--- a/packages/react/runtime/src/index.ts
+++ b/packages/react/runtime/src/index.ts
@@ -90,4 +90,3 @@ export {
 };
 
 export * from './lynx-api.js';
-export type { JSX } from '../jsx-runtime/index.d.ts';
diff --git a/packages/react/types/react.d.ts b/packages/react/types/react.d.ts
index e4b6cdc075..9068c0a707 100644
--- a/packages/react/types/react.d.ts
+++ b/packages/react/types/react.d.ts
@@ -145,3 +145,5 @@ declare module '@lynx-js/types' {
     'reuse-identifier'?: Key;
   }
 }
+
+export type { JSX } from '../runtime/jsx-runtime/index.d.ts';

From 31c5310bee90a12e49ac22aff771bed74a30da7d Mon Sep 17 00:00:00 2001
From: Moir <ys0514@yeah.net>
Date: Thu, 17 Apr 2025 16:48:08 +0800
Subject: [PATCH 10/21] chore:add tscofnig and type tests

---
 packages/react/runtime/__test__/tsconfig.json |  9 +++
 .../__test__/typecheck/jsx-runtime.test-d.tsx | 69 ++++++++++++++++++-
 2 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 packages/react/runtime/__test__/tsconfig.json

diff --git a/packages/react/runtime/__test__/tsconfig.json b/packages/react/runtime/__test__/tsconfig.json
new file mode 100644
index 0000000000..665574cb8c
--- /dev/null
+++ b/packages/react/runtime/__test__/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../../../../tsconfig.json",
+  "compilerOptions": {
+    "jsx": "react-jsx",
+    "jsxImportSource": "@lynx-js/react",
+    "noEmit": true,
+  },
+  "include": ["**/*.ts", "**/*.tsx", "../../types/react.d.ts"],
+}
diff --git a/packages/react/runtime/__test__/typecheck/jsx-runtime.test-d.tsx b/packages/react/runtime/__test__/typecheck/jsx-runtime.test-d.tsx
index a0d303863d..ee9aed1f02 100644
--- a/packages/react/runtime/__test__/typecheck/jsx-runtime.test-d.tsx
+++ b/packages/react/runtime/__test__/typecheck/jsx-runtime.test-d.tsx
@@ -2,8 +2,10 @@
 // Licensed under the Apache License Version 2.0 that can be found in the
 // LICENSE file in the root directory of this source tree.
 import { assertType, describe, test } from 'vitest';
-import { JSX } from '../../jsx-runtime/index';
-import React from 'react';
+import type { JSX } from '../../jsx-runtime/index.js';
+import type { MainThread, NodesRef, TouchEvent } from '@lynx-js/types';
+import { useMainThreadRef } from '../../lib/lynx-api.js';
+import { useRef } from '../../lib/hooks/react.js';
 
 describe('JSX Runtime Types', () => {
   test('should support basic JSX element', () => {
@@ -28,4 +30,67 @@ describe('JSX Runtime Types', () => {
     }
     assertType<JSX.Element>(App());
   });
+
+  test('should error on unsupported tags', () => {
+    // @ts-expect-error: Unsupported tag
+    const divElement = <div></div>;
+  });
+
+  test('should support event handlers', () => {
+    const viewWithBind = (
+      <view
+        bindtap={(e: TouchEvent) => {
+          e.currentTarget;
+        }}
+      >
+      </view>
+    );
+    const viewWithCatch = (
+      <view
+        catchtap={(e: TouchEvent) => {
+          e.currentTarget;
+        }}
+      >
+      </view>
+    );
+    assertType<JSX.Element>(viewWithBind);
+    assertType<JSX.Element>(viewWithCatch);
+  });
+
+  test('should support main-thread event handlers', () => {
+    const viewWithMainThreadEvent = (
+      <view
+        main-thread:bindtap={(e: MainThread.TouchEvent) => {
+          e.currentTarget;
+        }}
+      >
+      </view>
+    );
+    assertType<JSX.Element>(viewWithMainThreadEvent);
+  });
+
+  test('should support ref prop with ref object', () => {
+    const ref = useRef<NodesRef>(null);
+    const viewWithRefObject = <view ref={ref}></view>;
+    assertType<JSX.Element>(viewWithRefObject);
+  });
+
+  test('should support ref prop with function', () => {
+    const ref = useRef<NodesRef>(null);
+    const viewWithRefCallback = (
+      <view
+        ref={(n) => {
+          ref.current = n;
+        }}
+      >
+      </view>
+    );
+    assertType<JSX.Element>(viewWithRefCallback);
+  });
+
+  test('should support main-thread ref', () => {
+    const mtRef = useMainThreadRef<MainThread.Element>(null);
+    const viewWithMainThreadRef = <view main-thread:ref={mtRef}></view>;
+    assertType<JSX.Element>(viewWithMainThreadRef);
+  });
 });

From 4846f025e2ec61c8151bca1f3f5b388c863cc4c7 Mon Sep 17 00:00:00 2001
From: Moir <ys0514@yeah.net>
Date: Thu, 17 Apr 2025 16:53:34 +0800
Subject: [PATCH 11/21] chore: check

---
 .../runtime/__test__/typecheck/jsx-runtime.test-d.tsx     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/react/runtime/__test__/typecheck/jsx-runtime.test-d.tsx b/packages/react/runtime/__test__/typecheck/jsx-runtime.test-d.tsx
index ee9aed1f02..732772d672 100644
--- a/packages/react/runtime/__test__/typecheck/jsx-runtime.test-d.tsx
+++ b/packages/react/runtime/__test__/typecheck/jsx-runtime.test-d.tsx
@@ -1,15 +1,19 @@
 // Copyright 2024 The Lynx Authors. All rights reserved.
 // Licensed under the Apache License Version 2.0 that can be found in the
 // LICENSE file in the root directory of this source tree.
-import { assertType, describe, test } from 'vitest';
 import type { JSX } from '../../jsx-runtime/index.js';
 import type { MainThread, NodesRef, TouchEvent } from '@lynx-js/types';
+import { assertType, describe, test } from 'vitest';
 import { useMainThreadRef } from '../../lib/lynx-api.js';
 import { useRef } from '../../lib/hooks/react.js';
 
 describe('JSX Runtime Types', () => {
   test('should support basic JSX element', () => {
-    const viewEle = <view></view>;
+    const viewEle = (
+      <view>
+        <text>child node</text>
+      </view>
+    );
     assertType<JSX.Element>(viewEle);
   });
 

From e689d0eb5502dcfee9965fff9a513d8be2883cfc Mon Sep 17 00:00:00 2001
From: Moir <ys0514@yeah.net>
Date: Thu, 17 Apr 2025 20:06:24 +0800
Subject: [PATCH 12/21] chore: modify tests

---
 .../__test__/typecheck/jsx-runtime.test-d.tsx | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/packages/react/runtime/__test__/typecheck/jsx-runtime.test-d.tsx b/packages/react/runtime/__test__/typecheck/jsx-runtime.test-d.tsx
index 732772d672..41c99a52cb 100644
--- a/packages/react/runtime/__test__/typecheck/jsx-runtime.test-d.tsx
+++ b/packages/react/runtime/__test__/typecheck/jsx-runtime.test-d.tsx
@@ -2,10 +2,10 @@
 // Licensed under the Apache License Version 2.0 that can be found in the
 // LICENSE file in the root directory of this source tree.
 import type { JSX } from '../../jsx-runtime/index.js';
-import type { MainThread, NodesRef, TouchEvent } from '@lynx-js/types';
+import type { MainThread, NodesRef, Target, TouchEvent } from '@lynx-js/types';
 import { assertType, describe, test } from 'vitest';
-import { useMainThreadRef } from '../../lib/lynx-api.js';
-import { useRef } from '../../lib/hooks/react.js';
+import { useMainThreadRef } from '../../src/lynx-api.js';
+import { useRef } from '../../src/hooks/react.js';
 
 describe('JSX Runtime Types', () => {
   test('should support basic JSX element', () => {
@@ -43,16 +43,18 @@ describe('JSX Runtime Types', () => {
   test('should support event handlers', () => {
     const viewWithBind = (
       <view
-        bindtap={(e: TouchEvent) => {
-          e.currentTarget;
+        bindtap={(e) => {
+          assertType<number>(e.detail.x);
+          assertType<TouchEvent>(e);
         }}
       >
       </view>
     );
     const viewWithCatch = (
       <view
-        catchtap={(e: TouchEvent) => {
-          e.currentTarget;
+        catchtap={(e) => {
+          assertType<Target>(e.currentTarget);
+          assertType<TouchEvent>(e);
         }}
       >
       </view>
@@ -64,8 +66,9 @@ describe('JSX Runtime Types', () => {
   test('should support main-thread event handlers', () => {
     const viewWithMainThreadEvent = (
       <view
-        main-thread:bindtap={(e: MainThread.TouchEvent) => {
-          e.currentTarget;
+        main-thread:bindtap={(e) => {
+          assertType<number>(e.detail.x);
+          assertType<MainThread.Element>(e.currentTarget);
         }}
       >
       </view>

From 8d22d9d11893b40d3c6007a6c3d92bd59bf1d2d5 Mon Sep 17 00:00:00 2001
From: Moir <ys0514@yeah.net>
Date: Thu, 17 Apr 2025 20:22:03 +0800
Subject: [PATCH 13/21] chore: modify tests

---
 packages/react/runtime/__test__/typecheck/jsx-runtime.test-d.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/react/runtime/__test__/typecheck/jsx-runtime.test-d.tsx b/packages/react/runtime/__test__/typecheck/jsx-runtime.test-d.tsx
index 41c99a52cb..5ea4d19673 100644
--- a/packages/react/runtime/__test__/typecheck/jsx-runtime.test-d.tsx
+++ b/packages/react/runtime/__test__/typecheck/jsx-runtime.test-d.tsx
@@ -87,6 +87,7 @@ describe('JSX Runtime Types', () => {
     const viewWithRefCallback = (
       <view
         ref={(n) => {
+          assertType<NodesRef | null>(n);
           ref.current = n;
         }}
       >

From b2f65e72882faf452a7089760476ac36a76f1a19 Mon Sep 17 00:00:00 2001
From: Qingyu Wang <40660121+colinaaa@users.noreply.github.com>
Date: Thu, 17 Apr 2025 20:44:01 +0800
Subject: [PATCH 14/21] Create orange-days-chew.md

Signed-off-by: Qingyu Wang <40660121+colinaaa@users.noreply.github.com>
---
 .changeset/orange-days-chew.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .changeset/orange-days-chew.md

diff --git a/.changeset/orange-days-chew.md b/.changeset/orange-days-chew.md
new file mode 100644
index 0000000000..2db991cc5c
--- /dev/null
+++ b/.changeset/orange-days-chew.md
@@ -0,0 +1,17 @@
+---
+"@lynx-js/react": patch
+---
+
+Support using `"jsx": "react-jsx"` along with `"jsxImportSource": "@lynx-js/react"` in `tsconfig.json`.
+
+```json
+{
+  "compilerOptions": {
+    "jsx": "react-jsx",
+    "jsxImportSource": "@lynx-js/react"
+  }
+}
+```
+
+This configuration enhances TypeScript definitions for standard JSX elements,
+providing type errors for unsupported elements like `<div>` or `<button>`.

From af47ccc520d667d567de77de8d65a7d0441b4b15 Mon Sep 17 00:00:00 2001
From: Qingyu Wang <40660121+colinaaa@users.noreply.github.com>
Date: Thu, 17 Apr 2025 20:44:40 +0800
Subject: [PATCH 15/21] Create stupid-hounds-reflect.md

Signed-off-by: Qingyu Wang <40660121+colinaaa@users.noreply.github.com>
---
 .changeset/stupid-hounds-reflect.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/stupid-hounds-reflect.md

diff --git a/.changeset/stupid-hounds-reflect.md b/.changeset/stupid-hounds-reflect.md
new file mode 100644
index 0000000000..9008b57d4e
--- /dev/null
+++ b/.changeset/stupid-hounds-reflect.md
@@ -0,0 +1,5 @@
+---
+"create-rspeedy": patch
+---
+
+Use `"jsx": "react-jsx"` with `"jsxImportSource": "@lynx-js/react"`.

From deff0b8b47a269fd49701b598239e179936926bf Mon Sep 17 00:00:00 2001
From: Moir <ys0514@yeah.net>
Date: Thu, 17 Apr 2025 20:55:00 +0800
Subject: [PATCH 16/21] fix: exclude .test-d.* file when coverage test

---
 packages/react/runtime/vitest.config.ts | 1 +
 vitest.config.ts                        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/react/runtime/vitest.config.ts b/packages/react/runtime/vitest.config.ts
index 336204fd4a..547d1cd135 100644
--- a/packages/react/runtime/vitest.config.ts
+++ b/packages/react/runtime/vitest.config.ts
@@ -91,6 +91,7 @@ export default defineConfig({
 
         '__test__/page.test.jsx',
         '**/*.d.ts',
+        '**/*.test-d.ts',
       ],
       thresholds: {
         lines: 100,
diff --git a/vitest.config.ts b/vitest.config.ts
index 08ac275bcf..63400b1e54 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -9,6 +9,7 @@ export default defineConfig({
     coverage: {
       exclude: [
         '**/*.d.ts',
+        '**/*.test-d.ts',
         '**/vitest.config.ts',
         '**/rslib.config.ts',
         '**/*.bench.js',

From dae5e110c1457c8ee311bb876f2566d87e8ca1fb Mon Sep 17 00:00:00 2001
From: Moir <ys0514@yeah.net>
Date: Thu, 17 Apr 2025 21:03:00 +0800
Subject: [PATCH 17/21] fix: .*

---
 packages/react/runtime/vitest.config.ts | 2 +-
 vitest.config.ts                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react/runtime/vitest.config.ts b/packages/react/runtime/vitest.config.ts
index 547d1cd135..8e101659ea 100644
--- a/packages/react/runtime/vitest.config.ts
+++ b/packages/react/runtime/vitest.config.ts
@@ -91,7 +91,7 @@ export default defineConfig({
 
         '__test__/page.test.jsx',
         '**/*.d.ts',
-        '**/*.test-d.ts',
+        '**/*.test-d.*',
       ],
       thresholds: {
         lines: 100,
diff --git a/vitest.config.ts b/vitest.config.ts
index 63400b1e54..ed7c0c9bb7 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -9,7 +9,7 @@ export default defineConfig({
     coverage: {
       exclude: [
         '**/*.d.ts',
-        '**/*.test-d.ts',
+        '**/*.test-d.*',
         '**/vitest.config.ts',
         '**/rslib.config.ts',
         '**/*.bench.js',

From 65927c5562256d6bed148c11575d48c26926f3cc Mon Sep 17 00:00:00 2001
From: Qingyu Wang <40660121+colinaaa@users.noreply.github.com>
Date: Thu, 24 Apr 2025 10:21:01 +0800
Subject: [PATCH 18/21] fix: eslint import order

---
 packages/react/runtime/jsx-dev-runtime/index.d.ts | 6 ++++--
 packages/react/runtime/jsx-runtime/index.d.ts     | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/react/runtime/jsx-dev-runtime/index.d.ts b/packages/react/runtime/jsx-dev-runtime/index.d.ts
index ac0b7bdb09..c4b23855ae 100644
--- a/packages/react/runtime/jsx-dev-runtime/index.d.ts
+++ b/packages/react/runtime/jsx-dev-runtime/index.d.ts
@@ -1,10 +1,12 @@
 // Copyright 2024 The Lynx Authors. All rights reserved.
 // Licensed under the Apache License Version 2.0 that can be found in the
 // LICENSE file in the root directory of this source tree.
+import { JSX as _JSX } from 'react';
+
+import { IntrinsicElements as _IntrinsicElements } from '@lynx-js/types';
+
 export { jsxDEV, Fragment } from 'react/jsx-dev-runtime';
 export { jsx, jsxs } from 'react/jsx-runtime';
-import { IntrinsicElements as _IntrinsicElements } from '@lynx-js/types';
-import { JSX as _JSX } from 'react';
 
 export namespace JSX {
   interface IntrinsicElements extends _IntrinsicElements {}
diff --git a/packages/react/runtime/jsx-runtime/index.d.ts b/packages/react/runtime/jsx-runtime/index.d.ts
index 886c6ce243..0388f7658a 100644
--- a/packages/react/runtime/jsx-runtime/index.d.ts
+++ b/packages/react/runtime/jsx-runtime/index.d.ts
@@ -1,10 +1,12 @@
 // Copyright 2024 The Lynx Authors. All rights reserved.
 // Licensed under the Apache License Version 2.0 that can be found in the
 // LICENSE file in the root directory of this source tree.
-export { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import { IntrinsicElements as _IntrinsicElements } from '@lynx-js/types';
 import { JSX as _JSX } from 'react';
 
+import { IntrinsicElements as _IntrinsicElements } from '@lynx-js/types';
+
+export { jsx, jsxs, Fragment } from 'react/jsx-runtime';
+
 export namespace JSX {
   interface IntrinsicElements extends _IntrinsicElements {}
 

From d21f11336b842bcb86c3da60f3d3e6a6349cc030 Mon Sep 17 00:00:00 2001
From: Qingyu Wang <40660121+colinaaa@users.noreply.github.com>
Date: Thu, 24 Apr 2025 10:45:13 +0800
Subject: [PATCH 19/21] fix: change template of testing library

---
 .../template-react-vitest-rltl-ts/tsconfig.json              | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/rspeedy/create-rspeedy/template-react-vitest-rltl-ts/tsconfig.json b/packages/rspeedy/create-rspeedy/template-react-vitest-rltl-ts/tsconfig.json
index 802b9e24d8..d9460d5509 100644
--- a/packages/rspeedy/create-rspeedy/template-react-vitest-rltl-ts/tsconfig.json
+++ b/packages/rspeedy/create-rspeedy/template-react-vitest-rltl-ts/tsconfig.json
@@ -1,8 +1,9 @@
 {
   "compilerOptions": {
-    "jsx": "preserve",
+    "jsx": "react-jsx",
+    "jsxImportSource": "@lynx-js/react",
 
-    "module": "node16",
+    "module": "node18",
     "moduleResolution": "node16",
 
     "strict": true,

From 9fbd518ece5858c1328c4f03e2d8b51fa5a08ed4 Mon Sep 17 00:00:00 2001
From: Qingyu Wang <40660121+colinaaa@users.noreply.github.com>
Date: Thu, 24 Apr 2025 10:47:40 +0800
Subject: [PATCH 20/21] ci: run tsc on test-publish

---
 .github/workflows/test.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index af0e52d865..40444334cc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -148,11 +148,15 @@ jobs:
         npx --registry http://localhost:4873 create-rspeedy-canary@latest --template react --dir create-rspeedy-regression
         cd create-rspeedy-regression
         pnpm install --registry=http://localhost:4873
+        pnpm tsc --noEmit
         pnpm run build
+        pnpm tsc --noEmit
         npx --registry http://localhost:4873 create-rspeedy-canary@latest --template react-vitest-rltl --dir create-rspeedy-regression-vitest-rltl
         cd create-rspeedy-regression-vitest-rltl
         pnpm install --registry=http://localhost:4873
+        pnpm tsc --noEmit
         pnpm run build
+        pnpm tsc --noEmit
         pnpm run test
   test-tools:
     needs: build

From c08de88bd5bb2affc3fcd620afd10f119783b504 Mon Sep 17 00:00:00 2001
From: Qingyu Wang <40660121+colinaaa@users.noreply.github.com>
Date: Thu, 24 Apr 2025 11:47:38 +0800
Subject: [PATCH 21/21] ci: remove tsc check

---
 .github/workflows/test.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 40444334cc..af0e52d865 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -148,15 +148,11 @@ jobs:
         npx --registry http://localhost:4873 create-rspeedy-canary@latest --template react --dir create-rspeedy-regression
         cd create-rspeedy-regression
         pnpm install --registry=http://localhost:4873
-        pnpm tsc --noEmit
         pnpm run build
-        pnpm tsc --noEmit
         npx --registry http://localhost:4873 create-rspeedy-canary@latest --template react-vitest-rltl --dir create-rspeedy-regression-vitest-rltl
         cd create-rspeedy-regression-vitest-rltl
         pnpm install --registry=http://localhost:4873
-        pnpm tsc --noEmit
         pnpm run build
-        pnpm tsc --noEmit
         pnpm run test
   test-tools:
     needs: build