Fix mixed exports in server component with barrel optimization

packages/next/src/build/webpack/loaders/next-barrel-loader.ts

@@ -225,8 +225,6 @@ async function getBarrelMapping(
           if (targetMatches) {
             // Merge the export list
             exportList = exportList.concat(targetMatches.exportList)
-            // Inherit the client boundary from the target matched file
-            isClientEntry = isClientEntry || targetMatches.isClientEntry
           }
         })
       )

test/production/app-dir/barrel-optimization/basic/app/mixed-barrel-imports/page.js

@@ -0,0 +1,9 @@
+import { buttonStyle, Button } from 'mixed-lib'
+
+export default function Page() {
+  return (
+    <div>
+      <Button id="component" style={buttonStyle()} />
+    </div>
+  )
+}

test/production/app-dir/barrel-optimization/basic/index.test.ts

@@ -8,10 +8,14 @@ describe('Skipped in Turbopack', () => {
     },
     ({ next }) => {
       it('should build successfully', async () => {
-        // Ensure that MUI is working
         const $ = await next.render$('/')
         expect(await $('#client-mod').text()).toContain('client:default')
       })
+
+      it('should handle mixed imports from barrel optimized lib correctly', async () => {
+        const $ = await next.render$('/mixed-barrel-imports')
+        expect(await $('#component').attr('style')).toContain('color:blue')
+      })
     }
   )
 })

test/production/app-dir/barrel-optimization/basic/next.config.js

@@ -1,5 +1,5 @@
 module.exports = {
   experimental: {
-    optimizePackageImports: ['my-lib'],
+    optimizePackageImports: ['my-lib', 'mixed-lib'],
   },
 }