Skip to content
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

feat(app-router): introduce experimental.missingSuspenseWithCSRBailout flag #57642

Merged
merged 46 commits into from
Jan 9, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
3477c76
throw throw
feedthejim Oct 27, 2023
7471322
update copy
feedthejim Oct 30, 2023
1a4c1ee
Merge remote-tracking branch 'origin/canary' into feedthejim/forbid-n…
feedthejim Nov 1, 2023
c561de7
update test
feedthejim Nov 1, 2023
380b5ee
update test
feedthejim Nov 1, 2023
570b3e5
Merge remote-tracking branch 'origin/canary' into feedthejim/forbid-n…
feedthejim Nov 1, 2023
edd6c57
cleanup
feedthejim Nov 1, 2023
c6e3cae
cleanup
feedthejim Nov 1, 2023
8f9c91f
fix test
feedthejim Nov 1, 2023
2aa2dd9
fix test
feedthejim Nov 1, 2023
424e989
Merge branch 'canary' into feedthejim/forbid-no-suspense
feedthejim Nov 9, 2023
ccda2d4
update snapshot
feedthejim Nov 9, 2023
8e87709
Merge branch 'canary' into feedthejim/forbid-no-suspense
balazsorban44 Jan 4, 2024
f43c5dd
add experimental flag
balazsorban44 Jan 4, 2024
fe5493b
refactor: unify naming of bailout to client rendering error
balazsorban44 Jan 4, 2024
e2a1f9b
improve types
balazsorban44 Jan 4, 2024
0305f84
fix config types, pass flag
balazsorban44 Jan 4, 2024
efb256b
update test
balazsorban44 Jan 4, 2024
1d2caa7
update test
balazsorban44 Jan 4, 2024
63cd1ff
update test
balazsorban44 Jan 4, 2024
907ea98
fix test
balazsorban44 Jan 4, 2024
9657d17
Merge branch 'canary' into feedthejim/forbid-no-suspense
balazsorban44 Jan 4, 2024
5b27bf3
fix types
balazsorban44 Jan 4, 2024
7468cff
update snapshot
balazsorban44 Jan 4, 2024
7b7a682
drop .only from test
balazsorban44 Jan 4, 2024
6671b1f
update more snapshots
balazsorban44 Jan 4, 2024
8b0bce5
make bailout to csr error/message generic
balazsorban44 Jan 4, 2024
7989a55
refactor test
balazsorban44 Jan 4, 2024
5c5d0a1
Merge branch 'canary' into feedthejim/forbid-no-suspense
balazsorban44 Jan 4, 2024
8a26e56
cleanup loadable
balazsorban44 Jan 4, 2024
cce3e7b
Merge branch 'canary' into feedthejim/forbid-no-suspense
balazsorban44 Jan 4, 2024
6303f79
merge canary
balazsorban44 Jan 5, 2024
bf8f54f
revert some changes
balazsorban44 Jan 5, 2024
62c1c2d
revert
balazsorban44 Jan 5, 2024
4cc219a
better type loadable
balazsorban44 Jan 5, 2024
b0decbc
fix type
balazsorban44 Jan 5, 2024
6e92419
don't print bailtout to csr error during prerender
balazsorban44 Jan 5, 2024
f53bcc0
tweak log formatting
balazsorban44 Jan 5, 2024
4413664
fix lint
balazsorban44 Jan 5, 2024
e29f219
add error page
balazsorban44 Jan 5, 2024
3a515d5
fix: switch to native fs, skip next start for test
wyattjoh Jan 5, 2024
6b5ef5d
Merge branch 'canary' into feedthejim/forbid-no-suspense
balazsorban44 Jan 8, 2024
faa9faf
fix test
balazsorban44 Jan 8, 2024
d042d48
add comment to address review
balazsorban44 Jan 9, 2024
bbbcf7c
Merge branch 'canary' into feedthejim/forbid-no-suspense
balazsorban44 Jan 9, 2024
2c08aa2
fix build
balazsorban44 Jan 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions packages/next/src/export/helpers/is-dynamic-usage-error.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import { DYNAMIC_ERROR_CODE } from '../../client/components/hooks-server-context'
import { isNotFoundError } from '../../client/components/not-found'
import { isRedirectError } from '../../client/components/redirect'
import { NEXT_DYNAMIC_NO_SSR_CODE } from '../../shared/lib/lazy-dynamic/no-ssr-error'

export const isDynamicUsageError = (err: any) =>
err.digest === DYNAMIC_ERROR_CODE ||
isNotFoundError(err) ||
err.digest === NEXT_DYNAMIC_NO_SSR_CODE ||
isRedirectError(err) ||
// TODO: (wyattjoh) remove once we bump react
err.$$typeof === Symbol.for('react.postpone')
5 changes: 3 additions & 2 deletions packages/next/src/server/app-render/app-render.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ import { validateURL } from './validate-url'
import { createFlightRouterStateFromLoaderTree } from './create-flight-router-state-from-loader-tree'
import { handleAction } from './action-handler'
import { NEXT_DYNAMIC_NO_SSR_CODE } from '../../shared/lib/lazy-dynamic/no-ssr-error'
import { warn } from '../../build/output/log'
import { error } from '../../build/output/log'
import { appendMutableCookies } from '../web/spec-extension/adapters/request-cookies'
import { createServerInsertedHTML } from './server-inserted-html'
import { getRequiredScripts } from './required-scripts'
Expand Down Expand Up @@ -788,10 +788,11 @@ async function renderToHTMLOrFlightImpl(
}

if (err.digest === NEXT_DYNAMIC_NO_SSR_CODE) {
warn(
err(
`Entire page ${pagePath} deopted into client-side rendering. https://nextjs.org/docs/messages/deopted-into-client-rendering`,
pagePath
)
feedthejim marked this conversation as resolved.
Show resolved Hide resolved
throw err
}

if (isNotFoundError(err)) {
Expand Down
Loading