Skip to content

Commit 9116105

Browse files
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]>
1 parent 26b99bd commit 9116105

File tree

7 files changed

+28
-13
lines changed

7 files changed

+28
-13
lines changed

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ Breaking changes:
99
New features:
1010

1111
Bugfixes:
12+
- Add missing `react-dom/client` shim (#294 by @andys8)
1213
- Fix double `main` invocation (#295 by @JordanMartinez)
1314
- Stop loading hang when using query params to show compiled JS output (#296 by @JordanMartinez)
1415

1516
Other improvements:
17+
- Update package set to latest `0.15.4` one (#294) by @andys8)
1618

1719
## [v2022-07-21.1](https://github.com/purescript/trypurescript/releases/tag/v2022-07-21.1)
1820

README.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,15 @@ ln -s "$PWD/output" "$PWD/../client/public/js/output"
9696
cd client
9797
npm install
9898

99-
# Use `build:dev` and `base:dev` if you are using a local Try PureScript server,
99+
# Use `serve:dev` if you are using a local Try PureScript server,
100100
# e.g. you followed the instructions in step 1.
101101
#
102-
# Use `build:production` and `base:production` if you would like
102+
# Use `serve:production` if you would like
103103
# to test the client against the production Try PureScript server.
104-
npm run build:(dev|production)
104+
# Note: the production server may not match the package set you have locally.
105+
npm run serve:(dev|production)
105106

106-
npm run serve # Try PureScript is now available on localhost:8080
107+
# Try PureScript is now available on localhost:8080
107108
```
108109

109110
### 4. Choosing a Tag

client/packages.dhall

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
let upstream =
2-
https://github.com/purescript/package-sets/releases/download/psc-0.15.2-20220609/packages.dhall
3-
sha256:2b15922dcc47143e5f271a75d4aa91b0379bc1bd7d880adfb428e287617210f7
2+
https://github.com/purescript/package-sets/releases/download/psc-0.15.4-20220808/packages.dhall
3+
sha256:60eee64b04ca0013fae3e02a69fc3b176105c6baa2f31865c67cd5f881a412fd
44

55
in upstream

client/public/frame.html

+5-4
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,17 @@
1212
</script>
1313
<!--
1414
JSPM Generator Import Map
15-
Edit URL: https://generator.jspm.io/#Y2NhYGCzD80rySzJSU1hSMpM183MK0lNTy1yMNQz0zM1ZEhJTc7MTczRyyp2MDTQM9YzZChKTUwu0U3Jz3UwNNcz0DPCENAvTi0qSy2CiMMUlZZmpjhYAA0wAgA6XlZ2dAA
15+
Edit URL: https://generator.jspm.io/#ZcxBDkAwEEDRWQinMQwhlr2EA9BOZKQqqamtq5OIle1L/s8zgOIag4p6djDLUkpQXjgawh47AsdWtsnjehiqsUWCyJPV0u2boQEbrH9QWS8c9O8Hx5Pj61+ckjgzPOPmBszFaRmMAA
1616
-->
1717
<script type="importmap">
1818
{
1919
"imports": {
2020
"big-integer": "https://ga.jspm.io/npm:[email protected]/BigInteger.js",
2121
"decimal.js": "https://ga.jspm.io/npm:[email protected]/decimal.js",
22-
"react": "https://ga.jspm.io/npm:[email protected]/index.js",
23-
"react-dom": "https://ga.jspm.io/npm:[email protected]/index.js",
24-
"react-dom/server": "https://ga.jspm.io/npm:[email protected]/server.browser.js",
22+
"react": "https://ga.jspm.io/npm:[email protected]/index.js",
23+
"react-dom": "https://ga.jspm.io/npm:[email protected]/index.js",
24+
"react-dom/client": "https://ga.jspm.io/npm:[email protected]/client.js",
25+
"react-dom/server": "https://ga.jspm.io/npm:[email protected]/server.browser.js",
2526
"uuid": "https://ga.jspm.io/npm:[email protected]/dist/esm-browser/index.js"
2627
},
2728
"scopes": {

client/src/Try/SharedConfig.purs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pursReleaseUrl :: String
1212
pursReleaseUrl = "https://github.com/purescript/purescript/releases/tag/" <> pursVersion
1313

1414
packageSetVersion :: String
15-
packageSetVersion = "0.15.3-20220712"
15+
packageSetVersion = "0.15.4-20220808"
1616

1717
packageSetPackageJsonUrl :: String
1818
packageSetPackageJsonUrl = "https://github.com/purescript/package-sets/blob/psc-" <> packageSetVersion <> "/packages.json"

staging/packages.dhall

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
let upstream =
2-
https://github.com/purescript/package-sets/releases/download/psc-0.15.3-20220712/packages.dhall
3-
sha256:ffc496e19c93f211b990f52e63e8c16f31273d4369dbae37c7cf6ea852d4442f
2+
https://github.com/purescript/package-sets/releases/download/psc-0.15.4-20220808/packages.dhall
3+
sha256:60eee64b04ca0013fae3e02a69fc3b176105c6baa2f31865c67cd5f881a412fd
44

55
in upstream

staging/spago.dhall

+11
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
, "distributive"
6060
, "dodo-printer"
6161
, "dom-indexed"
62+
, "dotenv"
6263
, "droplet"
6364
, "dynamic-buffer"
6465
, "effect"
@@ -99,6 +100,7 @@
99100
, "generic-router"
100101
, "geometry-plane"
101102
, "github-actions-toolkit"
103+
, "graphql-client"
102104
, "graphs"
103105
, "group"
104106
, "halogen"
@@ -228,9 +230,13 @@
228230
, "rationals"
229231
, "react"
230232
, "react-basic"
233+
, "react-basic-classic"
234+
, "react-basic-dnd"
231235
, "react-basic-dom"
236+
, "react-basic-emotion"
232237
, "react-basic-hooks"
233238
, "react-dom"
239+
, "react-halo"
234240
, "react-icons"
235241
, "read"
236242
, "record"
@@ -270,6 +276,7 @@
270276
, "strings-extra"
271277
, "stringutils"
272278
, "substitute"
279+
, "sunde"
273280
, "supply"
274281
, "systemd-journald"
275282
, "tailrec"
@@ -288,6 +295,7 @@
288295
, "typelevel-prelude"
289296
, "typelevel-rows"
290297
, "uint"
298+
, "ulid"
291299
, "uncurried-transformers"
292300
, "undefined-is-not-a-problem"
293301
, "unfoldable"
@@ -297,6 +305,7 @@
297305
, "unsafe-coerce"
298306
, "unsafe-reference"
299307
, "uri"
308+
, "uuid"
300309
, "validation"
301310
, "variant"
302311
, "vectorfield"
@@ -314,13 +323,15 @@
314323
, "web-page-visibility"
315324
, "web-pointerevents"
316325
, "web-promise"
326+
, "web-router"
317327
, "web-socket"
318328
, "web-storage"
319329
, "web-streams"
320330
, "web-touchevents"
321331
, "web-uievents"
322332
, "web-workers"
323333
, "web-xhr"
334+
, "which"
324335
, "yoga-fetch"
325336
, "yoga-json"
326337
, "yoga-postgres"

0 commit comments

Comments
 (0)