diff --git a/.eslintrc.js b/.eslintrc.js index a53fedba15b..1457d9b553c 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -95,12 +95,8 @@ module.exports = { files: ["lib/rules/*", "tools/internal-rules/*"], excludedFiles: ["index.js"], rules: { - "internal-rules/no-invalid-meta": "error" - - /* - * TODO: enable it when all the rules using meta.messages - * "internal-rules/consistent-meta-messages": "error" - */ + "internal-rules/no-invalid-meta": "error", + "internal-rules/consistent-meta-messages": "error" } }, { diff --git a/tests/tools/internal-rules/consistent-docs-url.js b/tests/tools/internal-rules/consistent-docs-url.js index 3c61a181f39..4b3d3a05b67 100644 --- a/tests/tools/internal-rules/consistent-docs-url.js +++ b/tests/tools/internal-rules/consistent-docs-url.js @@ -55,7 +55,7 @@ ruleTester.run("consistent-docs-url", rule, { "};" ].join("\n"), errors: [{ - message: "Rule is missing a meta.docs property", + messageId: "missingMetaDocs", line: 2, column: 5 }] @@ -73,7 +73,7 @@ ruleTester.run("consistent-docs-url", rule, { "};" ].join("\n"), errors: [{ - message: "Rule is missing a meta.docs.url property", + messageId: "missingMetaDocsUrl", line: 3, column: 9 }] @@ -92,7 +92,11 @@ ruleTester.run("consistent-docs-url", rule, { "};" ].join("\n"), errors: [{ - message: "Incorrect url. Expected \"https://eslint.org/docs/rules/\" but got \"http://example.com/wrong-url\"", + messageId: "incorrectUrl", + data: { + expected: "https://eslint.org/docs/rules/", + url: "http://example.com/wrong-url" + }, line: 4, column: 18 }] diff --git a/tools/internal-rules/consistent-docs-url.js b/tools/internal-rules/consistent-docs-url.js index 1a52bd59280..052fe55f28a 100644 --- a/tools/internal-rules/consistent-docs-url.js +++ b/tools/internal-rules/consistent-docs-url.js @@ -55,7 +55,7 @@ function checkMetaDocsUrl(context, exportsNode) { if (!metaDocs) { context.report({ node: metaProperty, - message: "Rule is missing a meta.docs property" + messageId: "missingMetaDocs" }); return; } @@ -63,7 +63,7 @@ function checkMetaDocsUrl(context, exportsNode) { if (!metaDocsUrl) { context.report({ node: metaDocs, - message: "Rule is missing a meta.docs.url property" + messageId: "missingMetaDocsUrl" }); return; } @@ -75,7 +75,8 @@ function checkMetaDocsUrl(context, exportsNode) { if (url !== expected) { context.report({ node: metaDocsUrl.value, - message: `Incorrect url. Expected "${expected}" but got "${url}"` + messageId: "incorrectUrl", + data: { expected, url } }); } @@ -93,7 +94,12 @@ module.exports = { recommended: false }, type: "suggestion", - schema: [] + schema: [], + messages: { + missingMetaDocs: "Rule is missing a meta.docs property.", + missingMetaDocsUrl: "Rule is missing a meta.docs.url property.", + incorrectUrl: 'Incorrect url. Expected "{{ expected }}" but got "{{ url }}".' + } }, create(context) {