eslint-config-uphold 6.3.1 → 6.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-uphold",
-  "version": "6.3.1",
+  "version": "6.4.0",
   "description": "Uphold-flavored ESLint config",
   "keywords": [
     "config",
@@ -14,7 +14,7 @@
   },
   "license": "MIT",
   "author": "Uphold",
-  "main": "src",
+  "main": "./src/index.js",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@github.com/uphold/eslint-config-uphold.git"
@@ -26,9 +26,9 @@
     "access": "public"
   },
   "scripts": {
-    "lint": "eslint src test/index.js",
+    "lint": "eslint",
     "release": "release-it",
-    "test": "mocha $npm_package_options_mocha"
+    "test": "node --test 'test/index.test.js'"
   },
   "dependencies": {
     "@babel/core": "^7.26.10",
@@ -52,10 +52,8 @@
     "@types/eslint": "^9.6.1",
     "@uphold/github-changelog-generator": "^4.0.2",
     "eslint": "^9.23.0",
-    "mocha": "^11.1.0",
     "prettier": "^3.5.3",
-    "release-it": "^18.1.2",
-    "should": "^13.2.3"
+    "release-it": "^18.1.2"
   },
   "peerDependencies": {
     "eslint": "~9.23.0",
@@ -72,7 +70,5 @@
   "engines": {
     "node": "^20.19.0 || ^22.12.0"
   },
-  "options": {
-    "mocha": "-t 10000 --require should test"
-  }
+  "type": "module"
 }

package/src/index.js

@@ -1,26 +1,24 @@
-'use strict';
-
 /**
  * Module dependencies.
  *
  * @typedef {import('eslint').Linter.Config} LinterConfig
  */
 
-const { defineConfig } = require('eslint/config');
-const babelParser = require('@babel/eslint-parser');
-const eslintPluginPrettierRecommended = require('eslint-plugin-prettier/recommended');
-const globals = require('globals');
-const js = require('@eslint/js');
-const jsdoc = require('eslint-plugin-jsdoc');
-const mocha = require('eslint-plugin-mocha');
-const nodePlugin = require('eslint-plugin-n');
-const promise = require('eslint-plugin-promise');
-const rules = require('./rules');
-const sortDestructureKeys = require('eslint-plugin-sort-destructure-keys');
-const sortImportsRequires = require('eslint-plugin-sort-imports-requires');
-const sortKeysFix = require('eslint-plugin-sort-keys-fix');
-const sqlTemplate = require('eslint-plugin-sql-template');
-const stylistic = require('@stylistic/eslint-plugin-js');
+import { defineConfig } from 'eslint/config';
+import babelParser from '@babel/eslint-parser';
+import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended';
+import globals from 'globals';
+import js from '@eslint/js';
+import jsdoc from 'eslint-plugin-jsdoc';
+import mocha from 'eslint-plugin-mocha';
+import nodePlugin from 'eslint-plugin-n';
+import promise from 'eslint-plugin-promise';
+import rules from './rules/index.js';
+import sortDestructureKeys from 'eslint-plugin-sort-destructure-keys';
+import sortImportsRequires from 'eslint-plugin-sort-imports-requires';
+import sortKeysFix from 'eslint-plugin-sort-keys-fix';
+import sqlTemplate from 'eslint-plugin-sql-template';
+import stylistic from '@stylistic/eslint-plugin-js';
 
 /**
  * Language options.
@@ -39,7 +37,8 @@ const languageOptions = {
   parser: babelParser,
   parserOptions: {
     requireConfigFile: false
-  }
+  },
+  sourceType: 'module'
 };
 
 /**
@@ -50,7 +49,11 @@ const languageOptions = {
 
 const upholdBaseConfig = defineConfig([
   {
-    extends: [js.configs.recommended, jsdoc.configs['flat/recommended-error'], eslintPluginPrettierRecommended],
+    extends: [
+      { ...js.configs.recommended, name: 'eslint/recommended' },
+      jsdoc.configs['flat/recommended-error'],
+      eslintPluginPrettierRecommended
+    ],
     languageOptions,
     name: 'uphold/base',
     plugins: {
@@ -85,7 +88,12 @@ const upholdBaseConfig = defineConfig([
         }
       ],
       'jsdoc/no-defaults': 0,
-      'jsdoc/require-description-complete-sentence': 'error',
+      'jsdoc/require-description-complete-sentence': [
+        'error',
+        {
+          abbreviations: ['e.g.', 'i.e.', 'etc.']
+        }
+      ],
       'jsdoc/require-jsdoc': 0,
       'jsdoc/tag-lines': 0,
       'max-depth': 'error',
@@ -239,15 +247,23 @@ const upholdBinScriptsConfig = {
 };
 
 /**
- * Export `uphold` shared configuration preset.
+ * `uphold` shared configuration preset.
  *
  * @type {LinterConfig[]}
  */
 
-module.exports = defineConfig([
+const uphold = defineConfig([
   {
     extends: [upholdBaseConfig, upholdBinScriptsConfig],
-    languageOptions,
     name: 'uphold/default'
   }
 ]);
+
+/**
+ * Export the configuration.
+ *
+ * @see https://nodejs.org/docs/latest-v22.x/api/modules.html#loading-ecmascript-modules-using-require
+ */
+
+export { uphold as 'module.exports' };
+export default uphold;

package/src/rules/explicit-sinon-use-fake-timers.js

@@ -1,13 +1,11 @@
-'use strict';
-
 /**
- * Export `explicit-sinon-use-fake-timers` rule.
+ * `explicit-sinon-use-fake-timers` rule.
  * - Validates that `sinon.useFakeTimers()` is always called with an explicit `toFake` property.
  *
  * @type {import('eslint').Rule.RuleModule}
  */
 
-module.exports = {
+const explicitSinonUseFakeTimers = {
   create(context) {
     return {
       CallExpression(node) {
@@ -53,3 +51,9 @@ module.exports = {
     type: 'problem'
   }
 };
+
+/**
+ * Export `explicit-sinon-use-fake-timers` rule.
+ */
+
+export default explicitSinonUseFakeTimers;

package/src/rules/index.js

@@ -1,11 +1,11 @@
-'use strict';
-
 /**
  * Export `rules`.
  *
  * @type {Record<string, import('eslint').Rule.RuleModule>}
  */
 
-module.exports = {
-  'explicit-sinon-use-fake-timers': require('./explicit-sinon-use-fake-timers.js')
+import explicitSinonUseFakeTimers from './explicit-sinon-use-fake-timers.js';
+
+export default {
+  'explicit-sinon-use-fake-timers': explicitSinonUseFakeTimers
 };