WASM build on CI, clean-up sources

Author: lierdakil

.github/workflows/haskell.yml

@@ -6,7 +6,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: cachix/install-nix-action@v13
       with:
         nix_path: nixpkgs=channel:nixos-unstable
@@ -17,16 +17,15 @@ jobs:
       with:
         name: cabal2json
         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-    - run: npm ci
     - run: make
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: build-${{ runner.os }}
-        path: cabal2json.min.js
+        path: cabal2json.wasm
     - name: Release
       uses: softprops/action-gh-release@v1
       if: startsWith(github.ref, 'refs/tags/')
       with:
-        files: cabal2json.min.js
+        files: cabal2json.wasm
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -3,3 +3,4 @@
 /node_modules/
 /result
 /cabal2json.min.js
+/cabal2json.wasm

Makefile

@@ -1,10 +1,2 @@
-EXTERNS=$(shell find node_modules/google-closure-compiler/contrib/nodejs -name '*.js' | sed 's/^/--externs=/')
-JSEXE=result/bin/cabal2json.jsexe
-
-all: cabal2json.min.js
-
-$(JSEXE)/all.js: src cabal2json.cabal default.nix
-	nix-build -A projectCross.ghcjs.hsPkgs.cabal2json.components.exes.cabal2json
-
-cabal2json.min.js: $(JSEXE)/all.js
-	node_modules/.bin/google-closure-compiler $(JSEXE)/all.js --jscomp_off=checkVars --compilation_level=ADVANCED_OPTIMIZATIONS $(EXTERNS) --externs=$(JSEXE)/all.js.externs > cabal2json.min.js
+all:
+	nix shell -c wasm32-wasi-cabal install --installdir=. --install-method=copy --overwrite-policy=always

cabal.project

@@ -1,4 +1,3 @@
 with-compiler: wasm32-wasi-ghc
 with-hc-pkg: wasm32-wasi-ghc-pkg
 packages: .
-allow-newer: ghc-prim

cabal2json.cabal

@@ -1,4 +1,4 @@
-cabal-version:      1.12
+cabal-version:      2.0
 name:               cabal2json
 version:            0.1.0.0
 license:            BSD3
@@ -25,7 +25,7 @@ executable cabal2json
     hs-source-dirs:   src
     default-language: Haskell2010
     build-depends:
-        Cabal >=3.9 && <3.10,
+        Cabal ^>=3.10,
         aeson >=1.5.6.0 && <3,
         base >=4.7 && <5,
         bytestring >=0.10.12.0 && <0.12,

default.nix

@@ -0,0 +1,8 @@
+{
+  inputs.ghc-wasm-meta.url = "git+https://gitlab.haskell.org/ghc/ghc-wasm-meta.git";
+  outputs = { ghc-wasm-meta, ... }: let
+      pkg = ghc-wasm-meta.packages.x86_64-linux;
+    in {
+      packages.x86_64-linux.default = pkg.all_9_6;
+    };
+}