-
Notifications
You must be signed in to change notification settings - Fork 11.9k
feat(@angular/ssr): introduce DI token to signal route discovery process #32491
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.
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
Open
alan-agius4
wants to merge
1
commit into
angular:main
Choose a base branch
from
alan-agius4:route-extractor
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,6 +11,7 @@ import { | |
| ApplicationRef, | ||
| Compiler, | ||
| EnvironmentInjector, | ||
| InjectionToken, | ||
| Injector, | ||
| createEnvironmentInjector, | ||
| runInInjectionContext, | ||
|
|
@@ -23,6 +24,7 @@ import { | |
| Router, | ||
| ɵloadChildren as loadChildrenHelper, | ||
| } from '@angular/router'; | ||
|
|
||
| import { ServerAssets } from '../assets'; | ||
| import { Console } from '../console'; | ||
| import { AngularAppManifest, getAngularAppManifest } from '../manifest'; | ||
|
|
@@ -39,6 +41,16 @@ import { | |
| } from './route-config'; | ||
| import { RouteTree, RouteTreeNodeMetadata } from './route-tree'; | ||
|
|
||
| /** | ||
| * A DI token that indicates whether the application is in the process of discovering routes. | ||
| * | ||
| * This token is provided with the value `true` when route discovery is active, allowing other | ||
| * parts of the application to conditionally execute logic. For example, it can be used to | ||
| * disable features or behaviors that are not necessary or might interfere with the route | ||
| * discovery process. | ||
| */ | ||
| export const DURING_ROUTE_DISCOVERY = new InjectionToken<boolean>('DURING_ROUTE_DISCOVERY'); | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Consider: The naming feels a little awkward to me to start with "during". I wonder if |
||
|
|
||
| interface Route extends AngularRoute { | ||
| ɵentryName?: string; | ||
| } | ||
|
|
@@ -623,6 +635,10 @@ export async function getRoutesFromAngularRouterConfig( | |
| provide: ɵENABLE_ROOT_COMPONENT_BOOTSTRAP, | ||
| useValue: false, | ||
| }, | ||
| { | ||
| provide: DURING_ROUTE_DISCOVERY, | ||
| useValue: true, | ||
| }, | ||
| ]); | ||
|
|
||
| try { | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this have a default value? As this will run in browser mode too I guess ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ohhh. Good catch.