From 84a719b6c3b8ad840edd7e57a80000edf0d49ec9 Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Sun, 2 Feb 2025 10:53:00 -0800 Subject: [PATCH 1/6] doc(CONTRIBUTORS): updated --- .release | 2 +- CONTRIBUTORS.md | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.release b/.release index afb1db8..7307651 160000 --- a/.release +++ b/.release @@ -1 +1 @@ -Subproject commit afb1db801607dda5e859f39b600f0dd0111e4651 +Subproject commit 73076513e83c2057a32515831b638771c15b1d83 diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index ed8887d..909f3b5 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -2,7 +2,8 @@ This handcrafted artisinal software is brought to you by: -|
msimerson (5) | -| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +|
msimerson (6)| +| :---: | -this file is maintained by [.release](https://github.com/msimerson/.release) +this file is generated by [.release](https://github.com/msimerson/.release). +Contribute to this project to get your GitHub profile included here. From 18bea81ad35459c641c364d78f414a219f43675e Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Sun, 2 Feb 2025 10:54:05 -0800 Subject: [PATCH 2/6] dep(eslint): upgrade to v9 --- .eslintrc.yaml | 10 ---------- CHANGELOG.md | 19 +++++++++++++++---- README.md | 3 --- eslint.config.mjs | 26 ++++++++++++++++++++++++++ package.json | 2 +- 5 files changed, 42 insertions(+), 18 deletions(-) delete mode 100644 .eslintrc.yaml create mode 100644 eslint.config.mjs diff --git a/.eslintrc.yaml b/.eslintrc.yaml deleted file mode 100644 index b749c3e..0000000 --- a/.eslintrc.yaml +++ /dev/null @@ -1,10 +0,0 @@ -env: - node: true - es6: true - mocha: true - es2022: true - -extends: ['@haraka'] - -rules: - no-unused-vars: ['warn'] diff --git a/CHANGELOG.md b/CHANGELOG.md index 42fc052..6b8bf17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ +# Changelog + +The format is based on [Keep a Changelog](https://keepachangelog.com/). + ### Unreleased +### [1.2.3] - 2025-02-02 + +- dep(eslint): upgrade to v9 + + ### [1.2.2] - 2024-08-05 - chore: populate [files] in package.json. Delete .npmignore. @@ -28,7 +37,9 @@ - Import from Haraka - convert tests to mocha -[1.1.0]: https://github.com/haraka/message-stream/releases/tag/1.1.0 -[1.2.0]: https://github.com/haraka/message-stream/releases/tag/1.2.0 -[1.2.1]: https://github.com/haraka/message-stream/releases/tag/1.2.1 -[1.2.2]: https://github.com/haraka/message-stream/releases/tag/1.2.2 +[1.1.0]: https://github.com/haraka/message-stream/releases/tag/v1.1.0 +[1.2.0]: https://github.com/haraka/message-stream/releases/tag/v1.2.0 +[1.2.1]: https://github.com/haraka/message-stream/releases/tag/v1.2.1 +[1.2.2]: https://github.com/haraka/message-stream/releases/tag/v1.2.2 +[1.2.3]: https://github.com/haraka/message-stream/releases/tag/v1.2.3 +[1.0.0]: https://github.com/haraka/message-stream/releases/tag/v1.0.0 diff --git a/README.md b/README.md index 5ec113f..d661c6f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ [![CI Test Status][ci-img]][ci-url] [![Code Climate][clim-img]][clim-url] -[![NPM][npm-img]][npm-url] # haraka-message-stream @@ -21,5 +20,3 @@ new MessageStream(cfg, uuid, header_list) [ci-url]: https://github.com/haraka/message-stream/actions/workflows/ci.yml [clim-img]: https://codeclimate.com/github/haraka/message-stream/badges/gpa.svg [clim-url]: https://codeclimate.com/github/haraka/message-stream -[npm-img]: https://nodei.co/npm/haraka-message-stream.png -[npm-url]: https://www.npmjs.com/package/haraka-message-stream diff --git a/eslint.config.mjs b/eslint.config.mjs new file mode 100644 index 0000000..5ac1198 --- /dev/null +++ b/eslint.config.mjs @@ -0,0 +1,26 @@ +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, + }, + }, + + rules: { + "no-unused-vars": ["warn"], + }, +}]; \ No newline at end of file diff --git a/package.json b/package.json index 1cd9ac8..27d75e9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "haraka-message-stream", - "version": "1.2.2", + "version": "1.2.3", "description": "Haraka email message stream", "main": "index.js", "files": [ From 675e2ef12dfe5460986d28166f87ad269ebb6fbc Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Sun, 2 Feb 2025 10:54:38 -0800 Subject: [PATCH 3/6] prettier: move config into package.json --- .codeclimate.yml | 4 ++-- .prettierrc.yml | 2 -- CHANGELOG.md | 2 +- package.json | 14 +++++++++----- 4 files changed, 12 insertions(+), 10 deletions(-) delete mode 100644 .prettierrc.yml diff --git a/.codeclimate.yml b/.codeclimate.yml index c889eb8..563da6b 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -1,9 +1,9 @@ engines: eslint: enabled: true - channel: 'eslint-8' + channel: 'eslint-9' config: - config: '.eslintrc.yaml' + config: 'eslint.config.mjs' ratings: paths: diff --git a/.prettierrc.yml b/.prettierrc.yml deleted file mode 100644 index 8ded5e0..0000000 --- a/.prettierrc.yml +++ /dev/null @@ -1,2 +0,0 @@ -singleQuote: true -semi: false diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b8bf17..d89d8b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/). ### [1.2.3] - 2025-02-02 - dep(eslint): upgrade to v9 - +- prettier: move config into package.json ### [1.2.2] - 2024-08-05 diff --git a/package.json b/package.json index 27d75e9..ebcd90b 100644 --- a/package.json +++ b/package.json @@ -8,11 +8,11 @@ ], "scripts": { "format": "npm run prettier:fix && npm run lint:fix", - "lint": "npx eslint@^8 *.js test", + "lint": "npx eslint@^9 *.js test", "lintfix": "npx eslint@^8 --fix *.js test", "prettier": "npx prettier . --check", "prettier:fix": "npx prettier . --write --log-level=warn", - "test": "npx mocha@^10", + "test": "npx mocha@^11", "versions": "npx dependency-version-checker check", "versions:fix": "npx dependency-version-checker update && npm run prettier:fix" }, @@ -32,8 +32,12 @@ }, "homepage": "https://github.com/haraka/message-stream#readme", "devDependencies": { - "@haraka/eslint-config": "^1.1.3", + "@haraka/eslint-config": "^2.0.2", "haraka-test-fixtures": "^1.3.3" }, - "dependencies": {} -} + "dependencies": {}, + "prettier": { + "singleQuote": true, + "semi": false + } +} \ No newline at end of file From 097e39eced8237f3d9f28029c33deb3400bdb1f1 Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Sun, 2 Feb 2025 10:55:10 -0800 Subject: [PATCH 4/6] update --- CONTRIBUTORS.md | 4 ++-- eslint.config.mjs | 39 +++++++++++++++++++++------------------ package.json | 2 +- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 909f3b5..c1bfa38 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -2,8 +2,8 @@ This handcrafted artisinal software is brought to you by: -|
msimerson (6)| -| :---: | +|
msimerson (6) | +| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | 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 index 5ac1198..0377960 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -1,26 +1,29 @@ -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, + }, }, rules: { - "no-unused-vars": ["warn"], + 'no-unused-vars': ['warn'], }, -}]; \ No newline at end of file + }, +] diff --git a/package.json b/package.json index ebcd90b..2ab1259 100644 --- a/package.json +++ b/package.json @@ -40,4 +40,4 @@ "singleQuote": true, "semi": false } -} \ No newline at end of file +} From e0547bb1029a291885787c260df0fc187c69cd88 Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Sun, 2 Feb 2025 10:55:39 -0800 Subject: [PATCH 5/6] update --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2ab1259..eef9d4e 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "scripts": { "format": "npm run prettier:fix && npm run lint:fix", "lint": "npx eslint@^9 *.js test", - "lintfix": "npx eslint@^8 --fix *.js test", + "lint:fix": "npx eslint@^9 --fix *.js test", "prettier": "npx prettier . --check", "prettier:fix": "npx prettier . --write --log-level=warn", "test": "npx mocha@^11", From 3898c34b7b074168ea05d4c423738e8e15f28cb5 Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Sun, 2 Feb 2025 10:58:35 -0800 Subject: [PATCH 6/6] update --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eef9d4e..16f2c55 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "homepage": "https://github.com/haraka/message-stream#readme", "devDependencies": { "@haraka/eslint-config": "^2.0.2", - "haraka-test-fixtures": "^1.3.3" + "haraka-test-fixtures": "^1.3.9" }, "dependencies": {}, "prettier": {