fix: resolve rebase conflicts\n\n- Finalize ESLint resolver settings (NodeNext + TS, broad extensions)\n- Bump eslint-import-resolver-typescript to ^4.4.4; fix duplicate key\n- Normalize pnpm-lock.yaml to HEAD variants

Author: CharlieHelps

.eslintrc.cjs

@@ -5,6 +5,8 @@ module.exports = {
     tsconfigRootDir: __dirname,
   },
   settings: {
+    // Ensure import/no-unresolved can resolve NodeNext + TS paths where source files
+    // use .js specifiers that map to .ts during authoring.
     'import/resolver': {
       typescript: {
         // Use the ESLint tsconfig which includes tests
@@ -13,14 +15,6 @@ module.exports = {
       },
       node: {
         extensions: ['.js', '.mjs', '.cjs', '.ts', '.mts', '.cts', '.d.ts']
-    // Ensure import/no-unresolved can resolve NodeNext + TS paths where source files
-    // use .js specifiers that map to .ts during authoring.
-    'import/resolver': {
-      typescript: {
-        project: ['./tsconfig.eslint.json']
-      },
-      node: {
-        extensions: ['.js', '.mjs', '.cjs', '.ts', '.mts', '.cts', '.d.ts']
       }
     }
   }

package.json

@@ -58,7 +58,6 @@
     "eslint": "8.57.0",
     "eslint-config-shellscape": "^6.0.0",
     "eslint-import-resolver-typescript": "^4.4.4",
-    "eslint-import-resolver-typescript": "^3.10.1",
     "file-loader": "^6.2.0",
     "husky": "8.0.2",
     "lint-staged": "11.1.1",