@sablier/devkit 1.13.1 → 1.14.0

package/just/_vercel_helpers.py

@@ -0,0 +1,42 @@
+"""Shared helpers for Vercel Just recipes."""
+
+import json
+import os
+import subprocess
+import sys
+
+
+def run(*cmd):
+    """Run a command, exiting on failure."""
+    result = subprocess.run(cmd)
+    if result.returncode != 0:
+        sys.exit(result.returncode)
+
+
+def resolve_vercel_env(app, project_ids_json):
+    """Resolve VERCEL_PROJECT_ID and VERCEL_TOKEN, setting them in os.environ.
+
+    Precedence for project ID:
+      1. VERCEL_PROJECT_ID already set in the environment
+      2. Lookup `app` in the VERCEL_PROJECT_IDS JSON map
+
+    Returns (project_id, token).
+    """
+    project_id = os.environ.get("VERCEL_PROJECT_ID", "")
+    if not project_id:
+        project_ids = json.loads(project_ids_json)
+        if app not in project_ids:
+            print(
+                f"Error: unknown app '{app}'. Known apps: {', '.join(project_ids) or '(none)'}",
+                file=sys.stderr,
+            )
+            sys.exit(1)
+        project_id = project_ids[app]
+    os.environ["VERCEL_PROJECT_ID"] = project_id
+
+    token = os.environ.get("VERCEL_TOKEN", "")
+    if not token:
+        print("Error: VERCEL_TOKEN is not set.", file=sys.stderr)
+        sys.exit(1)
+
+    return project_id, token

package/just/evm.just

@@ -19,22 +19,7 @@ nlx := require("nlx")
 #                                   CONSTANTS                                  #
 # ---------------------------------------------------------------------------- #
 
-GLOBS_CLEAN := ```
-    arr=(
-        "artifacts"
-        "artifacts-*"
-        "broadcast"
-        "cache"
-        "cache_hardhat-zk"
-        "coverage"
-        "docs"
-        "out"
-        "out-*"
-        "typechain-types"
-        "lcov.info"
-    )
-    echo "${arr[*]}"
-```
+GLOBS_CLEAN := "artifacts artifacts-* broadcast cache cache_hardhat-zk coverage docs out out-* typechain-types lcov.info"
 GLOBS_PRETTIER := "**/*.{md,mdx,yaml,yml}"
 GLOBS_SOLIDITY := "{scripts,src,tests}/**/*.sol"
 
@@ -44,11 +29,10 @@ GLOBS_SOLIDITY := "{scripts,src,tests}/**/*.sol"
 
 # Clean directories and files
 clean globs=GLOBS_CLEAN:
-    nlx del-cli {{ globs }}
+    {{ nlx }} del-cli {{ globs }}
 alias c := clean
 
 # Clear node_modules recursively
-[confirm("Are you sure you want to delete all node_modules, including in subdirectories? Y/n")]
 clean-modules:
     just base::clean-modules
 
@@ -95,12 +79,12 @@ alias pw := prettier-write
 
 # Check code with Solhint
 solhint-check globs=GLOBS_SOLIDITY:
-    na solhint --cache "{{ globs }}"
+    {{ na }} solhint --cache "{{ globs }}"
 alias sc := solhint-check
 
 # Fix code with Solhint
 solhint-write globs=GLOBS_SOLIDITY:
-    na solhint --cache --fix --noPrompt "{{ globs }}"
+    {{ na }} solhint --cache --fix --noPrompt "{{ globs }}"
 alias sw := solhint-write
 
 # ---------------------------------------------------------------------------- #
@@ -110,21 +94,15 @@ alias sw := solhint-write
 # Build contracts
 [group("foundry")]
 build:
-    forge build
+    {{ forge }} build
 alias b := build
 
-# Build using optimized profile
-[group("foundry")]
-build-optimized:
-    FOUNDRY_PROFILE=optimized \
-        forge build
-alias bo := build-optimized
-
 # Build using optimized profile with optional arguments
 [group("foundry")]
 build-optimized *args:
     FOUNDRY_PROFILE=optimized \
-        forge build --extra-output-files metadata {{ args }}
+        {{ forge }} build --extra-output-files metadata {{ args }}
+alias bo := build-optimized
 
 # Dump code coverage to an html file
 [group("foundry"), script("bash")]
@@ -134,30 +112,30 @@ coverage:
         echo "Install it with Homebrew: https://formulae.brew.sh/formula/lcov"
         exit 1
     fi
-    forge coverage --report lcov
+    {{ forge }} coverage --report lcov
     genhtml --branch-coverage --ignore-errors inconsistent --output-dir coverage lcov.info
 alias cov := coverage
 
 # Check code with Forge formatter
 [group("foundry")]
 fmt-check:
-    forge fmt --check
+    {{ forge }} fmt --check
 
 # Fix code with Forge formatter
 [group("foundry")]
 fmt-write:
-    forge fmt
+    {{ forge }} fmt
 
 # Performs a gas report
 [group("foundry")]
 gas-report:
-    forge test --gas-report
+    {{ forge }} test --gas-report
 alias gr := gas-report
 
 # Run tests with optional arguments
 [group("foundry")]
 test *args:
-    forge test {{ args }}
+    {{ forge }} test {{ args }}
 alias t := test
 
 # Run Bulloak checks
@@ -166,19 +144,14 @@ test-bulloak:
     bulloak check --skip-modifiers "./tests/**/*.tree"
 alias tb := test-bulloak
 
-# Run tests using lite profile (skipping fork tests)
+# Run tests using lite profile (skips fork tests by default)
 [group("foundry")]
-test-lite:
-    FOUNDRY_PROFILE=lite forge test --nmt "testFork"
+test-lite *args="--nmt testFork":
+    FOUNDRY_PROFILE=lite {{ forge }} test {{ args }}
 alias tl := test-lite
 
-# Run tests using lite profile with optional arguments
-[group("foundry")]
-test-lite *args:
-    FOUNDRY_PROFILE=lite forge test {{ args }}
-
 # Run tests using optimized profile
 [group("foundry")]
 test-optimized: build-optimized
-    FOUNDRY_PROFILE=test-optimized forge test
+    FOUNDRY_PROFILE=test-optimized {{ forge }} test
 alias to := test-optimized

package/just/vercel.just

@@ -13,6 +13,7 @@ na := require("na")
 
 # Consumer MUST override with a JSON map of app name → Vercel project ID.
 # Example: '{"portal": "prj_xxx", "landing": "prj_yyy"}'
+# Note: if VERCEL_PROJECT_ID is already set in the environment, this map is ignored.
 VERCEL_PROJECT_IDS := '{}'
 
 # ---------------------------------------------------------------------------- #
@@ -44,29 +45,15 @@ alias vd := deploy
 # Core build: vercel pull + vercel build
 [private, script("python3")]
 _vercel-build app env:
-    import json, os, subprocess, sys
-
-    def run(*cmd):
-        result = subprocess.run(cmd)
-        if result.returncode != 0:
-            sys.exit(result.returncode)
+    import sys; sys.path.insert(0, "{{ source_directory() }}")
+    import os
+    from _vercel_helpers import resolve_vercel_env, run
 
     # Workaround for https://github.com/vercel/vercel/issues/14666
     os.environ["VERCEL_TARGET_ENV"] = "{{ env }}"
     os.environ["NEXT_PUBLIC_VERCEL_TARGET_ENV"] = "{{ env }}"
 
-    # Resolve project ID from app name
-    project_ids = json.loads('{{ VERCEL_PROJECT_IDS }}')
-    app = "{{ app }}"
-    if app not in project_ids:
-        print(f"Error: unknown app '{app}'. Known apps: {', '.join(project_ids) or '(none)'}", file=sys.stderr)
-        sys.exit(1)
-    os.environ["VERCEL_PROJECT_ID"] = project_ids[app]
-
-    token = os.environ.get("VERCEL_TOKEN", "")
-    if not token:
-        print("Error: VERCEL_TOKEN is not set.", file=sys.stderr)
-        sys.exit(1)
+    project_id, token = resolve_vercel_env("{{ app }}", '{{ VERCEL_PROJECT_IDS }}')
 
     # Pull the environment from the Vercel project
     run("na", "vercel", "pull", "--environment={{ env }}", f"--token={token}", "--yes")
@@ -77,12 +64,9 @@ _vercel-build app env:
 # Core deploy: optionally build, then deploy prebuilt artifacts
 [private, script("python3")]
 _vercel-deploy app env skip_build="false":
-    import json, os, subprocess, sys
-
-    def run(*cmd):
-        result = subprocess.run(cmd)
-        if result.returncode != 0:
-            sys.exit(result.returncode)
+    import sys; sys.path.insert(0, "{{ source_directory() }}")
+    import os
+    from _vercel_helpers import resolve_vercel_env, run
 
     # Build the project if not skipped (calls the PUBLIC recipe so consumer overrides apply)
     if "{{ skip_build }}" != "true":
@@ -92,18 +76,7 @@ _vercel-deploy app env skip_build="false":
     os.environ["VERCEL_TARGET_ENV"] = "{{ env }}"
     os.environ["NEXT_PUBLIC_VERCEL_TARGET_ENV"] = "{{ env }}"
 
-    # Resolve project ID from app name
-    project_ids = json.loads('{{ VERCEL_PROJECT_IDS }}')
-    app = "{{ app }}"
-    if app not in project_ids:
-        print(f"Error: unknown app '{app}'. Known apps: {', '.join(project_ids) or '(none)'}", file=sys.stderr)
-        sys.exit(1)
-    os.environ["VERCEL_PROJECT_ID"] = project_ids[app]
-
-    token = os.environ.get("VERCEL_TOKEN", "")
-    if not token:
-        print("Error: VERCEL_TOKEN is not set.", file=sys.stderr)
-        sys.exit(1)
+    project_id, token = resolve_vercel_env("{{ app }}", '{{ VERCEL_PROJECT_IDS }}')
 
     # Deploy the project to Vercel
     run("na", "vercel", "deploy", "--prebuilt", "--target={{ env }}", f"--token={token}")

package/package.json

@@ -3,7 +3,7 @@
   "description": "Configuration files and reusable scripts for Sablier repositories",
   "license": "MIT",
   "type": "module",
-  "version": "1.13.1",
+  "version": "1.14.0",
   "author": {
     "name": "Sablier Labs Ltd",
     "url": "https://sablier.com"