Skip to content

Conversation

renovate[bot]
Copy link
Contributor

@renovate renovate bot commented Nov 22, 2021

WhiteSource Renovate

This PR contains the following updates:

Package Change Age Adoption Passing Confidence
webpack 5.64.0 -> 5.64.2 age adoption passing confidence

Release Notes

webpack/webpack

v5.64.2

Compare Source

Bugfixes

  • avoid double initial compilation due to invalid dependencies with managedPaths

v5.64.1

Compare Source

Bugfixes

  • fix regexp in managedPaths to exclude additional slash
  • make module.accept errorHandler optional in typings
  • correctly create an async chunk when using a require(...).property in require.ensure
  • fix cleaning of symlinks in output.clean: true
  • fix change detection with unsafeCache within managedPaths (node_modules)
  • bump webpack-sources for Stack Overflow bugfix

Configuration

📅 Schedule: "before 3am on Monday" (UTC).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update again.


  • If you want to rebase/retry this PR, click this checkbox.

This PR has been generated by WhiteSource Renovate. View repository job log here.

@renovate renovate bot requested a review from locks November 22, 2021 01:38
@Turbo87
Copy link
Member

Turbo87 commented Nov 22, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Nov 22, 2021

📌 Commit ab5e335 has been approved by Turbo87

@bors
Copy link
Contributor

bors commented Nov 22, 2021

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout renovate/webpack-5.x (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self renovate/webpack-5.x --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
Auto-merging yarn.lock
CONFLICT (content): Merge conflict in yarn.lock
Automatic merge failed; fix conflicts and then commit the result.

@bors
Copy link
Contributor

bors commented Nov 22, 2021

☔ The latest upstream changes (presumably #4203) made this pull request unmergeable. Please resolve the merge conflicts.

@renovate renovate bot force-pushed the renovate/webpack-5.x branch from ab5e335 to b9cf2b2 Compare November 22, 2021 12:26
@Turbo87
Copy link
Member

Turbo87 commented Nov 22, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Nov 22, 2021

📌 Commit b9cf2b2 has been approved by Turbo87

@bors
Copy link
Contributor

bors commented Nov 22, 2021

⌛ Testing commit b9cf2b2 with merge baf9b5b...

@bors
Copy link
Contributor

bors commented Nov 22, 2021

☀️ Test successful - checks-actions
Approved by: Turbo87
Pushing baf9b5b to master...

@bors bors merged commit baf9b5b into master Nov 22, 2021
@renovate renovate bot deleted the renovate/webpack-5.x branch November 22, 2021 13:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants