diff --git a/eslint-rollouts.config.mjs b/eslint-rollouts.config.mjs index d6db4952869b..6c349e747567 100644 --- a/eslint-rollouts.config.mjs +++ b/eslint-rollouts.config.mjs @@ -322,8 +322,7 @@ export default [ }, { name: "rollout-valid-jsdoc", - files: [`**/*.{${mozilla.allFileExtensions.join(",")}}`], - ignores: [ + files: [ "accessible/tests/**", "browser/actors/**", "browser/base/content/**", @@ -420,12 +419,11 @@ export default [ "uriloader/**", "widget/tests/window_composition_text_querycontent.xhtml", ], - ...mozilla.configs["flat/valid-jsdoc"], + rules: mozilla.turnOff(mozilla.configs["flat/valid-jsdoc"].rules), }, { name: "rollout-require-jsdoc", - files: [`**/*.{${mozilla.allFileExtensions.join(",")}}`], - ignores: [ + files: [ "accessible/tests/**", "browser/actors/**", "browser/base/content/**", @@ -588,7 +586,7 @@ export default [ "widget/tests/file*.js", "widget/tests/window_composition_text_querycontent.xhtml", ], - ...mozilla.configs["flat/valid-jsdoc"], + rules: mozilla.turnOff(mozilla.configs["flat/require-jsdoc"].rules), }, { name: "rollout-layout", diff --git a/eslint.config.mjs b/eslint.config.mjs index 62c825fc3cac..ca2f9cc950be 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -55,6 +55,9 @@ function wrapPathsWithAllExts(paths, excludedExts = []) { if (p.endsWith("/")) { return p + `**/*.{${extensions.join(",")}}`; } + if (p.endsWith("*")) { + return p + `.{${extensions.join(",")}}`; + } return p; }); } @@ -358,6 +361,16 @@ let config = [ "@microsoft/sdl/no-insecure-url": "off", }, }, + { + name: "mozilla/valid-jsdoc", + files: wrapPathsWithAllExts(["**"]), + ...mozilla.configs["flat/valid-jsdoc"], + }, + { + name: "mozilla/require-jsdoc", + files: wrapPathsWithAllExts(["**"]), + ...mozilla.configs["flat/valid-jsdoc"], + }, ...wrapPathsInConfig(subdirConfigs), ...wrapPathsInConfig(repositoryGlobals),