Skip to content
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.

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

Reverse module deconflicting order #3977

merged 2 commits into from Feb 26, 2021


Copy link

@lukastaegert lukastaegert commented Feb 26, 2021

This PR contains:

  • bugfix
  • feature
  • refactor
  • documentation
  • other

Are tests included?

  • yes (bugfixes and features will not be merged without tests)
  • no

Breaking Changes?

  • yes (breaking changes will not be merged unless absolutely necessary)
  • no

List any relevant issue numbers:
Resolves #3975


This will reverse the order in which modules are deconflicted in each chunk. The rationale is that modules that are later in the execution order are more likely to be created by the current user as opposed to being part of dependencies, and that names in user modules are more important to maintain than names in dependencies.

Copy link

@rollup-bot rollup-bot commented Feb 26, 2021

Thank you for your contribution! ❤️

You can try out this pull request locally by installing Rollup via

npm install rollup/rollup#gh-3975_reverse_deconflicting_order

or load it into the REPL:

Copy link

@codecov codecov bot commented Feb 26, 2021

Codecov Report

Merging #3977 (a7b1b69) into master (85304f2) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #3977   +/-   ##
  Coverage   97.21%   97.21%           
  Files         191      191           
  Lines        6708     6709    +1     
  Branches     1962     1962           
+ Hits         6521     6522    +1     
  Misses         99       99           
  Partials       88       88           
Impacted Files Coverage Δ
src/utils/deconflictChunk.ts 100.00% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 85304f2...a7b1b69. Read the comment docs.

@lukastaegert lukastaegert merged commit b254672 into master Feb 26, 2021
9 checks passed
9 checks passed
14 (Windows)
12 (Windows)
10 (Windows)
ci/circleci: analysis Your tests passed on CircleCI!
ci/circleci: node-v10-latest Your tests passed on CircleCI!
ci/circleci: node-v12-latest Your tests passed on CircleCI!
ci/circleci: node-v14-latest Your tests passed on CircleCI!
codecov/patch 100.00% of diff hit (target 97.21%)
codecov/project 97.21% (+0.00%) compared to 85304f2
@lukastaegert lukastaegert deleted the gh-3975_reverse_deconflicting_order branch Feb 26, 2021
This was referenced Mar 6, 2021
This was referenced Mar 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
None yet
None yet
Linked issues

Successfully merging this pull request may close these issues.

2 participants