test: ensure @eslint/markdown works with both ESLint v9 and v10

.github/workflows/ci.yml

@@ -48,14 +48,14 @@ jobs:
         strategy:
             matrix:
                 os: [ubuntu-latest]
-                eslint: [9]
+                eslint: [9.15.0, 9.x, 10.x]
                 node: [25.x, 24.x, 22.x, 20.x, "20.19.0"]
                 include:
                     - os: windows-latest
-                      eslint: 9
+                      eslint: latest
                       node: lts/*
                     - os: macOS-latest
-                      eslint: 9
+                      eslint: latest
                       node: lts/*
         runs-on: ${{ matrix.os }}
         steps:
@@ -69,13 +69,16 @@ jobs:
               run: npm install
               env:
                   CI: true
-            - name: Install ESLint@${{  matrix.eslint  }}
-              run: npm install eslint@${{  matrix.eslint  }}
+            - name: Install ESLint@${{ matrix.eslint }}
+              run: npm install -D eslint@${{ matrix.eslint }}
             - name: Test
               run: npm run test
 
     test_types:
         name: Test Types
+        strategy:
+            matrix:
+                eslint: [9.x, 10.x]
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v6
@@ -85,6 +88,8 @@ jobs:
                   node-version: "lts/*"
             - name: Install dependencies
               run: npm install
+            - name: Install ESLint@${{ matrix.eslint }}
+              run: npm install -D eslint@${{ matrix.eslint }}
             - name: Check Types
               run: npm run test:types
 

examples/react/package.json

@@ -5,8 +5,8 @@
     "test": "eslint ."
   },
   "devDependencies": {
-    "@eslint/js": "^9.7.0",
-    "eslint": "^9.7.0",
+    "@eslint/js": "^9.39.2",
+    "eslint": "^9.39.2",
     "eslint-plugin-react": "^7.35.0",
     "globals": "^13.24.0"
   }

examples/typescript/package.json

@@ -5,9 +5,9 @@
     "test": "eslint ."
   },
   "devDependencies": {
-    "@eslint/js": "^9.7.0",
-    "eslint": "^9.15.0",
-    "typescript": "^5.8.3",
-    "typescript-eslint": "^8.15.0"
+    "@eslint/js": "^9.39.2",
+    "eslint": "^9.39.2",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.54.0"
   }
 }

package.json

@@ -93,8 +93,8 @@
     "yorkie": "^2.0.0"
   },
   "dependencies": {
-    "@eslint/core": "^0.17.0",
-    "@eslint/plugin-kit": "^0.4.1",
+    "@eslint/core": "^1.1.0",
+    "@eslint/plugin-kit": "^0.6.0",
     "github-slugger": "^2.0.0",
     "mdast-util-from-markdown": "^2.0.2",
     "mdast-util-frontmatter": "^2.0.1",

src/index.js

@@ -25,7 +25,7 @@ import rules from "./build/rules.js";
 // Exports
 //-----------------------------------------------------------------------------
 
-/** @type {Linter.RulesRecord} */
+/** @satisfies {Linter.RulesRecord} */
 const processorRulesConfig = {
 	// The Markdown parser automatically trims trailing
 	// newlines from code blocks.

tests/examples/all.test.js

@@ -35,12 +35,12 @@ for (const example of examples) {
 		describe("examples", () => {
 			describe(example, () => {
 				it("reports errors on code blocks in .md files", async () => {
-					const { FlatESLint } = require(
-						require.resolve("eslint/use-at-your-own-risk", {
+					const { ESLint } = require(
+						require.resolve("eslint", {
 							paths: [cwd],
 						}),
 					);
-					const eslint = new FlatESLint({ cwd });
+					const eslint = new ESLint({ cwd });
 					const results = await eslint.lintFiles(["README.md"]);
 					const readme = results.find(
 						result => path.basename(result.filePath) == "README.md",

tests/plugin.test.js

@@ -8,15 +8,12 @@
 //-----------------------------------------------------------------------------
 
 import assert from "node:assert";
-import api from "eslint";
-import unsupportedAPI from "eslint/use-at-your-own-risk";
 import path from "node:path";
-import plugin from "../src/index.js";
 import fs from "node:fs";
 import { fileURLToPath, pathToFileURL } from "node:url";
+import { ESLint } from "eslint";
+import plugin from "../src/index.js";
 
-const ESLint = api.ESLint;
-const LegacyESLint = unsupportedAPI.LegacyESLint;
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const rulesDir = path.resolve(__dirname, "../src/rules");
@@ -33,13 +30,23 @@ const pkg = JSON.parse(
 // Helpers
 //-----------------------------------------------------------------------------
 
+/**
+ * Gets the major version of the currently installed ESLint.
+ * @returns {number} The major version.
+ */
+function getESLintMajorVersion() {
+	return Number(ESLint.version.split(".")[0]);
+}
+
 /**
  * Helper function which creates ESLint instance with enabled/disabled autofix feature.
  * @param {string} fixtureConfigName ESLint JSON config fixture filename.
  * @param {Object} [options={}] Whether to enable autofix feature.
  * @returns {LegacyESLint} ESLint instance to execute in tests.
  */
-function initLegacyESLint(fixtureConfigName, options = {}) {
+async function initLegacyESLint(fixtureConfigName, options = {}) {
+	const { LegacyESLint } = await import("eslint/use-at-your-own-risk");
+
 	return new LegacyESLint({
 		cwd: path.resolve(__dirname, "./fixtures/"),
 		ignore: false,
@@ -87,6 +94,10 @@ describe("meta", () => {
 });
 
 describe("LegacyESLint", () => {
+	if (getESLintMajorVersion() >= 10) {
+		return; // Skip `LegacyESLint` tests on ESLint v10+
+	}
+
 	describe("recommended config", () => {
 		let eslint;
 		const shortText = [
@@ -96,8 +107,8 @@ describe("LegacyESLint", () => {
 			"```",
 		].join("\n");
 
-		before(() => {
-			eslint = initLegacyESLint("recommended.json");
+		before(async () => {
+			eslint = await initLegacyESLint("recommended.json");
 		});
 
 		it("should include the plugin", async () => {
@@ -142,8 +153,8 @@ describe("LegacyESLint", () => {
 		let eslint;
 		const shortText = ["```js", "console.log(42);", "```"].join("\n");
 
-		before(() => {
-			eslint = initLegacyESLint("eslintrc.json");
+		before(async () => {
+			eslint = await initLegacyESLint("eslintrc.json");
 		});
 
 		it("should run on .md files", async () => {
@@ -372,7 +383,7 @@ describe("LegacyESLint", () => {
 				"```",
 				"````",
 			].join("\n");
-			const recursiveCli = initLegacyESLint("eslintrc.json", {
+			const recursiveCli = await initLegacyESLint("eslintrc.json", {
 				extensions: [".js", ".markdown", ".md"],
 			});
 			const results = await recursiveCli.lintText(code, {
@@ -466,8 +477,8 @@ describe("LegacyESLint", () => {
 		});
 
 		describe("should fix code", () => {
-			before(() => {
-				eslint = initLegacyESLint("eslintrc.json", { fix: true });
+			before(async () => {
+				eslint = await initLegacyESLint("eslintrc.json", { fix: true });
 			});
 
 			it("in the simplest case", async () => {
@@ -1462,52 +1473,6 @@ describe("FlatESLint", () => {
 			assert.strictEqual(results[0].messages[0].column, 1);
 		});
 
-		// https://github.com/eslint/markdown/issues/181
-		it("should work when called on nested code blocks in the same file", async () => {
-			/*
-			 * As of this writing, the nested code block, though it uses the same
-			 * Markdown processor, must use a different extension or ESLint will not
-			 * re-apply the processor on the nested code block. To work around that,
-			 * a file named `test.md` contains a nested `markdown` code block in
-			 * this test.
-			 *
-			 * https://github.com/eslint/eslint/pull/14227/files#r602802758
-			 */
-			const code = [
-				"<!-- test.md -->",
-				"",
-				"````markdown",
-				"<!-- test.md/0_0.markdown -->",
-				"",
-				"This test only repros if the MD files have a different number of lines before code blocks.",
-				"",
-				"```js",
-				"// test.md/0_0.markdown/0_0.js",
-				"console.log('single quotes')",
-				"```",
-				"````",
-			].join("\n");
-			const recursiveCli = initLegacyESLint("eslintrc.json", {
-				extensions: [".js", ".markdown", ".md"],
-			});
-			const results = await recursiveCli.lintText(code, {
-				filePath: "test.md",
-			});
-
-			assert.strictEqual(results.length, 1);
-			assert.strictEqual(results[0].messages.length, 2);
-			assert.strictEqual(
-				results[0].messages[0].message,
-				"Unexpected console statement.",
-			);
-			assert.strictEqual(results[0].messages[0].line, 10);
-			assert.strictEqual(
-				results[0].messages[1].message,
-				"Strings must use doublequote.",
-			);
-			assert.strictEqual(results[0].messages[1].line, 10);
-		});
-
 		describe("configuration comments", () => {
 			it("apply only to the code block immediately following", async () => {
 				const code = [
@@ -1582,7 +1547,7 @@ describe("FlatESLint", () => {
 
 		describe("should fix code", () => {
 			before(() => {
-				eslint = initLegacyESLint("eslintrc.json", { fix: true });
+				eslint = initFlatESLint("eslint.config.js", { fix: true });
 			});
 
 			it("in the simplest case", async () => {

tests/types/types.test.ts

@@ -8,8 +8,8 @@ import type {
 	RangeMap,
 	Block,
 } from "@eslint/markdown";
-import type { SourceLocation, SourceRange } from "@eslint/core";
-import type { ESLint, Linter } from "eslint";
+import type { Plugin, SourceLocation, SourceRange } from "@eslint/core";
+import type { Linter } from "eslint";
 import type { Position } from "unist";
 import type {
 	// Nodes (abstract)
@@ -89,7 +89,7 @@ const invalidBlock: Block = {
 	value: "code",
 };
 
-markdown satisfies ESLint.Plugin;
+markdown satisfies Plugin;
 markdown.meta.name satisfies string;
 markdown.meta.version satisfies string;