feat: support Eslint 9

.eslintignore

@@ -0,0 +1,2 @@
+dist/
+node_modules/

.vscode/settings.json

@@ -1,9 +1,5 @@
 {
-  "cSpell.words": [
-    "astrojs",
-    "Globified",
-    "globify"
-  ],
+  "cSpell.words": ["astrojs", "Globified", "globify"],
   "explorer.fileNesting.patterns": {
     "index.js": "*.js"
   }

eslint.config.cjs

@@ -0,0 +1,2 @@
+const config = require("./index.js")
+module.exports = config

package.json

@@ -34,18 +34,18 @@
     "@typescript-eslint/eslint-plugin": "7.13.0",
     "@typescript-eslint/parser": "7.13.0",
     "anymatch": "^3.1.3",
-    "eslint": "^8.57.0",
+    "eslint": "^9.4.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-astro": "^0.34.0",
+    "eslint-plugin-astro": "^1.2.2",
     "eslint-plugin-html": "^8.1.1",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-json": "^3.1.0",
+    "eslint-plugin-json": "^4.0.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-only-warn": "npm:@aminya/eslint-plugin-only-warn@^1.2.2",
     "eslint-plugin-optimize-regex": "^1.2.1",
     "eslint-plugin-react": "^7.34.2",
     "eslint-plugin-solid": "^0.14.0",
-    "eslint-plugin-yaml": "^0.5.0",
+    "eslint-plugin-yaml": "^1.0.0",
     "globify-gitignore": "^1.0.3",
     "make-synchronous": "^0.1.1",
     "prettier": "3.3.2",
@@ -65,7 +65,7 @@
     "@types/shelljs": "^0.8.15",
     "eslint-config-atomic": "link:",
     "execa": "^5.1.1",
-    "gitly": "^2.5.3",
+    "gitly": "^3.0.0",
     "npm-check-updates": "16.14.20",
     "prettier-config-atomic": "^4.0.0",
     "shelljs": "^0.8.5",

prettier.config.mjs

@@ -0,0 +1,2 @@
+import config from "prettier-config-atomic"
+export default config

src/astro.cts

@@ -1,20 +1,28 @@
-import { Linter } from "eslint"
+import type { Linter } from "eslint"
 import { pluginImportAstroRulesExtra } from "./plugin-import-rules.cjs"
+import astroPlugin from "eslint-plugin-astro"
+import * as onlyWarnPlugin from "eslint-plugin-only-warn"
+import astroParser from "astro-eslint-parser"
 
-export const astroConfig: Linter.ConfigOverride<Linter.RulesRecord> = {
+export const astroConfig: Linter.FlatConfig<Linter.RulesRecord> = {
   // astro files
+  ...astroPlugin.configs.recommended,
   files: ["*.astro"],
-  parser: "astro-eslint-parser",
-  parserOptions: {
-    parser: "@typescript-eslint/parser",
-    extraFileExtensions: [".astro"],
+  languageOptions: {
+    parser: astroParser,
+    parserOptions: {
+      parser: "@typescript-eslint/parser",
+      extraFileExtensions: [".astro"],
+    },
+    globals: {
+      astroHTML: "readonly",
+    },
   },
-  plugins: ["astro", "only-warn"],
-  extends: ["plugin:astro/recommended"],
-  rules: {
-    ...pluginImportAstroRulesExtra
+  plugins: {
+    astro: astroPlugin,
+    "only-warn": onlyWarnPlugin,
   },
-  globals: {
-    astroHTML: "readonly",
+  rules: {
+    ...pluginImportAstroRulesExtra,
   },
 }

src/coffeescript.cts

@@ -1,13 +1,26 @@
 import { pluginNodeRules } from "./plugin-node-rules.cjs"
 import { pluginImportRulesExtra } from "./plugin-import-rules.cjs"
-import { Linter } from "eslint"
+import type { Linter } from "eslint"
+import * as eslintPluginCoffee from "eslint-plugin-coffee"
+import * as onlyWarnPlugin from "eslint-plugin-only-warn"
+import * as nodePlugin from "eslint-plugin-node"
+import * as coffeeParser from "eslint-plugin-coffee/parser"
+import * as optimizeRegexPlugin from "eslint-plugin-optimize-regex"
 
-export const coffeeConfig: Linter.ConfigOverride<Linter.RulesRecord> = {
+export const coffeeConfig: Linter.FlatConfig<Linter.RulesRecord> = {
   // CoffeeScript files
+  ...eslintPluginCoffee.configs!.recommended,
+  ...optimizeRegexPlugin.configs!.all,
+  ...eslintPluginCoffee.configs!.prettier,
   files: ["**/*.coffee"],
-  parser: "eslint-plugin-coffee",
-  plugins: ["coffee", "node", "only-warn"],
-  extends: ["plugin:coffee/eslint-recommended", "plugin:optimize-regex/all", "plugin:coffee/prettier"],
+  languageOptions: {
+    parser: coffeeParser,
+  },
+  plugins: {
+    coffee: eslintPluginCoffee,
+    node: nodePlugin,
+    "only-warn": onlyWarnPlugin,
+  },
   rules: {
     ...pluginNodeRules,
     ...pluginImportRulesExtra,

src/cson.cts

@@ -1,7 +1,7 @@
-import { Linter } from "eslint"
+import type { Linter } from "eslint"
 import { coffeeConfig } from "./coffeescript.cjs"
 
-export const csonConfig: Linter.ConfigOverride<Linter.RulesRecord> = {
+export const csonConfig: Linter.FlatConfig<Linter.RulesRecord> = {
   ...coffeeConfig,
   files: ["**/*.cson"],
   rules: {

src/html.cts

@@ -1,6 +1,7 @@
-import { Linter } from "eslint"
+import type { Linter } from "eslint"
+import * as htmlPlugin from "eslint-plugin-html"
 
-export const htmlConfig: Linter.ConfigOverride<Linter.RulesRecord> = {
+export const htmlConfig: Linter.FlatConfig<Linter.RulesRecord> = {
   files: [
     "**/*.erb",
     "**/*.handlebars",
@@ -16,5 +17,7 @@ export const htmlConfig: Linter.ConfigOverride<Linter.RulesRecord> = {
     "**/*.xhtml",
     "**/*.xml",
   ],
-  plugins: ["html"],
+  plugins: {
+    html: htmlPlugin,
+  },
 }

src/index-react.cts

@@ -1,8 +1,8 @@
-import { Linter } from "eslint"
+import type { Linter } from "eslint"
 import base from "./index.cjs"
 import { tsConfig } from "./typescript.cjs"
 
-const nonStrictConfig: Linter.Config = {
+const nonStrictConfig: Linter.FlatConfig = {
   ...base,
   plugins: ["react", ...(base.plugins ?? [])],
   extends: ["plugin:react/recommended", ...(base.extends ?? [])],

src/index-solid.cts

@@ -1,26 +1,24 @@
-import { Linter } from "eslint"
+import type { Linter } from "eslint"
 import base from "./index.cjs"
 import { tsConfig } from "./typescript.cjs"
 
-const nonStrictConfig: Linter.Config = {
+const nonStrictConfig: Linter.FlatConfig[] = [
   ...base,
-  overrides: [
-    // JavaScript:
-    {
-      files: ["*.js", "*.jsx", "*.mjs", "*.cjs"],
-      plugins: ["solid", ...(base.plugins ?? [])],
-      extends: ["plugin:solid/recommended", ...(base.extends ?? [])],
-    },
-    // TypeScript:
-    {
-      ...tsConfig,
-      plugins: ["solid", ...(tsConfig.plugins ?? [])],
-      extends: ["plugin:solid/typescript", ...(tsConfig.extends ?? [])],
-      rules: tsConfig.rules,
-    },
-    // The rest is the same
-    ...(base.overrides?.slice(1) ?? []),
-  ],
-}
+  // JavaScript:
+  {
+    files: ["*.js", "*.jsx", "*.mjs", "*.cjs"],
+    plugins: ["solid", ...(base.plugins ?? [])],
+    extends: ["plugin:solid/recommended", ...(base.extends ?? [])],
+  },
+  // TypeScript:
+  {
+    ...tsConfig,
+    plugins: ["solid", ...(tsConfig.plugins ?? [])],
+    extends: ["plugin:solid/typescript", ...(tsConfig.extends ?? [])],
+    rules: tsConfig.rules,
+  },
+  // The rest is the same
+  ...(base.overrides?.slice(1) ?? []),
+]
 
 export default nonStrictConfig

src/index-strict-react.cts

@@ -1,18 +1,18 @@
 import nonStrictConfig from "./index-react.cjs"
 
-// remove only-warn from javascript
-if (
-  nonStrictConfig.plugins !== undefined &&
-  nonStrictConfig.plugins[nonStrictConfig.plugins.length - 1] === "only-warn"
-) {
-  nonStrictConfig.plugins.pop()
-}
+// // remove only-warn from javascript
+// if (
+//   nonStrictConfig.plugins !== undefined &&
+//   nonStrictConfig.plugins[nonStrictConfig.plugins.length - 1] === "only-warn"
+// ) {
+//   nonStrictConfig.plugins.pop()
+// }
 
-// remove only-warn from overrides
-nonStrictConfig.overrides?.forEach((overrides) => {
-  if (overrides.plugins !== undefined && overrides.plugins[overrides.plugins.length - 1] === "only-warn") {
-    overrides.plugins.pop()
-  }
-})
+// // remove only-warn from overrides
+// nonStrictConfig.overrides?.forEach((overrides) => {
+//   if (overrides.plugins !== undefined && overrides.plugins[overrides.plugins.length - 1] === "only-warn") {
+//     overrides.plugins.pop()
+//   }
+// })
 
 export default nonStrictConfig

src/index-strict-solid.cts

@@ -1,18 +1,18 @@
 import nonStrictConfig from "./index-solid.cjs"
 
-// remove only-warn from javascript
-if (
-  nonStrictConfig.plugins !== undefined &&
-  nonStrictConfig.plugins[nonStrictConfig.plugins.length - 1] === "only-warn"
-) {
-  nonStrictConfig.plugins.pop()
-}
+// // remove only-warn from javascript
+// if (
+//   nonStrictConfig.plugins !== undefined &&
+//   nonStrictConfig.plugins[nonStrictConfig.plugins.length - 1] === "only-warn"
+// ) {
+//   nonStrictConfig.plugins.pop()
+// }
 
-// remove only-warn from overrides
-nonStrictConfig.overrides?.forEach((overrides) => {
-  if (overrides.plugins !== undefined && overrides.plugins[overrides.plugins.length - 1] === "only-warn") {
-    overrides.plugins.pop()
-  }
-})
+// // remove only-warn from overrides
+// nonStrictConfig.overrides?.forEach((overrides) => {
+//   if (overrides.plugins !== undefined && overrides.plugins[overrides.plugins.length - 1] === "only-warn") {
+//     overrides.plugins.pop()
+//   }
+// })
 
 export default nonStrictConfig

src/index-strict.cts

@@ -1,18 +1,18 @@
 import nonStrictConfig from "./index.cjs"
 
-// remove only-warn from javascript
-if (
-  nonStrictConfig.plugins !== undefined &&
-  nonStrictConfig.plugins[nonStrictConfig.plugins.length - 1] === "only-warn"
-) {
-  nonStrictConfig.plugins.pop()
-}
+// // remove only-warn from javascript
+// if (
+//   nonStrictConfig.plugins !== undefined &&
+//   nonStrictConfig.plugins[nonStrictConfig.plugins.length - 1] === "only-warn"
+// ) {
+//   nonStrictConfig.plugins.pop()
+// }
 
-// remove only-warn from overrides
-nonStrictConfig.overrides?.forEach((overrides) => {
-  if (overrides.plugins !== undefined && overrides.plugins[overrides.plugins.length - 1] === "only-warn") {
-    overrides.plugins.pop()
-  }
-})
+// // remove only-warn from overrides
+// nonStrictConfig.overrides?.forEach((overrides) => {
+//   if (overrides.plugins !== undefined && overrides.plugins[overrides.plugins.length - 1] === "only-warn") {
+//     overrides.plugins.pop()
+//   }
+// })
 
 export default nonStrictConfig

src/index.cts

@@ -1,11 +1,9 @@
 import { jsConfig } from "./javascript.cjs"
 import { tsConfig } from "./typescript.cjs"
-import { coffeeConfig } from "./coffeescript.cjs"
 import { jsonConfig } from "./json.cjs"
-import { csonConfig } from "./cson.cjs"
 import { yamlConfig } from "./yaml.cjs"
 import { htmlConfig } from "./html.cjs"
-import { pluginImportSettings } from "./plugin-import-rules.cjs"
+// import { pluginImportSettings } from "./plugin-import-rules.cjs"
 import semverMajor from "semver/functions/major"
 import { getEslintVersion } from "./eslint-version.cjs"
 import { astroConfig } from "./astro.cjs"
@@ -17,6 +15,9 @@ function maybeAddCoffeeScript() {
     // check if the eslint version is < 8
     // and if coffee installed
     if (eslintVersion < 8 && require.resolve("eslint-plugin-coffee")) {
+      const coffeeConfig = require("./coffee.cjs").coffeeConfig
+      const csonConfig = require("./cson.cjs").csonConfig
+
       // if so try adding the coffee plugin
       return [coffeeConfig, csonConfig]
     }
@@ -26,23 +27,23 @@ function maybeAddCoffeeScript() {
   return []
 }
 
-const config: Linter.Config = {
-  root: true,
-  env: {
-    atomtest: true,
-    es6: true,
-    node: true,
-    browser: true,
-  },
-  globals: {
-    atom: "readonly",
-  },
-  ignorePatterns: ["node_modules/"],
-  ...jsConfig,
-  overrides: [tsConfig, jsonConfig, yamlConfig, htmlConfig, astroConfig, ...maybeAddCoffeeScript()],
-  settings: {
-    ...pluginImportSettings,
-  },
-}
+const config: Linter.FlatConfig[] = [
+  // {
+  //   ignores: ["node_modules/"],
+  //   ...jsConfig,
+  //   settings: {
+  //     ...pluginImportSettings,
+  //   },
+  // },
+  jsConfig,
+  tsConfig,
+  jsonConfig,
+  yamlConfig,
+  htmlConfig,
+  astroConfig,
+  ...maybeAddCoffeeScript(),
+]
+
+// console.log(config)
 
 export default config