Merge pull request #77 from nsaunders/compiler/0.13

Updates for PureScript 0.13

Author: nsaunders

.gitignore

@@ -5,3 +5,4 @@
 /.psci*
 /src/.webpack.js
 /.psc-ide-port
+/.spago

.travis.yml

@@ -26,7 +26,8 @@ env:
   - secure: "K3g58P0HUnRLIa2te30XL8xmyzuvimzG0z5R4C2+fku/gC6kkYs2MT/Cc3MFYHt9FPGGOTfys3UR0aPkq2bSL+Y5WXbjutY9PNqsvA2MqMLxdpZirTW6N6yP2l/ilMnPnJUNxScnErqvk4JKvdybYrAxYRA1mC2x3UknCL7uFLowFB/GU/XyTBY3mhu5uIB5I//Lr/oKMxT1M98hA4T5WHbLEE6K5ozypbsX5yU8OOgf6+ZZO9YegBS7vD9zlZNZivObfX+N0tmWkGLp+1WZiI5x0BaYuNU2oFq+hQie/tHAQTvcmKfprreRPGr1R95878G8OpVuoVLX3yXEfznfV62RYJodHsOUDFOMRXbgoBPRGK3GsCts8UaOg0efG4Y67pbMYgXHROtrLxlBfZasrcu6Odh+ZlmV4eraMi6muJWkRwga03i7BtwiP3Aw47+ycoMympupRyDlzk9HCO7ZyhYXsN25RCOsY6HQ6U6k9WvG421KPEPGz5g4hBuVqq5svA8wAdT3XUGIkYkfPmSi2SK2xEDJhz/g5E5HazM8lbmZfFYCB8fthz3XuRuiQqHQov3VrBPMWYa4VxMsvbc2NFc+4DwenE6PaOBwrwcH1zdtlWZB4YpyCZPeXFrQwm5uvm3I3YKijBb4sNjzLCeUSR7QkuMiYa/sE/tb1yYPhFc="
 
 install:
-- npm install -g bower pulp@12.3.1 purescript@0.12.3
+- npm install -g bower pulp@13.0.0 purescript@^0.13.0 spago@0.8.3
+- spago install
 - bower install
 - pip install --user -r docs/requirements.txt
 
@@ -35,10 +36,12 @@ script:
 - if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then export VERSION=pull-request-job-$TRAVIS_JOB_NUMBER;
   fi
 - if [[ "$TRAVIS_TAG" != "" ]]; then export VERSION=$TRAVIS_TAG; fi
-- travis_wait pulp build
-- travis_wait pulp test
-- travis_wait make examples
-- travis_wait make docs
+- spago build
+- spago test
+- rm -rf .spago output
+- pulp build
+- make examples
+- make docs
 
 before_deploy: pip install --user awscli
 

bower.json

@@ -13,30 +13,35 @@
     "url": "git://github.com/owickstrom/hyper.git"
   },
   "dependencies": {
-    "purescript-aff": "^5.0.1",
+    "purescript-aff": "^5.1.1",
     "purescript-avar": "^3.0.0",
-    "purescript-argonaut": "^5.0.0",
-    "purescript-arrays": "^5.0.0",
-    "purescript-control": "^4.0.0",
-    "purescript-effect": "^2.0.0",
-    "purescript-foldable-traversable": "^4.0.0",
-    "purescript-generics-rep": "^6.0.0",
-    "purescript-http-methods": "^4.0.1",
+    "purescript-argonaut": "^6.0.0",
+    "purescript-arrays": "^5.3.0",
+    "purescript-control": "^4.1.0",
+    "purescript-effect": "^2.0.1",
+    "purescript-foldable-traversable": "^4.1.1",
+    "purescript-generics-rep": "^6.1.1",
+    "purescript-http-methods": "^4.0.2",
     "purescript-indexed-monad": "^1.0.0",
     "purescript-media-types": "^4.0.1",
     "purescript-node-fs-aff": "^6.0.0",
-    "purescript-node-http": "^5.0.0",
-    "purescript-ordered-collections": "^1.0.0",
+    "purescript-node-http": "^5.0.1",
+    "purescript-ordered-collections": "^1.6.1",
     "purescript-proxy": "^3.0.0",
     "purescript-random": "^4.0.0",
-    "purescript-smolder": "^11.0.0",
-    "purescript-strings": "^4.0.0",
-    "purescript-transformers": "^4.1.0",
-    "purescript-record-extra": "^1.0.0"
+    "purescript-smolder": "^12.0.0",
+    "purescript-strings": "^4.0.1",
+    "purescript-transformers": "^4.2.0",
+    "purescript-record-extra": "^3.0.0",
+    "purescript-typelevel-prelude": "^5.0.0"
   },
   "devDependencies": {
     "purescript-psci-support": "^4.0.0",
-    "purescript-spec": "^3.1.0",
-    "purescript-spec-discovery": "^3.1.0"
+    "purescript-spec": "^4.0.0",
+    "purescript-spec-discovery": "^4.0.0"
+  },
+  "resolutions": {
+    "purescript-spec": "^4.0.0",
+    "purescript-typelevel-prelude": "^5.0.0"
   }
 }

packages.dhall

@@ -0,0 +1,11 @@
+let mkPackage =
+      https://raw.githubusercontent.com/purescript/package-sets/psc-0.13.0-20190626/src/mkPackage.dhall sha256:0b197efa1d397ace6eb46b243ff2d73a3da5638d8d0ac8473e8e4a8fc528cf57
+
+let upstream =
+      https://raw.githubusercontent.com/purescript/package-sets/psc-0.13.0-20190626/src/packages.dhall sha256:9905f07c9c3bd62fb3205e2108515811a89d55cff24f4341652f61ddacfcf148
+
+let overrides = {=}
+
+let additions = {=}
+
+in  upstream // overrides // additions

spago.dhall

@@ -0,0 +1,31 @@
+{ name =
+    "hyper"
+, dependencies =
+    [ "aff"
+    , "avar"
+    , "argonaut"
+    , "arrays"
+    , "console"
+    , "control"
+    , "effect"
+    , "foldable-traversable"
+    , "generics-rep"
+    , "http-methods"
+    , "indexed-monad"
+    , "media-types"
+    , "node-fs-aff"
+    , "node-http"
+    , "ordered-collections"
+    , "proxy"
+    , "psci-support"
+    , "random"
+    , "smolder"
+    , "spec"
+    , "spec-discovery"
+    , "strings"
+    , "transformers"
+    , "record-extra"
+    ]
+, packages =
+    ./packages.dhall
+}

src/Hyper/Node/Server.purs

@@ -56,8 +56,8 @@ data HttpRequest
 instance requestHttpRequest :: Monad m => Request HttpRequest m where
   getRequestData = do
     getConn :>>=
-    case _ of
-      { request: HttpRequest _ d } -> ipure d
+      case _ of
+        { request: HttpRequest _ d } -> ipure d
 
 
 -- A limited version of Writable () e, with which you can only write, not end,

test/Hyper/FormSpec.purs

@@ -14,7 +14,7 @@ import Hyper.Middleware (runMiddleware)
 import Hyper.Test.TestServer (TestRequest(TestRequest))
 import Test.Spec (Spec, it, describe)
 import Test.Spec.Assertions (shouldEqual)
-import Test.Spec.Assertions.Aff (expectError)
+import Test.Spec.Assertions (expectError)
 
 liftEither ∷ ∀ a. Either String a → Aff a
 liftEither e =

test/Main.purs

@@ -2,9 +2,10 @@ module Test.Main where
 
 import Prelude
 import Effect (Effect)
+import Effect.Aff (launchAff_)
 import Test.Spec.Discovery (discover)
 import Test.Spec.Reporter.Console (consoleReporter)
-import Test.Spec.Runner (run)
+import Test.Spec.Runner (runSpec)
 
 main :: Effect Unit
-main = discover "Hyper\\..*Spec" >>= run [consoleReporter]
+main = discover "Hyper\\..*Spec" >>= runSpec [consoleReporter] >>> launchAff_