From 596b3cda9cd420dd5b31a304b0b42a67535dc891 Mon Sep 17 00:00:00 2001
From: Blake Williams <blake@blakewilliams.me>
Date: Mon, 27 Jul 2020 11:52:12 -0400
Subject: [PATCH] Release v2.18.0

* Fix auto-loading of previews (changes no longer require a server restart)

    *Matt Brictson*

* Add `default_preview_layout` configuration option to load custom app/views/layouts.

    *Jared White, Juan Manuel Ramallo*

* Calculate virtual_path once for all instances of a component class to improve performance.

    *Brad Parker*
---
 CHANGELOG.md                  | 6 ++++++
 Gemfile.lock                  | 2 +-
 lib/view_component/version.rb | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index abc2daf1d..01bad1c61 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # master
 
+# 2.18.0
+
 * Fix auto-loading of previews (changes no longer require a server restart)
 
     *Matt Brictson*
@@ -14,6 +16,10 @@
 
 # 2.17.1
 
+* Fix bug where rendering Slot with empty block resulted in error.
+
+    *Joel Hawksley*
+
 # 2.17.0
 
 * Slots return stripped HTML, removing leading and trailing whitespace.
diff --git a/Gemfile.lock b/Gemfile.lock
index dfaa3540d..687b72465 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    view_component (2.17.1)
+    view_component (2.18.0)
       activesupport (>= 5.0.0, < 7.0)
 
 GEM
diff --git a/lib/view_component/version.rb b/lib/view_component/version.rb
index b289531cb..44645c059 100644
--- a/lib/view_component/version.rb
+++ b/lib/view_component/version.rb
@@ -3,8 +3,8 @@
 module ViewComponent
   module VERSION
     MAJOR = 2
-    MINOR = 17
-    PATCH = 1
+    MINOR = 18
+    PATCH = 0
 
     STRING = [MAJOR, MINOR, PATCH].join(".")
   end