Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions client/packages.dhall
Original file line number Diff line number Diff line change
@@ -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
9 changes: 5 additions & 4 deletions client/public/frame.html
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there's a bug with jspm right now. This URL doesn't actually open anything for me. However, if I navigate to the above URL and then navigate to https://generator.jspm.io, then it shows what the URL should have displayed. 🤷‍♂️

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to work for me. 😅 Tested the link on mobile, different device.

Screenshot_2022-08-13-02-19-49-55_4d38fce200f96aeac5e860e739312e76

-->
<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": {
Expand Down
2 changes: 1 addition & 1 deletion client/src/Try/SharedConfig.purs
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions staging/packages.dhall
Original file line number Diff line number Diff line change
@@ -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
11 changes: 11 additions & 0 deletions staging/spago.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
, "distributive"
, "dodo-printer"
, "dom-indexed"
, "dotenv"
, "droplet"
, "dynamic-buffer"
, "effect"
Expand Down Expand Up @@ -99,6 +100,7 @@
, "generic-router"
, "geometry-plane"
, "github-actions-toolkit"
, "graphql-client"
, "graphs"
, "group"
, "halogen"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -270,6 +276,7 @@
, "strings-extra"
, "stringutils"
, "substitute"
, "sunde"
, "supply"
, "systemd-journald"
, "tailrec"
Expand All @@ -288,6 +295,7 @@
, "typelevel-prelude"
, "typelevel-rows"
, "uint"
, "ulid"
, "uncurried-transformers"
, "undefined-is-not-a-problem"
, "unfoldable"
Expand All @@ -297,6 +305,7 @@
, "unsafe-coerce"
, "unsafe-reference"
, "uri"
, "uuid"
, "validation"
, "variant"
, "vectorfield"
Expand All @@ -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"
Expand Down