From 98336cacaa1c6c59efd714d987c72918cc5bb65b Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Wed, 8 Jan 2025 13:12:39 -0800 Subject: [PATCH 1/6] doc(CONTRIBUTORS): updated --- .release | 2 +- CONTRIBUTORS.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.release b/.release index 80c3d1a..0bf2a09 160000 --- a/.release +++ b/.release @@ -1 +1 @@ -Subproject commit 80c3d1a67344cc321e054a23a8b4ae59b284909a +Subproject commit 0bf2a098d4792848c2103dfce0f911e00a14709e diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 9ab8594..0c71af0 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -2,8 +2,8 @@ This handcrafted artisinal software is brought to you by: -|
msimerson (59) |
PSSGCSim (7) |
louis-lau (2) |
baudehlo (1) |
Wesitos (1) |
oreoluwa (1) |
polarismail (1) | -| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +|
msimerson (60)|
PSSGCSim (7)|
louis-lau (2)|
baudehlo (1)|
Wesitos (1)|
oreoluwa (1)|
polarismail (1)| +| :---: | :---: | :---: | :---: | :---: | :---: | :---: | this file is generated by [.release](https://github.com/msimerson/.release). Contribute to this project to get your GitHub profile included here. From 489969967fc9c81f767a830017250ff963a5b9c8 Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Wed, 8 Jan 2025 13:15:51 -0800 Subject: [PATCH 2/6] dep(eslint): upgrade 8 -> 9 --- .codeclimate.yml | 4 ++-- .eslintrc.yaml | 7 ------- CHANGELOG.md | 5 +++++ CONTRIBUTORS.md | 4 ++-- eslint.config.mjs | 22 ++++++++++++++++++++++ package.json | 4 ++-- 6 files changed, 33 insertions(+), 13 deletions(-) delete mode 100644 .eslintrc.yaml create mode 100644 eslint.config.mjs diff --git a/.codeclimate.yml b/.codeclimate.yml index a8ccd03..563da6b 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -1,9 +1,9 @@ engines: eslint: enabled: true - channel: 'eslint-6' + channel: 'eslint-9' config: - config: '.eslintrc.yaml' + config: 'eslint.config.mjs' ratings: paths: diff --git a/.eslintrc.yaml b/.eslintrc.yaml deleted file mode 100644 index 035a400..0000000 --- a/.eslintrc.yaml +++ /dev/null @@ -1,7 +0,0 @@ -env: - node: true - es6: true - mocha: true - es2022: true - -extends: ['@haraka'] diff --git a/CHANGELOG.md b/CHANGELOG.md index 967b694..932351f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/). ### Unreleased +### [1.4.2] - 2025-01-08 + +- dep(eslint): upgrade 8 -> 9 + ### [1.4.1] - 2024-12-28 - ini: allow key with + character, to accept user+blah@domain.com #80 @@ -151,3 +155,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/). [1.3.0]: https://github.com/haraka/haraka-config/releases/tag/v1.3.0 [1.4.0]: https://github.com/haraka/haraka-config/releases/tag/v1.4.0 [1.4.1]: https://github.com/haraka/haraka-config/releases/tag/v1.4.1 +[1.4.2]: https://github.com/haraka/haraka-config/releases/tag/v1.4.2 diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 0c71af0..72e9afe 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -2,8 +2,8 @@ This handcrafted artisinal software is brought to you by: -|
msimerson (60)|
PSSGCSim (7)|
louis-lau (2)|
baudehlo (1)|
Wesitos (1)|
oreoluwa (1)|
polarismail (1)| -| :---: | :---: | :---: | :---: | :---: | :---: | :---: | +|
msimerson (60) |
PSSGCSim (7) |
louis-lau (2) |
baudehlo (1) |
Wesitos (1) |
oreoluwa (1) |
polarismail (1) | +| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | this file is generated by [.release](https://github.com/msimerson/.release). Contribute to this project to get your GitHub profile included here. diff --git a/eslint.config.mjs b/eslint.config.mjs new file mode 100644 index 0000000..4bd0214 --- /dev/null +++ b/eslint.config.mjs @@ -0,0 +1,22 @@ +import globals from "globals"; +import path from "node:path"; +import { fileURLToPath } from "node:url"; +import js from "@eslint/js"; +import { FlatCompat } from "@eslint/eslintrc"; + +const __filename = fileURLToPath(import.meta.url); +const __dirname = path.dirname(__filename); +const compat = new FlatCompat({ + baseDirectory: __dirname, + recommendedConfig: js.configs.recommended, + allConfig: js.configs.all +}); + +export default [...compat.extends("@haraka"), { + languageOptions: { + globals: { + ...globals.node, + ...globals.mocha, + }, + }, +}]; \ No newline at end of file diff --git a/package.json b/package.json index de20a6c..38e6ea9 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "name": "haraka-config", "license": "MIT", "description": "Haraka's config file loader", - "version": "1.4.1", + "version": "1.4.2", "homepage": "https://github.com/haraka/haraka-config", "repository": { "type": "git", @@ -24,7 +24,7 @@ "hjson": "^3.2.2" }, "devDependencies": { - "@haraka/eslint-config": "^1.1.5" + "@haraka/eslint-config": "^2.0.2" }, "bugs": { "url": "https://github.com/haraka/haraka-config/issues" From 853124de3d665abe98e02f599762d92e50c7f53f Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Wed, 8 Jan 2025 13:17:50 -0800 Subject: [PATCH 3/6] update --- eslint.config.mjs | 37 ++++++++++++++++++++----------------- package.json | 4 ++-- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index 4bd0214..cd75fea 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -1,22 +1,25 @@ -import globals from "globals"; -import path from "node:path"; -import { fileURLToPath } from "node:url"; -import js from "@eslint/js"; -import { FlatCompat } from "@eslint/eslintrc"; +import globals from 'globals' +import path from 'node:path' +import { fileURLToPath } from 'node:url' +import js from '@eslint/js' +import { FlatCompat } from '@eslint/eslintrc' -const __filename = fileURLToPath(import.meta.url); -const __dirname = path.dirname(__filename); +const __filename = fileURLToPath(import.meta.url) +const __dirname = path.dirname(__filename) const compat = new FlatCompat({ - baseDirectory: __dirname, - recommendedConfig: js.configs.recommended, - allConfig: js.configs.all -}); + baseDirectory: __dirname, + recommendedConfig: js.configs.recommended, + allConfig: js.configs.all, +}) -export default [...compat.extends("@haraka"), { +export default [ + ...compat.extends('@haraka'), + { languageOptions: { - globals: { - ...globals.node, - ...globals.mocha, - }, + globals: { + ...globals.node, + ...globals.mocha, + }, }, -}]; \ No newline at end of file + }, +] diff --git a/package.json b/package.json index 38e6ea9..1f1bbf9 100644 --- a/package.json +++ b/package.json @@ -31,8 +31,8 @@ }, "scripts": { "format": "npm run prettier:fix && npm run lint:fix", - "lint": "npx eslint@^8 *.js lib test test/*/*.js", - "lint:fix": "npx eslint@^8 *.js lib test test/*/*.js --fix", + "lint": "npx eslint *.js lib test test/*/*.js", + "lint:fix": "npx eslint *.js lib test test/*/*.js --fix", "prettier": "npx prettier . --check", "prettier:fix": "npx prettier . --write --log-level=warn", "test": "npx mocha@10 test test/readers", From 76e5dcc7db31748a3329517fe446bb99f0e75fa0 Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Wed, 8 Jan 2025 13:19:07 -0800 Subject: [PATCH 4/6] update --- eslint.config.mjs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eslint.config.mjs b/eslint.config.mjs index cd75fea..ba8ddbf 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -21,5 +21,8 @@ export default [ ...globals.mocha, }, }, + rules: { + 'no-unused-vars': 'warn', + } }, ] From d4e6624b8121f868a4cee85e0ae7754dda85fec2 Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Wed, 8 Jan 2025 13:19:11 -0800 Subject: [PATCH 5/6] chore: format --- eslint.config.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index ba8ddbf..507e7c5 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -23,6 +23,6 @@ export default [ }, rules: { 'no-unused-vars': 'warn', - } + }, }, ] From 7f0679e73a2391ca348807ab5b13e5134438b86b Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Wed, 8 Jan 2025 13:23:07 -0800 Subject: [PATCH 6/6] lint: allow catch (ignore) --- eslint.config.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index 507e7c5..c21edec 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -22,7 +22,7 @@ export default [ }, }, rules: { - 'no-unused-vars': 'warn', + 'no-unused-vars': ['warn', { 'caughtErrorsIgnorePattern': '^ignore' }], }, }, ]