Merge branch 'master' into 309-handle-application-exceptions-with-500-errors

Author: Sasa Bogicevic

.travis.yml

@@ -1,6 +1,6 @@
 # This Travis job script has been generated by a script via
 #
-#   runghc make_travis_yml_2.hs '--config=cabal.make-travis-yml' '--output=.travis.yml' '--max-backjumps=10000' 'cabal.project'
+#   runghc make_travis_yml_2.hs '--config=cabal.make-travis-yml' '--output=.travis.yml' 'cabal.project'
 #
 # For more information, see https://github.com/hvr/multi-ghc-travis
 #
@@ -33,18 +33,21 @@ before_cache:
 
 matrix:
   include:
-    - compiler: "ghc-7.8.4"
+    - compiler: "ghc-8.4.3"
     # env: TEST=--disable-tests BENCH=--disable-benchmarks
-      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.8.4], sources: [hvr-ghc]}}
-    - compiler: "ghc-7.10.3"
+      addons: {apt: {packages: [ghc-ppa-tools,ghc-8.4.3], sources: [hvr-ghc]}}
+    - compiler: "ghc-8.2.2"
     # env: TEST=--disable-tests BENCH=--disable-benchmarks
-      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.10.3], sources: [hvr-ghc]}}
+      addons: {apt: {packages: [ghc-ppa-tools,ghc-8.2.2], sources: [hvr-ghc]}}
     - compiler: "ghc-8.0.2"
     # env: TEST=--disable-tests BENCH=--disable-benchmarks
-      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}}
-    - compiler: "ghc-8.2.2"
+      addons: {apt: {packages: [ghc-ppa-tools,ghc-8.0.2], sources: [hvr-ghc]}}
+    - compiler: "ghc-7.10.3"
     # env: TEST=--disable-tests BENCH=--disable-benchmarks
-      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}
+      addons: {apt: {packages: [ghc-ppa-tools,ghc-7.10.3], sources: [hvr-ghc]}}
+    - compiler: "ghc-7.8.4"
+    # env: TEST=--disable-tests BENCH=--disable-benchmarks
+      addons: {apt: {packages: [ghc-ppa-tools,ghc-7.8.4], sources: [hvr-ghc]}}
 
 before_install:
   - HC=${CC}
@@ -56,6 +59,17 @@ before_install:
   - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
   - echo $HCNUMVER
 
+  # Let's download "better" cabal
+  - "curl -L http://oleg.fi/cabal-grayjay-buildable-fix.xz | xz -d > $HOME/.local/bin/cabal"
+  - |
+    if [ "$(cd $HOME/.local/bin && sha256sum cabal)" != "e281e9466b8eef30ac0d1371e8ea83c9d2e856bda4714a728ac474138b09b20f  cabal" ]; then
+      rm -f $HOME/.local/bin/cabal;
+      sha256sum $HOME/.local/bin/cabal;
+      false;
+    else
+      chmod a+x $HOME/.local/bin/cabal;
+    fi
+
 install:
   - cabal --version
   - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
@@ -64,15 +78,14 @@ install:
   - HADDOCK=${HADDOCK-true}
   - INSTALLED=${INSTALLED-true}
   - GHCHEAD=${GHCHEAD-false}
-  - CABALNEWBUILDOPTS=--max-backjumps=10000
   - travis_retry cabal update -v
   - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
   - rm -fv cabal.project cabal.project.local
   - "if [ $HCNUMVER -ge 70800 ]; then sed -i.bak 's/-- ghc-options:.*/ghc-options: -j2/' ${HOME}/.cabal/config; fi"
   - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
-  - "printf 'packages: \"servant\" \"servant-client\" \"servant-client-core\" \"servant-docs\" \"servant-foreign\" \"servant-server\" \"doc/tutorial\" \"doc/cookbook/db-postgres-pool\" \"doc/cookbook/jwt-and-basic-auth\" \"doc/cookbook/db-sqlite-simple\" \"doc/cookbook/basic-auth\" \"doc/cookbook/https\" \"doc/cookbook/structuring-apis\" \"doc/cookbook/using-custom-monad\" \"doc/cookbook/file-upload\"\\n' > cabal.project"
+  - "printf 'packages: \"servant\" \"servant-client\" \"servant-client-core\" \"servant-docs\" \"servant-foreign\" \"servant-server\" \"doc/tutorial\" \"doc/cookbook/basic-auth\" \"doc/cookbook/db-postgres-pool\" \"doc/cookbook/db-sqlite-simple\" \"doc/cookbook/https\" \"doc/cookbook/pagination\" \"doc/cookbook/structuring-apis\" \"doc/cookbook/using-custom-monad\"\\n' > cabal.project"
   - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"
-  - "echo 'allow-newer: servant-js:servant,servant-js:servant-foreign,servant-auth-server:http-types,servant-multipart:lens,servant-multipart:resourcet,servant-multipart:servant,servant-multipart:servant-server,servant-auth-server:servant-server' >> cabal.project"
+  - "echo 'allow-newer: servant-auth-server:http-types,servant-auth-server:servant-server, http-media:base' >> cabal.project"
   - cat cabal.project
   - if [ -f "servant/configure.ac" ]; then
       (cd "servant" && autoreconf -i);
@@ -95,32 +108,29 @@ install:
   - if [ -f "doc/tutorial/configure.ac" ]; then
       (cd "doc/tutorial" && autoreconf -i);
     fi
+  - if [ -f "doc/cookbook/basic-auth/configure.ac" ]; then
+      (cd "doc/cookbook/basic-auth" && autoreconf -i);
+    fi
   - if [ -f "doc/cookbook/db-postgres-pool/configure.ac" ]; then
       (cd "doc/cookbook/db-postgres-pool" && autoreconf -i);
     fi
-  - if [ -f "doc/cookbook/jwt-and-basic-auth/configure.ac" ]; then
-      (cd "doc/cookbook/jwt-and-basic-auth" && autoreconf -i);
-    fi
   - if [ -f "doc/cookbook/db-sqlite-simple/configure.ac" ]; then
       (cd "doc/cookbook/db-sqlite-simple" && autoreconf -i);
     fi
-  - if [ -f "doc/cookbook/basic-auth/configure.ac" ]; then
-      (cd "doc/cookbook/basic-auth" && autoreconf -i);
-    fi
   - if [ -f "doc/cookbook/https/configure.ac" ]; then
       (cd "doc/cookbook/https" && autoreconf -i);
     fi
+  - if [ -f "doc/cookbook/pagination/configure.ac" ]; then
+      (cd "doc/cookbook/pagination" && autoreconf -i);
+    fi
   - if [ -f "doc/cookbook/structuring-apis/configure.ac" ]; then
       (cd "doc/cookbook/structuring-apis" && autoreconf -i);
     fi
   - if [ -f "doc/cookbook/using-custom-monad/configure.ac" ]; then
       (cd "doc/cookbook/using-custom-monad" && autoreconf -i);
     fi
-  - if [ -f "doc/cookbook/file-upload/configure.ac" ]; then
-      (cd "doc/cookbook/file-upload" && autoreconf -i);
-    fi
   - rm -f cabal.project.freeze
-  - rm -rf .ghc.environment.* "servant"/dist "servant-client"/dist "servant-client-core"/dist "servant-docs"/dist "servant-foreign"/dist "servant-server"/dist "doc/tutorial"/dist "doc/cookbook/db-postgres-pool"/dist "doc/cookbook/jwt-and-basic-auth"/dist "doc/cookbook/db-sqlite-simple"/dist "doc/cookbook/basic-auth"/dist "doc/cookbook/https"/dist "doc/cookbook/structuring-apis"/dist "doc/cookbook/using-custom-monad"/dist "doc/cookbook/file-upload"/dist
+  - rm -rf .ghc.environment.* "servant"/dist "servant-client"/dist "servant-client-core"/dist "servant-docs"/dist "servant-foreign"/dist "servant-server"/dist "doc/tutorial"/dist "doc/cookbook/basic-auth"/dist "doc/cookbook/db-postgres-pool"/dist "doc/cookbook/db-sqlite-simple"/dist "doc/cookbook/https"/dist "doc/cookbook/pagination"/dist "doc/cookbook/structuring-apis"/dist "doc/cookbook/using-custom-monad"/dist
   - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
 
 # Here starts the actual work to be performed for the package under test;
@@ -135,37 +145,36 @@ script:
   - (cd "servant-foreign" && cabal sdist)
   - (cd "servant-server" && cabal sdist)
   - (cd "doc/tutorial" && cabal sdist)
+  - (cd "doc/cookbook/basic-auth" && cabal sdist)
   - (cd "doc/cookbook/db-postgres-pool" && cabal sdist)
-  - (cd "doc/cookbook/jwt-and-basic-auth" && cabal sdist)
   - (cd "doc/cookbook/db-sqlite-simple" && cabal sdist)
-  - (cd "doc/cookbook/basic-auth" && cabal sdist)
   - (cd "doc/cookbook/https" && cabal sdist)
+  - (cd "doc/cookbook/pagination" && cabal sdist)
   - (cd "doc/cookbook/structuring-apis" && cabal sdist)
   - (cd "doc/cookbook/using-custom-monad" && cabal sdist)
-  - (cd "doc/cookbook/file-upload" && cabal sdist)
   - echo -en 'travis_fold:end:sdist\\r'
   - echo Unpacking... && echo -en 'travis_fold:start:unpack\\r'
-  - mv "servant"/dist/servant-*.tar.gz "servant-client"/dist/servant-client-*.tar.gz "servant-client-core"/dist/servant-client-core-*.tar.gz "servant-docs"/dist/servant-docs-*.tar.gz "servant-foreign"/dist/servant-foreign-*.tar.gz "servant-server"/dist/servant-server-*.tar.gz "doc/tutorial"/dist/tutorial-*.tar.gz "doc/cookbook/db-postgres-pool"/dist/cookbook-db-postgres-pool-*.tar.gz "doc/cookbook/jwt-and-basic-auth"/dist/cookbook-jwt-and-basic-auth-*.tar.gz "doc/cookbook/db-sqlite-simple"/dist/cookbook-db-sqlite-simple-*.tar.gz "doc/cookbook/basic-auth"/dist/cookbook-basic-auth-*.tar.gz "doc/cookbook/https"/dist/cookbook-https-*.tar.gz "doc/cookbook/structuring-apis"/dist/cookbook-structuring-apis-*.tar.gz "doc/cookbook/using-custom-monad"/dist/cookbook-using-custom-monad-*.tar.gz "doc/cookbook/file-upload"/dist/cookbook-file-upload-*.tar.gz ${DISTDIR}/
+  - mv "servant"/dist/servant-*.tar.gz "servant-client"/dist/servant-client-*.tar.gz "servant-client-core"/dist/servant-client-core-*.tar.gz "servant-docs"/dist/servant-docs-*.tar.gz "servant-foreign"/dist/servant-foreign-*.tar.gz "servant-server"/dist/servant-server-*.tar.gz "doc/tutorial"/dist/tutorial-*.tar.gz "doc/cookbook/basic-auth"/dist/cookbook-basic-auth-*.tar.gz "doc/cookbook/db-postgres-pool"/dist/cookbook-db-postgres-pool-*.tar.gz "doc/cookbook/db-sqlite-simple"/dist/cookbook-db-sqlite-simple-*.tar.gz "doc/cookbook/https"/dist/cookbook-https-*.tar.gz "doc/cookbook/pagination"/dist/cookbook-pagination-*.tar.gz "doc/cookbook/structuring-apis"/dist/cookbook-structuring-apis-*.tar.gz "doc/cookbook/using-custom-monad"/dist/cookbook-using-custom-monad-*.tar.gz ${DISTDIR}/
   - cd ${DISTDIR} || false
   - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
-  - "printf 'packages: servant-*/*.cabal servant-client-*/*.cabal servant-client-core-*/*.cabal servant-docs-*/*.cabal servant-foreign-*/*.cabal servant-server-*/*.cabal tutorial-*/*.cabal cookbook-db-postgres-pool-*/*.cabal cookbook-jwt-and-basic-auth-*/*.cabal cookbook-db-sqlite-simple-*/*.cabal cookbook-basic-auth-*/*.cabal cookbook-https-*/*.cabal cookbook-structuring-apis-*/*.cabal cookbook-using-custom-monad-*/*.cabal cookbook-file-upload-*/*.cabal\\n' > cabal.project"
+  - "printf 'packages: servant-*/*.cabal servant-client-*/*.cabal servant-client-core-*/*.cabal servant-docs-*/*.cabal servant-foreign-*/*.cabal servant-server-*/*.cabal tutorial-*/*.cabal cookbook-basic-auth-*/*.cabal cookbook-db-postgres-pool-*/*.cabal cookbook-db-sqlite-simple-*/*.cabal cookbook-https-*/*.cabal cookbook-pagination-*/*.cabal cookbook-structuring-apis-*/*.cabal cookbook-using-custom-monad-*/*.cabal\\n' > cabal.project"
   - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"
-  - "echo 'allow-newer: servant-js:servant,servant-js:servant-foreign,servant-auth-server:http-types,servant-multipart:lens,servant-multipart:resourcet,servant-multipart:servant,servant-multipart:servant-server,servant-auth-server:servant-server' >> cabal.project"
+  - "echo 'allow-newer: servant-auth-server:http-types,servant-auth-server:servant-server, http-media:base' >> cabal.project"
   - cat cabal.project
   - echo -en 'travis_fold:end:unpack\\r'
 
 
   - echo Building with tests and benchmarks... && echo -en 'travis_fold:start:build-everything\\r'
   # build & run tests, build benchmarks
-  - cabal new-build -w ${HC} ${TEST} ${BENCH} ${CABALNEWBUILDOPTS} all
+  - cabal new-build -w ${HC} ${TEST} ${BENCH} all
   - echo -en 'travis_fold:end:build-everything\\r'
-  - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} ${BENCH} ${CABALNEWBUILDOPTS} all; fi
+  - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} ${BENCH} all; fi
 
   - echo Haddock... && echo -en 'travis_fold:start:haddock\\r'
   # haddock
   - rm -rf ./dist-newstyle
-  - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} ${CABALNEWBUILDOPTS} all; else echo "Skipping haddock generation";fi
+  - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
 
   - echo -en 'travis_fold:end:haddock\\r'
-# REGENDATA ["--config=cabal.make-travis-yml","--output=.travis.yml","--max-backjumps=10000","cabal.project"]
+# REGENDATA ["--config=cabal.make-travis-yml","--output=.travis.yml","cabal.project"]
 # EOF

cabal.project

@@ -5,19 +5,29 @@ packages: servant/
   servant-foreign/
   servant-server/
   doc/tutorial/
-  doc/cookbook/*/*.cabal
+
+  -- doc/cookbook/*/*.cabal
+
+  doc/cookbook/basic-auth
+  doc/cookbook/db-postgres-pool
+  doc/cookbook/db-sqlite-simple
+  -- MkLink changed
+  -- doc/cookbook/file-upload
+  doc/cookbook/https
+  -- servant-auth-* doesn't support GHC-8.4
+  -- doc/cookbook/jwt-and-basic-auth
+  doc/cookbook/pagination
+  doc/cookbook/structuring-apis
+  doc/cookbook/using-custom-monad
 
 allow-newer:
-  servant-js:servant,
-  servant-js:servant-foreign,
   servant-auth-server:http-types,
-  servant-multipart:lens,
-  servant-multipart:resourcet,
-  servant-multipart:servant,
-  servant-multipart:servant-server,
   servant-auth-server:servant-server
 
 constraints:
   -- see https://github.com/haskell-infra/hackage-trustees/issues/119
   foundation >=0.0.14,
   memory <0.14.12 || >0.14.12
+
+allow-newer:
+  http-media:base

doc/cookbook/basic-auth/basic-auth.cabal

@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          [email protected]
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2
+tested-with:         GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
 
 executable cookbook-basic-auth
   main-is:             BasicAuth.lhs

doc/cookbook/db-postgres-pool/db-postgres-pool.cabal

@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          [email protected]
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2
+tested-with:         GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
 
 executable cookbook-db-postgres-pool
   main-is:             PostgresPool.lhs

doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal

@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          [email protected]
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2
+tested-with:         GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
 
 executable cookbook-db-sqlite-simple
   main-is:             DBConnection.lhs

doc/cookbook/file-upload/file-upload.cabal

@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          [email protected]
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2
+tested-with:         GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
 
 executable cookbook-file-upload
   main-is:             FileUpload.lhs

doc/cookbook/https/https.cabal

@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          [email protected]
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2
+tested-with:         GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
 
 executable cookbook-https
   main-is:             Https.lhs

doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal

@@ -11,7 +11,7 @@ maintainer:          [email protected]
 category:            Servant
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2
+tested-with:         GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
 
 executable cookbook-jwt-and-basic-auth
   if !impl(ghc >= 7.10)

doc/cookbook/pagination/dummy/Pagination.lhs

@@ -0,0 +1,5 @@
+```haskell
+module Main (main) where
+main :: IO ()
+main = return ()
+```

doc/cookbook/pagination/pagination.cabal

@@ -8,17 +8,25 @@ author:              Servant Contributors
 maintainer:          [email protected]
 build-type:          Simple
 cabal-version:       >=1.10
+extra-source-files:
+  Pagination.lhs
+  dummy/Pagination.lhs
+tested-with:         GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
 
 executable cookbook-pagination
-  if impl(ghc < 7.10.1)
-    buildable:          False
   main-is:             Pagination.lhs
-  build-depends:       base == 4.*
-                     , aeson
-                     , servant
-                     , servant-server
-                     , servant-pagination >= 2.1.0 && < 3.0.0
-                     , warp
+  build-tool-depends:  markdown-unlit:markdown-unlit
   default-language:    Haskell2010
   ghc-options:         -Wall -pgmL markdown-unlit
-  build-tool-depends: markdown-unlit:markdown-unlit
+
+  if impl(ghc >= 8.0)
+    hs-source-dirs: .
+    build-depends:       base >= 4.8 && <4.12
+                       , aeson
+                       , servant
+                       , servant-server
+                       , servant-pagination >= 2.1.0 && < 3.0.0
+                       , warp
+  else
+    hs-source-dirs: dummy
+    build-depends: base

doc/cookbook/structuring-apis/structuring-apis.cabal

@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          [email protected]
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2
+tested-with:         GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
 
 executable cookbook-structuring-apis
   main-is:             StructuringApis.lhs

doc/cookbook/using-custom-monad/using-custom-monad.cabal

@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          [email protected]
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2
+tested-with:         GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
 
 executable cookbook-using-custom-monad
   main-is:             UsingCustomMonad.lhs

doc/examples.md

@@ -6,6 +6,11 @@
     including a test-suite using [**hspec**](http://hspec.github.io/) and
     **servant-client**.
 
+- **[servant-examples](https://github.com/sras/servant-examples)**:
+
+    Similar to [the cookbook](https://haskell-servant.readthedocs.io/en/latest/cookbook/index.html) but
+    with no explanations, for developers who just want to look at code examples to find out how to do X or Y
+    with servant.
 
 - **[stack-templates](https://github.com/commercialhaskell/stack-templates)**
 

doc/tutorial/ApiType.lhs

@@ -137,7 +137,7 @@ type StreamGet  = Stream 'GET
 type StreamPost = Stream 'POST
 ```
 
-These describe endpoints that return a stream of values rather than just a single value. They not only take a single content type as a parameter, but also a framing strategy -- this specifies how the individual results are delineated from one another in the stream. The two standard strategies given with Servant are `NewlineFraming` and `NetstringFraming`, but others can be written to match other protocols.
+These describe endpoints that return a stream of values rather than just a single value. They not only take a single content type as a parameter, but also a framing strategy -- this specifies how the individual results are delineated from one another in the stream. The three standard strategies given with Servant are `NewlineFraming`, `NetstringFraming` and `NoFraming`, but others can be written to match other protocols.
 
 
 ### `Capture`

doc/tutorial/Server.lhs

@@ -95,12 +95,6 @@ users1 =
   ]
 ```
 
-Let's also write our API type.
-
-``` haskell ignore
-type UserAPI1 = "users" :> Get '[JSON] [User]
-```
-
 We can now take care of writing the actual webservice that will handle requests
 to such an API. This one will be very simple, being reduced to just a single
 endpoint. The type of the web application is determined by the API type,

doc/tutorial/tutorial.cabal

@@ -17,6 +17,7 @@ tested-with:
   GHC==7.10.3
   GHC==8.0.2
   GHC==8.2.2
+  GHC==8.4.3
 extra-source-files:
   static/index.html
   static/ui.js
@@ -34,7 +35,7 @@ library
   -- Packages `servant` depends on.
   -- We don't need to specify bounds here as this package is never released.
   build-depends:
-      base >= 4.7 && <4.11
+      base >= 4.7 && <4.12
     , aeson
     , aeson-compat
     , attoparsec

servant-client-core/servant-client-core.cabal

@@ -23,6 +23,7 @@ tested-with:
   GHC==7.10.3
   GHC==8.0.2
   GHC==8.2.2
+  GHC==8.4.3
 
 source-repository head
   type:              git
@@ -47,7 +48,7 @@ library
   --
   -- note: mtl lower bound is so low because of GHC-7.8
   build-depends:
-      base                  >= 4.7      && < 4.11
+      base                  >= 4.7      && < 4.12
     , bytestring            >= 0.10.4.0 && < 0.11
     , containers            >= 0.5.5.1  && < 0.6
     , mtl                   >= 2.1      && < 2.3