From 8024072e8ca5ae2e098efa1f3aa5c31f90468ef6 Mon Sep 17 00:00:00 2001
From: andys8 <andys8@users.noreply.github.com>
Date: Wed, 10 Aug 2022 19:03:10 +0200
Subject: [PATCH 1/6] Update package-set to 0.15.4-20220808

Necessary to allow the latest react version v18 can be used cookbook examples
---
 CHANGELOG.md                     | 1 +
 client/packages.dhall            | 4 ++--
 client/src/Try/SharedConfig.purs | 2 +-
 staging/packages.dhall           | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb7ecb80..4ec80bf5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ New features:
 Bugfixes:
 
 Other improvements:
+- Update package set to latest `0.15.4` one (#??? by @andys8)
 
 ## [v2022-07-21.1](https://github.com/purescript/trypurescript/releases/tag/v2022-07-21.1)
 
diff --git a/client/packages.dhall b/client/packages.dhall
index c1888031..c21f1de2 100644
--- a/client/packages.dhall
+++ b/client/packages.dhall
@@ -1,5 +1,5 @@
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.15.2-20220609/packages.dhall
-        sha256:2b15922dcc47143e5f271a75d4aa91b0379bc1bd7d880adfb428e287617210f7
+      https://github.com/purescript/package-sets/releases/download/psc-0.15.4-20220808/packages.dhall
+        sha256:60eee64b04ca0013fae3e02a69fc3b176105c6baa2f31865c67cd5f881a412fd
 
 in  upstream
diff --git a/client/src/Try/SharedConfig.purs b/client/src/Try/SharedConfig.purs
index b2e33ee2..d01cd67b 100644
--- a/client/src/Try/SharedConfig.purs
+++ b/client/src/Try/SharedConfig.purs
@@ -12,7 +12,7 @@ pursReleaseUrl :: String
 pursReleaseUrl = "https://github.com/purescript/purescript/releases/tag/" <> pursVersion
 
 packageSetVersion :: String
-packageSetVersion = "0.15.3-20220712"
+packageSetVersion = "0.15.4-20220808"
 
 packageSetPackageJsonUrl :: String
 packageSetPackageJsonUrl = "https://github.com/purescript/package-sets/blob/psc-" <> packageSetVersion <> "/packages.json"
diff --git a/staging/packages.dhall b/staging/packages.dhall
index 926b7bf0..c21f1de2 100644
--- a/staging/packages.dhall
+++ b/staging/packages.dhall
@@ -1,5 +1,5 @@
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.15.3-20220712/packages.dhall
-        sha256:ffc496e19c93f211b990f52e63e8c16f31273d4369dbae37c7cf6ea852d4442f
+      https://github.com/purescript/package-sets/releases/download/psc-0.15.4-20220808/packages.dhall
+        sha256:60eee64b04ca0013fae3e02a69fc3b176105c6baa2f31865c67cd5f881a412fd
 
 in  upstream

From 257c1bfe0edbc4b974a12245ec25dc7bc0797434 Mon Sep 17 00:00:00 2001
From: andys8 <andys8@users.noreply.github.com>
Date: Thu, 11 Aug 2022 01:21:52 +0200
Subject: [PATCH 2/6] JSPM importmap with React v18.2.0

---
 client/public/frame.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/public/frame.html b/client/public/frame.html
index 985d3c6e..7cb29dbf 100644
--- a/client/public/frame.html
+++ b/client/public/frame.html
@@ -18,16 +18,16 @@
   </script>
   <!--
     JSPM Generator Import Map
-    Edit URL: https://generator.jspm.io/#Y2NhYGCzD80rySzJSU1hSMpM183MK0lNTy1yMNQz0zM1ZEhJTc7MTczRyyp2MDTQM9YzZChKTUwu0U3Jz3UwNNcz0DPCENAvTi0qSy2CiMMUlZZmpjhYAA0wAgA6XlZ2dAA
+    Edit URL: https://generator.jspm.io/#ZcxBCoAgEEDRWUS3aWqMol1eogOYDjKhBaadvyBatX18fl0B1POyZ8mBHaziG9kze06acMSBwLGVaAJup6YOeyRIbGxu3BE1Taiw+0F7cro4vf5FpYjT0zNQNwB+qMF0AA
   -->
   <script type="importmap">
   {
     "imports": {
       "big-integer": "https://ga.jspm.io/npm:big-integer@1.6.51/BigInteger.js",
       "decimal.js": "https://ga.jspm.io/npm:decimal.js@10.3.1/decimal.js",
-      "react": "https://ga.jspm.io/npm:react@17.0.2/index.js",
-      "react-dom": "https://ga.jspm.io/npm:react-dom@17.0.2/index.js",
-      "react-dom/server": "https://ga.jspm.io/npm:react-dom@17.0.2/server.browser.js",
+      "react": "https://ga.jspm.io/npm:react@18.2.0/index.js",
+      "react-dom": "https://ga.jspm.io/npm:react-dom@18.2.0/index.js",
+      "react-dom/server": "https://ga.jspm.io/npm:react-dom@18.2.0/server.browser.js",
       "uuid": "https://ga.jspm.io/npm:uuid@8.3.2/dist/esm-browser/index.js"
     },
     "scopes": {

From 823e716387f6416e5fcae720365d848de70dc7a7 Mon Sep 17 00:00:00 2001
From: andys8 <andys8@users.noreply.github.com>
Date: Sat, 13 Aug 2022 00:53:55 +0200
Subject: [PATCH 3/6] Importmap: Add export of react-dom/client

---
 client/public/frame.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/public/frame.html b/client/public/frame.html
index 7cb29dbf..b3f5209e 100644
--- a/client/public/frame.html
+++ b/client/public/frame.html
@@ -18,7 +18,7 @@
   </script>
   <!--
     JSPM Generator Import Map
-    Edit URL: https://generator.jspm.io/#ZcxBCoAgEEDRWUS3aWqMol1eogOYDjKhBaadvyBatX18fl0B1POyZ8mBHaziG9kze06acMSBwLGVaAJup6YOeyRIbGxu3BE1Taiw+0F7cro4vf5FpYjT0zNQNwB+qMF0AA
+    Edit URL: https://generator.jspm.io/#ZcxBDkAwEEDRWQinMQwhlr2EA9BOZKQqqamtq5OIle1L/s8zgOIag4p6djDLUkpQXjgawh47AsdWtsnjehiqsUWCyJPV0u2boQEbrH9QWS8c9O8Hx5Pj61+ckjgzPOPmBszFaRmMAA
   -->
   <script type="importmap">
   {
@@ -27,6 +27,7 @@
       "decimal.js": "https://ga.jspm.io/npm:decimal.js@10.3.1/decimal.js",
       "react": "https://ga.jspm.io/npm:react@18.2.0/index.js",
       "react-dom": "https://ga.jspm.io/npm:react-dom@18.2.0/index.js",
+      "react-dom/client": "https://ga.jspm.io/npm:react-dom@18.2.0/client.js",
       "react-dom/server": "https://ga.jspm.io/npm:react-dom@18.2.0/server.browser.js",
       "uuid": "https://ga.jspm.io/npm:uuid@8.3.2/dist/esm-browser/index.js"
     },

From 44ad6565928f4570fbe2a26647eb342b455cc6e2 Mon Sep 17 00:00:00 2001
From: Jordan Martinez <jordanalex.martinez@protonmail.com>
Date: Fri, 12 Aug 2022 19:18:30 -0500
Subject: [PATCH 4/6] Tweak readme to fix future client run issues

---
 README.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index feee89b0..716fc332 100644
--- a/README.md
+++ b/README.md
@@ -96,14 +96,15 @@ ln -s "$PWD/output" "$PWD/../client/public/js/output"
 cd client
 npm install
 
-# Use `build:dev` and `base:dev` if you are using a local Try PureScript server,
+# Use `serve:dev` if you are using a local Try PureScript server,
 # e.g. you followed the instructions in step 1.
 #
-# Use `build:production` and `base:production` if you would like
+# Use `serve:production` if you would like
 # to test the client against the production Try PureScript server.
-npm run build:(dev|production)
+# Note: the production server may not match the package set you have locally.
+npm run serve:(dev|production)
 
-npm run serve # Try PureScript is now available on localhost:8080
+# Try PureScript is now available on localhost:8080
 ```
 
 ### 4. Choosing a Tag

From aa479f4cbaf657899ac74834e9cf582026ef0629 Mon Sep 17 00:00:00 2001
From: Jordan Martinez <jordanalex.martinez@protonmail.com>
Date: Fri, 12 Aug 2022 19:19:06 -0500
Subject: [PATCH 5/6] Install new packages in latest set

---
 staging/spago.dhall | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/staging/spago.dhall b/staging/spago.dhall
index d435b845..28977167 100644
--- a/staging/spago.dhall
+++ b/staging/spago.dhall
@@ -59,6 +59,7 @@
   , "distributive"
   , "dodo-printer"
   , "dom-indexed"
+  , "dotenv"
   , "droplet"
   , "dynamic-buffer"
   , "effect"
@@ -99,6 +100,7 @@
   , "generic-router"
   , "geometry-plane"
   , "github-actions-toolkit"
+  , "graphql-client"
   , "graphs"
   , "group"
   , "halogen"
@@ -228,9 +230,13 @@
   , "rationals"
   , "react"
   , "react-basic"
+  , "react-basic-classic"
+  , "react-basic-dnd"
   , "react-basic-dom"
+  , "react-basic-emotion"
   , "react-basic-hooks"
   , "react-dom"
+  , "react-halo"
   , "react-icons"
   , "read"
   , "record"
@@ -270,6 +276,7 @@
   , "strings-extra"
   , "stringutils"
   , "substitute"
+  , "sunde"
   , "supply"
   , "systemd-journald"
   , "tailrec"
@@ -288,6 +295,7 @@
   , "typelevel-prelude"
   , "typelevel-rows"
   , "uint"
+  , "ulid"
   , "uncurried-transformers"
   , "undefined-is-not-a-problem"
   , "unfoldable"
@@ -297,6 +305,7 @@
   , "unsafe-coerce"
   , "unsafe-reference"
   , "uri"
+  , "uuid"
   , "validation"
   , "variant"
   , "vectorfield"
@@ -314,6 +323,7 @@
   , "web-page-visibility"
   , "web-pointerevents"
   , "web-promise"
+  , "web-router"
   , "web-socket"
   , "web-storage"
   , "web-streams"
@@ -321,6 +331,7 @@
   , "web-uievents"
   , "web-workers"
   , "web-xhr"
+  , "which"
   , "yoga-fetch"
   , "yoga-json"
   , "yoga-postgres"

From ecb0722c05464c9382e39516fefbea26790e9d76 Mon Sep 17 00:00:00 2001
From: Jordan Martinez <jordanalex.martinez@protonmail.com>
Date: Fri, 12 Aug 2022 19:23:35 -0500
Subject: [PATCH 6/6] Update changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ec80bf5..80da23ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,9 +9,10 @@ Breaking changes:
 New features:
 
 Bugfixes:
+- Add missing `react-dom/client` shim (#294 by @andys8)
 
 Other improvements:
-- Update package set to latest `0.15.4` one (#??? by @andys8)
+- Update package set to latest `0.15.4` one (#294) by @andys8)
 
 ## [v2022-07-21.1](https://github.com/purescript/trypurescript/releases/tag/v2022-07-21.1)