Revert "Fix client boundary inheritance for barrel optimization (#64467…

…)" This reverts commit cb8fb32.
vercel · Apr 15, 2024 · bef43f6 · bef43f6
1 parent 33e8334
commit bef43f6
Show file tree

Hide file tree

Showing 13 changed files with 1 addition and 103 deletions.
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,12 +221,9 @@ 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.15',
+          '@mui/material': '5.15.4',
           '@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
diff --git a/test/production/app-dir/barrel-optimization/basic/app/page.js b/test/production/app-dir/barrel-optimization/basic/app/page.js
diff --git a/test/production/app-dir/barrel-optimization/basic/index.test.ts b/test/production/app-dir/barrel-optimization/basic/index.test.ts
diff --git a/test/production/app-dir/barrel-optimization/basic/next.config.js b/test/production/app-dir/barrel-optimization/basic/next.config.js
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
diff --git a/test/production/app-dir/barrel-optimization/mui/app/page.js b/test/production/app-dir/barrel-optimization/mui/app/page.js
diff --git a/test/production/app-dir/barrel-optimization/mui/index.test.ts b/test/production/app-dir/barrel-optimization/mui/index.test.ts