diff --git a/src/Settings.hs b/src/Settings.hs index a0cc9022c..085ec469a 100644 --- a/src/Settings.hs +++ b/src/Settings.hs @@ -21,13 +21,17 @@ import Data.Aeson.TH import Data.FileEmbed (embedFile) import Data.Yaml (decodeEither') import Database.Persist.Postgresql (PostgresConf) -import Language.Haskell.TH.Syntax (Exp, Q, location, Loc(..)) import Network.Wai.Handler.Warp (HostPreference) import Yesod.Default.Config2 (applyEnvValue, configSettingsYml) #ifdef DEVELOPMENT import Yesod.Default.Util (WidgetFileSettings, widgetFileReload) +import Language.Haskell.TH.Syntax (Exp, Q, location, Loc(..)) + +import Text.Shakespeare.Text (st) +import Text.Blaze.Html (preEscapedToHtml) #else import Yesod.Default.Util (WidgetFileSettings, widgetFileNoReload, widgetFileReload) +import Language.Haskell.TH.Syntax (Exp, Q) #endif import qualified Yesod.Auth.Util.PasswordStore as PWStore @@ -67,9 +71,6 @@ import qualified System.FilePath as FilePath import Jose.Jwt (JwtEncoding(..)) -import Text.Shakespeare.Text (st) -import Text.Blaze.Html (preEscapedToHtml) - -- | Runtime settings to configure this application. These settings can be -- loaded from various sources: defaults, environment variables, config files, @@ -431,13 +432,11 @@ widgetFile nameBase = do toWidget $ preEscapedToHtml after |] #else -widgetFile nameBase = do - let widgetFile - | appReloadTemplates compileTimeAppSettings - = widgetFileReload widgetFileSettings - | otherwise - = widgetFileNoReload widgetFileSettings - widgetFile nameBase +widgetFile + | appReloadTemplates compileTimeAppSettings + = widgetFileReload widgetFileSettings + | otherwise + = widgetFileNoReload widgetFileSettings #endif -- | Raw bytes at compile time of @config/settings.yml@