diff --git a/yesod/Scaffolding/Scaffolder.hs b/yesod/Scaffolding/Scaffolder.hs index b48fcee2..0d814b49 100644 --- a/yesod/Scaffolding/Scaffolder.hs +++ b/yesod/Scaffolding/Scaffolder.hs @@ -155,6 +155,7 @@ scaffold = do writeFile' ".ghci" $(codegen ".ghci") writeFile' "LICENSE" $(codegen "LICENSE") writeFile' ("Foundation.hs") $ ifTiny $(codegen "tiny/Foundation.hs") $(codegen "Foundation.hs") + writeFile' "Import.hs" $(codegen "Import.hs") writeFile' "Application.hs" $ ifTiny $(codegen "tiny/Application.hs") $(codegen "Application.hs") writeFile' "Handler/Root.hs" $(codegen "Handler/Root.hs") unless isTiny $ writeFile' "Model.hs" $(codegen "Model.hs") diff --git a/yesod/scaffold/Application.hs.cg b/yesod/scaffold/Application.hs.cg index 3c60a604..e780f068 100644 --- a/yesod/scaffold/Application.hs.cg +++ b/yesod/scaffold/Application.hs.cg @@ -15,7 +15,6 @@ import Yesod.Default.Config import Yesod.Default.Main import Yesod.Default.Handlers import Yesod.Logger (Logger) -import Data.ByteString (ByteString) import Data.Dynamic (Dynamic, toDyn) import qualified Database.Persist.Base~importMigration~ diff --git a/yesod/scaffold/Handler/Root.hs.cg b/yesod/scaffold/Handler/Root.hs.cg index 4ee59109..1ab268e8 100644 --- a/yesod/scaffold/Handler/Root.hs.cg +++ b/yesod/scaffold/Handler/Root.hs.cg @@ -1,7 +1,7 @@ -{-# LANGUAGE TemplateHaskell, QuasiQuotes, OverloadedStrings #-} +{-# LANGUAGE TemplateHaskell, QuasiQuotes, OverloadedStrings, NoImplicitPrelude #-} module Handler.Root where -import Foundation +import Import -- This is a handler function for the GET request method on the RootR -- resource pattern. All of your resource patterns are defined in diff --git a/yesod/scaffold/Import.hs.cg b/yesod/scaffold/Import.hs.cg new file mode 100644 index 00000000..cef85920 --- /dev/null +++ b/yesod/scaffold/Import.hs.cg @@ -0,0 +1,18 @@ +module Import + ( module Prelude + , module Foundation + , (<>) + , Text + , module Data.Monoid + , module Control.Applicative + ) where + +import Prelude hiding (writeFile, readFile) +import Foundation +import Data.Monoid (Monoid (mappend, mempty, mconcat)) +import Control.Applicative ((<$>), (<*>), pure) +import Data.Text (Text) + +infixr 5 <> +(<>) :: Monoid m => m -> m -> m +(<>) = mappend diff --git a/yesod/scaffold/project.cabal.cg b/yesod/scaffold/project.cabal.cg index ac7297cb..a078def6 100644 --- a/yesod/scaffold/project.cabal.cg +++ b/yesod/scaffold/project.cabal.cg @@ -28,6 +28,7 @@ library exposed-modules: Application other-modules: Foundation + Import Model Settings Settings.StaticFiles diff --git a/yesod/scaffold/tiny/project.cabal.cg b/yesod/scaffold/tiny/project.cabal.cg index d6725b56..f0a25a02 100644 --- a/yesod/scaffold/tiny/project.cabal.cg +++ b/yesod/scaffold/tiny/project.cabal.cg @@ -27,6 +27,7 @@ library Buildable: False exposed-modules: Application other-modules: Foundation + Import Settings Settings.StaticFiles Handler.Root diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal index 9f202099..94ce8900 100644 --- a/yesod/yesod.cabal +++ b/yesod/yesod.cabal @@ -20,6 +20,7 @@ extra-source-files: scaffold/templates/default-layout.lucius.cg scaffold/templates/homepage.lucius.cg scaffold/Model.hs.cg + scaffold/Import.hs.cg scaffold/Foundation.hs.cg scaffold/LICENSE.cg scaffold/mongoDBConnPool.cg