refactoring wip

Author: functora

ghcjs/lightning-verifier/default.nix

@@ -42,7 +42,6 @@ in rec {
       (
         cd ${repo}
         ${functora-pkgs.nodejs}/bin/npm i --prefer-offline
-        ${functora-pkgs.nodejs}/bin/npm run build
         nix-build -A releaseDer
         rm -rf ./dist/latest
         mkdir -p ./dist/latest
@@ -81,16 +80,6 @@ in rec {
       cp ${./static}/*.woff2 $out/static/
       cp ${./static}/*.webmanifest $out/
       cp ${./static}/*.ico $out/
-      for FILE in ${./static}/web*.js; do
-        ${functora-pkgs.terser}/bin/terser \
-          $FILE -o $out/$(basename $FILE) --compress --mangle --source-map
-      done
-      for FILE in ${./static}/pwa*.js; do
-        ${functora-pkgs.terser}/bin/terser \
-          $FILE -o $out/$(basename $FILE) --compress --mangle --source-map
-      done
-      ${functora-pkgs.terser}/bin/terser \
-        ${./static}/main.js -o $out/main.js --compress --mangle --source-map
       ${functora-pkgs.html-minifier}/bin/html-minifier \
         --minify-js \
         --minify-css \
@@ -105,23 +94,28 @@ in rec {
         --minify-js \
         --minify-css \
         -o $out/index.html \
-        ${./static}/ghcjs.html
+        ${./static/ghcjs.html}
       ${functora-pkgs.clean-css-cli}/bin/cleancss \
         -O2 \
         --source-map \
         -o $out/static/all.css \
-        ${./static}/material-components-web.min.css \
-        ${./static}/material-icons.css \
-        ${./static}/app.css
+        ${./static/material-components-web.min.css} \
+        ${./static/material-icons.css} \
+        ${./static/app.css}
       ${functora-pkgs.closurecompiler}/bin/closure-compiler \
         --jscomp_off=checkVars \
         --compilation_level ADVANCED_OPTIMIZATIONS \
         --externs ${app}/bin/${label}.jsexe/all.js.externs \
-        --externs ${./static}/app.js \
-        --externs ${./static/hs-bitcoin-hash.js} \
-        --externs ${./static/hs-bitcoin-keys.js} \
-        --externs ${./static}/material-components-web.min.js \
-        --externs ${./static}/material-components-web-elm.min.js \
+        --externs ${./static/app.js} \
+        --externs ${
+        pkgs.haskell.packages.ghc865.bitcoin-hash.src
+      }/js/index.compiled.js \
+        --externs ${
+        pkgs.haskell.packages.ghc865.bitcoin-keys.src
+      }/js/index.compiled.js \
+        --externs ${../miso-widgets/js/main.min.js} \
+        --externs ${../miso-components/material-components-web.min.js} \
+        --externs ${../miso-components/material-components-web-elm.min.js} \
         --output_wrapper "%output%//# sourceMappingURL=all.js.map" \
         --create_source_map $out/all.js.map \
         --js ${app}/bin/${label}.jsexe/all.js \

ghcjs/lightning-verifier/src/App/Types.hs

@@ -38,7 +38,6 @@ import Functora.Money hiding (Currency, Money, Text)
 import qualified Functora.Prelude as Prelude
 import qualified Paths_lightning_verifier as Paths
 import qualified Text.URI as URI
-import qualified Text.URI.QQ as URI
 
 data Model = Model
   { modelFav :: OpenedOrClosed,
@@ -298,19 +297,24 @@ btc = CurrencyInfo (CurrencyCode "btc") mempty
 
 googlePlayLink :: URI
 googlePlayLink =
-  [URI.uri|https://play.google.com/apps/testing/com.functora.lightning_verifier|]
+  either impureThrow id
+    $ mkURI "https://play.google.com/apps/testing/com.functora.lightning_verifier"
 
 testGroupLink :: URI
 testGroupLink =
-  [URI.uri|https://groups.google.com/g/functora|]
+  either impureThrow id
+    $ mkURI "https://groups.google.com/g/functora"
 
 functoraLink :: URI
 functoraLink =
-  [URI.uri|https://functora.github.io/|]
+  either impureThrow id
+    $ mkURI "https://functora.github.io/"
 
 sourceLink :: URI
 sourceLink =
-  [URI.uri|https://github.com/functora/functora.github.io/tree/master/ghcjs/lightning-verifier|]
+  either impureThrow id
+    $ mkURI
+      "https://github.com/functora/functora.github.io/tree/master/ghcjs/lightning-verifier"
 
 apkLink :: URI
 apkLink =

ghcjs/lightning-verifier/src/Main.hs

@@ -61,10 +61,10 @@ main =
 #if !defined(__GHCJS__) && !defined(ghcjs_HOST_OS) && !defined(wasi_HOST_OS)
 runApp :: JSM () -> IO ()
 runApp app = do
-  let cap = "const cap = document.createElement('script'); cap.language = 'javascript'; cap.src = 'main.js'; cap.defer = 'defer'; cap.type = 'module'; document.getElementsByTagName('head')[0].appendChild(cap);" :: BL.ByteString
+  cap <- BL.readFile "../miso-widgets/js/main.min.js"
   js0 <- BL.readFile "static/app.js"
-  js1 <- BL.readFile "static/material-components-web.min.js"
-  js2 <- BL.readFile "static/material-components-web-elm.min.js"
+  js1 <- BL.readFile "../miso-components/material-components-web.min.js"
+  js2 <- BL.readFile "../miso-components/material-components-web-elm.min.js"
   Warp.runSettings
     ( Warp.setPort
         8080

ghcjs/miso-components/material-components-web.min.js

@@ -7,7 +7,10 @@ build-type:    Simple
 
 common pkg
   default-language:   Haskell2010
-  js-sources:         material-components-web-elm.min.js
+  js-sources:
+    material-components-web-elm.min.js
+    material-components-web.min.js
+
   default-extensions: NoImplicitPrelude
   build-depends:
     , aeson

ghcjs/miso-components/miso-components.cabal

@@ -23,7 +23,9 @@
   "devDependencies": {
     "@capacitor/assets": "^3.0.4",
     "@capacitor/cli": "^6.0.0",
+    "@swc/core": "^1.7.26",
     "@trapezedev/configure": "^7.0.10",
+    "terser-webpack-plugin": "^5.3.10",
     "webpack": "^5.94.0",
     "webpack-cli": "^5.1.4"
   }

ghcjs/miso-widgets/js/main.min.js

@@ -1,4 +1,5 @@
 const webpack = require("webpack");
+const TerserPlugin = require("terser-webpack-plugin");
 module.exports = {
   entry: "./js/main.js",
   output: {
@@ -8,6 +9,17 @@ module.exports = {
     libraryTarget: "var",
     library: "h$miso_widgets",
   },
+  optimization: {
+    minimize: true,
+    minimizer: [
+      new TerserPlugin({
+        minify: TerserPlugin.swcMinify,
+        // `terserOptions` options will be passed to `swc` (`@swc/core`)
+        // Link to options - https://swc.rs/docs/config-js-minify
+        terserOptions: {},
+      }),
+    ],
+  },
   plugins: [
     new webpack.optimize.LimitChunkCountPlugin({
       maxChunks: 1,