aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbin/watch.sh12
-rw-r--r--shell.nix16
2 files changed, 19 insertions, 9 deletions
diff --git a/bin/watch.sh b/bin/watch.sh
index f38a2c8..f93ce18 100755
--- a/bin/watch.sh
+++ b/bin/watch.sh
@@ -1,8 +1,16 @@
#!/usr/bin/env bash
set -euo pipefail
-python -m http.server --directory public 8000 &
+# Run server
+python -m http.server --directory public 8000 &
trap "fuser -k 8000/tcp" EXIT
-tsc --watch
+# Watch TypeScript
+
+CHECK="echo Checking TypeScript… && tsc --checkJs"
+BUILD="esbuild --bundle src/main.ts --target=es2016 --outdir=public"
+watchexec \
+ --clear \
+ --watch src \
+ -- "$CHECK && $BUILD"
diff --git a/shell.nix b/shell.nix
index ad4a34d..6b652d6 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,16 +1,18 @@
-with (import (builtins.fetchGit {
- name = "nixpkgs-20.09";
- url = "git@github.com:nixos/nixpkgs.git";
- rev = "cd63096d6d887d689543a0b97743d28995bc9bc3";
- ref = "refs/tags/20.09";
-}){});
+with import (builtins.fetchGit {
+ name = "nixos-21.05-2021-08-02";
+ url = "https://github.com/nixos/nixpkgs/";
+ ref = "refs/heads/nixos-21.05";
+ rev = "d4590d21006387dcb190c516724cb1e41c0f8fdf";
+}) {};
mkShell {
buildInputs = [
nodePackages.typescript
python3
- psmisc # fuser
+ psmisc
+ esbuild
+ watchexec
];
}