Skip to content

Merge main into branch and resolve conflicts #7803

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.

Sign up for GitHub

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

Jump to bottom
Draft
Copilot wants to merge 139 commits into
base: keanualoua/ex-536-use-imagehandler-from-netlifyimages
Choose a base branch
from
Draft

Merge main into branch and resolve conflicts #7803

Copilot wants to merge 139 commits into from
+19,578 −31,401

Conversation

Copy link

Copilot AI commented Nov 27, 2025 •
edited
Loading

🎉 Thanks for submitting a pull request! 🎉

Summary

Merged main branch into copilot/sub-pr-7584 to incorporate latest upstream changes.

Resolved merge conflicts between image handling refactor (using @netlify/images) and AI Gateway feature additions:

  • src/utils/proxy.ts: Combined imports - preserved both ImageHandler from @netlify/images and AIGatewayContext from @netlify/ai/bootstrap
  • package-lock.json: Regenerated lockfile via npm install to merge dependency trees from both branches

For us to review and ship your PR efficiently, please perform the following steps:

  • Open a bug/issue before writing your code 🧑‍💻. This ensures we can discuss the changes and get feedback from everyone that should be involved. If you're fixing a typo or something that's on fire 🔥 (e.g. incident related), you can skip this step.
  • Read the contribution guidelines 📖. This ensures your code follows our style guide and
    passes our tests.
  • Update or add tests (if any source code was changed or added) 🧪
  • Update or add documentation (if features were changed or added) 📝
  • Make sure the status checks below are successful ✅

A picture of a cute animal (not mandatory, but encouraged)

✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.

VaibhavAcharya and others added 30 commits September 18, 2025 19:52
@VaibhavAcharya
feat: add --draft flag to deploy command (#7626)
a1186e0 
* feat: add --draft flag to deploy cmd in CLI

* fix: add --alias test
@token-generator-app
chore(main): release 23.6.0 (#7627)
961abee 
Co-authored-by: token-generator-app[bot] <82042599+token-generator-app[bot]@users.noreply.github.com>
@kathmbeck
feat: support ai gateway (#7609)
efb5a3f 
* feat: initial ai gateway support

* fix: clean up duplication

* fix: extract func

* fix: format and lint errors

* use new ai gateway package and tests

* cleanup

* update to use new package

* use ai published package

* format/types

* chaining

* lint

* ignore rule

* feedback

* remove dev log

* Remove unused import
@ndhoule
fix: use env from cachedConfig when offlineEnv is set
e0648b8 
This changeset modifies the `dev` command's behavior when the
`--offlineEnv` command is set: Previously, passing `offlineEnv` would
ignore any environment variable data from the cached configuration
file by setting `env` data to an empty object before passing it around.
The unintended consequence of this is that environment variable data
set via the config file is ignored when running Preview Servers.
Environment variable data is not passed to edge functions, and only
build-time variables are passed to functions.

With this change, we'll only default to an empty object when
`cachedConfig.env` is not set. (I don't know if this is a realistic
scenario, but I'm doing it this way to lower the risk of this change.)
@token-generator-app @ndhoule
chore(main): release 23.7.0
fa87407
@ndhoule
fix: add missing @netlify/edge-functions-bootstrap dependency
5dfbd07 
This was moved to a dev dep in efb5a3f, but is still relied on at runtime.
@token-generator-app @ndhoule
chore(main): release 23.7.1
28de6c7
@VaibhavAcharya @kodiakhq
fix: zip based deploys ignore pattern and subdir case (#7636)
d547ef8 
* fix: zip based deploys ignore pattern and subdir case

* fix: typescript issue

* fix: move mkdir to async

* fix: windows tests

---------

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
@renovate @kodiakhq
fix(deps): update dependency raw-body to v3.0.1 (#7635)
0a42f12 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
@renovate @kodiakhq
chore(website): update dependency sharp to v0.34.4 (#7631)
883107f 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
@renovate @keanu-a @kodiakhq
fix(deps): update dependency ansi-escapes to v7.1.1 (#7638)
e121296 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Keanu Aloua <71466438+keanu-a@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
@renovate @kodiakhq
fix(deps): update dependency chalk to v5.6.2 (#7632)
18e9861 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
@renovate @kodiakhq
chore(deps): update thebinaryfelix/check-file-existence-action action…
ce9d91c 
… to v1.0.1 (#7630)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
@renovate @pieh
fix(deps): update netlify packages (#7643)
d88bbbb 
* fix(deps): update netlify packages

* fix: adjust types after upstream fix

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michal Piechowiak <misiek.piechowiak@gmail.com>
@renovate @kodiakhq
fix(deps): update dependency dotenv to v17.2.2 (#7634)
574153e 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
@token-generator-app
chore(main): release 23.7.2 (#7642)
2c3b3cf 
Co-authored-by: token-generator-app[bot] <82042599+token-generator-app[bot]@users.noreply.github.com>
@renovate @kodiakhq
chore(deps): update dependency @vitest/eslint-plugin to v1.3.12 (#7629)
7c1de03 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
@VitaliyR
fix: support non interactive tty when deploying (#7640)
1e7fc92
@renovate @kodiakhq
chore(website): update dependency @netlify/functions to v4.2.6 (#7645)
83b5784 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
@renovate
fix(deps): update dependency @netlify/blobs to v10.0.11 (#7647)
47e14cd 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@eduardoboucas
fix: show deploy errors when --json is used (#7649)
76c3009
@token-generator-app
chore(main): release 23.7.3 (#7646)
382c579 
Co-authored-by: token-generator-app[bot] <82042599+token-generator-app[bot]@users.noreply.github.com>
@renovate @kodiakhq
fix(deps): update dependency @netlify/dev-utils to v4.2.0 (#7648)
9c03ac7 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
@renovate
fix(deps): update dependency @netlify/edge-functions to v2.18.1 (#7624)
f7986e6 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate @kodiakhq
chore(website): update dependency strip-ansi to v7.1.2 (#7619)
689c681 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
@renovate
chore(website): update dependency astro to v5.13.11 (#7618)
ea0f568 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(website): update dependency tsx to v4.20.5 (#7652)
be24df7 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency @types/node to v22.18.6 (#7653)
e2fd25a 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@kathmbeck
feat: support ai gateway for local edge functions (#7637)
0349686 
* feat: support ai gateway for local edge functions

* update to published dep

* package lock
@dependabot
chore(deps): bump next (#7603)
ba3f6c1 
Bumps [next](https://github.com/vercel/next.js) from 14.2.26 to 14.2.32.
- [Release notes](https://github.com/vercel/next.js/releases)
- [Changelog](https://github.com/vercel/next.js/blob/canary/release.js)
- [Commits](vercel/next.js@v14.2.26...v14.2.32)

---
updated-dependencies:
- dependency-name: next
  dependency-version: 14.2.32
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
renovate bot and others added 21 commits November 25, 2025 11:24
@renovate
fix(deps): update netlify packages (#7792)
95c9daa 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate @kodiakhq
chore(website): update dependency astro to v5.15.6 [security] (#7775)
8fa098d 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
@renovate
chore(website): update dependency astro to v5.15.9 [security] (#7793)
3b1c797 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update actions/setup-node action to v6 (#7749)
c0b4a41 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate @eduardoboucas
fix(deps): update dependency @netlify/build to v35.5.2 (#7795)
f027183 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Eduardo Bouças <mail@eduardoboucas.com>
@renovate
chore(deps): update actions/upload-artifact action to v5 (#7788)
d619104 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@eduardoboucas
feat: support skew protection token (#7796)
64c3c72 
* feat: support skew protection token

* chore: remove claude file

* refactor: move options to `getRunBuildOptions`
@renovate
chore(deps): update dependency deno to v2 (#7797)
5aa6b58 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate @kodiakhq
chore(deps): update dependency @netlify/types to v2.2.0 (#7789)
5826474 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
@renovate
fix(deps): update dependency @netlify/functions to v5 (#7726)
b4e3777 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(website): update dependency @netlify/functions to v5 (#7724)
df51b4d 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
fix(deps): update dependency @netlify/ai to v0.3.3 (#7739)
8f3c275 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@token-generator-app
chore(main): release 23.12.0 (#7784)
237c3bc 
Co-authored-by: token-generator-app[bot] <82042599+token-generator-app[bot]@users.noreply.github.com>
@serhalp @ndhoule
fix(npm-shrinkwrap.json): update lockfile
c0268cb 
The lockfile (which becomes `npm-shrinkwrap.json` in the published package) is out of sync. I just
ran `npm i` with the expected npm version (10) and this is the result.
@serhalp @ndhoule
ci: downgrade to npm@10 when publishing and updating deps
9e4d0ea
@serhalp @ndhoule
test: run npm ci in a project depending on netlify-cli
60b8a1c
@token-generator-app
chore(main): release 23.12.1 (#7801)
47eb885 
Co-authored-by: token-generator-app[bot] <82042599+token-generator-app[bot]@users.noreply.github.com>
@serhalp @ndhoule
ci(e2e): let corepack manage package managers
49f8ce8
@serhalp @ndhoule
test(e2e): actually log child proc output on failure
c92f9b0
@serhalp @ndhoule
build: add missing packageManager field to package.json
41c2ae8 
This is especially important as there are significant bugs in npm 11 at the moment.
Initial plan
b0ce989
Copilot AI mentioned this pull request Nov 27, 2025
Open
5 tasks
Merge remote-tracking branch 'origin/main' into copilot/sub-pr-7584
08d3edb 
# Conflicts:
#	package-lock.json
#	src/utils/proxy.ts
Copy link
Author

Copilot AI commented Nov 27, 2025

Just as a heads up, I was blocked by some firewall rules while working on your feedback. Expand below for details.

Warning

Firewall rules blocked me from connecting to one or more addresses (expand for details)

I tried to connect to the following addresses, but was blocked by firewall rules:

  • https://api.github.com//advisories
    • Triggering command: /home/REDACTED/work/_temp/ghcca-node/node/bin/node /home/REDACTED/work/_temp/ghcca-node/node/bin/node --enable-source-maps /home/REDACTED/work/_temp/copilot-developer-action-main/dist/index.js (http block)

If you need me to access, download, or install something from one of these locations, you can either:

Copilot AI changed the title [WIP] Fix refactor image handling to use @netlify/images Merge main into branch and resolve conflicts Nov 27, 2025
Copilot AI requested a review from serhalp November 27, 2025 19:27
Copilot finished work on behalf of serhalp November 27, 2025 19:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@serhalp serhalp Awaiting requested review from serhalp

Assignees

@serhalp serhalp

Copilot code review Copilot

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.