diff --git a/eslint.config.js b/eslint.config.js
deleted file mode 100644
index a7aab5d..0000000
--- a/eslint.config.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import js from '@eslint/js';
-import solid from 'eslint-plugin-solid';
-import globals from 'globals';
-import tseslint from 'typescript-eslint';
-
-export default tseslint.config(
-  { ignores: ['dist'] },
-  {
-    extends: [js.configs.recommended, ...tseslint.configs.recommended, 'plugin:solid/typescript'],
-    files: ['**/*.{ts,tsx}'],
-    languageOptions: {
-      ecmaVersion: 2020,
-      globals: globals.browser,
-    },
-    plugins: { solid },
-    rules: {
-      'solid/reactivity': 'warn',
-      'solid/no-destructure': 'warn',
-      'solid/jsx-no-undef': 'error',
-    },
-  },
-);
diff --git a/eslint.config.mjs b/eslint.config.mjs
new file mode 100644
index 0000000..01c66e8
--- /dev/null
+++ b/eslint.config.mjs
@@ -0,0 +1,35 @@
+import js from '@eslint/js';
+
+import solid from 'eslint-plugin-solid';
+import globals from 'globals';
+import tseslint from 'typescript-eslint';
+
+export default [
+  {
+    ignores: ['node_modules/', 'dist/', 'dist-ssr/', '.output/', '*.config.js'],
+  },
+  js.configs.recommended,
+  ...tseslint.configs.recommended,
+  {
+    files: ['**/*.{ts,tsx,jsx}'],
+    plugins: {
+      solid,
+    },
+    languageOptions: {
+      globals: {
+        ...globals.browser,
+      },
+      parserOptions: {
+        ecmaFeatures: {
+          jsx: true,
+        },
+      },
+    },
+    rules: {
+      ...solid.configs.typescript.rules,
+      'solid/reactivity': 'warn',
+      'solid/no-destructure': 'warn',
+      'solid/jsx-no-undef': 'error',
+    },
+  },
+];