From e91441eaf302d427c0c3a49ea1fc8d9ab61cb611 Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinkle@fastmail.com>
Date: Tue, 15 Feb 2022 22:20:07 +0000
Subject: [PATCH] Build: Prepare 2.18.0 release

---
 .mailmap                       |  5 +++--
 AUTHORS.txt                    |  4 +++-
 History.md                     | 15 +++++++++++++++
 docs/QUnit/hooks.md            |  2 +-
 docs/assert/notPropContains.md |  2 +-
 docs/assert/propContains.md    |  2 +-
 package.json                   |  2 +-
 7 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/.mailmap b/.mailmap
index 106ccde24..7cbe2ef10 100644
--- a/.mailmap
+++ b/.mailmap
@@ -40,8 +40,9 @@ Wesley Walser <waw325@gmail.com>
 Rob Kinninmont <robk@twitter.com>
 Marc Portier <marc.portier@gmail.com>
 Michael Righi <michael@righi.me>
-Timo Tijhof <krinklemail@gmail.com>
-Timo Tijhof <krinklemail@gmail.com> <49699333+dependabot[bot]@users.noreply.github.com>
+Timo Tijhof <krinkle@fastmail.com>
+Timo Tijhof <krinkle@fastmail.com> <krinklemail@gmail.com>
+Timo Tijhof <krinkle@fastmail.com> <49699333+dependabot[bot]@users.noreply.github.com>
 Jan Alonzo <jmalonzo@taguchimail.com>
 Daniel Trebbien <dtrebbien@gmail.com>
 Bob Fanger <bfanger@gmail.com>
diff --git a/AUTHORS.txt b/AUTHORS.txt
index 53a451833..82c0ce79f 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -32,7 +32,7 @@ Wesley Walser <waw325@gmail.com>
 Rob Kinninmont <robk@twitter.com>
 Marc Portier <marc.portier@gmail.com>
 Michael Righi <michael@righi.me>
-Timo Tijhof <krinklemail@gmail.com>
+Timo Tijhof <krinkle@fastmail.com>
 Jan Alonzo <jmalonzo@taguchimail.com>
 Daniel Trebbien <dtrebbien@gmail.com>
 Bob Fanger <bfanger@gmail.com>
@@ -179,3 +179,5 @@ Ryuta Kamizono <kamipo@gmail.com>
 Chris Krycho <hello@chriskrycho.com>
 Ben Demboski <demboskb@gmail.com>
 Jan Buschtöns <jan@buschtoens.me>
+Jarek Radosz <jradosz@gmail.com>
+Izel Nakri <contact@izelnakri.com>
diff --git a/History.md b/History.md
index 4250f5b1c..e260872e2 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,19 @@
 
+2.18.0 / 2022-02-15
+==================
+
+### Added
+
+* Assert: New `assert.propContains()` for partial object comparison. (Izel Nakri) [#1668](https://github.com/qunitjs/qunit/pull/1668)
+* Core: Add `QUnit.hooks` to globally add beforeEach and afterEach. (Timo Tijhof) [#1475](https://github.com/qunitjs/qunit/issues/1475)
+* CLI: Add support for watching `.ts` files when TypeScript is used. (Timo Tijhof) [#1669](https://github.com/qunitjs/qunit/issues/1669)
+* CLI: Add support for watching `.json`, `.cjs`, and `.mjs` files. [#1676](https://github.com/qunitjs/qunit/pull/1676)
+
+### Fixed
+
+* CLI: Fix ESM file imports on Windows to use file-protocol URLs. (Timo Tijhof) [#1667](https://github.com/qunitjs/qunit/issues/1667)
+* CLI: Improve performance of watch mode by recursively ignoring directories. (Timo Tijhof) [#1676](https://github.com/qunitjs/qunit/pull/1676)
+
 2.17.2 / 2021-09-19
 ==================
 
diff --git a/docs/QUnit/hooks.md b/docs/QUnit/hooks.md
index 22520e1d0..24f9e035c 100644
--- a/docs/QUnit/hooks.md
+++ b/docs/QUnit/hooks.md
@@ -4,7 +4,7 @@ title: QUnit.hooks
 excerpt: Add global callbacks to run before or after each test.
 groups:
   - main
-version_added: "unreleased"
+version_added: "2.18.0"
 ---
 
 `QUnit.hooks.beforeEach( callback )`<br>
diff --git a/docs/assert/notPropContains.md b/docs/assert/notPropContains.md
index c5e64aa93..ad6534324 100644
--- a/docs/assert/notPropContains.md
+++ b/docs/assert/notPropContains.md
@@ -4,7 +4,7 @@ title: assert.notPropContains()
 excerpt: Check that an object does not contain certain properties.
 groups:
   - assert
-version_added: "unreleased"
+version_added: "2.18.0"
 ---
 
 `notPropContains( actual, expected, message = "" )`
diff --git a/docs/assert/propContains.md b/docs/assert/propContains.md
index f465583d7..f7c9dbb81 100644
--- a/docs/assert/propContains.md
+++ b/docs/assert/propContains.md
@@ -4,7 +4,7 @@ title: assert.propContains()
 excerpt: Check that an object contains certain properties.
 groups:
   - assert
-version_added: "unreleased"
+version_added: "2.18.0"
 ---
 
 `propContains( actual, expected, message = "" )`
diff --git a/package.json b/package.json
index 8eb6da347..1f318df50 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "qunit",
   "title": "QUnit",
   "description": "The powerful, easy-to-use testing framework.",
-  "version": "2.17.2-pre",
+  "version": "2.18.0-pre",
   "homepage": "https://qunitjs.com",
   "author": {
     "name": "OpenJS Foundation and other contributors",