Merge pull request #35 from hildjj/modernize

Modernize

.editorconfig

@@ -0,0 +1,12 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8
+indent_style = space
+indent_size = 2

.npmignore

@@ -3,3 +3,4 @@
 eslint.config.mjs
 node_modules/
 test/
+.editorconfig

README.md

@@ -2,24 +2,30 @@
 
 For js-only projects:
 
-File: `.eslintrc.js` (or `.eslintrc.cjs` if you're type `"module"`):
+File: `eslint.config.js` (or `eslint.config.mjs` if you're in a project with
+type `"commonjs"`):
 
 ```js
-"use strict";
+import mocha from "@peggyjs/eslint-config/flat/mocha.js";
+// Use commonjs if you're in an older project
+import module from "@peggyjs/eslint-config/flat/module.js";
+import ts from "@peggyjs/eslint-config/flat/ts.js";
 
-module.exports = {
-  root: true,
-  extends: ["@peggyjs"],
-};
+export default [
+  ...module,
+  ...ts,
+  ...mocha,
+];
 ```
 
-For projects that include typescript:
+If you include the ts config, you'll need to add dependencies:
 
-```js
-"use strict";
+```sh
+npm install -D typescript typescript-eslint
+```
+
+If you include the mocha config, you'll need to add dependencies:
 
-module.exports = {
-  root: true,
-  extends: ["@peggyjs", "@peggyjs/eslint-config/typescript"],
-};
+```sh
+npm install -D eslint-plugin-mocha
 ```

commonjs.js

@@ -0,0 +1,26 @@
+import globals from "globals";
+import ignores from "./ignores.js";
+import json from "./json.js";
+import markdown from "@eslint/markdown";
+import override from "./override.js";
+import { rules } from "./rules/js.js";
+import stylistic from "@stylistic/eslint-plugin";
+
+export default [
+  ...ignores,
+  {
+    files: ["**/*.js", "**/*.cjs", "**/*.mjs", "**/*.ts"],
+    plugins: {
+      "@stylistic": stylistic,
+    },
+    languageOptions: {
+      globals: globals["shared-node-browser"],
+      ecmaVersion: 2018,
+      sourceType: "commonjs",
+    },
+    rules,
+  },
+  ...override,
+  ...json,
+  ...markdown.configs.recommended,
+];

eslint.config.mjs → eslint.config.js

@@ -1,20 +1,14 @@
-import cjs from "./flat/cjs.js";
-import js from "./flat/js.js";
+import json from "@eslint/json";
 import meta from "@cto.af/eslint-plugin-meta";
-import mjs from "./flat/mjs.js";
-import { plugin } from "typescript-eslint";
+import module from "./module.js";
 import stylistic from "@stylistic/eslint-plugin";
+import { plugin as ts } from "typescript-eslint";
 
 export default [
   {
-    ignores: [
-      "node_modules/**",
-      "test/**",
-    ],
+    ignores: ["test/**"],
   },
-  js,
-  cjs,
-  mjs,
+  ...module,
   {
     files: [
       "rules/*.js",
@@ -23,7 +17,8 @@ export default [
       meta: {
         libs: {
           "@stylistic": stylistic,
-          "@typescript-eslint": plugin,
+          "@typescript-eslint": ts,
+          json,
         },
       },
     },

globals.js

@@ -0,0 +1 @@
+export { default } from "globals";

ignores.js

@@ -0,0 +1,8 @@
+export default [{
+  ignores: [
+    "node_modules/**",
+    "coverage/**",
+    "docs/**",
+    "**/*.min.js",
+  ],
+}];

json.js

@@ -0,0 +1,26 @@
+import json from "@eslint/json";
+import { rules } from "./rules/json.js";
+
+export default [{
+  files: ["**/*.json"],
+  plugins: { json },
+  language: "json/json",
+  rules,
+},
+{
+  files: [
+    "**/*.jsonc",
+    ".vscode/*.json",
+    "**/tsconfig.json",
+    "**/tsconfig-base.json",
+  ],
+  plugins: { json },
+  language: "json/jsonc",
+  rules,
+},
+{
+  files: ["**/*.json5"],
+  plugins: { json },
+  language: "json/json5",
+  rules,
+}];

mocha.js

@@ -0,0 +1,18 @@
+import globals from "globals";
+import mocha from "eslint-plugin-mocha";
+
+export default [{
+  files: [
+    "test/**/*.{spec,test}.{js,ts,cjs,mjs}",
+  ],
+  languageOptions: {
+    globals: globals.mocha,
+  },
+  plugins: {
+    mocha,
+  },
+  rules: {
+    ...mocha.configs.recommended.rules,
+    "mocha/no-mocha-arrows": "off",
+  },
+}];

flat/modern.js → modern.js

@@ -1,10 +1,10 @@
-"use strict";
+import globals from "globals";
 
-const globals = require("globals");
-
-module.exports = {
+export const modern = {
   languageOptions: {
     globals: globals.node,
     ecmaVersion: 2022,
   },
 };
+
+export default [modern];

module.js

@@ -0,0 +1,26 @@
+import globals from "globals";
+import ignores from "./ignores.js";
+import json from "./json.js";
+import markdown from "@eslint/markdown";
+import override from "./override.js";
+import { rules } from "./rules/js.js";
+import stylistic from "@stylistic/eslint-plugin";
+
+export default [
+  ...ignores,
+  {
+    files: ["**/*.js", "**/*.cjs", "**/*.mjs", "**/*.ts"],
+    plugins: {
+      "@stylistic": stylistic,
+    },
+    languageOptions: {
+      globals: globals["shared-node-browser"],
+      ecmaVersion: 2020,
+      sourceType: "module",
+    },
+    rules,
+  },
+  ...override,
+  ...json,
+  ...markdown.configs.recommended,
+];

override.js

@@ -0,0 +1,12 @@
+export default [{
+  files: ["**/*.mjs"],
+  languageOptions: {
+    sourceType: "module", // Force
+  },
+},
+{
+  files: ["**/*.cjs"],
+  languageOptions: {
+    sourceType: "commonjs", // Force
+  },
+}];

package.json

@@ -2,14 +2,15 @@
   "name": "@peggyjs/eslint-config",
   "version": "4.0.4",
   "description": "Lint rules for peggyjs projects",
-  "main": "index.js",
+  "main": "./module.js",
+  "type": "module",
   "keywords": [
     "peggy",
     "eslint"
   ],
   "scripts": {
     "lint": "eslint .",
-    "test": "cd test/old && npm test && cd ../flat && npm test && cd ../flat-module && npm test",
+    "test": "(cd test/flat && npm test); (cd test/flat-module && npm test)",
     "ci": "npm run lint && npm run test"
   },
   "author": "Joe Hildebrand <[email protected]>",
@@ -20,15 +21,16 @@
   },
   "devDependencies": {
     "@cto.af/eslint-plugin-meta": "1.1.1",
-    "@peggyjs/sort-rules": "link:sort-rules",
     "eslint": "^9.12.0",
     "eslint-plugin-mocha": "10.5.0",
-    "typescript": "^5.6.2",
+    "typescript": "^5.6.3",
     "typescript-eslint": "8.8.1"
   },
   "dependencies": {
+    "@eslint/json": "0.5.0",
+    "@eslint/markdown": "6.2.0",
     "@stylistic/eslint-plugin": "2.9.0",
-    "globals": "15.10.0"
+    "globals": "15.11.0"
   },
   "packageManager": "[email protected]",
   "engines": {