Disable FOW for all ssr:false and tighten up spa mode logic #12894
Conversation
This file contains 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
🦋 Changeset detectedLatest commit: f99370d The changes in this PR will be included in the next version bump. This PR includes changesets to release 11 packages
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 |
brophdawg11
commented
Jan 29, 2025
| @@ -1402,7 +1401,7 @@ export const reactRouterVitePlugin: ReactRouterVitePlugin = () => { | |||
| let route = getRoute(ctx.reactRouterConfig, id); | |||
| if (!route) return; | |||
|
|
|||
| if (!options?.ssr && !ctx.reactRouterConfig.ssr) { | |||
| if (!options?.ssr && isSpaModeEnabled(ctx.reactRouterConfig)) { | |||
There was a problem hiding this comment.
Only reject server-only exports in true SPA mode
brophdawg11
commented
Jan 29, 2025
| reactRouterConfig.prerender.length === 1 && | ||
| reactRouterConfig.prerender[0] === "/")) | ||
| ); | ||
| } |
There was a problem hiding this comment.
This is the proper detection, the old buggy one was simply:
!ctx.reactRouterConfig.ssr && ctx.reactRouterConfig.prerender == null
brophdawg11
commented
Jan 29, 2025
| @@ -1908,13 +1920,6 @@ async function handlePrerender( | |||
| ); | |||
| } | |||
| } | |||
|
|
|||
| await prerenderManifest( | |||
There was a problem hiding this comment.
Never need to prerender a manifest anymore
ssr: truewill handle the manifest via the server handlerssr: falsewill not have fog of war enabled
brophdawg11
commented
Jan 29, 2025
| export function isFogOfWarEnabled(isSpaMode: boolean) { | ||
| return !isSpaMode; | ||
| export function isFogOfWarEnabled(ssr: boolean) { | ||
| return ssr === true; |
There was a problem hiding this comment.
Only enable fog of war for ssr:true apps
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.
Fixes a few
ssr/prerenderbugs found during testing:ssr: falseapps so we don't make any assumptions about the static file server's ability to serve__manifestand deal with search paramsprerender- this has been fixed up so that SPA mode is now properly detected asssr:falseand prerendeing the root route (/) and nothing elsessr: falseand a more advanced prerender config is for advanced use cases - this unlocks the ability to run loaders during the build as well as render down past the rot route for prerendered pages