From 272762d670786cf4c7ee0e26b2f20ab12dfd37a9 Mon Sep 17 00:00:00 2001
From: Gaurav Tiwari <gaurav@gauravtiwari.co.uk>
Date: Tue, 18 May 2021 11:27:50 +0100
Subject: [PATCH] 5.4.0

---
 CHANGELOG.md             | 6 +++++-
 Gemfile.lock             | 2 +-
 lib/webpacker/version.rb | 2 +-
 package.json             | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 024db7a66..206bf75dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,11 @@
 
 **Please note that Webpacker 4.1.0 has an installer bug. Please use 4.2.0 or above**
 
-## [[5.3.0]](https://github.com/rails/webpacker/compare/v5.3.0...5.2.1) - 2021-TBD
+## [[5.4.0]](https://github.com/rails/webpacker/compare/v5.4.0...5.3.0) - 2021-05-18
+
+- Fix compatibility with Psych 4
+
+## [[5.3.0]](https://github.com/rails/webpacker/compare/v5.3.0...5.2.1) - 2021-04-27
 
 - Adds experimental Yarn 2 support. Note you must manually set `nodeLinker: node-modules` in your `.yarnrc.yml`.
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 0578c2733..f659bc1f4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    webpacker (5.3.0)
+    webpacker (5.4.0)
       activesupport (>= 5.2)
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
diff --git a/lib/webpacker/version.rb b/lib/webpacker/version.rb
index 84835e55f..fbb42ef35 100644
--- a/lib/webpacker/version.rb
+++ b/lib/webpacker/version.rb
@@ -1,4 +1,4 @@
 module Webpacker
   # Change the version in package.json too, please!
-  VERSION = "5.3.0".freeze
+  VERSION = "5.4.0".freeze
 end
diff --git a/package.json b/package.json
index 378ba7d80..87c4f0270 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rails/webpacker",
-  "version": "5.3.0",
+  "version": "5.4.0",
   "description": "Use webpack to manage app-like JavaScript modules in Rails",
   "main": "package/index.js",
   "files": [