Logic around the CMS Preview API is required prior to initialisation (#…

…926)

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]

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
 

config/initializers/contentful_rails.rb

@@ -1,5 +1,3 @@
-require_relative 'types'
-
 require 'management'
 require 'caching'
 require 'pagination'

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