@ntnyq/eslint-config 2.0.0-beta.2 → 2.0.0-beta.3

package/index.js

@@ -7,3 +7,5 @@ export * from './lib/jsonc.js'
 export * from './lib/prettier.js'
 export * from './lib/markdown.js'
 export * from './lib/eslint-comments.js'
+
+export * from './lib/presets.js'

package/lib/astro.js

@@ -1,12 +1,11 @@
 import astroPlugin, { configs } from 'eslint-plugin-astro'
 import astroParser from 'astro-eslint-parser'
-import { GLOB_EXCLUDE, GLOB_ASTRO } from './shared.js'
+import { GLOB_ASTRO } from './shared.js'
 
 /** @type {import('eslint-define-config').FlatESLintConfig[]} */
 export const astro = [
   {
     files: [GLOB_ASTRO],
-    ignores: GLOB_EXCLUDE,
     plugins: {
       astro: astroPlugin,
     },

package/lib/js.js

@@ -2,7 +2,6 @@ import globals from 'globals'
 import jsConfig from '@eslint/js'
 import importPlugin from 'eslint-plugin-import'
 import unicornPlugin from 'eslint-plugin-unicorn'
-import { GLOB_EXCLUDE } from './shared.js'
 
 /** @type {import('eslint-define-config').FlatESLintConfig[]} */
 export const js = [
@@ -21,7 +20,6 @@ export const js = [
 
   {
     files: ['**/scripts/*', '**/cli.*'],
-    ignores: GLOB_EXCLUDE,
     rules: {
       'no-console': 'off',
     },
@@ -40,7 +38,6 @@ export const js = [
 export const jsx = [
   {
     files: ['**/*.jsx'],
-    ignores: GLOB_EXCLUDE,
     languageOptions: {
       parserOptions: {
         ecmaFeatures: {

package/lib/jsonc.js

@@ -1,12 +1,11 @@
 import jsoncPlugin, { configs } from 'eslint-plugin-jsonc'
 import jsoncParser from 'jsonc-eslint-parser'
-import { GLOB_EXCLUDE, GLOB_JSON, GLOB_JSON5, GLOB_JSONC } from './shared.js'
+import { GLOB_JSON, GLOB_JSON5, GLOB_JSONC } from './shared.js'
 
 /** @type {import('eslint-define-config').FlatESLintConfig[]} */
 export const jsonc = [
   {
     files: [GLOB_JSON, GLOB_JSON5, GLOB_JSONC, '**/*rc'],
-    ignores: GLOB_EXCLUDE,
     plugins: {
       jsonc: jsoncPlugin,
     },

package/lib/markdown.js

@@ -1,18 +1,18 @@
 import markdownPlugin from 'eslint-plugin-markdown'
-import { GLOB_EXCLUDE, GLOB_MARKDOWN } from './shared.js'
+import tsPlugin from '@typescript-eslint/eslint-plugin'
+import { GLOB_MARKDOWN, GLOB_SRC, GLOB_VUE } from './shared.js'
 
 /** @type {import('eslint-define-config').FlatESLintConfig[]} */
 export const markdown = [
   {
     files: [GLOB_MARKDOWN],
-    ignores: GLOB_EXCLUDE,
     plugins: {
       markdown: markdownPlugin,
     },
     processor: 'markdown/markdown',
   },
   {
-    files: ['**/*.md/*'],
+    files: [`**/*.md/${GLOB_SRC}`, `**/*.md/${GLOB_VUE}`],
     languageOptions: {
       parserOptions: {
         ecmaFeatures: {
@@ -20,6 +20,9 @@ export const markdown = [
         },
       },
     },
+    plugins: {
+      '@typescript-eslint': tsPlugin,
+    },
     rules: {
       ...markdownPlugin.configs.recommended.overrides[1].rules,
       'no-undef': 'off',

package/lib/presets.js

@@ -1,15 +1,23 @@
-import jsConfig from '@eslint/js'
+// @ts-check
+
 import { ts } from './ts.js'
 import { yml } from './yml.js'
 import { vue } from './vue.js'
+import { astro } from './astro.js'
+import { prettier } from './prettier.js'
 import { markdown } from './markdown.js'
 import { jsonc, pkgOrder } from './jsonc.js'
 import { imports, js, jsx, unicorn } from './js.js'
 import { eslintComments } from './eslint-comments.js'
+import { GLOB_EXCLUDE } from './shared.js'
+
+/**
+ * @typedef { import('eslint-define-config').FlatESLintConfig } FlatESLintConfig
+ */
 
-/** @type {import('eslint-define-config').FlatESLintConfig[]} */
-export const presetBasic = [
-  jsConfig.configs.recommended,
+/** @type {FlatESLintConfig[]} */
+export const basic = [
+  { ignores: GLOB_EXCLUDE },
   ...js,
   ...jsx,
   ...ts,
@@ -22,3 +30,31 @@ export const presetBasic = [
   ...markdown,
   ...eslintComments,
 ]
+
+/** @type {FlatESLintConfig[]} */
+export const all = [...vue, ...astro, ...basic, ...prettier]
+
+/** @type {(config?: FlatESLintConfig | FlatESLintConfig[], enables?: Partial<{
+ * vue: boolean
+ * prettier: boolean
+ * markdown: boolean
+ * }>) => FlatESLintConfig[]} */
+export function ntnyq(
+  config = [],
+  { vue: enableVue = true, prettier: enablePrettier = true, markdown: enableMarkdown = true } = {},
+) {
+  const configs = [...basic]
+  if (enableVue !== false) {
+    configs.push(...vue)
+  }
+  if (enableMarkdown !== false) {
+    configs.push(...markdown)
+  }
+  if (enablePrettier !== false) {
+    configs.push(...prettier)
+  }
+  if (Object.keys(config).length > 0) {
+    configs.push(...(Array.isArray(config) ? config : [config]))
+  }
+  return configs
+}

package/lib/prettier.js

@@ -1,9 +1,6 @@
 import prettierPlugin from 'eslint-plugin-prettier'
 import prettierConfig from 'eslint-config-prettier'
 
-const prettierConflictRules = { ...prettierConfig.rules }
-delete prettierConflictRules['vue/html-self-closing']
-
 /** @type {import('eslint-define-config').FlatESLintConfigItem[]} */
 export const prettier = [
   {
@@ -11,7 +8,7 @@ export const prettier = [
       prettier: prettierPlugin,
     },
     rules: {
-      ...prettierConflictRules,
+      ...prettierConfig.rules,
       ...prettierPlugin.configs.recommended.rules,
       'prettier/prettier': 'warn',
     },

package/lib/shared.js

@@ -24,7 +24,7 @@ export const GLOB_MARKDOWN = '**/*.md'
 export const GLOB_YAML = '**/*.y?(a)ml'
 export const GLOB_HTML = '**/*.htm?(l)'
 
-export const GLOB_ALL_SRC = /** @type {const} */ ([
+export const GLOB_ALL_SRC = [
   GLOB_SRC,
   GLOB_STYLE,
   GLOB_JSON,
@@ -33,16 +33,12 @@ export const GLOB_ALL_SRC = /** @type {const} */ ([
   GLOB_VUE,
   GLOB_YAML,
   GLOB_HTML,
-])
-
-export const GLOB_NODE_MODULES = /** @type {const} */ ('**/node_modules/**')
-export const GLOB_DIST = /** @type {const} */ ('**/dist/**')
-export const GLOB_LOCKFILE = /** @type {const} */ ([
-  '**/package-lock.json',
-  '**/yarn.lock',
-  '**/pnpm-lock.yaml',
-])
-export const GLOB_EXCLUDE = /** @type {const} */ ([
+]
+
+export const GLOB_NODE_MODULES = '**/node_modules/**'
+export const GLOB_DIST = '**/dist/**'
+export const GLOB_LOCKFILE = ['**/package-lock.json', '**/yarn.lock', '**/pnpm-lock.yaml']
+export const GLOB_EXCLUDE = [
   GLOB_NODE_MODULES,
   GLOB_DIST,
   ...GLOB_LOCKFILE,
@@ -52,10 +48,15 @@ export const GLOB_EXCLUDE = /** @type {const} */ ([
   '**/output',
   '**/coverage',
   '**/temp',
+  '**/cache',
   '**/fixtures',
+  '**/.vitepress/cache',
+  '**/.nuxt',
+  '**/.vercel',
+  '**/.changeset',
   '**/__snapshots__',
   '**/auto-import.d.ts',
   '**/components.d.ts',
   '**/.npmrc',
   '**/.yarnrc',
-])
+]

package/lib/ts.js

@@ -1,12 +1,13 @@
 import tsParser from '@typescript-eslint/parser'
 import tsPlugin from '@typescript-eslint/eslint-plugin'
-import { GLOB_EXCLUDE, GLOB_TS, GLOB_TSX } from './shared.js'
+import { GLOB_TS, GLOB_TSX } from './shared.js'
+
+export { tsParser, tsPlugin }
 
 /** @type {import('eslint-define-config').FlatESLintConfig[]} */
 export const ts = [
   {
     files: [GLOB_TS, GLOB_TSX],
-    ignores: GLOB_EXCLUDE,
     languageOptions: {
       parser: tsParser,
       parserOptions: {
@@ -53,7 +54,6 @@ export const ts = [
 
   {
     files: ['**/*.d.ts'],
-    ignores: GLOB_EXCLUDE,
     rules: {
       'import/no-duplicates': 'off',
       'import/newline-after-import': 'off',
@@ -67,4 +67,11 @@ export const ts = [
       'max-lines-per-function': 'off',
     },
   },
+
+  {
+    files: ['**/*.js', '**/*.cjs'],
+    rules: {
+      '@typescript-eslint/no-var-requires': 'off',
+    },
+  },
 ]

package/lib/vue.js

@@ -1,23 +1,64 @@
+import { getPackageInfoSync } from 'local-pkg'
 import vuePlugin from 'eslint-plugin-vue'
 import vueParser from 'vue-eslint-parser'
-import { GLOB_EXCLUDE, GLOB_VUE } from './shared.js'
+import tsPlugin from '@typescript-eslint/eslint-plugin'
+import { ts } from './ts.js'
+import { GLOB_VUE } from './shared.js'
+
+export { vueParser, vuePlugin }
+
+export function getVueVersion() {
+  const pkg = getPackageInfoSync('vue', { paths: [process.cwd()] })
+  if (pkg && typeof pkg.version === 'string' && !Number.isNaN(+pkg.version[0])) {
+    return +pkg.version[0]
+  }
+  return 3
+}
+const isVue3 = getVueVersion() === 3
+
+/** @type {import('eslint-define-config').Rules} */
+const vueBaseRules = {}
+
+/** @type {import('eslint-define-config').Rules} */
+const vue2Rules = {
+  ...vueBaseRules,
+}
+
+/** @type {import('eslint-define-config').Rules} */
+const vue3Rules = {
+  ...vueBaseRules,
+}
 
 /** @type {import('eslint-define-config').FlatESLintConfig[]} */
 export const vue = [
   {
     files: [GLOB_VUE],
-    ignores: GLOB_EXCLUDE,
     plugins: {
       vue: vuePlugin,
+      '@typescript-eslint': tsPlugin,
     },
     languageOptions: {
       parser: vueParser,
       parserOptions: {
         parser: '@typescript-eslint/parser',
+        sourceType: 'module',
+        extraFileExtensions: ['.vue'],
+        ecmaFeatures: {
+          jsx: true,
+        },
       },
     },
+    processor: vuePlugin.processors['.vue'],
+    rules: {
+      ...ts[0].rules,
+    },
+  },
+  {
+    plugins: {
+      vue: vuePlugin,
+    },
     rules: {
-      ...vuePlugin.configs['vue3-recommended'],
+      ...(isVue3 ? vue3Rules : vue2Rules),
     },
   },
 ]

package/lib/yml.js

@@ -1,12 +1,11 @@
 import ymlPlugin, { configs } from 'eslint-plugin-yml'
 import ymlParser from 'yaml-eslint-parser'
-import { GLOB_EXCLUDE, GLOB_YAML } from './shared.js'
+import { GLOB_YAML } from './shared.js'
 
 /** @type {import('eslint-define-config').FlatESLintConfig[]} */
 export const yml = [
   {
     files: [GLOB_YAML],
-    ignores: GLOB_EXCLUDE,
     languageOptions: {
       parser: ymlParser,
     },

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@ntnyq/eslint-config",
   "type": "module",
-  "version": "2.0.0-beta.2",
-  "packageManager": "pnpm@7.29.1",
+  "version": "2.0.0-beta.3",
+  "packageManager": "pnpm@8.1.0",
   "description": "",
   "keywords": [],
   "license": "MIT",
@@ -29,38 +29,39 @@
     "eslint": "^8.30.0"
   },
   "dependencies": {
-    "@eslint/js": "^8.35.0",
-    "@typescript-eslint/eslint-plugin": "^5.54.1",
-    "@typescript-eslint/parser": "^5.54.1",
-    "astro-eslint-parser": "^0.12.0",
-    "eslint-config-prettier": "^8.7.0",
-    "eslint-plugin-astro": "^0.24.0",
+    "@eslint/js": "^8.37.0",
+    "@typescript-eslint/eslint-plugin": "^5.57.0",
+    "@typescript-eslint/parser": "^5.57.0",
+    "astro-eslint-parser": "^0.13.2",
+    "eslint-config-prettier": "^8.8.0",
+    "eslint-plugin-astro": "^0.26.1",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-jsonc": "^2.6.0",
+    "eslint-plugin-jsonc": "^2.7.0",
     "eslint-plugin-markdown": "^3.0.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-unicorn": "^46.0.0",
-    "eslint-plugin-vue": "^9.9.0",
+    "eslint-plugin-vue": "^9.10.0",
     "eslint-plugin-yml": "^1.5.0",
     "globals": "^13.20.0",
     "jsonc-eslint-parser": "^2.2.0",
-    "prettier": "^2.8.4",
-    "vue-eslint-parser": "^9.1.0",
+    "local-pkg": "^0.4.3",
+    "prettier": "^2.8.7",
+    "vue-eslint-parser": "^9.1.1",
     "yaml-eslint-parser": "^1.2.0"
   },
   "devDependencies": {
-    "@ntnyq/prettier-config": "^1.4.1",
-    "@types/node": "^18.15.0",
-    "bumpp": "^9.0.0",
-    "eslint": "^8.35.0",
-    "eslint-define-config": "^1.16.0",
+    "@ntnyq/prettier-config": "^1.6.1",
+    "@types/node": "^18.15.11",
+    "bumpp": "^9.1.0",
+    "eslint": "^8.37.0",
+    "eslint-define-config": "^1.17.0",
     "husky": "^8.0.3",
     "nano-staged": "^0.8.0",
-    "typescript": "5.0.0-beta"
+    "typescript": "5.0.3"
   },
   "engines": {
-    "node": ">=14.19.0"
+    "node": ">=16.14.0"
   },
   "prettier": "@ntnyq/prettier-config",
   "scripts": {