From 2c84ab3a9936057599c9b2a14b543c93afab0324 Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Sun, 26 Jan 2025 14:38:08 -0800 Subject: [PATCH] Release v2.2.5 (#41) - move prettier config into package.json - deps(eslint): upgrade to v9 - deps: bump versions --- .codeclimate.yml | 4 ++-- .eslintrc.yaml | 7 ------- .prettierrc.yml | 2 -- .release | 2 +- CHANGELOG.md | 7 +++++++ CONTRIBUTORS.md | 5 +++-- README.md | 3 --- eslint.config.mjs | 25 +++++++++++++++++++++++++ package.json | 24 ++++++++++++++---------- test/result_store.js | 2 +- 10 files changed, 53 insertions(+), 28 deletions(-) delete mode 100644 .eslintrc.yaml delete mode 100644 .prettierrc.yml create mode 100644 eslint.config.mjs diff --git a/.codeclimate.yml b/.codeclimate.yml index 2ccb1e4..6d94ceb 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' checks: return-statements: 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/.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/.release b/.release index 36bb27a..0bf2a09 160000 --- a/.release +++ b/.release @@ -1 +1 @@ -Subproject commit 36bb27a93862517943e04f24fd67b0df2da6cbbe +Subproject commit 0bf2a098d4792848c2103dfce0f911e00a14709e diff --git a/CHANGELOG.md b/CHANGELOG.md index be6e908..5704c29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/). ### Unreleased +### [2.2.5] - 2025-01-26 + +- prettier: move config into package.json +- deps(eslint): upgrade to v9 +- deps: bump versions + ### [2.2.4] - 2024-04-10 - deps: bump versions @@ -84,3 +90,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/). [2.2.2]: https://github.com/haraka/haraka-results/releases/tag/2.2.2 [2.2.3]: https://github.com/haraka/haraka-results/releases/tag/v2.2.3 [2.2.4]: https://github.com/haraka/haraka-results/releases/tag/v2.2.4 +[2.2.5]: https://github.com/haraka/haraka-results/releases/tag/v2.2.5 diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 2777efa..e0f6abf 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -2,7 +2,8 @@ This handcrafted artisinal software is brought to you by: -|
msimerson (29) |
PSSGCSim (2) |
lnedry (2) |
baudehlo (1) |
smfreegard (1) | +|
msimerson (30) |
PSSGCSim (2) |
lnedry (2) |
baudehlo (1) |
smfreegard (1) | | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -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. diff --git a/README.md b/README.md index e6d9ad5..cb9e8e8 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,6 @@ [![Build Status][ci-img]][ci-url] [![Code Coverage][cov-img]][cov-url] [![Code Climate][clim-img]][clim-url] -[![NPM][npm-img]][npm-url] Add, log, retrieve, and share the results of plugin tests. @@ -252,5 +251,3 @@ exports.redis_unsubscribe = function (next, connection) { [cov-url]: https://codecov.io/github/haraka/haraka-results [clim-img]: https://codeclimate.com/github/haraka/haraka-results/badges/gpa.svg [clim-url]: https://codeclimate.com/github/haraka/haraka-results -[npm-img]: https://nodei.co/npm/haraka-results.png -[npm-url]: https://www.npmjs.com/package/haraka-results diff --git a/eslint.config.mjs b/eslint.config.mjs new file mode 100644 index 0000000..cd75fea --- /dev/null +++ b/eslint.config.mjs @@ -0,0 +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' + +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, + }, + }, + }, +] diff --git a/package.json b/package.json index 1c49695..41e389d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "haraka-results", - "version": "2.2.4", + "version": "2.2.5", "description": "Haraka results store for connections and transactions", "main": "index.js", "directories": { @@ -15,13 +15,17 @@ ], "scripts": { "format": "npm run prettier:fix && npm run lint:fix", - "lint": "npx eslint@^8 *.js test", - "lint:fix": "npx eslint@^8 *.js test --fix", + "lint": "npx eslint@^9 *.js test", + "lint:fix": "npx eslint@^9 *.js test --fix", "prettier": "npx prettier . --check", "prettier:fix": "npx prettier . --write --log-level=warn", - "test": "npx mocha@10", - "versions": "npx @msimerson/dependency-version-checker check", - "versions:fix": "npx @msimerson/dependency-version-checker update && npm run prettier:fix" + "test": "npx mocha@^11", + "versions": "npx dependency-version-checker check", + "versions:fix": "npx dependency-version-checker update && npm run prettier:fix" + }, + "prettier": { + "singleQuote": true, + "semi": false }, "repository": { "type": "git", @@ -40,13 +44,13 @@ }, "homepage": "https://github.com/haraka/haraka-results#readme", "devDependencies": { - "@haraka/eslint-config": "^1.1.3", - "haraka-test-fixtures": "^1.3.6" + "@haraka/eslint-config": "^2.0.2", + "haraka-test-fixtures": "^1.3.8" }, "dependencies": { - "haraka-config": "^1.1.0" + "haraka-config": "^1.4.2" }, "optionalDependencies": { - "redis": "^4.6.13" + "redis": "^4.7.0" } } diff --git a/test/result_store.js b/test/result_store.js index 2cfa494..c4d8a8f 100644 --- a/test/result_store.js +++ b/test/result_store.js @@ -198,7 +198,7 @@ describe('redis_publish', () => { }, } await server.notes.redis.connect() - this.connection = new fixtures.connection.createConnection(null, server) + this.connection = new fixtures.connection.createConnection({}, server) this.connection.results = new Results(this.connection) })