@wondermarin/eslint-config 2.3.0 → 2.4.1

package/dist/main.js

@@ -1,5 +1,5 @@
-import fs from 'node:fs';
-import path, { join } from 'node:path';
+import path, { join, dirname } from 'node:path';
+import fs, { existsSync } from 'node:fs';
 import globals from 'globals';
 
 // node_modules/.pnpm/defu@6.1.4/node_modules/defu/dist/defu.mjs
@@ -57,6 +57,15 @@ function createDefu(merger) {
   );
 }
 var defu = createDefu();
+function findProjectRoot() {
+  const startDir = process.cwd();
+  let currentDir = startDir;
+  while (!currentDir.endsWith("\\")) {
+    if (existsSync(join(currentDir, "package.json"))) return currentDir;
+    currentDir = dirname(currentDir);
+  }
+  return startDir;
+}
 
 // src/configs/javascript.ts
 function javascriptConfig() {
@@ -408,7 +417,7 @@ async function interopDefault(module) {
 }
 
 // src/configs/typescript.ts
-async function typescriptConfig() {
+async function typescriptConfig(projectRoot) {
   const [typescriptParser, typescriptPlugin] = await Promise.all([
     interopDefault(import('@typescript-eslint/parser')),
     interopDefault(import('@typescript-eslint/eslint-plugin'))
@@ -421,7 +430,7 @@ async function typescriptConfig() {
         parser: typescriptParser,
         parserOptions: {
           project: true,
-          tsconfigRootDir: process.cwd()
+          tsconfigRootDir: projectRoot
         }
       },
       plugins: {
@@ -660,6 +669,7 @@ async function typescriptConfig() {
             checksConditionals: true,
             checksSpreads: true,
             checksVoidReturn: {
+              arguments: false,
               attributes: false,
               properties: false
             }
@@ -1519,7 +1529,7 @@ async function reactConfig() {
     }
   ];
 }
-function baseConfig() {
+function baseConfig(projectRoot) {
   return [
     {
       name: "wondermarin/eslint-config",
@@ -1539,7 +1549,7 @@ function baseConfig() {
     },
     {
       name: "wondermarin/eslint-config/ignores",
-      ignores: includeIgnoreFile(join(process.cwd(), ".gitignore")).ignores
+      ignores: includeIgnoreFile(join(projectRoot, ".gitignore")).ignores
     }
   ];
 }
@@ -1585,13 +1595,16 @@ async function wondermarin(options) {
     stylistic: true,
     json: true
   });
-  const config = [...baseConfig()];
-  if (options.javascript) config.push(...javascriptConfig());
-  if (options.typescript) config.push(...await typescriptConfig());
-  if (options.stylistic) config.push(...await stylisticConfig());
-  if (options.json) config.push(...await jsonConfig());
-  if (options.react) config.push(...await reactConfig());
-  return config;
+  const projectRoot = findProjectRoot();
+  const configs = await Promise.all([
+    baseConfig(projectRoot),
+    options.javascript ? javascriptConfig() : [],
+    options.typescript ? typescriptConfig(projectRoot) : [],
+    options.stylistic ? stylisticConfig() : [],
+    options.json ? jsonConfig() : [],
+    options.react ? reactConfig() : []
+  ]);
+  return configs.flat();
 }
 var main_default = wondermarin;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wondermarin/eslint-config",
-  "version": "2.3.0",
+  "version": "2.4.1",
   "description": "Personal ESLint config.",
   "homepage": "https://github.com/Wondermarin/eslint-config#readme",
   "repository": {