Upgrading eslint and mocha.

Author: arithmetric

.github/workflows/lint-test.yaml

@@ -5,8 +5,6 @@ on:
   push:
     branches:
       - master
-      - github_actions
-      - support_node16
   pull_request:
 
 jobs:
@@ -16,14 +14,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        nodejs_version: [ 12, 14, 16, 18 ]
+        nodejs_version: [ 18, 20, 22 ]
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.nodejs_version }}
 

eslint.config.mjs

@@ -0,0 +1,34 @@
+import globals from "globals";
+import pluginJs from "@eslint/js";
+import stylistic from "@stylistic/eslint-plugin";
+import stylisticJs from "@stylistic/eslint-plugin-js";
+
+/** @type {import('eslint').Linter.Config[]} */
+export default [
+  pluginJs.configs.recommended,
+  stylistic.configs.customize({
+    quotes: "double",
+    semi: true,
+    commaDangle: "only-multiline",
+  }),
+  {
+    files: ["**/*.js"],
+    languageOptions: {
+      globals: {
+        ...globals.node,
+      },
+      sourceType: "commonjs",
+    },
+    plugins: {
+      "@stylistic/js": stylisticJs,
+    },
+    rules: {
+      "@stylistic/brace-style": 0,
+      "@stylistic/multiline-ternary": 0,
+      "@stylistic/object-curly-spacing": 0,
+      "@stylistic/operator-linebreak": 0,
+      "@stylistic/quotes": 0,
+      "@stylistic/space-before-function-paren": 0,
+    },
+  },
+];

example/index.js

@@ -1,4 +1,3 @@
-
 var LambdaForwarder = require("aws-lambda-ses-forwarder");
 
 exports.handler = function(event, context, callback) {

index.js

@@ -69,11 +69,11 @@ var defaultConfig = {
 exports.parseEvent = function(data) {
   // Validate characteristics of a SES event record.
   if (!data.event ||
-      !data.event.hasOwnProperty('Records') ||
-      data.event.Records.length !== 1 ||
-      !data.event.Records[0].hasOwnProperty('eventSource') ||
-      data.event.Records[0].eventSource !== 'aws:ses' ||
-      data.event.Records[0].eventVersion !== '1.0') {
+    !Object.hasOwn(data.event, 'Records') ||
+    data.event.Records.length !== 1 ||
+    !Object.hasOwn(data.event.Records[0], 'eventSource') ||
+    data.event.Records[0].eventSource !== 'aws:ses' ||
+    data.event.Records[0].eventVersion !== '1.0') {
     data.log({
       message: "parseEvent() received invalid SES message:",
       level: "error", event: JSON.stringify(data.event)
@@ -101,7 +101,7 @@ exports.transformRecipients = function(data) {
     if (data.config.allowPlusSign) {
       origEmailKey = origEmailKey.replace(/\+.*?@/, '@');
     }
-    if (data.config.forwardMapping.hasOwnProperty(origEmailKey)) {
+    if (Object.hasOwn(data.config.forwardMapping, origEmailKey)) {
       newRecipients = newRecipients.concat(
         data.config.forwardMapping[origEmailKey]);
       data.originalRecipient = origEmail;
@@ -116,16 +116,16 @@ exports.transformRecipients = function(data) {
         origEmailUser = origEmailKey.slice(0, pos);
       }
       if (origEmailDomain &&
-          data.config.forwardMapping.hasOwnProperty(origEmailDomain)) {
+        Object.hasOwn(data.config.forwardMapping, origEmailDomain)) {
         newRecipients = newRecipients.concat(
           data.config.forwardMapping[origEmailDomain]);
         data.originalRecipient = origEmail;
       } else if (origEmailUser &&
-        data.config.forwardMapping.hasOwnProperty(origEmailUser)) {
+        Object.hasOwn(data.config.forwardMapping, origEmailUser)) {
         newRecipients = newRecipients.concat(
           data.config.forwardMapping[origEmailUser]);
         data.originalRecipient = origEmail;
-      } else if (data.config.forwardMapping.hasOwnProperty("@")) {
+      } else if (Object.hasOwn(data.config.forwardMapping, "@")) {
         newRecipients = newRecipients.concat(
           data.config.forwardMapping["@"]);
         data.originalRecipient = origEmail;
@@ -337,13 +337,13 @@ exports.sendMessage = function(data) {
  */
 exports.handler = function(event, context, callback, overrides) {
   var steps = overrides && overrides.steps ? overrides.steps :
-    [
-      exports.parseEvent,
-      exports.transformRecipients,
-      exports.fetchMessage,
-      exports.processMessage,
-      exports.sendMessage
-    ];
+      [
+        exports.parseEvent,
+        exports.transformRecipients,
+        exports.fetchMessage,
+        exports.processMessage,
+        exports.sendMessage
+      ];
   var data = {
     event: event,
     callback: callback,

package.json

@@ -5,22 +5,23 @@
   "main": "index.js",
   "scripts": {
     "check-coverage": "nyc report --reporter=lcov",
-    "lint": "eslint *.js example/*.js test/*.js",
-    "test": "nyc --statements 100 -- mocha -- --check-leaks --timeout 3000"
+    "lint": "npx eslint",
+    "test": "nyc --statements 100 -- mocha -- --check-leaks"
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.188.0",
     "@aws-sdk/client-sesv2": "^3.188.0"
   },
   "devDependencies": {
-    "coveralls": "^3.0.7",
-    "eslint": "^6.8.0",
-    "eslint-config-google": "~0.6.0",
-    "mocha": "^6.2.2",
-    "nyc": "^15.1.0"
+    "@eslint/js": "^9.18.0",
+    "@stylistic/eslint-plugin": "^2.12.1",
+    "@stylistic/eslint-plugin-js": "^2.12.1",
+    "globals": "^15.14.0",
+    "mocha": "^11.1.0",
+    "nyc": "^17.1.0"
   },
   "engines": {
-    "node": ">=8.0"
+    "node": ">=18.0"
   },
   "repository": {
     "type": "git",

test/fetchMessage.js

@@ -1,4 +1,3 @@
-
 /* global describe, it */
 
 var assert = require("assert");

test/handler.js

@@ -1,4 +1,3 @@
-
 /* global describe, it */
 
 var assert = require("assert");

test/parseEvent.js

@@ -1,4 +1,3 @@
-
 /* global describe, it */
 
 var assert = require("assert");

test/processMessage.js

@@ -1,4 +1,3 @@
-
 /* global describe, it */
 
 var assert = require("assert");

test/sendMessage.js

@@ -1,4 +1,3 @@
-
 /* global describe, it */
 
 var assert = require("assert");