Alias next/dynamic to lazy impl for appDir

shorter path
vercel · Oct 6, 2022 · f60ae22 · f60ae22
1 parent 21605a5
commit f60ae22
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -1586,13 +1586,28 @@ export default async function getBaseWebpackConfig(
               } as any,
             ]
           : []),
+        // Alias `next/dynamic` to React.lazy implementation for RSC
+        ...(hasServerComponents
+          ? [
+              {
+                test: codeCondition.test,
+                include: [appDir],
+                resolve: {
+                  alias: {
+                    [require.resolve('next/dynamic')]:
+                      'next/dist/client/components/dynamic',
+                  },
+                },
+              },
+            ]
+          : []),
         ...(hasServerComponents && (isNodeServer || isEdgeServer)
           ? [
               // RSC server compilation loaders
               {
                 test: codeCondition.test,
                 include: [
-                  dir,
+                  appDir,
                   // To let the internal client components passing through flight loader
                   /next[\\/]dist/,
                 ],

diff --git a/...lient/components/shared/dynamic/index.tsx → packages/next/client/components/dynamic.tsx b/...lient/components/shared/dynamic/index.tsx → packages/next/client/components/dynamic.tsx
@@ -15,7 +15,5 @@ export type LoadableComponent<P = {}> = React.ComponentType<P>
 export default function dynamic<P = {}>(
   loader: Loader<P>
 ): React.ComponentType<P> {
-  const LazyLoadable = React.lazy(loader)
-
-  return LazyLoadable
+  return React.lazy(loader)
 }
diff --git a/packages/next/shared/lib/dynamic.tsx b/packages/next/shared/lib/dynamic.tsx
@@ -1,5 +1,3 @@
-'client'
-
 import React from 'react'
 import Loadable from './loadable'
 

diff --git a/test/e2e/app-dir/app/app/dashboard/index/dynamic-imports/dynamic-client.js b/test/e2e/app-dir/app/app/dashboard/index/dynamic-imports/dynamic-client.js
@@ -1,6 +1,6 @@
 'client'
 
-import dynamic from 'next/dist/client/components/shared/dynamic'
+import dynamic from 'next/dynamic'
 
 const Dynamic = dynamic(() => import('../text-dynamic-client'))
 

diff --git a/test/e2e/app-dir/app/app/dashboard/index/dynamic-imports/dynamic-server.js b/test/e2e/app-dir/app/app/dashboard/index/dynamic-imports/dynamic-server.js
@@ -1,4 +1,4 @@
-import dynamic from 'next/dist/client/components/shared/dynamic'
+import dynamic from 'next/dynamic'
 
 const Dynamic = dynamic(() => import('../text-dynamic-server'))