From c34f14f67f077acd5a61b3da9c0b0de298d20059 Mon Sep 17 00:00:00 2001
From: Jordan Harband <ljharb@gmail.com>
Date: Sun, 24 Jun 2018 09:35:37 -0700
Subject: [PATCH] changelog/package bumps

---
 CHANGELOG.md                   | 13 ++++++++++++-
 package.json                   |  2 +-
 resolvers/webpack/CHANGELOG.md |  6 ++++++
 resolvers/webpack/package.json |  2 +-
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 628a9a944..d384d5c39 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This change log adheres to standards from [Keep a CHANGELOG](http://keepachangelog.com).
 
 ## [Unreleased]
-- Add [`no-relative-parent-imports`] rule: disallow relative imports from parent directories.
+
+## [2.13.0] - 2018-06-24
+### Added
+- Add ESLint 5 support ([#1122], thanks [@ai] and [@ljharb])
+- Add [`no-relative-parent-imports`] rule: disallow relative imports from parent directories ([#1093], thanks [@chrislloyd])
+
+### Fixed
+- `namespace` rule: ensure it works in eslint 5/ecmaVersion 2018 (thanks [@ljharb])
 
 ## [2.12.0] - 2018-05-17
 ### Added
@@ -466,6 +473,8 @@ for info on changes for earlier releases.
 
 [`memo-parser`]: ./memo-parser/README.md
 
+[#1122]: https://github.com/benmosher/eslint-plugin-import/pull/1122
+[#1093]: https://github.com/benmosher/eslint-plugin-import/pull/1093
 [#1085]: https://github.com/benmosher/eslint-plugin-import/pull/1085
 [#1068]: https://github.com/benmosher/eslint-plugin-import/pull/1068
 [#1046]: https://github.com/benmosher/eslint-plugin-import/pull/1046
@@ -722,3 +731,5 @@ for info on changes for earlier releases.
 [@manovotny]: https://github.com/manovotny
 [@mattijsbliek]: https://github.com/mattijsbliek
 [@hulkish]: https://github.com/hulkish
+[@chrislloyd]: https://github.com/chrislloyd
+[@ai]: https://github.com/ai
diff --git a/package.json b/package.json
index 968e21781..7d39395a7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-import",
-  "version": "2.12.0",
+  "version": "2.13.0",
   "description": "Import with sanity.",
   "engines": {
     "node": ">=4"
diff --git a/resolvers/webpack/CHANGELOG.md b/resolvers/webpack/CHANGELOG.md
index 022d7447c..93246bf0b 100644
--- a/resolvers/webpack/CHANGELOG.md
+++ b/resolvers/webpack/CHANGELOG.md
@@ -5,6 +5,9 @@ This change log adheres to standards from [Keep a CHANGELOG](http://keepachangel
 
 ## Unreleased
 
+## 0.10.1 - 2018-06-24
+### Fixed
+- log a useful error in a module bug arises ([#768]/[#767], thanks [@mattkrick])
 
 ## 0.10.0 - 2018-05-17
 ### Changed
@@ -104,6 +107,7 @@ This change log adheres to standards from [Keep a CHANGELOG](http://keepachangel
 [#1091]: https://github.com/benmosher/eslint-plugin-import/pull/1091
 [#969]: https://github.com/benmosher/eslint-plugin-import/pull/969
 [#968]: https://github.com/benmosher/eslint-plugin-import/pull/968
+[#768]: https://github.com/benmosher/eslint-plugin-import/pull/768
 [#683]: https://github.com/benmosher/eslint-plugin-import/pull/683
 [#572]: https://github.com/benmosher/eslint-plugin-import/pull/572
 [#569]: https://github.com/benmosher/eslint-plugin-import/pull/569
@@ -118,6 +122,7 @@ This change log adheres to standards from [Keep a CHANGELOG](http://keepachangel
 [#164]: https://github.com/benmosher/eslint-plugin-import/pull/164
 
 [#788]: https://github.com/benmosher/eslint-plugin-import/issues/788
+[#767]: https://github.com/benmosher/eslint-plugin-import/issues/767
 [#681]: https://github.com/benmosher/eslint-plugin-import/issues/681
 [#435]: https://github.com/benmosher/eslint-plugin-import/issues/435
 [#411]: https://github.com/benmosher/eslint-plugin-import/issues/411
@@ -141,3 +146,4 @@ This change log adheres to standards from [Keep a CHANGELOG](http://keepachangel
 [@ljharb]: https://github.com/ljharb
 [@SkeLLLa]: https://github.com/SkeLLLa
 [@graingert]: https://github.com/graingert
+[@mattkrick]: https://github.com/mattkrick
diff --git a/resolvers/webpack/package.json b/resolvers/webpack/package.json
index e1c586019..a36a78e47 100644
--- a/resolvers/webpack/package.json
+++ b/resolvers/webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-import-resolver-webpack",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "Resolve paths to dependencies, given a webpack.config.js. Plugin for eslint-plugin-import.",
   "main": "index.js",
   "scripts": {