standard-tsx 0.0.3 → 0.0.5

package/HISTORY.md

@@ -1,3 +1,10 @@
+## 0.0.5
+* [Update .gitignore handling (#12)](https://github.com/extremeheat/standard-tsx/commit/29b2286623bf5145ec6c8b3d112136f9d0b7ccac) (thanks @extremeheat)
+
+## 0.0.4
+* [Fix tsconfig lookup (#9)](https://github.com/extremeheat/standard-tsx/commit/4f28fc3798d52a35d86126c29a7e5d3d341b1578) (thanks @extremeheat)
+* [Fix .gitignore handling in eslint.config.js](https://github.com/extremeheat/standard-tsx/commit/a8d88a03742b02b7138d9b653026eb33a74ce829) (thanks @extremeheat)
+
 ## 0.0.3
 * [Update README.md](https://github.com/extremeheat/standard-tsx/commit/0f6de2eac2d90cec95ad49ef887cfca79e6e35d1) (thanks @extremeheat)
 * [Update eslint.config.js - glob: ignore node_modules](https://github.com/extremeheat/standard-tsx/commit/7f5f6735c0baebc1923ef86d12cbd00a1db22032) (thanks @extremeheat)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "standard-tsx",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "standardjs lint with TypeScript and JSX file support (with no new typescript rules)",
   "main": "src/index.js",
   "bin": {

package/src/eslint.config.js

@@ -1,4 +1,7 @@
 // ./eslint.config.js
+const path = require('node:path')
+const fs = require('node:fs')
+
 const globals = require('globals')
 const pluginJs = require('@eslint/js').configs
 const tseslint = require('typescript-eslint')
@@ -9,12 +12,16 @@ const promisePlugin = require('eslint-plugin-promise')
 const eslintEnvRestorePlugin = require('eslint-plugin-eslint-env-restore')
 const reactPlugin = require('eslint-plugin-react')
 const reactHooksPlugin = require('eslint-plugin-react-hooks')
-
-const { includeIgnoreFile } = require('@eslint/compat')
-const path = require('node:path')
 const glob = require('glob')
 
-const gitignoreFiles = glob.sync('**/.gitignore', { cwd: process.cwd(), ignore: 'node_modules/**' })
+// Find all .gitignore files in the project (upto 2 levels up for monorepo support)
+const gitignoreFiles = glob.sync('**/.gitignore', { cwd: process.cwd() })
+if (gitignoreFiles.length === 0) {
+  gitignoreFiles.push(...glob.sync('**/.gitignore', { cwd: path.join(process.cwd(), '..') }).map(file => path.join('..', file)))
+  if (gitignoreFiles.length === 0) {
+    gitignoreFiles.push(...glob.sync('**/.gitignore', { cwd: path.join(process.cwd(), '../..') }).map(file => path.join('..', '..', file)))
+  }
+}
 
 // Sort by directory depth (root to leaves) to match Git's override behavior
 const sortedGitignoreFiles = gitignoreFiles.sort((a, b) => {
@@ -23,14 +30,47 @@ const sortedGitignoreFiles = gitignoreFiles.sort((a, b) => {
   return depthA - depthB
 })
 
-// Convert each .gitignore file into an ESLint ignore config
-const ignoreConfigs = sortedGitignoreFiles.map(file => {
-  const fullPath = path.resolve(process.cwd(), file)
-  return includeIgnoreFile(fullPath)
-})
+// Merge ignore patterns from all .gitignore files
+const ignorePatterns = []
+for (const file of sortedGitignoreFiles) {
+  const dir = path.dirname(file)
+  const content = fs.readFileSync(file, 'utf8')
+  const lines = content.split('\n').map(line => line.trim()).filter(line => line && !line.startsWith('#'))
+  for (const line of lines) {
+    let rule = path.join(dir, line).replaceAll('\\', '/')
+    if (rule.startsWith('..//')) continue // a rule intended for a parent directory
+    // rules that don't start with slash apply to all directories
+    rule = rule.replaceAll('../', '')
+    // mimic .gitignore behavior as ESlint is a bit different and doesn't recursively apply rules
+    if (!rule.startsWith('/') || !rule.startsWith('./') || !rule.startsWith('*')) rule = '**/' + rule
+    // Restore ordering of ! to front after above transformation
+    if (line.startsWith('!')) rule = '!' + rule.replaceAll('!', '')
+    ignorePatterns.push(rule)
+  }
+}
+
+function findNearestTsconfigDir (startDir = process.cwd()) {
+  let currentDir = path.resolve(startDir)
+
+  while (true) {
+    const tsconfigPath = path.join(currentDir, 'tsconfig.json')
+    if (fs.existsSync(tsconfigPath)) {
+      return currentDir
+    }
+
+    const parentDir = path.dirname(currentDir)
+    if (parentDir === currentDir) {
+      // Reached filesystem root
+      break
+    }
+    currentDir = parentDir
+  }
+  return null
+}
+const tsconfigRootDir = findNearestTsconfigDir()
 
 module.exports = [
-  ...ignoreConfigs,
+  { ignores: ignorePatterns },
   {
     languageOptions: {
       globals: {
@@ -102,7 +142,8 @@ module.exports = [
     languageOptions: {
       parser: tseslint.parser,
       parserOptions: {
-        project: './tsconfig.json'
+        project: './tsconfig.json',
+        tsconfigRootDir
       },
       globals: {
         ...globals.node
@@ -130,6 +171,7 @@ module.exports = [
       parser: tseslint.parser,
       parserOptions: {
         project: './tsconfig.json',
+        tsconfigRootDir,
         ecmaFeatures: {
           jsx: true
         }

package/src/env-restore.js

@@ -1,41 +0,0 @@
-// ./env-restore.js
-const envGlobals = require('globals')
-
-function extractEslintEnv (text) {
-  const firstLine = text.split('\n')[0].trim()
-  if (firstLine.startsWith('/* eslint-env ') && firstLine.endsWith('*/')) {
-    const envPart = firstLine.slice(14, -2).trim()
-    return envPart.split(',').map(env => env.trim())
-  }
-  return []
-}
-
-function mapEnvsToGlobals (envs) {
-  const globals = {}
-  envs.forEach(env => {
-    if (envGlobals[env]) {
-      Object.assign(globals, envGlobals[env])
-    }
-  })
-  return globals
-}
-
-module.exports = {
-  processors: {
-    js: {
-      preprocess (text, filename) {
-        const envs = extractEslintEnv(text)
-        if (envs.length === 0) return [text]
-
-        const globals = mapEnvsToGlobals(envs)
-        const globalNames = Object.keys(globals).join(', ')
-        const injectedComment = `/* global ${globalNames} */ ${text}`
-        return [injectedComment]
-      },
-      postprocess (messages) {
-        return messages[0]
-      },
-      supportsAutofix: true
-    }
-  }
-}