diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3cd686a..54d561a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,4 +22,4 @@ jobs: uses: haraka/.github/.github/workflows/windows.yml@master macos: - uses: haraka/.github/.github/workflows/macos.yml@master \ No newline at end of file + uses: haraka/.github/.github/workflows/macos.yml@master diff --git a/.release b/.release index 0fa4e69..afb1db8 160000 --- a/.release +++ b/.release @@ -1 +1 @@ -Subproject commit 0fa4e690ffabb0157e46d56f18e4f7cfe49ce291 +Subproject commit afb1db801607dda5e859f39b600f0dd0111e4651 diff --git a/CHANGELOG.md b/CHANGELOG.md index b1eb488..3b58cf1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/). ### Unreleased +### [1.4.0] - 2024-05-12 + +- doc(README): fix hjson link (#78) +- config: fix json overrides (#77) + ### [1.3.0] - 2024-05-02 - feat: getDir is now recursive @@ -137,5 +142,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/). [1.2.0]: https://github.com/haraka/haraka-config/releases/tag/v1.2.0 [1.2.1]: https://github.com/haraka/haraka-config/releases/tag/v1.2.1 [1.2.2]: https://github.com/haraka/haraka-config/releases/tag/v1.2.2 +[1.2.3]: https://github.com/haraka/haraka-config/releases/tag/v1.2.3 [1.2.4]: https://github.com/haraka/haraka-config/releases/tag/v1.2.4 [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 diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 0b78bde..9912882 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -2,7 +2,7 @@ This handcrafted artisinal software is brought to you by: -|
msimerson (57) |
PSSGCSim (7) |
baudehlo (1) |
Wesitos (1) |
oreoluwa (1) | -| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +|
msimerson (58) |
PSSGCSim (7) |
louis-lau (2) |
baudehlo (1) |
Wesitos (1) |
oreoluwa (1) | +| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | this file is maintained by [.release](https://github.com/msimerson/.release) diff --git a/README.md b/README.md index 5073396..fa4a168 100644 --- a/README.md +++ b/README.md @@ -245,6 +245,7 @@ These are as you would expect, and returns an object as given in the file. If a requested .json or .hjson file does not exist then the same file will be checked for with a .yaml extension and that will be loaded instead. This is done because YAML files are far easier for a human to write. ### JSON Overrides + You can use JSON, HJSON or YAML files to override any other file by prefixing the outer variable name with a `!` e.g. ```js diff --git a/config.js b/config.js index ab0eb02..c62184e 100644 --- a/config.js +++ b/config.js @@ -159,4 +159,4 @@ function merge_struct(defaults, overrides) { } // JSON overrides needs smtp.(json|yaml) loaded early -module.exports.get('smtp.json'); \ No newline at end of file +module.exports.get('smtp.json') diff --git a/package.json b/package.json index ae4361d..cffe1c2 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "name": "haraka-config", "license": "MIT", "description": "Haraka's config file loader", - "version": "1.3.0", + "version": "1.4.0", "homepage": "http://haraka.github.io", "repository": { "type": "git",