Skip to content

Commit

Permalink
Chore: use eslint-plugin-rulesdir instead of --rulesdir for self-lint…
Browse files Browse the repository at this point in the history
…ing (#9164)
  • Loading branch information
not-an-aardvark committed Oct 28, 2017
1 parent 9cf4ebe commit 2224733
Show file tree
Hide file tree
Showing 12 changed files with 48 additions and 28 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Expand Up @@ -8,3 +8,4 @@
/tests/performance/**
/tmp/**
test.js
!.eslintrc.js
29 changes: 29 additions & 0 deletions .eslintrc.js
@@ -0,0 +1,29 @@
"use strict";

const path = require("path");
const rulesDirPlugin = require("eslint-plugin-rulesdir");

rulesDirPlugin.RULES_DIR = path.join(__dirname, "tools/internal-rules");

module.exports = {
root: true,
plugins: [
"eslint-plugin",
"node",
"rulesdir"
],
extends: [
"./packages/eslint-config-eslint/default.yml",
"plugin:node/recommended",
"plugin:eslint-plugin/recommended"
],
rules: {
"eslint-plugin/consistent-output": "error",
"eslint-plugin/no-deprecated-context-methods": "error",
"eslint-plugin/prefer-output-null": "error",
"eslint-plugin/prefer-placeholders": "error",
"eslint-plugin/report-message-format": ["error", "[^a-z].*\\.$"],
"eslint-plugin/test-case-property-ordering": "error",
"eslint-plugin/test-case-shorthand-strings": "error"
}
};
17 changes: 0 additions & 17 deletions .eslintrc.yml

This file was deleted.

8 changes: 7 additions & 1 deletion Makefile.js
Expand Up @@ -73,7 +73,7 @@ const NODE = "node ", // intentional extra space

// Utilities - intentional extra space at the end of each string
MOCHA = `${NODE_MODULES}mocha/bin/_mocha `,
ESLINT = `${NODE} bin/eslint.js --rulesdir tools/internal-rules/ --report-unused-disable-directives `,
ESLINT = `${NODE} bin/eslint.js --report-unused-disable-directives `,

// Files
MAKEFILE = "./Makefile.js",
Expand Down Expand Up @@ -486,6 +486,12 @@ target.lint = function() {
errors++;
}

echo("Validating .eslintrc.js");
lastReturn = exec(`${ESLINT} .eslintrc.js`);
if (lastReturn.code !== 0) {
errors++;
}

echo("Validating JSON Files");
lodash.forEach(JSON_FILES, validateJsonFile);

Expand Down
4 changes: 2 additions & 2 deletions lib/rules/.eslintrc.yml
@@ -1,3 +1,3 @@
rules:
internal-no-invalid-meta: "error"
internal-consistent-docs-description: "error"
rulesdir/no-invalid-meta: "error"
rulesdir/consistent-docs-description: "error"
1 change: 1 addition & 0 deletions package.json
Expand Up @@ -86,6 +86,7 @@
"ejs": "^2.5.6",
"eslint-plugin-eslint-plugin": "^1.2.0",
"eslint-plugin-node": "^5.1.0",
"eslint-plugin-rulesdir": "^0.1.0",
"eslint-release": "^0.10.1",
"eslump": "1.6.0",
"esprima": "^4.0.0",
Expand Down
4 changes: 2 additions & 2 deletions tests/lib/cli-engine.js
Expand Up @@ -588,7 +588,7 @@ describe("CLIEngine", () => {

engine = new CLIEngine({
cwd: originalDir,
configFile: ".eslintrc.yml"
configFile: ".eslintrc.js"
});

const report = engine.executeOnFiles(["lib/cli*.js"]);
Expand All @@ -602,7 +602,7 @@ describe("CLIEngine", () => {

engine = new CLIEngine({
cwd: originalDir,
configFile: ".eslintrc.yml"
configFile: ".eslintrc.js"
});

const report = engine.executeOnFiles(["lib/cli*.js", "lib/cli.?s", "lib/{cli,cli-engine}.js"]);
Expand Down
Expand Up @@ -9,7 +9,7 @@
// Requirements
//------------------------------------------------------------------------------

const rule = require("../../../tools/internal-rules/internal-consistent-docs-description"),
const rule = require("../../../tools/internal-rules/consistent-docs-description"),
RuleTester = require("../../../lib/testers/rule-tester");

//------------------------------------------------------------------------------
Expand All @@ -18,7 +18,7 @@ const rule = require("../../../tools/internal-rules/internal-consistent-docs-des

const ruleTester = new RuleTester();

ruleTester.run("internal-consistent-docs-description", rule, {
ruleTester.run("consistent-docs-description", rule, {
valid: [

// wrong exports format: "internal-no-invalid-meta" reports this already
Expand Down
Expand Up @@ -9,7 +9,7 @@
// Requirements
//------------------------------------------------------------------------------

const rule = require("../../../tools/internal-rules/internal-no-invalid-meta"),
const rule = require("../../../tools/internal-rules/no-invalid-meta"),
RuleTester = require("../../../lib/testers/rule-tester");

//------------------------------------------------------------------------------
Expand All @@ -18,7 +18,7 @@ const rule = require("../../../tools/internal-rules/internal-no-invalid-meta"),

const ruleTester = new RuleTester();

ruleTester.run("internal-no-invalid-meta", rule, {
ruleTester.run("no-invalid-meta", rule, {
valid: [

// context.report() call with no fix
Expand Down
4 changes: 2 additions & 2 deletions tools/internal-rules/.eslintrc.yml
@@ -1,3 +1,3 @@
rules:
internal-no-invalid-meta: "error"
internal-consistent-docs-description: "error"
rulesdir/no-invalid-meta: "error"
rulesdir/consistent-docs-description: "error"
File renamed without changes.

0 comments on commit 2224733

Please sign in to comment.