Merge branch 'dev-merge' into dev

shell.nix

@@ -49,7 +49,7 @@ let
 
     spago build --purs-args '--codegen corefn,js'
     zephyr -f Main.main
-    yarn parcel build dist/index.html --public-url '.' --no-source-maps
+    browserify-zephyr
   '';
 
   browserify = pkgs.writeShellScriptBin "browserify" ''
@@ -59,6 +59,14 @@ let
     pulp browserify --skip-compile -t dist/bundle.js --src-path output
   '';
 
+  browserify-zephyr = pkgs.writeShellScriptBin "browserify-zephyr" ''
+    #!/usr/bin/env bash
+    set -e
+
+    pulp browserify --skip-compile -t dist/bundle.js -o dce-output
+    #purs bundle -o dist/bundle.js -m Main dce-output/**/*.js
+  '';
+
   minify-bundle = pkgs.writeShellScriptBin "minify-bundle" ''
     #!/usr/bin/env bash
     set -e
@@ -91,12 +99,14 @@ pkgs.mkShell {
     easy-ps.dhall-json-simple
     easy-ps.zephyr
     browserify
+    browserify-zephyr
     build-css
     build-purs
     build-watch
     build-zephyr
     build
     minify-bundle
+    pkgs.closurecompiler
     pkgs.minify
     pkgs.nodejs
     repl