Repository navigation
fix(@schematics/angular): include the SSR entry file in the trust-proxy-headers migration - #34513
Merged
alan-agius4 merged 1 commit intoOct 26, 2026
Conversation
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request updates the trust-proxy-headers migration to include the ssr.entry file when configuring proxy headers. The review identified that the current implementation fails when the ssr option is set to the boolean true instead of an object, and suggested handling this case explicitly. Additionally, a new test case was requested to ensure the migration correctly handles the ssr: true configuration.
alan-agius4
self-requested a review
October 23, 2026 20:10
alan-agius4
added
action: review
alan-agius4
approved these changes
Oct 26, 2026
alan-agius4
added
action: merge
alan-agius4
force-pushed
the
trust-proxy-migration-ssr-entry
branch
from
October 26, 2026 09:02
3c59e3b to
10af305
Compare
…xy-headers migration migration collected only `build.options.server`, which in application builder projects is `src/main.server.ts`, while `AngularNodeAppEngine` is created in `ssr.entry` file (`src/server.ts`) so on default SSR workspace it made no changes and after update app stoped trusting `X-Forwarded-Host` and `X-Forwarded-Proto`, now `ssr.entry` file is collected too
alan-agius4
force-pushed
the
trust-proxy-migration-ssr-entry
branch
from
October 26, 2026 10:28
10af305 to
d1df453
Compare
Collaborator
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR Checklist
PR Type
What is the current behavior?
Issue Number: N/A
trust-proxy-headersmigration collects onlyserveroption ofbuildtargetIn workspace created by
ng new --ssron 21 that option issrc/main.server.ts, andnew AngularNodeAppEngine()is insrc/server.ts, which is set inssr.entrySo
ng updatefrom 21 printsMigration completed (No changes made)for this migration andsrc/server.tskeepsnew AngularNodeAppEngine()without optionsOn 21 undefined
trustProxyHeaderstrustedx-forwarded-hostandx-forwarded-proto, on 22 it trusts nothing (#32911), so after update default SSR app stops trusting these headers and only logs warning when they arrive, which is exactly what migration was ment to avoidExisting spec cases pass only because test workspace has
server: '/server.ts',ng newdoes not create that layoutWhat is the new behavior?
Migration also collects
ssr.entryfile frombuildtarget options and configurations,serveris still collected for other layoutsOn default SSR workspace
src/server.tsgets TODO comment andtrustProxyHeaders: ['x-forwarded-host', 'x-forwarded-proto'],src/main.server.tsis left as isNew case in
migration_spec.tsuses real layout (server: 'src/main.server.ts',ssr.entry: 'src/server.ts'), it fails on mainDoes this PR introduce a breaking change?
Other information
Workspaces that already went to 22 can run it again once they are on release with this fix: