chore: fix linting errors

eslint · Apr 18, 2024 · d416481 · d416481
1 parent d7e82cd
commit d416481
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 34 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,3 +1 @@
 node_modules/
-temp/
-*/templates/*
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
diff --git a/app/index.js b/app/index.js
@@ -15,15 +15,20 @@ import PluginGenerator from "../plugin/index.js";
 import { fileURLToPath } from "node:url";
 import path from "node:path";
 
-const __dirname = path.dirname(fileURLToPath(import.meta.url)); // eslint-disable-line no-underscore-dangle
+/* eslint-disable no-underscore-dangle -- cjs convention */
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 const RULE_GENERATOR_PATH = path.join(__dirname, "..", "rule", "index.js");
 const PLUGIN_GENERATOR_PATH = path.join(__dirname, "..", "plugin", "index.js");
+/* eslint-enable no-underscore-dangle -- cjs convention*/
 
 //------------------------------------------------------------------------------
 // Constructor
 //------------------------------------------------------------------------------
 
+/**
+ *
+ */
 export default class extends Generator {
  async prompting() {
  const answers = await this.prompt({

diff --git a/eslint.config.js b/eslint.config.js
@@ -1,8 +1,15 @@
-"use strict";
+import globals from "globals";
 import eslintConfigESLint from "eslint-config-eslint";
 
 export default [
  ...eslintConfigESLint,
- {files: ["tests/**/*.js"],
- languageOptions: { globals: globals.mocha }}
+ {
+ name: "generator-eslint/global-ignores",
+ ignores: ["temp/", "*/templates/*"]
+ },
+ {
+ name: "generator-eslint/test-files",
+ files: ["tests/**/*.js"],
+ languageOptions: { globals: globals.mocha }
+ }
 ];
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
  "scripts": {
  "lint": "npm-run-all --continue-on-error --aggregate-output --parallel lint:*",
  "lint:docs": "markdownlint \"**/*.md\"",
- "lint:js": "eslint --report-unused-disable-directives .",
+ "lint:js": "eslint .",
  "release:generate:latest": "eslint-generate-release",
  "release:generate:alpha": "eslint-generate-prerelease alpha",
  "release:generate:beta": "eslint-generate-prerelease beta",

diff --git a/plugin/index.js b/plugin/index.js
@@ -21,6 +21,9 @@ import { isPluginId, isRequired } from "../lib/validators.js";
 // Constructor
 //------------------------------------------------------------------------------
 
+/**
+ *
+ */
 export default class extends Generator {
  async prompting() {
  const prompts = [{

diff --git a/plugin/templates/_eslint.config.mjs b/plugin/templates/_eslint.config.mjs
@@ -6,4 +6,4 @@ export default [
  pluginJs.configs.recommended,
  pluginNode.configs["flat/recommended"],
  eslintPlugin.configs["flat/recommended"]
-]
+];
diff --git a/rule/index.js b/rule/index.js
@@ -19,6 +19,9 @@ import { isRuleId, isRequired } from "../lib/validators.js";
 // Constructor
 //------------------------------------------------------------------------------
 
+/**
+ *
+ */
 export default class extends Generator {
  async prompting() {
  const prompts = [

diff --git a/tests/app/index.js b/tests/app/index.js
@@ -15,12 +15,13 @@ import path from "node:path";
 //------------------------------------------------------------------------------
 // Tests
 //------------------------------------------------------------------------------
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url)); // eslint-disable-line no-underscore-dangle
+/* eslint-disable no-underscore-dangle -- cjs convention */
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 const APP_GENERATOR_PATH = path.join(__dirname, "..", "..", "app", "index.js");
 const RULE_GENERATOR_PATH = path.join(__dirname, "..", "..", "rule", "index.js");
 const PLUGIN_GENERATOR_PATH = path.join(__dirname, "..", "..", "plugin", "index.js");
+/* eslint-enable no-underscore-dangle -- cjs convention */
 
 describe("ESLint Main Generator", () => {
  describe("User answers with Plugin", () => {

diff --git a/tests/plugin/index.js b/tests/plugin/index.js
@@ -16,7 +16,7 @@ import path from "node:path";
 // Tests
 //------------------------------------------------------------------------------
 
-const __dirname = path.dirname(fileURLToPath(import.meta.url)); // eslint-disable-line no-underscore-dangle
+const __dirname = path.dirname(fileURLToPath(import.meta.url)); // eslint-disable-line no-underscore-dangle -- cjs convention
 
 const PLUGIN_GENERATOR_PATH = path.join(__dirname, "..", "..", "plugin", "index.js");
 

diff --git a/tests/rule/index.js b/tests/rule/index.js
@@ -17,7 +17,7 @@ import path from "node:path";
 // Tests
 //------------------------------------------------------------------------------
 
-const __dirname = path.dirname(fileURLToPath(import.meta.url)); // eslint-disable-line no-underscore-dangle
+const __dirname = path.dirname(fileURLToPath(import.meta.url)); // eslint-disable-line no-underscore-dangle -- cjs convention
 
 const RULE_GENERATOR_PATH = path.join(__dirname, "..", "..", "rule", "index.js");
 

diff --git a/tests/test-load.js b/tests/test-load.js
@@ -5,8 +5,14 @@
 
 import assert from "node:assert";
 
-// eslint-disable-next-line func-style, node/no-unsupported-features/es-syntax -- https://github.com/mysticatea/eslint-plugin-node/issues/250
-const importFresh = async modulePath => import(`${modulePath}?x=${new Date()}`);
+/**
+ * Import a module fresh every time.
+ * @param {string} modulePath The path to the module to import.
+ * @returns {Promise<*>} The imported module.
+ */
+async function importFresh(modulePath) {
+ return import(`${modulePath}?x=${new Date()}`);
+}
 
 describe("eslint generator", () => {
  it("can be imported without blowing up", () => {