From a0756d721d5fbf1bbddc938d15237888cb37241c Mon Sep 17 00:00:00 2001 From: Jacky Nguyen Date: Sun, 15 Sep 2024 16:56:12 -0400 Subject: [PATCH] Update dependencies --- cli.sh | 9 ++++++- deno.json | 11 +++------ deno.lock | 72 +++++++++++++++++++++--------------------------------- flake.lock | 12 ++++----- flake.nix | 9 +++---- 5 files changed, 50 insertions(+), 63 deletions(-) diff --git a/cli.sh b/cli.sh index ab14bf4..0b46acf 100755 --- a/cli.sh +++ b/cli.sh @@ -1,7 +1,13 @@ #!/usr/bin/env bash set -euo pipefail +shopt -s extglob globstar + SCRIPT_DIR=$(realpath "$(dirname "${BASH_SOURCE[0]}")") +check_all() { + deno check ./**/*.ts +} + code_quality() { echo "Checking formatting..." deno fmt --check @@ -21,7 +27,8 @@ update_lock() { } update_deps() { - deno run -A jsr:@wok/deup@1.3.0 update "$@" + deno run -A jsr:@wok/deup@1.3.1 update "$@" + "$0" update_lock } run() { diff --git a/deno.json b/deno.json index d48f610..f1dbee7 100644 --- a/deno.json +++ b/deno.json @@ -7,9 +7,6 @@ "publish": { "include": ["./src", "./deno.json", "./README.md", "./LICENSE"] }, - "tasks": { - "check_all": "deno check **/*.ts" - }, "fmt": { "include": [ "build.ts", @@ -34,13 +31,13 @@ } }, "imports": { - "@std/assert": "jsr:@std/assert@^1.0.4", + "@std/assert": "jsr:@std/assert@^1.0.5", "@std/async": "jsr:@std/async@^1.0.5", "@std/fmt": "jsr:@std/fmt@^1.0.2", "@std/fs": "jsr:@std/fs@^1.0.3", - "@std/path": "jsr:@std/path@^1.0.4", + "@std/path": "jsr:@std/path@^1.0.6", "@std/yaml": "jsr:@std/yaml@^1.0.5", - "@wok/typebox": "jsr:@wok/typebox@^0.33.7", - "@wok/utils": "jsr:@wok/utils@^1.12.0" + "@wok/typebox": "jsr:@wok/typebox@^0.33.10", + "@wok/utils": "jsr:@wok/utils@^2.1.6" } } diff --git a/deno.lock b/deno.lock index dc96373..8e760ea 100644 --- a/deno.lock +++ b/deno.lock @@ -1,31 +1,24 @@ { "version": "4", "specifiers": { - "jsr:@std/assert@^1.0.3": "jsr:@std/assert@1.0.4", - "jsr:@std/assert@^1.0.4": "jsr:@std/assert@1.0.4", - "jsr:@std/async@^1.0.4": "jsr:@std/async@1.0.5", + "jsr:@std/assert@^1.0.5": "jsr:@std/assert@1.0.5", "jsr:@std/async@^1.0.5": "jsr:@std/async@1.0.5", "jsr:@std/bytes@^1.0.2": "jsr:@std/bytes@1.0.2", - "jsr:@std/cli@^1.0.4": "jsr:@std/cli@1.0.4", - "jsr:@std/fmt@^1.0.1": "jsr:@std/fmt@1.0.2", + "jsr:@std/cli@^1.0.6": "jsr:@std/cli@1.0.6", "jsr:@std/fmt@^1.0.2": "jsr:@std/fmt@1.0.2", "jsr:@std/fs@^1.0.3": "jsr:@std/fs@1.0.3", - "jsr:@std/internal@^1.0.2": "jsr:@std/internal@1.0.3", - "jsr:@std/internal@^1.0.3": "jsr:@std/internal@1.0.3", - "jsr:@std/path@^1.0.4": "jsr:@std/path@1.0.4", - "jsr:@std/streams@^1.0.3": "jsr:@std/streams@1.0.3", + "jsr:@std/path@^1.0.4": "jsr:@std/path@1.0.6", + "jsr:@std/path@^1.0.6": "jsr:@std/path@1.0.6", + "jsr:@std/streams@^1.0.5": "jsr:@std/streams@1.0.5", "jsr:@std/yaml@^1.0.5": "jsr:@std/yaml@1.0.5", "jsr:@wok/case@^1.0.1": "jsr:@wok/case@1.0.1", - "jsr:@wok/typebox@^0.33.7": "jsr:@wok/typebox@0.33.7", - "jsr:@wok/utils@^1.12.0": "jsr:@wok/utils@1.12.0", - "npm:@sinclair/typebox@^0.33.7": "npm:@sinclair/typebox@0.33.9" + "jsr:@wok/typebox@^0.33.10": "jsr:@wok/typebox@0.33.10", + "jsr:@wok/utils@^2.1.6": "jsr:@wok/utils@2.1.6", + "npm:@sinclair/typebox@^0.33.10": "npm:@sinclair/typebox@0.33.11" }, "jsr": { - "@std/assert@1.0.4": { - "integrity": "d4c767ea578e5bc09c15b6e503376003e5b2d1f4c0cdf08524a92101ff4d7b96", - "dependencies": [ - "jsr:@std/internal@^1.0.3" - ] + "@std/assert@1.0.5": { + "integrity": "e37da8e4033490ce613eec4ac1d78dba1faf5b02a3f6c573a28f15365b9b440f" }, "@std/async@1.0.5": { "integrity": "31d68214bfbb31bd4c6022401d484e3964147c76c9220098baa703a39b6c2da6" @@ -33,11 +26,8 @@ "@std/bytes@1.0.2": { "integrity": "fbdee322bbd8c599a6af186a1603b3355e59a5fb1baa139f8f4c3c9a1b3e3d57" }, - "@std/cli@1.0.4": { - "integrity": "79ca75add572a99a8ba93ae37ccbd8d43fb4e2b635a8a7ebebb4f2d092048764" - }, - "@std/fmt@1.0.1": { - "integrity": "ef76c37faa7720faa8c20fd8cc74583f9b1e356dfd630c8714baa716a45856ab" + "@std/cli@1.0.6": { + "integrity": "d22d8b38c66c666d7ad1f2a66c5b122da1704f985d3c47f01129f05abb6c5d3d" }, "@std/fmt@1.0.2": { "integrity": "87e9dfcdd3ca7c066e0c3c657c1f987c82888eb8103a3a3baa62684ffeb0f7a7" @@ -45,17 +35,14 @@ "@std/fs@1.0.3": { "integrity": "3cb839b1360b0a42d8b367c3093bfe4071798e6694fa44cf1963e04a8edba4fe", "dependencies": [ - "jsr:@std/path" + "jsr:@std/path@^1.0.4" ] }, - "@std/internal@1.0.3": { - "integrity": "208e9b94a3d5649bd880e9ca38b885ab7651ab5b5303a56ed25de4755fb7b11e" - }, - "@std/path@1.0.4": { - "integrity": "48dd5d8389bcfcd619338a01bdf862cb7799933390146a54ae59356a0acc7105" + "@std/path@1.0.6": { + "integrity": "ab2c55f902b380cf28e0eec501b4906e4c1960d13f00e11cfbcd21de15f18fed" }, - "@std/streams@1.0.3": { - "integrity": "d62e645ab981cee2c3d03040eb03cf387fc6bceef6d4564f3ed485a43741a81f", + "@std/streams@1.0.5": { + "integrity": "74e5c73d7d68eeab0d7fba3b05cbee3ba4ac5ae37c5f4e675f67e62f8f53edc4", "dependencies": [ "jsr:@std/bytes" ] @@ -66,20 +53,17 @@ "@wok/case@1.0.1": { "integrity": "409e94f961f5b278992bace87a0c7d3c6a3db516d01759bdb827d9ae4d75e9aa" }, - "@wok/typebox@0.33.7": { - "integrity": "307c3959b8da7eb21b926dc4a47ae953e5124fc1db059477bbb8b1bb51810ccf", + "@wok/typebox@0.33.10": { + "integrity": "baf265ddc5d0559284000d2cd5a30388b3de220fde69f48ce5eec106a655c008", "dependencies": [ "npm:@sinclair/typebox" ] }, - "@wok/utils@1.12.0": { - "integrity": "752c2100eb0902c267236b46f77af5a32c385e960883192a95a931a29f739fd3", + "@wok/utils@2.1.6": { + "integrity": "a09cff34f064f1db590876786a976014e69b3c7480ca4d10b8644669077caa73", "dependencies": [ - "jsr:@std/assert@^1.0.3", - "jsr:@std/async@^1.0.4", "jsr:@std/cli", - "jsr:@std/fmt@^1.0.1", - "jsr:@std/internal@^1.0.2", + "jsr:@std/fmt", "jsr:@std/streams", "jsr:@wok/case", "jsr:@wok/typebox" @@ -87,20 +71,20 @@ } }, "npm": { - "@sinclair/typebox@0.33.9": { - "integrity": "sha512-agK7y8hO5Gz4Thu5kxTtLiZudNRflR1rTwmnWW5skxMd/+aqQ9XQene8HyyBsiajs5HV6ZQ/pCd3IKsqIfu4Kw==" + "@sinclair/typebox@0.33.11": { + "integrity": "sha512-2+0JxGh5HK1KX660phgcfxw161/TV3n0koonoQ8u65gTeZFHdWI5ujPaGaQmXXtVC6rwEWwPtOoQ8ihyZwt3eg==" } }, "workspace": { "dependencies": [ - "jsr:@std/assert@^1.0.4", + "jsr:@std/assert@^1.0.5", "jsr:@std/async@^1.0.5", "jsr:@std/fmt@^1.0.2", "jsr:@std/fs@^1.0.3", - "jsr:@std/path@^1.0.4", + "jsr:@std/path@^1.0.6", "jsr:@std/yaml@^1.0.5", - "jsr:@wok/typebox@^0.33.7", - "jsr:@wok/utils@^1.12.0" + "jsr:@wok/typebox@^0.33.10", + "jsr:@wok/utils@^2.1.6" ] } } diff --git a/flake.lock b/flake.lock index 180fe9f..d8dbc89 100644 --- a/flake.lock +++ b/flake.lock @@ -83,11 +83,11 @@ "npmlock2nixPkg": "npmlock2nixPkg" }, "locked": { - "lastModified": 1725401469, - "narHash": "sha256-YW/BPPv27iOJjxjT/caW/6YGbRcwrpLjhfmr6HvdGjw=", + "lastModified": 1726433229, + "narHash": "sha256-XkRE84OVXdB6jz/cj5+DmYrC4A0LCgNIaY6Vqy6rO4I=", "owner": "shopstic", "repo": "nix-hot-pot", - "rev": "1d6c39688ba96d01251247dc789c6eff27143bad", + "rev": "a1576e05be5af131899bfbec3df3acbdd9f1a509", "type": "github" }, "original": { @@ -137,11 +137,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1725001927, - "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=", + "lastModified": 1726320982, + "narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421", + "rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d85e57f..5a54ec9 100644 --- a/flake.nix +++ b/flake.nix @@ -67,15 +67,14 @@ hasSuffix "/deno.json" path ); }; - deno-cache = pkgs.callPackage hotPotLib.denoAppCache2 { + deno-cache-dir = pkgs.callPackage hotPotLib.denoAppCache2 { inherit deno name src; config-file = ./deno.json; lock-file = ./deno.lock; }; - built = pkgs.callPackage hotPotLib.denoAppBuild + transpiled = pkgs.callPackage hotPotLib.denoAppTranspile { - inherit name deno-cache src; - inherit (hotPotPkgs) deno-app-build; + inherit name deno-cache-dir src; appSrcPath = "./src/app.ts"; denoRunFlags = ''"''${DENO_RUN_FLAGS[@]}"''; preExec = '' @@ -98,7 +97,7 @@ buildInputs = [ pkgs.makeWrapper ]; } '' - makeWrapper ${built}/bin/jetski $out/bin/jetski \ + makeWrapper ${transpiled}/bin/jetski $out/bin/jetski \ --set JETSKI_VERSION "${denoJson.version}" \ --prefix PATH : "${pkgs.lib.makeBinPath runtimeInputs}" \ --set-default JETSKI_ENABLE_STACKTRACE "0"