@ithinkdt/lint 4.0.0-9 → 4.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ithinkdt/lint",
-  "version": "4.0.0-9",
+  "version": "4.0.1",
   "type": "module",
   "description": "iThinkDT 项目的 ESLint、StyleLint 配置",
   "keywords": [
@@ -32,35 +32,36 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@eslint-community/eslint-plugin-eslint-comments": "^4.5.0",
-    "@eslint/js": "^9.37.0",
-    "@eslint/json": ">=0.13.2",
-    "@eslint/markdown": "7.4.0",
-    "@stylistic/eslint-plugin": "^5.4.0",
-    "@typescript-eslint/parser": "^8.46.0",
-    "@unocss/eslint-config": "^66.5.2",
-    "@vitest/eslint-plugin": "^1.3.16",
-    "@vue/compiler-sfc": "^3.5.22",
-    "eslint-flat-config-utils": "^2.1.4",
+    "@eslint-community/eslint-plugin-eslint-comments": "^4.6.0",
+    "@eslint/js": "^9.39.2",
+    "@eslint/json": ">=1.0.1",
+    "@eslint/markdown": "7.5.1",
+    "@stylistic/eslint-plugin": "^5.9.0",
+    "@typescript-eslint/parser": "^8.56.1",
+    "@unocss/eslint-config": "^66.6.2",
+    "@vitest/eslint-plugin": "^1.6.9",
+    "@vue/compiler-sfc": "^3.5.29",
+    "eslint-flat-config-utils": "^3.0.1",
     "eslint-import-resolver-custom-alias": "^1.3.2",
     "eslint-import-resolver-typescript": "^4.4.4",
     "eslint-merge-processors": "^2.0.0",
-    "eslint-plugin-format": "^1.0.2",
+    "eslint-plugin-format": "^2.0.1",
     "eslint-plugin-import": "npm:eslint-plugin-import-x@^4.16.1",
     "eslint-plugin-no-only-tests": "^3.3.0",
-    "eslint-plugin-playwright": "^2.2.2",
-    "eslint-plugin-tsdoc": ">=0.4.0",
-    "eslint-plugin-unicorn": "^61.0.2",
-    "eslint-plugin-vue": "^10.5.0",
+    "eslint-plugin-playwright": "^2.7.1",
+    "eslint-plugin-tsdoc": ">=0.5.2",
+    "eslint-plugin-unicorn": "^63.0.0",
+    "eslint-plugin-vue": "^10.8.0",
     "eslint-processor-vue-blocks": "^2.0.0",
-    "globby": "^15.0.0",
+    "globals": "^17.3.0",
+    "globby": "^16.1.1",
     "is-glob": "^4.0.3",
-    "postcss-html": "^1.8.0",
-    "stylelint-config-standard": "^39.0.1",
+    "postcss-html": "^1.8.1",
+    "stylelint-config-standard": "^40.0.0",
     "stylelint-config-standard-vue": "^1.0.0",
-    "stylelint-order": "^7.0.0",
-    "typescript-eslint": "^8.46.0",
-    "vue-eslint-parser": "^10.2.0"
+    "stylelint-order": "^7.0.1",
+    "typescript-eslint": "^8.56.1",
+    "vue-eslint-parser": "^10.4.0"
   },
   "peerDependencies": {
     "eslint": ">=9",
@@ -68,8 +69,8 @@
     "typescript": ">=5.8"
   },
   "devDependencies": {
-    "eslint": "^9.37.0",
-    "stylelint": "~16.25.0",
+    "eslint": "^9.39.2",
+    "stylelint": "~17.4.0",
     "typescript": "~5.9.3"
   },
   "license": "MIT",

package/src/base.js

@@ -9,6 +9,7 @@ import importx from 'eslint-plugin-import'
 import noonlytests from 'eslint-plugin-no-only-tests'
 import tsdoc from 'eslint-plugin-tsdoc'
 import unicorn from 'eslint-plugin-unicorn'
+import globals from 'globals'
 import { configs as tsconfigs } from 'typescript-eslint'
 
 export { default as vitest } from '@vitest/eslint-plugin'
@@ -23,7 +24,8 @@ export { createTypeScriptImportResolver } from 'eslint-import-resolver-typescrip
 
 export const defaultJsFiles = ['**/*.cts', '**/*.js', '**/*.jsx', '**/*.cjs', '**/*.mjs']
 export const defaultTsFiles = ['**/*.ts', '**/*.tsx', '**/*.mts', '**/*.cts']
-export const defaultEsFiles = [...defaultTsFiles, ...defaultJsFiles, '**/*.vue']
+export const defaultTsWithVueFiles = [...defaultTsFiles, '**/*.vue']
+export const defaultEsFiles = [...defaultTsWithVueFiles, ...defaultJsFiles]
 
 export const disableTypeChecked = {
     ...tsconfigs.disableTypeChecked,
@@ -40,17 +42,25 @@ export function base({ stylistic: stylisticOptions, inCI }) {
             ignores: ['package-lock.json'],
             language: 'json/json',
         },
-        [js.configs.recommended,
+        [
+            js.configs.recommended,
             unicorn.configs.recommended,
-            ...tsconfigs.recommendedTypeChecked,
             importx.flatConfigs.recommended,
-            importx.flatConfigs.typescript,
         ].map((it) => {
             return {
                 ...it,
                 files: defaultEsFiles,
             }
         }),
+        [
+            ...tsconfigs.recommendedTypeChecked,
+            importx.flatConfigs.typescript,
+        ].map((it) => {
+            return {
+                ...it,
+                files: defaultTsWithVueFiles,
+            }
+        }),
         stylisticOptions
             ? [
                     {
@@ -106,13 +116,6 @@ export function base({ stylistic: stylisticOptions, inCI }) {
 
                 // ------ start copy from @vue/eslint-config-typescript
 
-                // The core 'no-unused-vars' rules (in the eslint:recommeded ruleset)
-                // does not work with type definitions
-                'no-unused-vars': 'off',
-                // TS already checks for that, and Typescript-Eslint recommends to disable it
-                // https://typescript-eslint.io/linting/troubleshooting#i-get-errors-from-the-no-undef-rule-about-global-variables-not-being-defined-even-though-there-are-no-typescript-errors
-                'no-undef': 'off',
-
                 // The following rules are enabled in an `overrides` field in the
                 // `@typescript-eslint/recommended` ruleset, only turned on for TypeScript source modules
                 // <https://github.com/typescript-eslint/typescript-eslint/blob/cb2d44650d27d8b917e8ce19423245b834db29d2/packages/eslint-plugin/src/configs/eslint-recommended.ts#L27-L30>
@@ -131,48 +134,6 @@ export function base({ stylistic: stylisticOptions, inCI }) {
                 'prefer-rest-params': 'error', // ts provides better types with rest args over arguments
                 'prefer-spread': 'error', // ts transpiles spread to apply, so no need for manual apply
 
-                // this rule, if on, would require explicit return type on the `render` function
-                // 'ts/explicit-function-return-type': 'off',
-
-                // ------ end
-
-                // 忽略下划线开始的变量名
-                'ts/no-unused-vars': ['warn', {
-                    args: 'after-used',
-                    argsIgnorePattern: '^_',
-                    varsIgnorePattern: '^_',
-                    destructuredArrayIgnorePattern: '^_',
-                    ignoreRestSiblings: true,
-                    caughtErrors: 'none',
-                }],
-                // 允许非空断言
-                'ts/no-non-null-assertion': 'off',
-                // 空合并提示
-                'ts/prefer-nullish-coalescing': ['warn', {
-                    ignoreConditionalTests: true,
-                    ignoreTernaryTests: true,
-                    ignoreMixedLogicalExpressions: true,
-                    ignorePrimitives: true,
-                }],
-                'ts/no-empty-object-type': ['error', {
-                    allowInterfaces: 'with-single-extends',
-                    allowWithName: 'Props$',
-                }],
-
-                'ts/no-explicit-any': ['error', {
-                    ignoreRestArgs: true,
-                }],
-
-                // 允许未 catch 的 promise
-                'ts/no-floating-promises': 'off',
-                'ts/no-misused-promises': ['warn', {
-                    checksVoidReturn: false,
-                }],
-                // 允许模版表达式使用数字
-                'ts/restrict-template-expressions': ['warn', {
-                    allowNumber: true,
-                }],
-
                 // 允许缩写
                 'unicorn/prevent-abbreviations': 'off',
 
@@ -195,9 +156,6 @@ export function base({ stylistic: stylisticOptions, inCI }) {
                     ignoreUsedVariables: true,
                 }],
 
-                // tla 设为 警告
-                'unicorn/prefer-top-level-await': 'warn',
-
                 'unicorn/no-useless-undefined': ['warn', {
                     checkArguments: false,
                     checkArrowFunctionBody: false,
@@ -226,7 +184,25 @@ export function base({ stylistic: stylisticOptions, inCI }) {
             },
         },
         {
-            files: defaultTsFiles,
+            files: defaultJsFiles,
+            languageOptions: {
+                globals: {
+                    ...globals.browser,
+                },
+            },
+            rules: {
+                'no-unused-vars': ['warn', {
+                    args: 'after-used',
+                    argsIgnorePattern: '^_',
+                    varsIgnorePattern: '^_',
+                    destructuredArrayIgnorePattern: '^_',
+                    ignoreRestSiblings: true,
+                    caughtErrors: 'none',
+                }],
+            },
+        },
+        {
+            files: defaultTsWithVueFiles,
             plugins: {
                 tsdoc,
             },
@@ -235,6 +211,48 @@ export function base({ stylistic: stylisticOptions, inCI }) {
                 'tsdoc/syntax': 'warn',
                 // 不允许使用标记为 @deprecated 的代码
                 'ts/no-deprecated': 'warn',
+
+                // this rule, if on, would require explicit return type on the `render` function
+                // 'ts/explicit-function-return-type': 'off',
+
+                // ------ end
+
+                // 忽略下划线开始的变量名
+                'ts/no-unused-vars': ['warn', {
+                    args: 'after-used',
+                    argsIgnorePattern: '^_',
+                    varsIgnorePattern: '^_',
+                    destructuredArrayIgnorePattern: '^_',
+                    ignoreRestSiblings: true,
+                    caughtErrors: 'none',
+                }],
+                // 允许非空断言
+                'ts/no-non-null-assertion': 'off',
+                // 空合并提示
+                'ts/prefer-nullish-coalescing': ['warn', {
+                    ignoreConditionalTests: true,
+                    ignoreTernaryTests: true,
+                    ignoreMixedLogicalExpressions: true,
+                    ignorePrimitives: true,
+                }],
+                'ts/no-empty-object-type': ['error', {
+                    allowInterfaces: 'with-single-extends',
+                    allowWithName: 'Props$',
+                }],
+
+                'ts/no-explicit-any': ['error', {
+                    ignoreRestArgs: true,
+                }],
+
+                // 允许未 catch 的 promise
+                'ts/no-floating-promises': 'off',
+                'ts/no-misused-promises': ['warn', {
+                    checksVoidReturn: false,
+                }],
+                // 允许模版表达式使用数字
+                'ts/restrict-template-expressions': ['warn', {
+                    allowNumber: true,
+                }],
             },
         },
         {

package/src/index.js

@@ -2,7 +2,6 @@ import { env } from 'node:process'
 
 import unocss from '@unocss/eslint-config/flat'
 import { mergeProcessors } from 'eslint-merge-processors'
-import tsdoc from 'eslint-plugin-tsdoc'
 import processorVueBlocks from 'eslint-processor-vue-blocks'
 
 import { base, defaultEsFiles, defaultJsFiles, defaultTsFiles, disableTypeChecked, playwright, tsParser, vitest, vue, vueParser } from './base.js'
@@ -226,14 +225,9 @@ export default function config({ unocss: withUnoCSS, stylistic: withStylistic, t
                         },
                     },
                 },
-                plugins: { tsdoc },
                 rules: {
-                    // 启用 tsdoc 扫描
-                    'tsdoc/syntax': 'warn',
                     /** script setup 不能开启此规则 */
                     'import-x/exports-last': 'off',
-                    // 不允许使用标记为 @deprecated 的代码
-                    'ts/no-deprecated': 'warn',
                 },
             },
 

package/src/tsparser-for-extra-files/index.js

@@ -1,3 +1,5 @@
+import { cwd } from 'node:process'
+
 import { parser as tsEslintParser } from 'typescript-eslint'
 
 import { TSServiceManager } from './ts.js'
@@ -41,7 +43,7 @@ function* _iterateOptions(options) {
     if (!options.project) {
         throw new Error('Specify `parserOptions.project`. Otherwise there is no point in using this parser.')
     }
-    const tsconfigRootDir = typeof options.tsconfigRootDir === 'string' ? options.tsconfigRootDir : process.cwd()
+    const tsconfigRootDir = typeof options.tsconfigRootDir === 'string' ? options.tsconfigRootDir : cwd()
 
     for (const project of resolveProjectList({
         project: getProjectConfigFiles({

package/src/tsparser-for-extra-files/ts.js

@@ -1,4 +1,5 @@
 import path from 'node:path'
+import { cwd } from 'node:process'
 
 import ts from 'typescript'
 
@@ -309,7 +310,7 @@ function isVirtualTSX(fileName, extraFileExtensions) {
 function formatDiagnostics(diagnostics) {
     return ts.formatDiagnostics(diagnostics, {
         getCanonicalFileName: f => f,
-        getCurrentDirectory: () => process.cwd(),
+        getCurrentDirectory: () => cwd(),
         getNewLine: () => '\n',
     })
 }
@@ -326,7 +327,7 @@ function normalizeFileName(fileName) {
 }
 
 function toAbsolutePath(filePath, baseDir) {
-    return path.isAbsolute(filePath) ? filePath : path.join(baseDir || process.cwd(), filePath)
+    return path.isAbsolute(filePath) ? filePath : path.join(baseDir || cwd(), filePath)
 }
 
 function* iterateDirs(filePath) {

package/src/tsparser-for-extra-files/utils/resolve-project-list.js

@@ -1,4 +1,5 @@
 import path from 'node:path'
+import { cwd } from 'node:process'
 
 import { globbySync } from 'globby'
 import isGlob from 'is-glob'
@@ -64,5 +65,5 @@ function _getCanonicalFileName(filePath) {
 }
 
 function _ensureAbsolutePath(p, tsconfigRootDir) {
-    return path.isAbsolute(p) ? p : path.join(tsconfigRootDir || process.cwd(), p)
+    return path.isAbsolute(p) ? p : path.join(tsconfigRootDir || cwd(), p)
 }