diff --git a/common/tools/eslint-plugin-azure-sdk/package.json b/common/tools/eslint-plugin-azure-sdk/package.json index 1ee0456e8ab1..80772d7e9ca7 100644 --- a/common/tools/eslint-plugin-azure-sdk/package.json +++ b/common/tools/eslint-plugin-azure-sdk/package.json @@ -89,7 +89,6 @@ "@typescript-eslint/eslint-plugin": "~8.24.1", "@typescript-eslint/parser": "~8.24.1", "eslint": "^9.9.0", - "eslint-plugin-markdown": "^5.0.0", "eslint-plugin-n": "^17.15.0", "eslint-plugin-no-only-tests": "^3.3.0", "eslint-plugin-promise": "^7.2.1", @@ -118,7 +117,6 @@ "@vitest/browser": "^3.0.3", "@vitest/coverage-istanbul": "^3.0.3", "eslint": "^9.9.0", - "eslint-plugin-markdown": "^5.0.0", "playwright": "^1.49.1", "prettier": "^3.3.3", "rimraf": "^5.0.5", diff --git a/common/tools/eslint-plugin-azure-sdk/src/configs/index.ts b/common/tools/eslint-plugin-azure-sdk/src/configs/index.ts index ea42c155480d..181a3aa28d18 100644 --- a/common/tools/eslint-plugin-azure-sdk/src/configs/index.ts +++ b/common/tools/eslint-plugin-azure-sdk/src/configs/index.ts @@ -5,11 +5,9 @@ import eslint from "@eslint/js"; import typescriptEslint from "typescript-eslint"; import type { FlatConfig } from "@typescript-eslint/utils/ts-eslint"; import eslintConfigPrettier from "eslint-config-prettier"; -import markdown from "eslint-plugin-markdown"; import promise from "eslint-plugin-promise"; import eslintCustomized from "./eslint-customized.js"; -import markdownCustomized from "./markdown-customized.js"; import azureSdkCustomized from "./azure-sdk-customized.js"; function recommended(plugin: FlatConfig.Plugin, options: { typeChecked: boolean }) { @@ -26,7 +24,6 @@ function recommended(plugin: FlatConfig.Plugin, options: { typeChecked: boolean { plugins: { "@azure/azure-sdk": plugin, - markdown, promise, }, }, @@ -35,7 +32,6 @@ function recommended(plugin: FlatConfig.Plugin, options: { typeChecked: boolean // azure sdk customized eslintCustomized, - ...markdownCustomized, ...azureSdkCustomized(typescriptEslint.parser), ); } diff --git a/common/tools/eslint-plugin-azure-sdk/src/configs/markdown-customized.ts b/common/tools/eslint-plugin-azure-sdk/src/configs/markdown-customized.ts deleted file mode 100644 index 0fd3e73016dd..000000000000 --- a/common/tools/eslint-plugin-azure-sdk/src/configs/markdown-customized.ts +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT License. - -import type { FlatConfig } from "@typescript-eslint/utils/ts-eslint"; -import typescriptEslint from "typescript-eslint"; - -const markdownConfigs: FlatConfig.ConfigArray = [ - { - files: ["**/*.md"], - ignores: ["**/*.api.md"], - processor: "markdown/markdown", - }, - { - name: "markdown-js-azsdk-customized", - files: ["*.md/*.js", "*/*/*.md/*.js"], - languageOptions: { - parserOptions: { - project: true, - programs: null, - }, - }, - ...typescriptEslint.configs.disableTypeChecked, - rules: { - "no-unused-vars": "off", - "no-undef": "off", - "no-console": "off", - "no-restricted-imports": [ - "error", - { - patterns: [ - { - group: ["*"], - message: "Please use require instead of import.", - }, - ], - }, - ], - "@typescript-eslint/no-var-requires": "off", - "@typescript-eslint/no-unused-vars": "off", - "@typescript-eslint/no-require-imports": "off", - }, - }, - { - name: "markdown-ts-azsdk-customized", - files: ["*.md/*.ts", "*/*/*.md/*.ts"], - languageOptions: { - parserOptions: { - project: true, - programs: null, - }, - }, - ...typescriptEslint.configs.disableTypeChecked, - rules: { - "@typescript-eslint/no-unused-vars": "off", - "@typescript-eslint/no-unused-expressions": "off", - }, - }, -]; - -export default markdownConfigs; diff --git a/common/tools/eslint-plugin-azure-sdk/src/index.ts b/common/tools/eslint-plugin-azure-sdk/src/index.ts index 2eb56570c9bd..c60513200cf3 100644 --- a/common/tools/eslint-plugin-azure-sdk/src/index.ts +++ b/common/tools/eslint-plugin-azure-sdk/src/index.ts @@ -19,38 +19,10 @@ const plugin: Omit = { // assign configs here so we can reference `plugin` const configs = azsdkConfigs(plugin); -// helper to ensure azure sdk markdown rules are not overridden by custom rules function config(customConfigs?: FlatConfig.ConfigArray) { - const updated = customConfigs?.length - ? customConfigs.map((rule) => { - if (!rule.files) { - return rule; - } - - const containsMarkdownFiles = (patterns: (string | string[])[]) => { - if (Array.isArray(patterns) && patterns.some((p) => p.includes("/*.md/"))) { - return true; - } else if (patterns.includes("/*.md/")) { - return true; - } - - return false; - }; - // is the rule for *.md? - if (containsMarkdownFiles(rule.files)) { - return rule; - } - - return { - ...rule, - ignores: [...(rule.ignores ?? []), "**/*.md/*.ts", "**/*.md/*.js", "**/*.md/*.json"], - }; - }) - : []; - return [ ...configs.recommended, - ...updated, + ...(customConfigs ?? []), { ignores: ["**/test/snippets.spec.ts", "**/test/stress"], },