Merge branch 'canary' into update-examples-readmes

vercel · Mar 16, 2022 · 947f5a5 · 947f5a5
2 parents 05848b8 + efdb87d
commit 947f5a5
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 2 deletions.
diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -646,7 +646,9 @@ export default async function getBaseWebpackConfig(
           },
         }
       : undefined),
-    mainFields: !targetWeb ? ['main', 'module'] : ['browser', 'module', 'main'],
+    mainFields: targetWeb
+      ? (isEdgeRuntime ? [] : ['browser']).concat(['module', 'main'])
+      : ['main', 'module'],
     plugins: [],
   }
 

diff --git a/...ion/react-streaming-and-server-components/app/node_modules/non-isomorphic-text/browser.js b/...ion/react-streaming-and-server-components/app/node_modules/non-isomorphic-text/browser.js
diff --git a/...ation/react-streaming-and-server-components/app/node_modules/non-isomorphic-text/index.js b/...ation/react-streaming-and-server-components/app/node_modules/non-isomorphic-text/index.js
diff --git a/...n/react-streaming-and-server-components/app/node_modules/non-isomorphic-text/package.json b/...n/react-streaming-and-server-components/app/node_modules/non-isomorphic-text/package.json
diff --git a/test/integration/react-streaming-and-server-components/app/pages/external-imports.server.js b/test/integration/react-streaming-and-server-components/app/pages/external-imports.server.js
@@ -1,5 +1,11 @@
 import moment from 'moment'
+import nonIsomorphicText from 'non-isomorphic-text'
 
 export default function Page() {
-  return <div>date:{moment().toString()}</div>
+  return (
+    <div>
+      <div>date:{moment().toString()}</div>
+      <div>{nonIsomorphicText()}</div>
+    </div>
+  )
 }
diff --git a/test/integration/react-streaming-and-server-components/test/rsc.js b/test/integration/react-streaming-and-server-components/test/rsc.js
@@ -157,6 +157,11 @@ export default function (context, { runtime, env }) {
     })
   }
 
+  it('should not pick browser field from package.json for external libraries', async () => {
+    const html = await renderViaHTTP(context.appPort, '/external-imports')
+    expect(html).toContain('isomorphic-export')
+  })
+
   it('should handle various kinds of exports correctly', async () => {
     const html = await renderViaHTTP(context.appPort, '/various-exports')
     const content = getNodeBySelector(html, '#__next').text()