vercel · huozhi · Apr 14, 2024 · Apr 14, 2024 · Apr 14, 2024 · Apr 14, 2024
diff --git a/packages/next/src/build/webpack/loaders/next-barrel-loader.ts b/packages/next/src/build/webpack/loaders/next-barrel-loader.ts
@@ -221,9 +221,12 @@ async function getBarrelMapping(
             true,
             isClientEntry
           )
+
           if (targetMatches) {
             // Merge the export list
             exportList = exportList.concat(targetMatches.exportList)
+            // Inherit the client boundary from the target matched file
+            isClientEntry = isClientEntry || targetMatches.isClientEntry
           }
         })
       )

diff --git a/test/development/basic/barrel-optimization/barrel-optimization-mui.test.ts b/test/development/basic/barrel-optimization/barrel-optimization-mui.test.ts
@@ -14,7 +14,7 @@ import { hasRedbox } from 'next-test-utils'
         files: join(__dirname, 'fixture'),
 
         dependencies: {
-          '@mui/material': '5.15.4',
+          '@mui/material': '5.15.15',
           '@emotion/react': '11.11.1',
           '@emotion/styled': '11.11.0',
         },

diff --git a/test/production/app-dir/barrel-optimization/basic/app/layout.js b/test/production/app-dir/barrel-optimization/basic/app/layout.js
@@ -0,0 +1,7 @@
+export default function RootLayout({ children }) {
+  return (
+    <html>
+      <body>{children}</body>
+    </html>
+  )
+}
diff --git a/test/production/app-dir/barrel-optimization/basic/app/page.js b/test/production/app-dir/barrel-optimization/basic/app/page.js
@@ -0,0 +1,9 @@
+import { ClientDefault } from 'my-lib'
+
+export default function Home() {
+  return (
+    <div id="client-mod">
+      <ClientDefault />
+    </div>
+  )
+}
diff --git a/test/production/app-dir/barrel-optimization/basic/index.test.ts b/test/production/app-dir/barrel-optimization/basic/index.test.ts
@@ -0,0 +1,21 @@
+import { createNextDescribe } from 'e2e-utils'
+
+// Skipped in Turbopack, will be added later.
+;(process.env.TURBOPACK ? describe.skip : describe)(
+  'Skipped in Turbopack',
+  () => {
+    createNextDescribe(
+      'app-dir - optimizePackageImports - basic',
+      {
+        files: __dirname,
+      },
+      ({ next }) => {
+        it('should build successfully', async () => {
+          // Ensure that MUI is working
+          const $ = await next.render$('/')
+          expect(await $('#client-mod').text()).toContain('client:default')
+        })
+      }
+    )
+  }
+)
diff --git a/test/production/app-dir/barrel-optimization/basic/next.config.js b/test/production/app-dir/barrel-optimization/basic/next.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+  experimental: {
+    optimizePackageImports: ['my-lib'],
+  },
+}
diff --git a/.../production/app-dir/barrel-optimization/basic/node_modules/my-lib/client/client-module.js b/.../production/app-dir/barrel-optimization/basic/node_modules/my-lib/client/client-module.js
diff --git a/test/production/app-dir/barrel-optimization/basic/node_modules/my-lib/client/index.js b/test/production/app-dir/barrel-optimization/basic/node_modules/my-lib/client/index.js
diff --git a/test/production/app-dir/barrel-optimization/basic/node_modules/my-lib/index.js b/test/production/app-dir/barrel-optimization/basic/node_modules/my-lib/index.js
diff --git a/test/production/app-dir/barrel-optimization/basic/node_modules/my-lib/package.json b/test/production/app-dir/barrel-optimization/basic/node_modules/my-lib/package.json
diff --git a/test/production/app-dir/barrel-optimization/mui/app/layout.js b/test/production/app-dir/barrel-optimization/mui/app/layout.js
@@ -0,0 +1,7 @@
+export default function RootLayout({ children }) {
+  return (
+    <html>
+      <body>{children}</body>
+    </html>
+  )
+}
diff --git a/test/production/app-dir/barrel-optimization/mui/app/page.js b/test/production/app-dir/barrel-optimization/mui/app/page.js
@@ -0,0 +1,11 @@
+import { Typography } from '@mui/material'
+
+export default function Home() {
+  return (
+    <div id="typography">
+      <Typography id="typography" variant="h1">
+        typography
+      </Typography>
+    </div>
+  )
+}
diff --git a/test/production/app-dir/barrel-optimization/mui/index.test.ts b/test/production/app-dir/barrel-optimization/mui/index.test.ts
@@ -0,0 +1,27 @@
+import { createNextDescribe } from 'e2e-utils'
+
+// Skipped in Turbopack, will be added later.
+;(process.env.TURBOPACK ? describe.skip : describe)(
+  'Skipped in Turbopack',
+  () => {
+    createNextDescribe(
+      'app-dir - optimizePackageImports - mui',
+      {
+        files: __dirname,
+
+        dependencies: {
+          '@mui/material': '5.15.15',
+          '@emotion/react': '11.11.1',
+          '@emotion/styled': '11.11.0',
+        },
+      },
+      ({ next }) => {
+        it('should build successfully', async () => {
+          // Ensure that MUI is working
+          const $ = await next.render$('/')
+          expect(await $('#typography').text()).toContain('typography')
+        })
+      }
+    )
+  }
+)