fix GlobalError interop and add test case (#49033)

### What? fixes handling of GlobalError interop adds a test case for client component bug ### Why? app dir client component interop is broken ### Turbopack changes * vercel/turbo#4597  * vercel/turbo#4761
vercel · May 1, 2023 · dbccc79 · dbccc79
1 parent 3362851
commit dbccc79
Show file tree

Hide file tree

Showing 9 changed files with 81 additions and 49 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -42,11 +42,11 @@ swc_relay = { version = "0.2.7" }
 testing = { version = "0.33.6" }
 
 # Turbo crates
-turbo-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230501.2" }
+turbo-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230501.3" }
 # [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
-turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230501.2" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230501.3" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230501.2" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230501.3" }
 
 # General Deps
 

diff --git a/packages/next-swc/crates/next-core/js/package.json b/packages/next-swc/crates/next-core/js/package.json
@@ -10,8 +10,8 @@
     "check": "tsc --noEmit"
   },
   "dependencies": {
-    "@vercel/turbopack-dev": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230501.2",
-    "@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230501.2",
+    "@vercel/turbopack-dev": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230501.3",
+    "@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230501.3",
     "anser": "^2.1.1",
     "css.escape": "^1.5.1",
     "next": "*",

diff --git a/...c/crates/next-dev-tests/tests/integration/next/app/named-client-comp/input/app/layout.tsx b/...c/crates/next-dev-tests/tests/integration/next/app/named-client-comp/input/app/layout.tsx
@@ -0,0 +1,7 @@
+export default function RootLayout({ children }: { children: any }) {
+  return (
+    <html>
+      <body>{children}</body>
+    </html>
+  )
+}
diff --git a/...swc/crates/next-dev-tests/tests/integration/next/app/named-client-comp/input/app/page.tsx b/...swc/crates/next-dev-tests/tests/integration/next/app/named-client-comp/input/app/page.tsx
@@ -0,0 +1,9 @@
+import { Test } from './test'
+
+export default function Page() {
+  return (
+    <div>
+      <Test />
+    </div>
+  )
+}
diff --git a/...swc/crates/next-dev-tests/tests/integration/next/app/named-client-comp/input/app/test.tsx b/...swc/crates/next-dev-tests/tests/integration/next/app/named-client-comp/input/app/test.tsx
@@ -0,0 +1,12 @@
+'use client'
+
+import { useEffect } from 'react'
+
+export function Test() {
+  useEffect(() => {
+    import('@turbo/pack-test-harness').then(() => {
+      it('should allow to import a named export from a client component', () => {})
+    })
+    return () => {}
+  }, [])
+}
diff --git a/...c/crates/next-dev-tests/tests/integration/next/app/named-client-comp/input/next.config.js b/...c/crates/next-dev-tests/tests/integration/next/app/named-client-comp/input/next.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+  experimental: {
+    appDir: true,
+  },
+}
diff --git a/packages/next/src/server/app-render/app-render.tsx b/packages/next/src/server/app-render/app-render.tsx
@@ -1204,10 +1204,9 @@ export async function renderToHTMLOrFlight(
     const AppRouter =
       ComponentMod.AppRouter as typeof import('../../client/components/app-router').default
 
-    const GlobalError = interopDefault(
+    const GlobalError =
       /** GlobalError can be either the default error boundary or the overwritten app/global-error.js **/
       ComponentMod.GlobalError as typeof import('../../client/components/error-boundary').default
-    )
 
     let serverComponentsInlinedTransformStream: TransformStream<
       Uint8Array,