Skip to content

Commit d99398a

Browse files
committed
add comments, add prop deletion back
1 parent ab14efa commit d99398a

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

packages/next/shared/lib/dynamic.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,15 @@ export default function dynamic<P = {}>(
134134
...loadableOptions,
135135
...loadableOptions.loadableGenerated,
136136
}
137+
delete loadableOptions.loadableGenerated
137138
}
138139

139140
// support for disabling server side rendering, eg: dynamic(import('../hello-world'), {ssr: false})
140-
if (loadableOptions.ssr === false) {
141-
return noSSR(loadableFn, loadableOptions)
141+
if (typeof loadableOptions.ssr === 'boolean') {
142+
if (!loadableOptions.ssr) {
143+
return noSSR(loadableFn, loadableOptions)
144+
}
145+
delete loadableOptions.ssr
142146
}
143147

144148
return loadableFn(loadableOptions)

test/integration/react-18/app/pages/suspense/no-preload.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ import dynamic from 'next/dynamic'
33

44
const Bar = dynamic(() => import('../../components/bar'), {
55
suspense: true,
6+
// Explicitly declare loaded modules.
7+
// For suspense cases, they'll be ignored.
8+
// For loadable component cases, they'll be handled
69
loadableGenerated: {
710
modules: ['../../components/bar'],
811
webpack: [require.resolveWeak('../../components/bar')],

0 commit comments

Comments
 (0)