Skip to content

Commit ed0e8e5

Browse files
authored
Release v1.1.10 (#39)
- dep(eslint): upgrade to v9 - style: move prettier config into package.json
1 parent 082592e commit ed0e8e5

File tree

10 files changed

+50
-24
lines changed

10 files changed

+50
-24
lines changed

.codeclimate.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
engines:
22
eslint:
33
enabled: true
4-
channel: 'eslint-8'
4+
channel: 'eslint-9'
55
config:
6-
config: '.eslintrc.yaml'
6+
config: 'eslint.config.mjs'
77
checks:
88
complexity:
99
enabled: false

.eslintrc.yaml

Lines changed: 0 additions & 7 deletions
This file was deleted.

.prettierrc

Lines changed: 0 additions & 2 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
44

55
### Unreleased
66

7+
### [1.1.10] - 2025-01-26
8+
9+
- code formatting with prettier
10+
- dep(eslint): upgrade to v9
11+
712
### [1.1.9] - 2024-11-18
813

914
- Fix hook registration for any access.domains #37
@@ -60,8 +65,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
6065
- initial release
6166

6267
[1.1.5]: https://github.com/haraka/haraka-plugin-access/releases/tag/1.1.5
63-
[1.1.6]: https://github.com/haraka/haraka-plugin-access/releases/tag/1.1.6
68+
[1.1.6]: https://github.com/haraka/haraka-plugin-access/releases/tag/v1.1.6
6469
[1.1.7]: https://github.com/haraka/haraka-plugin-access/releases/tag/v1.1.7
6570
[1.1.4]: https://github.com/haraka/haraka-plugin-access/releases/tag/v1.1.4
6671
[1.1.8]: https://github.com/haraka/haraka-plugin-access/releases/tag/v1.1.8
6772
[1.1.9]: https://github.com/haraka/haraka-plugin-access/releases/tag/v1.1.9
73+
[1.1.10]: https://github.com/haraka/haraka-plugin-access/releases/tag/v1.1.10

CONTRIBUTORS.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
This handcrafted artisinal software is brought to you by:
44

5-
| <img height="80" src="https://avatars.githubusercontent.com/u/261635?v=4"><br><a href="https://github.com/msimerson">msimerson</a> (<a href="https://github.com/haraka/haraka-plugin-access/commits?author=msimerson">40</a>) | <img height="80" src="https://avatars.githubusercontent.com/u/2158203?v=4"><br><a href="https://github.com/luto">luto</a> (<a href="https://github.com/haraka/haraka-plugin-access/commits?author=luto">8</a>) | <img height="80" src="https://avatars.githubusercontent.com/u/48384?v=4"><br><a href="https://github.com/dalibor">dalibor</a> (<a href="https://github.com/haraka/haraka-plugin-access/commits?author=dalibor">2</a>) | <img height="80" src="https://avatars.githubusercontent.com/u/1674289?v=4"><br><a href="https://github.com/Dexus">Dexus</a> (<a href="https://github.com/haraka/haraka-plugin-access/commits?author=Dexus">2</a>) | <img height="80" src="https://avatars.githubusercontent.com/u/15035337?v=4"><br><a href="https://github.com/gtech99">gtech99</a> (<a href="https://github.com/haraka/haraka-plugin-access/commits?author=gtech99">1</a>) | <img height="80" src="https://avatars.githubusercontent.com/u/83369329?v=4"><br><a href="https://github.com/polarismail">polarismail</a> (<a href="https://github.com/haraka/haraka-plugin-access/commits?author=polarismail">1</a>) |
5+
| <img height="80" src="https://avatars.githubusercontent.com/u/261635?v=4"><br><a href="https://github.com/msimerson">msimerson</a> (<a href="https://github.com/haraka/haraka-plugin-access/commits?author=msimerson">41</a>) | <img height="80" src="https://avatars.githubusercontent.com/u/2158203?v=4"><br><a href="https://github.com/luto">luto</a> (<a href="https://github.com/haraka/haraka-plugin-access/commits?author=luto">8</a>) | <img height="80" src="https://avatars.githubusercontent.com/u/48384?v=4"><br><a href="https://github.com/dalibor">dalibor</a> (<a href="https://github.com/haraka/haraka-plugin-access/commits?author=dalibor">2</a>) | <img height="80" src="https://avatars.githubusercontent.com/u/1674289?v=4"><br><a href="https://github.com/Dexus">Dexus</a> (<a href="https://github.com/haraka/haraka-plugin-access/commits?author=Dexus">2</a>) | <img height="80" src="https://avatars.githubusercontent.com/u/15035337?v=4"><br><a href="https://github.com/gtech99">gtech99</a> (<a href="https://github.com/haraka/haraka-plugin-access/commits?author=gtech99">1</a>) | <img height="80" src="https://avatars.githubusercontent.com/u/83369329?v=4"><br><a href="https://github.com/polarismail">polarismail</a> (<a href="https://github.com/haraka/haraka-plugin-access/commits?author=polarismail">1</a>) |
66
| :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
77

8-
<sub>this file is maintained by [.release](https://github.com/msimerson/.release)</sub>
8+
<sub>this file is generated by [.release](https://github.com/msimerson/.release).
9+
Contribute to this project to get your GitHub profile included here.</sub>

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
[![CI Tests][ci-img]][ci-url]
22
[![Code Climate][clim-img]][clim-url]
33

4-
[![NPM][npm-img]][npm-url]
5-
64
# haraka-plugin-access - ACLs
75

86
This plugin applies Access Control Lists during the connect, helo, mail, and rcpt phases of the SMTP conversation. It has a split personality, supporting two somewhat different modes, **any** -vs- **precise**.
@@ -201,5 +199,3 @@ The Organizational Domain is the next level higher than the Public Suffix. So if
201199
[ci-url]: https://github.com/haraka/haraka-plugin-access/actions/workflows/ci.yml
202200
[clim-img]: https://codeclimate.com/github/haraka/haraka-plugin-access/badges/gpa.svg
203201
[clim-url]: https://codeclimate.com/github/haraka/haraka-plugin-access
204-
[npm-img]: https://nodei.co/npm/haraka-plugin-access.png
205-
[npm-url]: https://www.npmjs.com/package/haraka-plugin-access

eslint.config.mjs

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import globals from 'globals'
2+
import path from 'node:path'
3+
import { fileURLToPath } from 'node:url'
4+
import js from '@eslint/js'
5+
import { FlatCompat } from '@eslint/eslintrc'
6+
7+
const __filename = fileURLToPath(import.meta.url)
8+
const __dirname = path.dirname(__filename)
9+
const compat = new FlatCompat({
10+
baseDirectory: __dirname,
11+
recommendedConfig: js.configs.recommended,
12+
allConfig: js.configs.all,
13+
})
14+
15+
export default [
16+
...compat.extends('@haraka'),
17+
{
18+
languageOptions: {
19+
globals: {
20+
...globals.node,
21+
...globals.mocha,
22+
},
23+
},
24+
"rules": {
25+
'no-unused-vars': ['warn', { caughtErrorsIgnorePattern: '^ignore' }],
26+
}
27+
},
28+
]

index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ exports.data_any = function (next, connection) {
400400
let hdr_addr
401401
try {
402402
hdr_addr = haddr.parse(hdr_from)[0]
403-
} catch (e) {
403+
} catch (ignore) {
404404
connection.transaction.results.add(this, {
405405
fail: `data(unparsable_from:${hdr_from})`,
406406
})

package.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "haraka-plugin-access",
3-
"version": "1.1.9",
3+
"version": "1.1.10",
44
"description": "Haraka plugin for ACLs for email connections",
55
"main": "index.js",
66
"files": [
@@ -9,11 +9,11 @@
99
],
1010
"scripts": {
1111
"format": "npm run prettier:fix && npm run lint:fix",
12-
"lint": "npx eslint@^8 *.js test",
13-
"lint:fix": "npx eslint@^8 *.js test --fix",
12+
"lint": "npx eslint@^9 *.js test",
13+
"lint:fix": "npx eslint@^9 *.js test --fix",
1414
"prettier": "npx prettier . --check",
1515
"prettier:fix": "npx prettier . --write --log-level=warn",
16-
"test": "npx mocha@^10",
16+
"test": "npx mocha@^11",
1717
"versions": "npx dependency-version-checker check",
1818
"versions:fix": "npx dependency-version-checker update && npx prettier package.json --write --log-level=warn"
1919
},
@@ -41,5 +41,9 @@
4141
"haraka-net-utils": "^1.7.0",
4242
"haraka-tld": "^1.2.2",
4343
"haraka-utils": "^1.1.3"
44+
},
45+
"prettier": {
46+
"singleQuote": true,
47+
"semi": false
4448
}
4549
}

0 commit comments

Comments
 (0)