Skip to content

Commit

Permalink
Use TH-enabled build, remove custom miso
Browse files Browse the repository at this point in the history
  • Loading branch information
amesgen committed Oct 26, 2024
1 parent 35a70b4 commit 29f97c9
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 23 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,15 @@ jobs:
~/.ghc-wasm/add_to_github_path.sh
popd
- name: cabal
run: |
ghcup config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/develop/ghcup-prereleases-0.0.8.yaml
ghcup install cabal --set 3.15.0.0.2024.10.3
- name: wasm32-wasi-ghc
run: |
ghcup config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/develop/ghcup-cross-0.0.8.yaml
ghcup install ghc --set wasm32-wasi-9.10.1 -- $CONFIGURE_ARGS
ghcup install ghc --set wasm32-wasi-9.10.1.20241021 -- $CONFIGURE_ARGS
- uses: dw-labs-org/dart-sass-gha@v1

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ The GHC wasm backend supports the
feature, allowing Haskell wasm apps to interop with JavaScript
seamlessly in the browser. This repo contains a few examples to
demonstrate this ability, all of which based on the
[`miso`](https://haskell-miso.org) frontend framework, using an
unofficial [port](https://github.com/amesgen/miso/tree/remove-th) as
well as an experimental
[`miso`](https://haskell-miso.org) frontend framework as well as
an experimental
[`jsaddle-wasm`](https://github.com/amesgen/jsaddle-wasm) library
under the hood.

Expand Down Expand Up @@ -44,7 +43,8 @@ You can set up the toolchain by either:
[`ghc-wasm-meta`](https://gitlab.haskell.org/ghc/ghc-wasm-meta#getting-started-without-nix)
directly to set up ghc head or ghc 9.10
- Using [`ghcup`](https://www.haskell.org/ghcup/guide/#cross-support)
to set up ghc 9.10
to set up ghc 9.10 (9.10.1.20241021 or later, with TemplateHaskell support)
and cabal >=3.15.

Also install [Sass](https://sass-lang.com/install/).

Expand Down
22 changes: 10 additions & 12 deletions cabal.project
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
packages: . hs2048

index-state: 2024-09-29T15:37:55Z
index-state: 2024-10-26T13:27:42Z

if arch(wasm32)
-- Required for TemplateHaskell. When using wasm32-wasi-cabal from
-- ghc-wasm-meta, this is superseded by the global cabal.config.
shared: True

-- https://github.com/haskellari/time-compat/issues/37
-- Older versions of time don't build on WASM.
constraints: time installed
allow-newer: time

-- https://github.com/haskellari/splitmix/pull/73
source-repository-package
type: git
location: https://github.com/amesgen/splitmix
tag: 5f5b766d97dc735ac228215d240a3bb90bc2ff75

-- remove TemplateHaskell
source-repository-package
type: git
location: https://github.com/amesgen/miso
tag: 27dd5fc80be9d0a3b80a9ecc81ee3401bc610e01

source-repository-package
type: git
location: https://github.com/amesgen/jsaddle-wasm
tag: be129c788f8ca1ea2e9cc1515397c1a46d02bb41

package aeson
flags: -ordered-keymap
12 changes: 6 additions & 6 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 29f97c9

Please sign in to comment.