Merge branch 'tailwind-4'

Author: jhh

.gitignore

@@ -2,12 +2,18 @@
 .tmp
 /result
 /venv
+.direnv/
 
 # project
+/website/static/css/main.css
+/website/static/js/main.js
 node_modules/
 *.tar
 *.json
+!package.json
+!package-lock.json
 /*.pickle
+.ruff_cache/
 
 # Created by https://www.toptal.com/developers/gitignore/api/django
 # Edit at https://www.toptal.com/developers/gitignore?templates=django

flake.nix

@@ -47,7 +47,7 @@
           sourcePreference = "wheel";
         };
 
-        pythonSets =
+        pythonSet =
           let
             baseSet = pkgs.callPackage pyproject-nix.build.packages {
               inherit python;
@@ -75,29 +75,16 @@
             ]
           );
 
-        inherit (pkgs.stdenv) mkDerivation;
         inherit (pkgs) writeShellApplication;
 
       in
       {
         packages = {
-          venv = pythonSets.mkVirtualEnv "strykeforce-env" workspace.deps.default;
-
-          static = mkDerivation {
-            pname = "strykeforce-static";
-            inherit (pythonSets.website) version;
-            src = self;
-            phases = "installPhase";
-            installPhase = ''
-              export DJANGO_SETTINGS_MODULE=website.settings.production
-              export SECRET_KEY=notsecret
-              export TBA_READ_KEY=
-              export EMAIL_HOST_USER=
-              export EMAIL_HOST_PASSWORD=
-              export STATIC_ROOT=$out
-              mkdir -p $out
-              ${self.packages.${system}.venv}/bin/strykeforce-manage collectstatic --no-input
-            '';
+          venv = pythonSet.mkVirtualEnv "strykeforce-env" workspace.deps.default;
+
+          static = import ./lib/static.nix {
+            inherit pkgs pythonSet;
+            inherit (self.packages.${system}) venv;
           };
 
           manage = import ./lib/manage.nix {

justfile

@@ -4,7 +4,7 @@ _default:
   @just --list
 
 # bootstrap the development environment
-bootstrap: venv pre-commit
+bootstrap: pre-commit
 
 # open the project in Pycharm
 edit:
@@ -32,51 +32,19 @@ test: (manage "test --keepdb")
 push:
     nix build --json .#venv | jq -r '.[].outputs | to_entries[].value' | cachix push strykeforce
     nix build --json .#static | jq -r '.[].outputs | to_entries[].value' | cachix push strykeforce
-
-# update CSS and download all JS dependencies
-update: venv update-css update-alpine
-
-# update CSS with classes from HTML templates
+#
+# update CSS
 update-css:
-    tailwindcss -i website/static/css/base.css -o website/static/css/main.css
-
-# watch HTML templates and update CSS
-watch:
-    tailwindcss -i website/static/css/base.css -o website/static/css/main.css --watch
-
-# download all JS dependencies
-update-alpine:
-    curl --no-progress-meter --location https://unpkg.com/alpinejs --output website/static/js/alpine.js
+    npx @tailwindcss/cli --input=website/static/css/base.css --output=website/static/css/main.css
 
-# update dev dependencies to latest version
-update-dev: && poetry-check
-    poetry add --group=dev --lock black@latest
-    # poetry add --group=dev --lock django-debug-toolbar@latest
-    poetry add --group=dev --lock ipython@latest
-    poetry add --group=dev --lock rich@latest
+# update JS
+update-js:
+    npx esbuild --bundle --outfile=website/static/js/main.js website/static/js/base.js
 
-# checks poetry.lock against the version of pyproject.toml and locks if neccessary
-poetry-check:
-    poetry check --lock --quiet || (just poetry-lock)
-
-# locks the python packages in pyproject.toml without updating the poetry env
-poetry-lock:
-    poetry lock --no-update
+# Watch CSS and JS for changes
+watch: update-css
+    npx @tailwindcss/cli --watch --input=website/static/css/base.css --output=website/static/css/main.css
 
 # install pre-commit hooks
 pre-commit:
     pre-commit install --install-hooks
-
-# refresh the python packages in the dev env
-venv: poetry-check
-    nix build .#venv -o .venv
-
-# grep for version
-version:
-    @rg "version = " -m 1 pyproject.toml flake.nix
-
-# supply a new project version for pyproject.toml and flake.nix
-set-version version:
-    @sed --in-place 's/^version = ".*"/version = "{{ version }}"/' pyproject.toml
-    @sed --in-place --regexp-extended 's/(\s+version = )".*";/\1"{{ version }}";/' flake.nix
-    @git diff -U0 pyproject.toml flake.nix

lib/static.nix

@@ -0,0 +1,54 @@
+{
+  pkgs,
+  pythonSet,
+  venv,
+}:
+let
+  baseCss = "website/static/css/base.css";
+
+  djangoStaticDeps = pkgs.buildNpmPackage {
+    name = "django-static-deps";
+    src = ../.;
+    npmDepsHash = "sha256-K7GLUG25KdvTT5gqounSi3U0UJonw9gPEuHUF4pP8os=";
+    dontNpmBuild = true;
+
+    patchPhase = ''
+      runHook prePatch
+      runHook postPatch
+    '';
+
+    buildPhase = ''
+      runHook preBuild
+      npx @tailwindcss/cli --minify --input=${baseCss} --output=$out/css/main.css
+      npx esbuild --bundle --minify --outfile=$out/js/main.js website/static/js/base.js
+      runHook postBuild
+    '';
+
+    installPhase = ''
+      runHook postInstall
+    '';
+  };
+  inherit (pkgs.stdenv) mkDerivation;
+in
+mkDerivation {
+  pname = "strykeforce-static";
+  inherit (pythonSet.website) version;
+  nativeBuildInputs = [ venv ];
+
+  dontUnpack = true;
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    export DJANGO_SETTINGS_MODULE=website.settings.production
+    export DJANGO_STATICFILES_DIR="${djangoStaticDeps}"
+    export SECRET_KEY=
+    export STATIC_ROOT=$out
+    export TBA_READ_KEY=
+    export EMAIL_HOST_USER=
+    export EMAIL_HOST_PASSWORD=
+    mkdir -p $out
+    ${venv}/bin/strykeforce-manage collectstatic --no-input --ignore="css/base.css" --ignore="js/base.js"
+  '';
+
+}