From ca9b0771945aed967f61fcaabbeeb1f9844dea09 Mon Sep 17 00:00:00 2001
From: kejace <kejace@gmail.com>
Date: Fri, 30 Jul 2021 11:44:17 -0400
Subject: [PATCH 1/2] Support for purescript v0.14

---
 .gitignore                |  1 +
 examples-icon-spago.dhall | 30 ++++++++++++++++++++++-------
 package.json              |  2 +-
 packages.dhall            | 40 +++++++++++++++++----------------------
 spago.dhall               |  4 +++-
 5 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/.gitignore b/.gitignore
index 40dc827..7c84f1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,5 +9,6 @@ package-lock.json
 /.purs*
 /.psa*
 /.spago
+/.vscode
 yarn-error.log
 yarn.lock
diff --git a/examples-icon-spago.dhall b/examples-icon-spago.dhall
index 38aaadf..b2b0983 100644
--- a/examples-icon-spago.dhall
+++ b/examples-icon-spago.dhall
@@ -1,10 +1,26 @@
 { name = "examples-icon"
-, dependencies = (./spago.dhall).dependencies #
-  [ "react-map-gl"
-  , "web-html"
-  , "affjax"
-  , "argonaut"
-  ]
+, dependencies =
+      (./spago.dhall).dependencies
+    # [ "react-map-gl"
+      , "web-html"
+      , "affjax"
+      , "argonaut"
+      , "aff"
+      , "arrays"
+      , "either"
+      , "exceptions"
+      , "foldable-traversable"
+      , "integers"
+      , "math"
+      , "maybe"
+      , "newtype"
+      , "ordered-collections"
+      , "partial"
+      , "react-dom"
+      , "transformers"
+      , "tuples"
+      , "web-dom"
+      ]
 , packages = (./spago.dhall).packages
-, sources = (./spago.dhall).sources # ["examples/icon/src/**/*.purs"]
+, sources = (./spago.dhall).sources # [ "examples/icon/src/**/*.purs" ]
 }
diff --git a/package.json b/package.json
index 90c1f76..adf8da0 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "scripts": {
     "build": "spago build",
     "//": "",
-    "examples-icon": "yarn examples-icon:bundle-app && yarn examples-icon:browserify",
+    "examples-icon": "npm run examples-icon:bundle-app && npm run examples-icon:browserify",
     "examples-icon:build": "spago --config examples-icon-spago.dhall build",
     "examples-icon:bundle-app": "spago --config examples-icon-spago.dhall bundle-app --to examples/icon/dist/bundle.js",
     "examples-icon:browserify": "browserify examples/icon/dist/bundle.js -o examples/icon/dist/bundle.js",
diff --git a/packages.dhall b/packages.dhall
index b7e3915..d707a88 100644
--- a/packages.dhall
+++ b/packages.dhall
@@ -1,33 +1,27 @@
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20200922/packages.dhall sha256:5edc9af74593eab8834d7e324e5868a3d258bbab75c5531d2eb770d4324a2900
+      https://github.com/purescript/package-sets/releases/download/psc-0.14.3-20210722/packages.dhall sha256:1ceb43aa59436bf5601bac45f6f3781c4e1f0e4c2b8458105b018e5ed8c30f8c
 
 let overrides = {=}
 
 let additions =
-  { react-map-gl =
-      { dependencies =
-          [ "prelude"
-          , "react"
-          , "web-mercator"
-          , "simple-json"
-          , "generics-rep"
-          ]
-      , repo =
-          "https://github.com/f-o-a-m/purescript-react-map-gl.git"
-      , version =
-          "master"
-      }
-  , web-mercator =
-      { dependencies =
-          [ "partial"
+      { react-map-gl =
+        { dependencies = [ "prelude", "react", "web-mercator", "simple-json" ]
+        , repo = "https://github.com/f-o-a-m/purescript-react-map-gl.git"
+        , version = "v0.14"
+        }
+      , web-mercator =
+        { dependencies =
+          [ "assert"
+          , "console"
+          , "effect"
           , "prelude"
+          , "psci-support"
+          , "partial"
           , "functions"
           ]
-      , repo =
-          "https://github.com/f-o-a-m/purescript-web-mercator.git"
-      , version =
-          "master"
+        , repo = "https://github.com/f-o-a-m/purescript-web-mercator.git"
+        , version = "v0.14"
+        }
       }
-  }
 
-in  upstream // overrides // additions
+in  upstream ⫽ overrides ⫽ additions
diff --git a/spago.dhall b/spago.dhall
index 1079e4c..8eba815 100644
--- a/spago.dhall
+++ b/spago.dhall
@@ -4,10 +4,12 @@
   , "effect"
   , "foreign"
   , "foreign-object"
+  , "nullable"
   , "prelude"
   , "psci-support"
+  , "react"
+  , "unsafe-coerce"
   , "web-mercator"
-  , "react-dom"
   ]
 , packages = ./packages.dhall
 , sources = [ "src/**/*.purs", "test/**/*.purs" ]

From 1cfa2bcd874a7e2155431295d6cd4131a2e102d1 Mon Sep 17 00:00:00 2001
From: kejace <kejace@gmail.com>
Date: Fri, 30 Jul 2021 11:49:55 -0400
Subject: [PATCH 2/2] Fix travis

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5778d9d..350b224 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: node_js
-dist: trusty
+dist: focal
 sudo: required
 node_js: stable
 install: