some lighthouse optimizations

functora · functora · commit 53719ffd374f · 2024-04-06T13:35:01.000-03:00
diff --git a/ghcjs/currency-converter/default.nix b/ghcjs/currency-converter/default.nix
@@ -20,10 +20,11 @@ let
   };
 in rec {
   inherit pkgs functora android-pkgs android-sdk-args;
-  dev = pkgs.haskell.packages.ghc865.callCabal2nix "app" ./. {
+  source = pkgs.nix-gitignore.gitignoreSourcePure ./.gitignore ./.;
+  dev = pkgs.haskell.packages.ghc865.callCabal2nix "app" source {
     miso = functora-miso.miso-jsaddle;
   };
-  app = pkgs.haskell.packages.ghcjs86.callCabal2nix "app" ./. {};
+  app = pkgs.haskell.packages.ghcjs86.callCabal2nix "app" source {};
   vsn = app.passthru.version;
   repo = builtins.toString ./.;
   app-serve-latest = functora-pkgs.writeShellApplication rec {
@@ -76,13 +77,21 @@ in rec {
       cp ${./static}/*.woff2 $out/static/
       cp ${./static}/*.webmanifest $out/
       cp ${./static}/*.ico $out/
-      ${functora-pkgs.html-minifier}/bin/html-minifier -o $out/license.html \
+      ${functora-pkgs.html-minifier}/bin/html-minifier \
+        --minify-js \
+        --minify-css \
+        -o $out/license.html \
         ${licenseDer}/license.html
-      ${functora-pkgs.html-minifier}/bin/html-minifier -o $out/privacy.html \
+      ${functora-pkgs.html-minifier}/bin/html-minifier \
+        --minify-js \
+        --minify-css \
+        -o $out/privacy.html \
         ${privacyDer}/privacy.html
-      echo '<!doctype html><html lang="en"><head><script language="javascript" src="all.js" defer></script><link rel="stylesheet" href="static/all.css"/></head><body></body></html>' \
-        | ${functora-pkgs.html-minifier}/bin/html-minifier \
-        > $out/index.html
+      ${functora-pkgs.html-minifier}/bin/html-minifier \
+        --minify-js \
+        --minify-css \
+        -o $out/index.html \
+        ${./static}/index.html
       ${functora-pkgs.clean-css-cli}/bin/cleancss \
         -O2 \
         --source-map \
@@ -129,15 +138,15 @@ in rec {
   };
   licenseDer = functora-pkgs.stdenv.mkDerivation {
     name = "licenseDer";
-    src = ./.;
+    src = ./LICENSE;
     dontUnpack = true;
     buildPhase = ''
       echo "# [Back](index.html)" > ./index-link.md
       ${functora-pkgs.pandoc}/bin/pandoc \
         --standalone \
         --from markdown \
         --metadata title="LICENSE" \
-        $src/LICENSE ./index-link.md > license.html
+        $src ./index-link.md > license.html
     '';
     installPhase = ''
       mkdir -p $out
@@ -146,15 +155,15 @@ in rec {
   };
   privacyDer = functora-pkgs.stdenv.mkDerivation {
     name = "privacyDer";
-    src = ./.;
+    src = ./privacy.md;
     dontUnpack = true;
     buildPhase = ''
       echo "# [Back](index.html)" > ./index-link.md
       ${functora-pkgs.pandoc}/bin/pandoc \
         --standalone \
         --from markdown \
         --metadata title="PRIVACY POLICY" \
-        $src/privacy.md ./index-link.md > privacy.html
+        $src ./index-link.md > privacy.html
     '';
     installPhase = ''
       mkdir -p $out
diff --git a/ghcjs/currency-converter/static/index.html b/ghcjs/currency-converter/static/index.html
@@ -0,0 +1,19 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="description" content="Currency Converter" />
+    <script language="javascript" src="all.js" defer="defer"></script>
+    <link rel="preconnect" href="https://cdn.jsdelivr.net" />
+    <link
+      rel="preload"
+      href="static/all.css"
+      as="style"
+      onload="this.onload=null;this.rel='stylesheet'"
+    />
+    <noscript>
+      <link rel="stylesheet" href="static/all.css" />
+    </noscript>
+  </head>
+  <body></body>
+</html>
