Unverified Commit 3e341678 authored by Shu Ding's avatar Shu Ding Committed by GitHub

Fix missing SWC transforms for optimized barrel files (#57474)

With Barrel Optimization, we are trying to "shortcut" the import to be
directly pointing to the final target, as barrel files shouldn't have
any side effects. However, there could be `"use client"` and `"use
server"` directives which we can't ignore. Hence we must apply the
`serverComponents` transform of SWC to these barrel files too.
Co-authored-by: 's avatarkodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
parent df0fb70c
...@@ -88,6 +88,7 @@ import type webpack from 'webpack' ...@@ -88,6 +88,7 @@ import type webpack from 'webpack'
import path from 'path' import path from 'path'
import { transform } from '../../swc' import { transform } from '../../swc'
import { WEBPACK_LAYERS } from '../../../lib/constants'
// This is a in-memory cache for the mapping of barrel exports. This only applies // This is a in-memory cache for the mapping of barrel exports. This only applies
// to the packages that we optimize. It will never change (e.g. upgrading packages) // to the packages that we optimize. It will never change (e.g. upgrading packages)
...@@ -103,6 +104,7 @@ const barrelTransformMappingCache = new Map< ...@@ -103,6 +104,7 @@ const barrelTransformMappingCache = new Map<
>() >()
async function getBarrelMapping( async function getBarrelMapping(
layer: string | null | undefined,
resourcePath: string, resourcePath: string,
swcCacheDir: string, swcCacheDir: string,
resolve: (context: string, request: string) => Promise<string>, resolve: (context: string, request: string) => Promise<string>,
...@@ -133,6 +135,9 @@ async function getBarrelMapping( ...@@ -133,6 +135,9 @@ async function getBarrelMapping(
optimizeBarrelExports: { optimizeBarrelExports: {
wildcard: isWildcard, wildcard: isWildcard,
}, },
serverComponents: {
isReactServerLayer: layer === WEBPACK_LAYERS.reactServerComponents,
},
jsc: { jsc: {
parser: { parser: {
syntax: isTypeScript ? 'typescript' : 'ecmascript', syntax: isTypeScript ? 'typescript' : 'ecmascript',
...@@ -244,6 +249,7 @@ const NextBarrelLoader = async function ( ...@@ -244,6 +249,7 @@ const NextBarrelLoader = async function (
}) })
const mapping = await getBarrelMapping( const mapping = await getBarrelMapping(
this._module?.layer,
this.resourcePath, this.resourcePath,
swcCacheDir, swcCacheDir,
resolve, resolve,
......
...@@ -148,4 +148,9 @@ describe('optimizePackageImports', () => { ...@@ -148,4 +148,9 @@ describe('optimizePackageImports', () => {
const html = await next.render('/client') const html = await next.render('/client')
expect(html).toContain('this is a client component') expect(html).toContain('this is a client component')
}) })
it('should support "use client" directive in barrel file', async () => {
const html = await next.render('/client-boundary')
expect(html).toContain('<button>0</button>')
})
}) })
import { Button } from 'my-client-lib'
export default function Page() {
return <Button />
}
module.exports = { module.exports = {
transpilePackages: ['my-client-lib'],
experimental: { experimental: {
optimizePackageImports: ['my-lib', 'recursive-barrel'], optimizePackageImports: ['my-lib', 'recursive-barrel', 'my-client-lib'],
}, },
} }
import { useState } from 'react'
export function Button() {
const [count, setCount] = useState(0)
return <button onClick={() => setCount(count + 1)}>{count}</button>
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment