Skip to content

Potentially update local config on wrangler deploy --x-remote-diff-check invocations - #11033

Merged
dario-piotrowicz merged 3 commits into
mainfrom
dario/10894/remote-diff-conflict-patch-local-config
Oct 31, 2025
Merged

Potentially update local config on wrangler deploy --x-remote-diff-check invocations#11033
dario-piotrowicz merged 3 commits into
mainfrom
dario/10894/remote-diff-conflict-patch-local-config

Conversation

@dario-piotrowicz

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

Copy link
Copy Markdown
Member

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

changeset-bot Bot commented Oct 20, 2025

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: a84053b

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

pkg-pr-new Bot commented Oct 20, 2025

Copy link
Copy Markdown
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

@cloudflare/workers-utils

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

wrangler

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

commit: a84053b

@dario-piotrowicz
dario-piotrowicz force-pushed the dario/10894/remote-diff-conflict-patch-local-config branch 2 times, most recently 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

@petebacondarwin petebacondarwin left a comment

Copy link
Copy Markdown
Contributor

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.

Comment thread .changeset/cyan-tools-show.md Outdated
Comment thread .changeset/cyan-tools-show.md Outdated
Comment thread .changeset/cyan-tools-show.md
Comment thread packages/wrangler/src/deploy/deploy.ts Outdated
@github-project-automation github-project-automation Bot moved this from Untriaged to Approved in workers-sdk Oct 24, 2025
@github-actions

Copy link
Copy Markdown
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 force-pushed the dario/10894/remote-diff-conflict-patch-local-config branch from d8b6378 to a84053b Compare October 31, 2025 11:56
@dario-piotrowicz
dario-piotrowicz merged commit 77ed7e2 into main Oct 31, 2025
48 of 52 checks passed
@dario-piotrowicz
dario-piotrowicz deleted the dario/10894/remote-diff-conflict-patch-local-config branch October 31, 2025 17:53
@github-project-automation github-project-automation Bot moved this from Approved to Done in workers-sdk Oct 31, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

3 participants