Update package-set to 0.15.4-20220808 and react dependency (#294)

* Update package-set to 0.15.4-20220808 Necessary to allow the latest react version v18 can be used cookbook examples * JSPM importmap with React v18.2.0 * Importmap: Add export of react-dom/client * Tweak readme to fix future client run issues * Install new packages in latest set * Update changelog Co-authored-by: Jordan Martinez <[email protected]>
purescript · Aug 13, 2022 · 9116105 · 9116105
1 parent 26b99bd
commit 9116105
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,10 +9,12 @@ Breaking changes:
 New features:
 
 Bugfixes:
+- Add missing `react-dom/client` shim (#294 by @andys8)
 - Fix double `main` invocation (#295 by @JordanMartinez)
 - Stop loading hang when using query params to show compiled JS output (#296 by @JordanMartinez)
 
 Other improvements:
+- 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)
 

diff --git 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

diff --git 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/public/frame.html b/client/public/frame.html
@@ -12,16 +12,17 @@
   </script>
   <!--
     JSPM Generator Import Map
-    Edit URL: https://generator.jspm.io/#Y2NhYGCzD80rySzJSU1hSMpM183MK0lNTy1yMNQz0zM1ZEhJTc7MTczRyyp2MDTQM9YzZChKTUwu0U3Jz3UwNNcz0DPCENAvTi0qSy2CiMMUlZZmpjhYAA0wAgA6XlZ2dAA
+    Edit URL: https://generator.jspm.io/#ZcxBDkAwEEDRWQinMQwhlr2EA9BOZKQqqamtq5OIle1L/s8zgOIag4p6djDLUkpQXjgawh47AsdWtsnjehiqsUWCyJPV0u2boQEbrH9QWS8c9O8Hx5Pj61+ckjgzPOPmBszFaRmMAA
   -->
   <script type="importmap">
   {
     "imports": {
       "big-integer": "https://ga.jspm.io/npm:[email protected]/BigInteger.js",
       "decimal.js": "https://ga.jspm.io/npm:[email protected]/decimal.js",
-      "react": "https://ga.jspm.io/npm:[email protected]/index.js",
-      "react-dom": "https://ga.jspm.io/npm:[email protected]/index.js",
-      "react-dom/server": "https://ga.jspm.io/npm:[email protected]/server.browser.js",
+      "react": "https://ga.jspm.io/npm:[email protected]/index.js",
+      "react-dom": "https://ga.jspm.io/npm:[email protected]/index.js",
+      "react-dom/client": "https://ga.jspm.io/npm:[email protected]/client.js",
+      "react-dom/server": "https://ga.jspm.io/npm:[email protected]/server.browser.js",
       "uuid": "https://ga.jspm.io/npm:[email protected]/dist/esm-browser/index.js"
     },
     "scopes": {

diff --git 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
@@ -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
diff --git 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,13 +323,15 @@
   , "web-page-visibility"
   , "web-pointerevents"
   , "web-promise"
+  , "web-router"
   , "web-socket"
   , "web-storage"
   , "web-streams"
   , "web-touchevents"
   , "web-uievents"
   , "web-workers"
   , "web-xhr"
+  , "which"
   , "yoga-fetch"
   , "yoga-json"
   , "yoga-postgres"