bundle and optimize with clean-css

functora · functora · commit 9c9be4e5d55a · 2024-04-05T18:10:09.000-03:00
diff --git a/ghcjs/currency-converter/Main.hs b/ghcjs/currency-converter/Main.hs
@@ -459,13 +459,17 @@ getQuoteMoneyOptic = \case
 
 viewModel :: Model -> View Action
 viewModel st =
+#ifndef __GHCJS__
   div_
     mempty
     [ link_ [rel_ "stylesheet", href_ "static/material-components-web.min.css"],
       link_ [rel_ "stylesheet", href_ "static/material-icons.css"],
       link_ [rel_ "stylesheet", href_ "static/app.css"],
       mainWidget st
     ]
+#else
+  mainWidget st
+#endif
 
 mainWidget :: Model -> View Action
 mainWidget st =
@@ -514,9 +518,7 @@ amountWidget st loc =
     [ TextField.outlined
         $ TextField.config
         & TextField.setType (Just "number")
-        & TextField.setValid valid
         & TextField.setOnInput onInputAction
-        & TextField.setRequired True
         & TextField.setLeadingIcon
           ( Just
               $ TextField.icon
diff --git a/ghcjs/currency-converter/default.nix b/ghcjs/currency-converter/default.nix
@@ -66,20 +66,26 @@ in rec {
     installPhase = ''
       mkdir -p $out/static
       cp ${./static}/*.png $out/static/
-      cp ${./static}/*.css $out/static/
       cp ${./static}/*.woff2 $out/static/
       cp ${./static}/*.ico $out/
       cp ${./static}/*.webmanifest $out/
       cp ${readmeDer}/readme.html $out/
       cp ${licenseDer}/license.html $out/
       cp ${privacyDer}/privacy.html $out/
-      echo '<!doctype html><html><head><script language="javascript" src="all.js"></script></head><body></body></html>' > $out/index.html
+      echo '<!doctype html><html><head><script language="javascript" src="all.js"></script><link rel="stylesheet" href="static/all.css"/></head><body></body></html>' > $out/index.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
       ${functora-pkgs.closurecompiler}/bin/closure-compiler \
         --jscomp_off=checkVars \
         --compilation_level ADVANCED_OPTIMIZATIONS \
         --externs ${app}/bin/app.jsexe/all.js.externs \
         --externs ${./static}/material-components-web.min.js \
-        --externs ${./static}/material-components-web-elm.min.js \
+        --create_source_map $out/all.js.map \
         --js ${app}/bin/app.jsexe/all.js \
         --js_output_file $out/all.js
     '';
diff --git a/ghcjs/currency-converter/shell.nix b/ghcjs/currency-converter/shell.nix
@@ -30,6 +30,7 @@ in
         app-release-license
         functora-pkgs.cabal-install
         functora-pkgs.closurecompiler
+        functora-pkgs.clean-css-cli
       ]
       ++ prev.buildInputs
       ++ functora-tools;

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ in`
`30`	`30`	`app-release-license`
`31`	`31`	`functora-pkgs.cabal-install`
`32`	`32`	`functora-pkgs.closurecompiler`
	`33`	`+ functora-pkgs.clean-css-cli`
`33`	`34`	`]`
`34`	`35`	`++ prev.buildInputs`
`35`	`36`	`++ functora-tools;`