Fix starting templates (#326)

Author: serras

docs/docs/intro-graphql.md

@@ -46,8 +46,13 @@ This schema defines **three types: a book, an author, and a query**. All GraphQL
 Now let's have a look at the already finished `src/Main.hs` and we'll go bit by bit explaining what is going on:
 
 ```haskell
-graphql "ServiceDefinition" "schema.graphql"
+{-# language TupleSections #-} -- add this at the top of the file
+
+import Data.Text -- add this at the imports section
+
+graphql "ServiceDefinition" "schema.graphql"  -- this is already there
 
+-- you should replace the old main with this new code
 main :: IO ()
 main = do
   putStrLn "starting GraphQL server on port 8080"

docs/docs/intro-rpc.md

@@ -49,7 +49,7 @@ stack new my_project https://raw.githubusercontent.com/higherkindness/mu-haskell
 
 This command creates a new folder called `my_project`, with a few files. The most important from those are the `.proto` file, in which you will define your service; `src/Schema.hs`, which loads the service definition at compile-time; and `src/Main.hs`, which contains the code of the server.
 
-The first step to get your project running is defining the right schema and service. In this case, you can just copy the definition above after the `package` declaration.
+The first step to get your project running is defining the right schema and service. In this case, you can just copy the definition above after the `package` declaration in the newly created `.proto` file.
 
 #### Data type definition
 
@@ -120,7 +120,7 @@ The `MonadServer` portion in the type is mandated by `mu-rpc`; it tells us that
 Another possibility is to use the `optics`-based API in `Mu.Schema.Optics`. In that case, you access the value of the fields using `(^.)` followed by the name of the field after `#`, and build messages by using `record` followed by a tuple of the components. The previous example would then be written:
 
 ```haskell
-{-# language OverloadedLabels #-}
+{-# language OverloadedLabels #-} -- add this at the top of the file
 
 sayHello :: (MonadServer m) => HelloRequestMessage' -> m HelloReplyMessage'
 sayHello (HelloRequestMessage nm)

templates/graphql-server.hsfiles

@@ -21,27 +21,24 @@ executable {{name}}
   build-depends:
       base        >=4.12  && <5
     , conduit
-    , mu-graphql  >=0.4.1
-    , mu-rpc      >=0.4.0
+    , mu-graphql  >=0.5.0
+    , mu-rpc      >=0.5.0
     , mu-schema   >=0.3.1
     , text
     , wai-extra
     , warp
 
 
 {-# START_FILE stack.yaml #-}
-resolver: lts-16.22
+resolver: lts-18.18
 allow-newer: true
 extra-deps:
-- mu-schema-0.3.1.1
-- mu-rpc-0.4.0.1
-- mu-graphql-0.4.1.0
-- graphql-0.11.0.0
-- primitive-extras-0.8
-- primitive-unlifted-0.1.3.0
-- stm-hamt-1.2.0.4
-- stm-containers-1.1.0.4
-- stm-lifted-2.5.0.0
+- mu-schema-0.3.1.2
+- mu-rpc-0.5.0.1
+- mu-graphql-0.5.0.3
+- graphql-1.0.1.0
+- stm-containers-1.2
+- stm-hamt-1.2.0.6
 
 {-# START_FILE Setup.hs #-}
 import Distribution.Simple
@@ -79,6 +76,7 @@ import           Data.Proxy
 
 import           Mu.GraphQL.Quasi
 import           Mu.GraphQL.Server
+import           Mu.Schema
 import           Mu.Server
 
 graphql "ServiceDefinition" "schema.graphql"

templates/grpc-server-avro.hsfiles

@@ -22,31 +22,31 @@ executable {{name}}
   build-depends:
       base            >=4.12  && <5
     , mu-avro         >=0.4.0
-    , mu-grpc-server  >=0.4.0
-    , mu-rpc          >=0.4.0
+    , mu-grpc-server  >=0.5.0
+    , mu-rpc          >=0.5.0
     , mu-schema       >=0.3.1
     , text
 
 {-# START_FILE stack.yaml #-}
-resolver: lts-16.22
+resolver: lts-18.18
 allow-newer: true
 extra-deps:
 # mu
-- mu-schema-0.3.1.1
-- mu-rpc-0.4.0.1
+- mu-schema-0.3.1.2
+- mu-rpc-0.5.0.1
 - mu-optics-0.3.0.1
-- mu-avro-0.4.0.2
-- mu-protobuf-0.4.0.3
-- mu-grpc-server-0.4.0.0
+- mu-avro-0.4.0.4
+- mu-protobuf-0.4.2.0
+- mu-grpc-server-0.5.0.0
 - mu-grpc-common-0.4.0.0
 - compendium-client-0.2.1.1
 # dependencies of mu
-- http2-client-0.9.0.0
-- http2-grpc-types-0.5.0.0
+- http2-client-0.10.0.0
+- http2-client-grpc-0.8.0.0
 - http2-grpc-proto3-wire-0.1.0.0
+- http2-grpc-types-0.5.0.0
+- proto3-wire-1.2.2
 - warp-grpc-0.4.0.1
-- proto3-wire-1.2.0
-- parameterized-0.5.0.0
 
 {-# START_FILE Setup.hs #-}
 import Distribution.Simple
@@ -81,8 +81,8 @@ protocol Service {
 
 module Schema where
 
--- import Data.Text as T
--- import GHC.Generics
+import Data.Text as T
+import GHC.Generics
 
 import Mu.Quasi.Avro
 import Mu.Schema
@@ -100,9 +100,11 @@ avdl "TheSchema" "TheService" "." "{{name}}.avdl"
 type Message = Term TheSchema (TheSchema :/: "Message")
 
 {-# START_FILE src/Main.hs #-}
+{-# language DataKinds             #-}
 {-# language FlexibleContexts      #-}
 {-# language PartialTypeSignatures #-}
 {-# language OverloadedStrings     #-}
+{-# language TypeApplications      #-}
 {-# OPTIONS_GHC -fno-warn-partial-type-signatures #-}
 
 module Main where

templates/grpc-server-protobuf.hsfiles

@@ -21,32 +21,32 @@ executable {{name}}
   default-language: Haskell2010
   build-depends:
       base            >=4.12  && <5
-    , mu-grpc-server  >=0.4.0
-    , mu-protobuf     >=0.4.0
-    , mu-rpc          >=0.4.0
+    , mu-grpc-server  >=0.5.0
+    , mu-protobuf     >=0.4.2
+    , mu-rpc          >=0.5.0
     , mu-schema       >=0.3.1
     , text
 
 {-# START_FILE stack.yaml #-}
-resolver: lts-16.22
+resolver: lts-18.18
 allow-newer: true
 extra-deps:
 # mu
-- mu-schema-0.3.1.1
-- mu-rpc-0.4.0.1
+- mu-schema-0.3.1.2
+- mu-rpc-0.5.0.1
 - mu-optics-0.3.0.1
-- mu-avro-0.4.0.2
-- mu-protobuf-0.4.0.3
-- mu-grpc-server-0.4.0.0
+- mu-avro-0.4.0.4
+- mu-protobuf-0.4.2.0
+- mu-grpc-server-0.5.0.0
 - mu-grpc-common-0.4.0.0
 - compendium-client-0.2.1.1
 # dependencies of mu
-- http2-client-0.9.0.0
-- http2-grpc-types-0.5.0.0
+- http2-client-0.10.0.0
+- http2-client-grpc-0.8.0.0
 - http2-grpc-proto3-wire-0.1.0.0
+- http2-grpc-types-0.5.0.0
+- proto3-wire-1.2.2
 - warp-grpc-0.4.0.1
-- proto3-wire-1.2.0
-- parameterized-0.5.0.0
 
 {-# START_FILE Setup.hs #-}
 import Distribution.Simple
@@ -86,8 +86,8 @@ service Service {
 
 module Schema where
 
--- import Data.Text as T
--- import GHC.Generics
+import Data.Text as T
+import GHC.Generics
 
 import Mu.Quasi.GRpc
 import Mu.Schema
@@ -105,9 +105,11 @@ grpc "TheSchema" id "{{name}}.proto"
 type Message = Term TheSchema (TheSchema :/: "Message")
 
 {-# START_FILE src/Main.hs #-}
+{-# language DataKinds             #-}
 {-# language FlexibleContexts      #-}
 {-# language PartialTypeSignatures #-}
 {-# language OverloadedStrings     #-}
+{-# language TypeApplications      #-}
 {-# OPTIONS_GHC -fno-warn-partial-type-signatures #-}
 
 module Main where