From 714a7bac6f52d2b2b4890991b6273acaef14f28b Mon Sep 17 00:00:00 2001
From: Peter Hamilton <pete@peterdavidhamilton.com>
Date: Thu, 26 Oct 2023 09:05:55 +0100
Subject: [PATCH] Logic around the CMS Preview API is required prior to
 initialisation (#926)

---
 config/application.rb                   |  6 +-----
 config/environments/production.rb       |  1 -
 config/initializers/contentful_rails.rb |  2 --
 config/initializers/types.rb            | 10 ++++------
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/config/application.rb b/config/application.rb
index a89251da4..2c9a20e3d 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -97,11 +97,7 @@ def dashboard?
     #
     # @return [Boolean]
     def preview?
-      if defined?(::Types)
-        Types::Params::Bool[ENV.fetch('CONTENTFUL_PREVIEW', false)]
-      else
-        false
-      end
+      Dry::Types['params.bool'][ENV.fetch('CONTENTFUL_PREVIEW', false)]
     end
 
     # @return [Boolean]
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 2b272ae0e..5d340016a 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -52,7 +52,6 @@
     # elsif Rails.application.live?
     #   config.action_dispatch.cookies_same_site_protection = :strict
     # else
-    #   # default
     #   config.action_dispatch.cookies_same_site_protection = :lax
   end
 
diff --git a/config/initializers/contentful_rails.rb b/config/initializers/contentful_rails.rb
index 64bd20f8d..10196ba55 100644
--- a/config/initializers/contentful_rails.rb
+++ b/config/initializers/contentful_rails.rb
@@ -1,5 +1,3 @@
-require_relative 'types'
-
 require 'management'
 require 'caching'
 require 'pagination'
diff --git a/config/initializers/types.rb b/config/initializers/types.rb
index b78ab6bc6..cda3a37ab 100644
--- a/config/initializers/types.rb
+++ b/config/initializers/types.rb
@@ -1,8 +1,6 @@
-unless defined?(::Types)
-  require 'dry-types'
+require 'dry-types'
 
-  module Types
-    include Dry.Types()
-    include Dry::Core::Constants
-  end
+module Types
+  include Dry.Types()
+  include Dry::Core::Constants
 end