diff --git a/.changeset/twenty-schools-pretend.md b/.changeset/twenty-schools-pretend.md
new file mode 100644
index 000000000..1bb43a428
--- /dev/null
+++ b/.changeset/twenty-schools-pretend.md
@@ -0,0 +1,5 @@
+---
+"solid-js": patch
+---
+
+update TS to NodeNext
diff --git a/packages/solid/h/jsx-runtime/src/index.ts b/packages/solid/h/jsx-runtime/src/index.ts
index 9375fa59c..d75ba3788 100644
--- a/packages/solid/h/jsx-runtime/src/index.ts
+++ b/packages/solid/h/jsx-runtime/src/index.ts
@@ -1,6 +1,6 @@
 import h from "solid-js/h";
-export type { JSX } from "./jsx";
-import type { JSX } from "./jsx";
+export type { JSX } from "./jsx.d.ts";
+import type { JSX } from "./jsx.d.ts";
 
 function Fragment(props: { children: JSX.Element }) {
   return props.children;
diff --git a/packages/solid/h/src/index.ts b/packages/solid/h/src/index.ts
index 2dc5a5221..900a80efc 100644
--- a/packages/solid/h/src/index.ts
+++ b/packages/solid/h/src/index.ts
@@ -1,5 +1,5 @@
-import { createHyperScript } from "./hyperscript";
-import type { HyperScript } from "./hyperscript";
+import { createHyperScript } from "./hyperscript.js";
+import type { HyperScript } from "./hyperscript.js";
 import {
   spread,
   assign,
diff --git a/packages/solid/html/src/index.ts b/packages/solid/html/src/index.ts
index 03d92f991..890bac67e 100644
--- a/packages/solid/html/src/index.ts
+++ b/packages/solid/html/src/index.ts
@@ -1,5 +1,5 @@
-import { createHTML } from "./lit";
-import type { HTMLTag } from "./lit";
+import { createHTML } from "./lit.js";
+import type { HTMLTag } from "./lit.js";
 import {
   effect,
   style,
diff --git a/packages/solid/universal/src/universal.ts b/packages/solid/universal/src/universal.ts
index a5337a87a..ab9cf10da 100644
--- a/packages/solid/universal/src/universal.ts
+++ b/packages/solid/universal/src/universal.ts
@@ -1 +1 @@
-export * from "dom-expressions/src/universal";
+export * from "dom-expressions/src/universal.js";
diff --git a/packages/solid/web/src/client.ts b/packages/solid/web/src/client.ts
index 86cd9795b..0cf6bbffe 100644
--- a/packages/solid/web/src/client.ts
+++ b/packages/solid/web/src/client.ts
@@ -1 +1 @@
-export * from "dom-expressions/src/client";
+export * from "dom-expressions/src/client.js";
diff --git a/tsconfig.json b/tsconfig.json
index f8787324d..0d8b3738a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,9 +2,10 @@
   "compilerOptions": {
     "emitDeclarationOnly": true,
     "declaration": true,
-    "target": "esnext",
+    "target": "ESNext",
     "newLine": "LF",
-    "moduleResolution": "node",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
     "strict": true,
     "jsx": "preserve"
   },