simplify and update test

vercel · Apr 7, 2022 · df3ba30 · df3ba30
1 parent 406dea0
commit df3ba30
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 21 deletions.
diff --git a/packages/next/build/webpack/loaders/next-flight-server-loader.ts b/packages/next/build/webpack/loaders/next-flight-server-loader.ts
@@ -121,9 +121,9 @@ async function parseModuleInfo({
           // have to be imported from either server or client components.
           if (
             isServerComponent(importSource) ||
-            hasFlightLoader(importSource, 'server') // ||
+            hasFlightLoader(importSource, 'server') ||
             // TODO: support handling RSC components from node_modules
-            // isNodeModuleImport
+            isNodeModuleImport
           ) {
             continue
           }
@@ -195,11 +195,12 @@ export default async function transformSource(
   const hasAppliedFlightServerLoader = this.loaders.some((loader: any) => {
     return hasFlightLoader(loader.path, 'server')
   })
+  const isServerExt = isServerComponent(resourcePath)
 
   if (!isClientCompilation) {
     // We only apply the loader to server components, or shared components that
     // are imported by a server component.
-    if (!isServerComponent(resourcePath) && !hasAppliedFlightServerLoader) {
+    if (!isServerExt && !hasAppliedFlightServerLoader) {
       return source
     }
   }
@@ -238,7 +239,7 @@ export default async function transformSource(
       _: () => {
         ${imports.map((source) => `require('${source}');`).join('\n')}
       },
-      server: ${isServerComponent(resourcePath) ? 'true' : 'false'}
+      server: ${isServerExt ? 'true' : 'false'}
     }`,
   }
 
@@ -260,8 +261,5 @@ export default async function transformSource(
   }
 
   const output = transformedSource + '\n' + buildExports(rscExports, isEsm)
-  // if (resourcePath.includes('external-imports')) {
-  //   console.log(isClientCompilation ? 'client' : 'server', '\n' ,output)
-  // }
   return output
 }
diff --git a/...tion/react-streaming-and-server-components/app/node_modules/esm-client-component/index.js b/...tion/react-streaming-and-server-components/app/node_modules/esm-client-component/index.js
diff --git a/.../react-streaming-and-server-components/app/node_modules/esm-client-component/package.json b/.../react-streaming-and-server-components/app/node_modules/esm-client-component/package.json
diff --git a/...eact-streaming-and-server-components/app/node_modules/esm-client-component/text.client.js b/...eact-streaming-and-server-components/app/node_modules/esm-client-component/text.client.js
diff --git a/test/integration/react-streaming-and-server-components/test/rsc.js b/test/integration/react-streaming-and-server-components/test/rsc.js
@@ -18,7 +18,6 @@ export default function (context, { runtime, env }) {
     expect(homeHTML).toContain('component:index.server')
     expect(homeHTML).toContain('env:env_var_test')
     expect(homeHTML).toContain('header:test-util')
-    expect(homeHTML).toContain('nav-title')
     expect(homeHTML).toContain('path:/')
   })