fix: sort css by sourceorder, esm import comes first#12778
Merged
Conversation
Ensure dependencies with None source_order are placed after Some, preserving their relative order.
✅ Deploy Preview for rspack canceled.
|
github-actions
bot
added
release: bug fix
JSerFeng
force-pushed
the
vk/3359-css-sourceorder
branch
from
a70197d to
a9e7615
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
This PR aims to fix CSS source order issues when mixing ESM import statements with CommonJS require() calls. The change modifies the dependency sorting logic in the chunk graph builder to ensure proper ordering of CSS modules regardless of how they're imported.
Changes:
- Modified dependency sorting in
code_splitter.rsto sort by whethersource_order()exists - Added test case verifying CSS cascade order with mixed ESM/CJS imports
- Added CSS files for the test case
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
crates/rspack_core/src/compilation/build_chunk_graph/code_splitter.rs |
Modified dependency sorting to use tuple key (is_none, source_order) instead of just source_order |
tests/rspack-test/configCases/css/mixed-import-require/index.js |
Test file importing CSS via ESM and CJS, expecting red color to win in CSS cascade |
tests/rspack-test/configCases/css/mixed-import-require/style1.css |
CSS file setting body color to red, imported via ESM |
tests/rspack-test/configCases/css/mixed-import-require/style2.css |
CSS file setting body color to blue, imported via CJS |
tests/rspack-test/configCases/css/mixed-import-require/rspack.config.js |
Test configuration enabling CSS experiments |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
JSerFeng
changed the title
Contributor
Rsdoctor Bundle Diff AnalysisFound 5 projects in monorepo, 0 projects with changes. 📊 Quick Summary
Generated by Rsdoctor GitHub Action |
Contributor
📦 Binary Size-limit
❌ Size increased by 2.63KB from 47.99MB to 48.00MB (⬆️0.01%) |
JSerFeng
force-pushed
the
vk/3359-css-sourceorder
branch
from
a9e7615 to
36e1f02
Compare
CodSpeed Performance ReportMerging this PR will not alter performanceComparing Summary
Footnotes
|
ahabhgk
approved these changes
Jan 19, 2026
This was referenced Jan 19, 2026
LingyuCoder
pushed a commit
that referenced
this pull request
Jan 21, 2026
* fix(core): correct dependency sorting by source_order Ensure dependencies with None source_order are placed after Some, preserving their relative order. * test: add test case for css source order with mixed import and require
chenjiahan
pushed a commit
that referenced
this pull request
Jan 21, 2026
* fix(core): correct dependency sorting by source_order Ensure dependencies with None source_order are placed after Some, preserving their relative order. * test: add test case for css source order with mixed import and require
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
close #12765
buildChunkGraph will set preOrderIndex for each module. Each module is sorted by importer dependency's source_order. ESMImportSpecifierDependency's source_order returns Some while CommonjsRequireDependency returns None.
Sort ESM dependencies' order and make sure ESM dependencies always comes before CJS dependencies
Related links
Checklist