Skip to content

chore(treefmt): replace prettier with oxfmt and simplify CI #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryoppippi merged 4 commits into from
Dec 23, 2025
Merged

chore(treefmt): replace prettier with oxfmt and simplify CI #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5bfab5b
build(treefmt): replace prettier with oxfmt
ryoppippi Dec 23, 2025
d76d605
chore(just): consolidate lint and format commands
ryoppippi Dec 23, 2025
e75d1df
refactor(ci): simplify lint by leveraging treefmt
ryoppippi Dec 23, 2025
cd68570
build(treefmt): specify typos config file path
ryoppippi Dec 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,6 @@ jobs:
- name: Run Gitleaks
run: nix develop --command just gitleaks

typos:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1

- name: Setup Nix
uses: ./.github/actions/setup-nix

- name: Run Typo Check
run: nix develop --command just typos

ci:
runs-on: ubuntu-latest
strategy:
Expand Down
18 changes: 9 additions & 9 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 19 additions & 12 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,26 @@
nixfmt.package = pkgs.nixfmt-rfc-style;
ruff-check.enable = true;
ruff-format.enable = true;
prettier = {
enable = true;
includes = [
"*.md"
"*.yml"
"*.yaml"
"*.json"
];
excludes = [
"CHANGELOG.md"
];
};
typos.enable = true;
typos.configFile = "typos.toml";
};
settings.formatter.oxfmt = {
command = "${pkgs.oxfmt}/bin/oxfmt";
Copy link

Copilot AI Dec 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The package reference pkgs.oxfmt may not exist in nixpkgs. The oxfmt formatter is part of the oxc project, but it's unclear if it's available as a standalone package named oxfmt in nixpkgs. You should verify that this package exists in the nixpkgs version being used (nixpkgs-unstable). If the package doesn't exist or has a different name, the build will fail. Common alternatives might be pkgs.oxc (if oxfmt is included) or it may need to be added as a separate input or built from source.

Suggested change
command = "${pkgs.oxfmt}/bin/oxfmt";
command = "${pkgs.oxc}/bin/oxfmt";

Copilot uses AI. Check for mistakes.
includes = [
"*.md"
"*.yml"
"*.yaml"
"*.json"
"*.ts"
"*.tsx"
"*.js"
"*.jsx"
"*.html"
"*.css"
];
excludes = [
"CHANGELOG.md"
];
};
};

Expand Down
18 changes: 5 additions & 13 deletions justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
install *extras:
uv sync {{ extras }}

# Run ruff linting
# Run linting and format check (ruff, typos, nixfmt, oxfmt)
lint:
uv run ruff check .
nix fmt -- --fail-on-change

# Auto-fix linting issues
lint-fix:
uv run ruff check --fix .
# Format and auto-fix linting issues
format:
nix fmt

# Run all tests
test:
Expand All @@ -30,18 +30,10 @@ test-examples:
ty:
uv run ty check stackone_ai

# Run typos spell checker
typos:
typos --config typos.toml .

# Run gitleaks secret detection
gitleaks:
gitleaks detect --source . --config .gitleaks.toml

# Fix typos
typos-fix:
typos --config typos.toml --write-changes .

# Update version in __init__.py
update-version:
uv run scripts/update_version.py
Expand Down