Skip to content

fix(oxfmt): Revert #20326 partially#20413

Merged
graphite-app[bot] merged 1 commit intomainfrom
03-16-fix_oxfmt_revert_20326_partially
Mar 16, 2026
Merged

fix(oxfmt): Revert #20326 partially#20413
graphite-app[bot] merged 1 commit intomainfrom
03-16-fix_oxfmt_revert_20326_partially

Conversation

@leaysgur
Copy link
Member

@leaysgur leaysgur commented Mar 16, 2026

Current status:

First, correct this inconsistency.

Since #20326 includes a change that displays errors from the JS side as-is, we will keep that part.

Copilot AI review requested due to automatic review settings March 16, 2026 01:03
Copy link
Member Author


How to use the Graphite Merge Queue

Add either label to this PR to merge it via the merge queue:

  • 0-merge - adds this PR to the back of the merge queue
  • hotfix - for urgent changes, fast-track this PR to the front of the merge queue

You must have a Graphite account in order to use the merge queue. Sign up using this link.

An organization admin has enabled the Graphite Merge Queue in this repository.

Please do not merge from GitHub as this will restart CI on PRs being processed by the merge queue.

This stack of pull requests is managed by Graphite. Learn more about stacking.

@github-actions github-actions bot added A-cli Area - CLI A-formatter Area - Formatter C-bug Category - Bug labels Mar 16, 2026
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Adjusts oxfmt’s Vite config handling to align with the partial revert goal: missing .fmt remains skippable for auto-discovery, but Vite config load failures now surface as errors (including when auto-discovered), with updated CLI tests/fixtures to lock in the behavior.

Changes:

  • Update Vite-config CLI tests to cover (a) explicit config without .fmt, (b) explicit config load failure, and (c) auto-discovered config load failure.
  • Add new fixtures for “no .fmt field” and “load failure (missing dependency)” scenarios.
  • Change config discovery/loading logic to propagate Vite config load errors, while continuing to skip auto-discovered Vite configs that load but don’t contain .fmt.

Reviewed changes

Copilot reviewed 3 out of 8 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
apps/oxfmt/test/cli/vite_config/vite_config.test.ts Adds/adjusts test cases for explicit vs auto-discovered Vite config error behaviors.
apps/oxfmt/test/cli/vite_config/fixtures/no_fmt_field/vite.config.ts Fixture: Vite config with no .fmt field.
apps/oxfmt/test/cli/vite_config/fixtures/no_fmt_field/test.ts Fixture input file used by the “no .fmt” tests.
apps/oxfmt/test/cli/vite_config/fixtures/error_load_failure/child/vite.config.ts Fixture: Vite config that fails to load via missing import.
apps/oxfmt/test/cli/vite_config/fixtures/error_load_failure/child/test.ts Fixture input file used by the load-failure tests.
apps/oxfmt/test/cli/vite_config/fixtures/error_load_failure/.oxfmtrc.json Fixture: parent config present in the load-failure tree (for discovery behavior context).
apps/oxfmt/test/cli/vite_config/snapshots/vite_config.test.ts.snap Updates snapshots to match new error cases/output.
apps/oxfmt/src/core/config.rs Makes auto-discovery propagate Vite config load errors; explicit JS/TS configs still require .fmt when loader returns null.

You can also share your feedback on Copilot code review. Take the survey.

@leaysgur leaysgur added the 0-merge Merge with Graphite Merge Queue label Mar 16, 2026
Copy link
Member Author

leaysgur commented Mar 16, 2026

Merge activity

Current status:

- oxfmt: #20326 was merged
- oxlint: After discussion in #20327, it was decided NOT to merge

First, correct this inconsistency.

Since #20326 includes a change that displays errors from the JS side as-is, we will keep that part.
@graphite-app graphite-app bot force-pushed the 03-16-fix_oxfmt_revert_20326_partially branch from 08ce1ad to f908742 Compare March 16, 2026 01:23
@graphite-app graphite-app bot merged commit f908742 into main Mar 16, 2026
19 checks passed
@graphite-app graphite-app bot deleted the 03-16-fix_oxfmt_revert_20326_partially branch March 16, 2026 01:35
@graphite-app graphite-app bot removed the 0-merge Merge with Graphite Merge Queue label Mar 16, 2026
camc314 pushed a commit that referenced this pull request Mar 16, 2026
# Oxlint
### 🚀 Features

- c95951f linter/plugins: Implement `sourceCode.markVariableAsUsed` (#20357) (overlookmotel)
- 7a2a7d0 linter: Implement `n/handle-callback-err` rule (#19616) (Mikhail Baev)

### 🐛 Bug Fixes

- f8fbd6e linter/plugins: Remove `hashbang` property from AST (#20365) (overlookmotel)
- 6eb5b01 linter/prefer-await-to-then: Ignore Promise static methods (#20347) (camc314)
- a4b61f7 linter: Remove `defineConfig` check (#20308) (camc314)
- 3ad7f53 linter/explicit-module-boundary-types: False positive with satisfies expr (#20309) (camc314)
- f547401 linter/no-unused-private-class-members: Treat switch discriminants as read (#20307) (camc314)
- 1c07b3b diagnostics: Handle `WouldBlock` in stdout writes to prevent panic (#20295) (Boshen)

### ⚡ Performance

- e4f7248 linter: Remove unnecessary clone of owned String in drain loop (#20388) (Boshen)
- 4a67f1d linter: Eliminate Vec allocation in disable directive matching (#20387) (Boshen)
- 618a598 linter/plugins: Add fast path for files with no comments (#20366) (overlookmotel)
- b0125c5 linter/plugins: Deserialize comments without AST (#20364) (overlookmotel)
- 9cd612f linter/plugins: Recycle comment objects (#20362) (overlookmotel)
- bf442f8 linter/plugins: Cheaper `Token` creation (#20360) (overlookmotel)
- 5474d0a semantic: V8-style walk-up reference resolution (#20292) (Boshen)
- 7946eba linter/plugins: Avoid arguments spread and temp array when merging (#20318) (overlookmotel)
- fc7cf8a linter/plugins: Pre-define less CFG merger functions (#20317) (overlookmotel)
- 3b9eb28 linter/plugins: Streamline getting/creating visit fn mergers (#20319) (overlookmotel)
- f04e850 linter/plugins: Inline binary search functions into call sites (#20312) (overlookmotel)
- fe24afe linter/plugins: Apply replace globals TSDown plugin to JS files (#20305) (overlookmotel)
- 77cdacc linter/plugins: Use array buffer views for tokens (#20301) (overlookmotel)
- 910c941 linter/plugins: Reorder branches in `getTokenByRangeStart` (#20296) (overlookmotel)
- af7674c linter/tokens: Avoid extra token value allocation (#20013) (camc314)

### 📚 Documentation

- 24490b5 linter: Improve formatting for 80ish rules' docs. (#20411) (connorshea)
- 3383523 linter: Improve `--tsconfig` flag docs (#20342) (camc314)
# Oxfmt
### 🚀 Features

- d22c443 oxfmt: Export `OxfmtConfig` type (#20275) (leaysgur)
- a11ecff oxfmt/lsp: Respect `angular` language id as `.component.html` file (#20242) (Sysix)

### 🐛 Bug Fixes

- ce65099 formatter: Preserve parentheses around as expression before private field access (#20419) (bab)
- f908742 oxfmt: Revert #20326 partially (#20413) (leaysgur)
- 4ef93ea formatter: Honor trailing ignore comments after list separators (#19925) (Andreas Lubbe)
- 68fb0d0 oxfmt: Skip vite.config.ts which fails to import (#20326) (leaysgur)
- 88ee826 oxfmt: Handle literalline for script-in-vue (#20130) (leaysgur)
- 1c07b3b diagnostics: Handle `WouldBlock` in stdout writes to prevent panic (#20295) (Boshen)

Co-authored-by: Boshen <1430279+Boshen@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-cli Area - CLI A-formatter Area - Formatter C-bug Category - Bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants