Skip to content

feat(oxfmt): Support css-in-js substitution#20019

Merged
graphite-app[bot] merged 1 commit intomainfrom
03-05-feat_oxfmt_support_css-in-js_substitution
Mar 6, 2026
Merged

feat(oxfmt): Support css-in-js substitution#20019
graphite-app[bot] merged 1 commit intomainfrom
03-05-feat_oxfmt_support_css-in-js_substitution

Conversation

@leaysgur
Copy link
Member

@leaysgur leaysgur commented Mar 5, 2026

Part of #15180

@github-actions github-actions bot added the A-cli Area - CLI label Mar 5, 2026
Copy link
Member Author

leaysgur commented Mar 5, 2026


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 hot fixes, skip the queue and merge this PR next

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-formatter Area - Formatter C-enhancement Category - New feature or request labels Mar 5, 2026
@codspeed-hq
Copy link

codspeed-hq bot commented Mar 5, 2026

Merging this PR will not alter performance

✅ 49 untouched benchmarks
⏩ 7 skipped benchmarks1


Comparing 03-05-feat_oxfmt_support_css-in-js_substitution (54ddd96) with main (6173e53)2

Open in CodSpeed

Footnotes

  1. 7 benchmarks were skipped, so the baseline results were used instead. If they were deleted from the codebase, click here and archive them to remove them from the performance reports.

  2. No successful run was found on main (d631b31) during the generation of this report, so 6173e53 was used instead as the comparison base. There might be some changes unrelated to this pull request in this report.

@leaysgur leaysgur force-pushed the 03-05-feat_oxfmt_support_css-in-js_substitution branch 5 times, most recently from 33c4561 to 94cbdde Compare March 5, 2026 08:52
@leaysgur
Copy link
Member Author

leaysgur commented Mar 6, 2026

Oxfmt Ecosystem CI

suite oxfmt@latest 94cbdde branch
vuejs/core
eggjs/egg
cnpm/cnpmcore
fuma-nama/fumadocs
monkeytypegame/monkeytype
actualbudget/actual
AmanVarshney01/create-better-t-stack
formatjs/formatjs
fastify/fastify-vite
aidenybai/react-grab
tale/headplane
rolldown/rolldown
mastodon/mastodon
openclaw/openclaw
npmx-dev/npmx.dev
Comfy-Org/ComfyUI_frontend
lichess-org/lila
cloudflare/agents
dyad-sh/dyad
vercel/turborepo
getsentry/sentry-javascript
huggingface/huggingface.js
vuejs/pinia

@leaysgur
Copy link
Member Author

leaysgur commented Mar 6, 2026

Ecosystem failure for rolldown is expected.

https://github.com/oxc-project/oxc-ecosystem-ci/actions/runs/22744104964/job/65964343172#step:12:16

> --- a/examples/styled-components-native/src/components/Button.jsx
> +++ b/examples/styled-components-native/src/components/Button.jsx
> @@ -32,7 +32,11 @@ const StyledButton = styled.button`
>      height: 0;
>      border-radius: 50%;
>      background: rgba(255, 255, 255, 0.3);
> -    transition: width 0.6s, height 0.6s, top 0.6s, left 0.6s;
> +    transition:
> +      width 0.6s,
> +      height 0.6s,
> +      top 0.6s,
> +      left 0.6s;
>      transform: translate(-50%, -50%);
>      z-index: 0;
>    }

It's reflecting printWidth correctly! A failure worth celebrating. 🤣

@leaysgur leaysgur marked this pull request as ready for review March 6, 2026 01:22
@leaysgur leaysgur requested a review from Dunqing as a code owner March 6, 2026 01:22
Copilot AI review requested due to automatic review settings March 6, 2026 01:22
@leaysgur leaysgur force-pushed the 03-05-feat_oxfmt_support_css-in-js_substitution branch from 94cbdde to 54ddd96 Compare March 6, 2026 01:23
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

Adds css-in-js ${...} substitution support to oxfmt’s embedded-language pipeline by switching CSS templates to the Doc→IR formatting path (Prettier printToDoc) and restoring expressions via Prettier-style placeholders.

Changes:

  • Implement placeholder-based CSS-in-JS template formatting (Doc→IR) and replace placeholders with ${expr} Docs for correct wrapping.
  • Generalize embedded Doc callback output to a new EmbeddedDocResult (multiple IRs for GraphQL; single IR + placeholder counts for CSS).
  • Update oxfmt’s Prettier-doc conversion + embedded parser mapping to support the new CSS flow (using scss).

Reviewed changes

Copilot reviewed 7 out of 7 changed files in this pull request and generated 3 comments.

Show a summary per file
File Description
crates/oxc_formatter/src/print/template/embed/mod.rs Routes CSS/styled tagged templates + styled-jsx/Angular styles templates to the new CSS Doc formatter.
crates/oxc_formatter/src/print/template/embed/graphql.rs Adapts GraphQL embedded-doc handling to the new EmbeddedDocResult return type.
crates/oxc_formatter/src/print/template/embed/css.rs New placeholder-based CSS template Doc→IR formatting with ${expr} restoration.
crates/oxc_formatter/src/lib.rs Re-exports EmbeddedDocResult for downstream usage.
crates/oxc_formatter/src/external_formatter.rs Introduces EmbeddedDocResult and updates embedded-doc callback API to return it.
apps/oxfmt/src/prettier_compat/from_prettier_doc.rs Converts Prettier Doc JSON into EmbeddedDocResult and adds placeholder counting + Text merging.
apps/oxfmt/src/core/external_formatter.rs Parses Doc JSON batches once and switches embedded CSS languages to the scss parser.

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

Copy link
Member

@Dunqing Dunqing left a comment

Choose a reason for hiding this comment

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

Cool!

@graphite-app graphite-app bot added the 0-merge Merge with Graphite Merge Queue label Mar 6, 2026
@graphite-app
Copy link
Contributor

graphite-app bot commented Mar 6, 2026

Merge activity

@graphite-app graphite-app bot force-pushed the 03-05-feat_oxfmt_support_css-in-js_substitution branch from 54ddd96 to ee26215 Compare March 6, 2026 04:00
@graphite-app graphite-app bot merged commit ee26215 into main Mar 6, 2026
21 checks passed
@graphite-app graphite-app bot deleted the 03-05-feat_oxfmt_support_css-in-js_substitution branch March 6, 2026 04:07
@graphite-app graphite-app bot removed the 0-merge Merge with Graphite Merge Queue label Mar 6, 2026
camc314 pushed a commit that referenced this pull request Mar 9, 2026
# Oxlint
### 🚀 Features

- e6b604f oxlint: Auto-enable gitlab formatter on GitLab (#20076)
(camc314)
- 2488a68 linter: Add .oxlintrc.jsonc config file support (#19870)
(Scott S.)
- 61bf388 linter: Add `options.reportUnusedDisableDirectives` to config
file (#19799) (Peter Wagenet)
- c92422b oxlint: Auto-enable github formatter on GitHub Actions
(#19944) (Boshen)
- 0337c6d linter: Implement typescript/no-unecessary-type-conversion
(#19955) (camc314)
- 2919313 linter: Introduce denyWarnings config options (#19926)
(camc314)
- a607119 linter: Introduce maxWarnings config option (#19777) (camc314)

### 🐛 Bug Fixes

- 0861d9a linter/plugins: Remove getters from `Context` (#20115)
(overlookmotel)
- 92cfb14 linter/plugins: Fix types for `walkProgram` and
`walkProgramWithCfg` (#20081) (overlookmotel)
- 10e211f oxlint/lsp: Send other code actions besides `source.fixAll` if
requested (#20042) (Sysix)
- 602daaa linter/plugins: Fix type definition for `VisitorObject`
(#20065) (overlookmotel)
- ee0491e apps,napi: Explicitly specify libs in tsconfigs (#20071)
(camc314)
- b6e9499 linter: Fix the logic for `unicorn/prefer-dom-node-remove` to
handle literal callees as well as arguments. (#20059) (connorshea)
- 3874ae1 linter: Update `unicorn/prefer-query-selector` to also catch
`getElementsByName()`. (#20060) (connorshea)
- 77c93fb linter: Handle array-type shorthand inside union members
(#20034) (camc314)
- 50eb160 linter/no-unused-vars: Allow unused type params in ambient
module blocks (#19615) (Don Isaac)
- 1dd0d21 linter/no-restricted-imports: Apply regex pattern checks to
side-effect imports (#20028) (camc314)
- 7f3d735 linter: Error when --type-check is used without --type-aware
(#20025) (camc314)
- eea201c unicorn/prefer-string-slice: Avoid unsafe autofix for
substr-to-slice (#20010) (camc314)
- 50359dc oxlint/lsp: Detect `reportUnusedDisableDirectives` from oxlint
config, change lsp `unusedDisableDirectives` default value to `None`
(#20011) (Sysix)
- 4bc84b1 linter/plugins: Allow `null` and `undefined` for
`rule.meta.fixable` (#20008) (overlookmotel)
- 753e27e linter/role-supports-aria-props: Add `aria-posinset` to
supported `option` ARIA properties (#20003) (JongKyung Lee)
- f57b2c9 linter/plugins: Fix return types of tokens methods (#19985)
(overlookmotel)
- 27ee4fc linter/no-loss-of-precision: Avoid double rounding for
negative exponents (#19999) (camc314)
- 77a94bb linter: Avoid no-loss-of-precision false positive for 3e-308
(#19992) (camc314)
- 6245c56 linter/no-unused-private-class-members: Treat logical lhs
access as usage (#19991) (camc314)
- 65891e3 linter: Avoid prefer-const false positive for mixed-scope
destructuring (#19982) (camc314)
- 89991fe linter: Avoid prefer-const false positive for operator
reassignments (#19975) (camc314)
- 87318e7 oxlint/lsp: Load js config with reforcing fs read (#19551)
(Sysix)
- d40a942 linter/no-useless-constructor: Mark fixer as suggestion
(#19961) (camc314)
- ccbd959 linter/prefer-code-point: Report String.fromCharCode member
references (#19931) (camc314)
- 14fbbfc linter: Add help text to oxc/no-rest-spread-properties rule
(#19900) (Subin Kim)

### ⚡ Performance

- 2baa5fb napi: Unify build-test profile to coverage for cache sharing
(#20090) (Boshen)
- 77f1c71 linter/plugins: Make tokens class instances (#19980)
(overlookmotel)
- 758b424 linter/plugins: Reduce memory copies for tokens (#19979)
(overlookmotel)
- 236847f linter/plugins: Cache token objects (#19978) (overlookmotel)
- 94b597a linter/plugins: Store tokens as a `Box<[Token]>` (#19969)
(overlookmotel)

### 📚 Documentation

- 2c0010a linter/plugins: Move comment about "bivariance hack" into
generated code (#20082) (overlookmotel)
- 7538f09 linter: Improve `import/extensions` and
`import/no-named-as-default` rule docs. (#20053) (connorshea)
- 1f909cf linter: Improve docs for
`unicorn/require-post-message-target-origin` rule. (#20061) (connorshea)
- 12ae35c oxlint/lsp: Remove outdated ToDo for `LintOptions.run`
(#20012) (Sysix)
- 3be73e6 linter/plugins: Fix JSDoc comments for tokens methods (#20004)
(overlookmotel)
- 48ef285 linter: Update `--config` docs (#19965) (camc314)
- 6ea49a0 linter: Fix some identation issues for the generated types
used in `oxlint.config.ts`. (#19942) (connorshea)
- 6c0e0b5 linter: Add oxlint.config.ts to the config docs. (#19941)
(connorshea)
- 160e423 linter: Add a note that the typeAware and typeCheck options
require oxlint-tsgolint (#19940) (connorshea)
- d54c275 linter: Improve rule docs for 27 unicorn rules (#19903)
(connorshea)
# Oxfmt
### 🚀 Features

- ee26215 oxfmt: Support css-in-js substitution (#20019) (leaysgur)
- 0f0ff51 oxfmt: Display default settings was used message in cli stats
(#19939) (leaysgur)
- 88815b8 oxfmt: Reintroduce stats line for write mode (#19938)
(leaysgur)

### 🐛 Bug Fixes

- ee0491e apps,napi: Explicitly specify libs in tsconfigs (#20071)
(camc314)
- 92f4490 oxfmt: Apply `is_ignored_dir` for glob paths too (#20056)
(leaysgur)
- 114f974 oxfmt/lsp: Prefer language_id over file extension when
formatting (#19977) (copilot-swe-agent)

### ⚡ Performance

- 2baa5fb napi: Unify build-test profile to coverage for cache sharing
(#20090) (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-enhancement Category - New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants