Skip to content

Conversation

@dario-piotrowicz
Copy link
Member

@dario-piotrowicz dario-piotrowicz commented Oct 20, 2025

Addresses #10894 but without including cases when environments are used, such cases are tricky (because the diffing logic needs to understand inheritance and related nuanes) and I figured I'd deal with them in a followup PR.

Basically this PR adds the option to update a config file on wrangler deploy --x-remote-diff-check invocations:
Screenshot 2025-10-21 at 14 58 23


  • Tests
    • Tests included
    • Tests not necessary because:
  • Public documentation
    • Cloudflare docs PR(s):
    • Documentation not necessary because: DX improvement, no documentation needed
  • Wrangler V3 Backport
    • Wrangler PR:
    • Not necessary because: not a v3 feature

@changeset-bot
Copy link

changeset-bot bot commented Oct 20, 2025

🦋 Changeset detected

Latest commit: d8b6378

The changes in this PR will be included in the next version bump.

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@pkg-pr-new
Copy link

pkg-pr-new bot commented Oct 20, 2025

create-cloudflare

npm i https://pkg.pr.new/create-cloudflare@11033

@cloudflare/kv-asset-handler

npm i https://pkg.pr.new/@cloudflare/kv-asset-handler@11033

miniflare

npm i https://pkg.pr.new/miniflare@11033

@cloudflare/pages-shared

npm i https://pkg.pr.new/@cloudflare/pages-shared@11033

@cloudflare/unenv-preset

npm i https://pkg.pr.new/@cloudflare/unenv-preset@11033

@cloudflare/vite-plugin

npm i https://pkg.pr.new/@cloudflare/vite-plugin@11033

@cloudflare/vitest-pool-workers

npm i https://pkg.pr.new/@cloudflare/vitest-pool-workers@11033

@cloudflare/workers-editor-shared

npm i https://pkg.pr.new/@cloudflare/workers-editor-shared@11033

wrangler

npm i https://pkg.pr.new/wrangler@11033

commit: d8b6378

@dario-piotrowicz dario-piotrowicz force-pushed the dario/10894/remote-diff-conflict-patch-local-config branch from c8ab048 to 890f0aa Compare October 20, 2025 18:20
@dario-piotrowicz dario-piotrowicz force-pushed the dario/10894/remote-diff-conflict-patch-local-config branch from 890f0aa to fe7ceba Compare October 21, 2025 11:10
@dario-piotrowicz dario-piotrowicz marked this pull request as ready for review October 21, 2025 12:28
@dario-piotrowicz dario-piotrowicz requested a review from a team as a code owner October 21, 2025 12:28
Copy link
Contributor

@petebacondarwin petebacondarwin left a comment

Choose a reason for hiding this comment

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

Love it. Just some notes on the wording.

@@ -0,0 +1,7 @@
---
"wrangler": patch
Copy link
Contributor

Choose a reason for hiding this comment

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

In the future (if we change our approach to experimental semvers) this could be minor

Copy link
Member Author

Choose a reason for hiding this comment

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

right 🤔

I am happy to change it if we want 🙂

// (the best we can) here
!targetingEnvironment &&
(await confirm(
"Would you like to update the local config file with the conflicting remote values?",
Copy link
Contributor

Choose a reason for hiding this comment

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

Conflicting seems a bit of a strong word here?

Copy link
Member Author

Choose a reason for hiding this comment

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

mh.... yeah I see what you mean...

What about just removing it? is Would you like to update the local config file with the remote values? clear? 🤔

@github-project-automation github-project-automation bot moved this from Untriaged to Approved in workers-sdk Oct 24, 2025
Co-authored-by: Pete Bacon Darwin <[email protected]>
@github-actions
Copy link
Contributor

Failed to automatically backport this PR's changes to Wrangler v3. Please manually create a PR targeting the v3-maintenance branch with your changes. Thank you for helping us keep Wrangler v3 supported!

Depending on your changes, running git rebase --onto v3-maintenance main dario/10894/remote-diff-conflict-patch-local-config might be a good starting point.

Notes:

  • your PR branch should be named v3-backport-11033
  • add the skip-v3-pr label to the current PR to stop this workflow from failing

@dario-piotrowicz dario-piotrowicz added the skip-v3-pr Skip validation of presence of a v3 backport PR label Oct 24, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

skip-v3-pr Skip validation of presence of a v3 backport PR

Projects

Status: Approved

Development

Successfully merging this pull request may close these issues.

2 participants