add comments, add prop deletion back

vercel · Aug 13, 2021 · d99398a · d99398a
1 parent ab14efa
commit d99398a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/packages/next/shared/lib/dynamic.tsx b/packages/next/shared/lib/dynamic.tsx
@@ -134,11 +134,15 @@ export default function dynamic<P = {}>(
       ...loadableOptions,
       ...loadableOptions.loadableGenerated,
     }
+    delete loadableOptions.loadableGenerated
   }
 
   // support for disabling server side rendering, eg: dynamic(import('../hello-world'), {ssr: false})
-  if (loadableOptions.ssr === false) {
-    return noSSR(loadableFn, loadableOptions)
+  if (typeof loadableOptions.ssr === 'boolean') {
+    if (!loadableOptions.ssr) {
+      return noSSR(loadableFn, loadableOptions)
+    }
+    delete loadableOptions.ssr
   }
 
   return loadableFn(loadableOptions)

diff --git a/test/integration/react-18/app/pages/suspense/no-preload.js b/test/integration/react-18/app/pages/suspense/no-preload.js
@@ -3,6 +3,9 @@ import dynamic from 'next/dynamic'
 
 const Bar = dynamic(() => import('../../components/bar'), {
   suspense: true,
+  // Explicitly declare loaded modules.
+  // For suspense cases, they'll be ignored.
+  // For loadable component cases, they'll be handled
   loadableGenerated: {
     modules: ['../../components/bar'],
     webpack: [require.resolveWeak('../../components/bar')],