Skip barrel optimization tests in Turbopack (#61253)
## What? Barrel optimization will be added after Turbopack is stable. <!-- Thanks for opening a PR! Your contribution is much appreciated. To make sure your PR is handled as smoothly as possible we request that you follow the checklist sections below. Choose the right checklist for the change(s) that you're making: ## For Contributors ### Improving Documentation - Run `pnpm prettier-fix` to fix formatting issues before opening the PR. - Read the Docs Contribution Guide to ensure your contribution follows the docs guidelines: https://nextjs.org/docs/community/contribution-guide ### Adding or Updating Examples - The "examples guidelines" are followed from our contributing doc https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md - Make sure the linting passes by running `pnpm build && pnpm lint`. See https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md ### Fixing a bug - Related issues linked using `fixes #number` - Tests added. See: https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs - Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md ### Adding a feature - Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR. (A discussion must be opened, see https://github.com/vercel/next.js/discussions/new?category=ideas) - Related issues/discussions are linked using `fixes #number` - e2e tests added (https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs) - Documentation added - Telemetry added. In case of a feature if it's used or not. - Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md ## For Maintainers - Minimal description (aim for explaining to someone not on the team to understand the PR) - When linking to a Slack thread, you might want to share details of the conclusion - Link both the Linear (Fixes NEXT-xxx) and the GitHub issues - Add review comments if necessary to explain to the reviewer the logic behind a change ### What? ### Why? ### How? Closes NEXT- Fixes # --> Closes NEXT-2266
This commit is contained in:
Tim Neutkens
GitHub
parent
ecef83ac61
commit
d439da6700
1 changed files with 160 additions and 155 deletions
|
|
@ -1,166 +1,171 @@
|
|||
import { join } from 'path'
|
||||
import { createNextDescribe } from 'e2e-utils'
|
||||
import { hasRedbox, shouldRunTurboDevTest } from 'next-test-utils'
|
||||
|
||||
createNextDescribe(
|
||||
'optimizePackageImports',
|
||||
{
|
||||
env: {
|
||||
NEXT_TEST_MODE: '1',
|
||||
},
|
||||
files: join(__dirname, 'fixture'),
|
||||
packageJson: {
|
||||
scripts: {
|
||||
setup: `cp -r ./node_modules_bak/* ./node_modules`,
|
||||
build: `yarn setup && next build`,
|
||||
dev: `yarn setup && next ${
|
||||
shouldRunTurboDevTest() ? 'dev --turbo' : 'dev'
|
||||
}`,
|
||||
start: 'next start',
|
||||
// Skipped in Turbopack, will be added later.
|
||||
;(process.env.TURBOPACK ? describe.skip : describe)(
|
||||
'Skipped in Turbopack',
|
||||
() => {
|
||||
createNextDescribe(
|
||||
'optimizePackageImports',
|
||||
{
|
||||
env: {
|
||||
NEXT_TEST_MODE: '1',
|
||||
},
|
||||
files: join(__dirname, 'fixture'),
|
||||
packageJson: {
|
||||
scripts: {
|
||||
setup: `cp -r ./node_modules_bak/* ./node_modules`,
|
||||
build: `yarn setup && next build`,
|
||||
dev: `yarn setup && next ${
|
||||
shouldRunTurboDevTest() ? 'dev --turbo' : 'dev'
|
||||
}`,
|
||||
start: 'next start',
|
||||
},
|
||||
},
|
||||
installCommand: 'yarn',
|
||||
startCommand: (global as any).isNextDev ? 'yarn dev' : 'yarn start',
|
||||
buildCommand: 'yarn build',
|
||||
dependencies: {
|
||||
'lucide-react': '0.264.0',
|
||||
'@headlessui/react': '1.7.17',
|
||||
'@heroicons/react': '2.0.18',
|
||||
'@visx/visx': '3.3.0',
|
||||
'recursive-barrel': '1.0.0',
|
||||
'@mui/material': '5.15.4',
|
||||
'@emotion/styled': '11.11.0',
|
||||
'@emotion/react': '11.11.1',
|
||||
},
|
||||
},
|
||||
},
|
||||
installCommand: 'yarn',
|
||||
startCommand: (global as any).isNextDev ? 'yarn dev' : 'yarn start',
|
||||
buildCommand: 'yarn build',
|
||||
dependencies: {
|
||||
'lucide-react': '0.264.0',
|
||||
'@headlessui/react': '1.7.17',
|
||||
'@heroicons/react': '2.0.18',
|
||||
'@visx/visx': '3.3.0',
|
||||
'recursive-barrel': '1.0.0',
|
||||
'@mui/material': '5.15.4',
|
||||
'@emotion/styled': '11.11.0',
|
||||
'@emotion/react': '11.11.1',
|
||||
},
|
||||
},
|
||||
({ next }) => {
|
||||
it('app - should render the icons correctly without creating all the modules', async () => {
|
||||
let logs = ''
|
||||
next.on('stdout', (log) => {
|
||||
logs += log
|
||||
})
|
||||
({ next }) => {
|
||||
it('app - should render the icons correctly without creating all the modules', async () => {
|
||||
let logs = ''
|
||||
next.on('stdout', (log) => {
|
||||
logs += log
|
||||
})
|
||||
|
||||
const html = await next.render('/')
|
||||
const html = await next.render('/')
|
||||
|
||||
// Ensure the icons are rendered
|
||||
expect(html).toContain('<svg xmlns="http://www.w3.org/2000/svg"')
|
||||
// Ensure the icons are rendered
|
||||
expect(html).toContain('<svg xmlns="http://www.w3.org/2000/svg"')
|
||||
|
||||
const modules = [
|
||||
...logs.matchAll(
|
||||
/Compiled (\/[\w-]*)*\s*in \d+(\.\d+)?(s|ms) \((\d+) modules\)/g
|
||||
),
|
||||
]
|
||||
const modules = [
|
||||
...logs.matchAll(
|
||||
/Compiled (\/[\w-]*)*\s*in \d+(\.\d+)?(s|ms) \((\d+) modules\)/g
|
||||
),
|
||||
]
|
||||
|
||||
expect(modules.length).toBeGreaterThanOrEqual(1)
|
||||
for (const [, , , , moduleCount] of modules) {
|
||||
// Ensure that the number of modules is less than 1000 - otherwise we're
|
||||
// importing the entire library.
|
||||
expect(parseInt(moduleCount)).toBeLessThan(1000)
|
||||
expect(modules.length).toBeGreaterThanOrEqual(1)
|
||||
for (const [, , , , moduleCount] of modules) {
|
||||
// Ensure that the number of modules is less than 1000 - otherwise we're
|
||||
// importing the entire library.
|
||||
expect(parseInt(moduleCount)).toBeLessThan(1000)
|
||||
}
|
||||
})
|
||||
|
||||
it('pages - should render the icons correctly without creating all the modules', async () => {
|
||||
let logs = ''
|
||||
next.on('stdout', (log) => {
|
||||
logs += log
|
||||
})
|
||||
|
||||
const html = await next.render('/pages-route')
|
||||
|
||||
// Ensure the icons are rendered
|
||||
expect(html).toContain('<svg xmlns="http://www.w3.org/2000/svg"')
|
||||
|
||||
const modules = [
|
||||
...logs.matchAll(
|
||||
/Compiled (\/[\w-]+)*\s*in \d+(\.\d+)?(s|ms) \((\d+) modules\)/g
|
||||
),
|
||||
]
|
||||
|
||||
expect(modules.length).toBeGreaterThanOrEqual(1)
|
||||
for (const [, , , , moduleCount] of modules) {
|
||||
// Ensure that the number of modules is less than 1000 - otherwise we're
|
||||
// importing the entire library.
|
||||
expect(parseInt(moduleCount)).toBeLessThan(1000)
|
||||
}
|
||||
})
|
||||
|
||||
it('app - should optimize recursive wildcard export mapping', async () => {
|
||||
let logs = ''
|
||||
next.on('stdout', (log) => {
|
||||
logs += log
|
||||
})
|
||||
|
||||
await next.render('/recursive-barrel-app')
|
||||
|
||||
const modules = [...logs.matchAll(/\((\d+) modules\)/g)]
|
||||
|
||||
expect(modules.length).toBeGreaterThanOrEqual(1)
|
||||
for (const [, moduleCount] of modules) {
|
||||
// Ensure that the number of modules is less than 1000 - otherwise we're
|
||||
// importing the entire library.
|
||||
expect(parseInt(moduleCount)).toBeLessThan(1000)
|
||||
}
|
||||
})
|
||||
|
||||
it('pages - should optimize recursive wildcard export mapping', async () => {
|
||||
let logs = ''
|
||||
next.on('stdout', (log) => {
|
||||
logs += log
|
||||
})
|
||||
|
||||
await next.render('/recursive-barrel')
|
||||
|
||||
const modules = [...logs.matchAll(/\((\d+) modules\)/g)]
|
||||
|
||||
expect(modules.length).toBeGreaterThanOrEqual(1)
|
||||
for (const [, moduleCount] of modules) {
|
||||
// Ensure that the number of modules is less than 1000 - otherwise we're
|
||||
// importing the entire library.
|
||||
expect(parseInt(moduleCount)).toBeLessThan(1000)
|
||||
}
|
||||
})
|
||||
|
||||
it('should handle recursive wildcard exports', async () => {
|
||||
const html = await next.render('/recursive')
|
||||
expect(html).toContain('<h1>42</h1>')
|
||||
})
|
||||
|
||||
it('should support visx', async () => {
|
||||
const html = await next.render('/visx')
|
||||
expect(html).toContain('<linearGradient')
|
||||
})
|
||||
|
||||
it('should support MUI', async () => {
|
||||
let logs = ''
|
||||
next.on('stdout', (log) => {
|
||||
logs += log
|
||||
})
|
||||
|
||||
// Ensure that MUI is working
|
||||
const $ = await next.render$('/mui')
|
||||
expect(await $('#button').text()).toContain('button')
|
||||
expect(await $('#typography').text()).toContain('typography')
|
||||
|
||||
const browser = await next.browser('/mui')
|
||||
expect(await hasRedbox(browser)).toBe(false)
|
||||
|
||||
const modules = [...logs.matchAll(/\((\d+) modules\)/g)]
|
||||
expect(modules.length).toBeGreaterThanOrEqual(1)
|
||||
for (const [, moduleCount] of modules) {
|
||||
// Ensure that the number of modules is less than 1500 - otherwise we're
|
||||
// importing the entire library.
|
||||
expect(parseInt(moduleCount)).toBeLessThan(1500)
|
||||
}
|
||||
})
|
||||
|
||||
it('should not break "use client" directive in optimized packages', async () => {
|
||||
const html = await next.render('/client')
|
||||
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>')
|
||||
})
|
||||
}
|
||||
})
|
||||
|
||||
it('pages - should render the icons correctly without creating all the modules', async () => {
|
||||
let logs = ''
|
||||
next.on('stdout', (log) => {
|
||||
logs += log
|
||||
})
|
||||
|
||||
const html = await next.render('/pages-route')
|
||||
|
||||
// Ensure the icons are rendered
|
||||
expect(html).toContain('<svg xmlns="http://www.w3.org/2000/svg"')
|
||||
|
||||
const modules = [
|
||||
...logs.matchAll(
|
||||
/Compiled (\/[\w-]+)*\s*in \d+(\.\d+)?(s|ms) \((\d+) modules\)/g
|
||||
),
|
||||
]
|
||||
|
||||
expect(modules.length).toBeGreaterThanOrEqual(1)
|
||||
for (const [, , , , moduleCount] of modules) {
|
||||
// Ensure that the number of modules is less than 1000 - otherwise we're
|
||||
// importing the entire library.
|
||||
expect(parseInt(moduleCount)).toBeLessThan(1000)
|
||||
}
|
||||
})
|
||||
|
||||
it('app - should optimize recursive wildcard export mapping', async () => {
|
||||
let logs = ''
|
||||
next.on('stdout', (log) => {
|
||||
logs += log
|
||||
})
|
||||
|
||||
await next.render('/recursive-barrel-app')
|
||||
|
||||
const modules = [...logs.matchAll(/\((\d+) modules\)/g)]
|
||||
|
||||
expect(modules.length).toBeGreaterThanOrEqual(1)
|
||||
for (const [, moduleCount] of modules) {
|
||||
// Ensure that the number of modules is less than 1000 - otherwise we're
|
||||
// importing the entire library.
|
||||
expect(parseInt(moduleCount)).toBeLessThan(1000)
|
||||
}
|
||||
})
|
||||
|
||||
it('pages - should optimize recursive wildcard export mapping', async () => {
|
||||
let logs = ''
|
||||
next.on('stdout', (log) => {
|
||||
logs += log
|
||||
})
|
||||
|
||||
await next.render('/recursive-barrel')
|
||||
|
||||
const modules = [...logs.matchAll(/\((\d+) modules\)/g)]
|
||||
|
||||
expect(modules.length).toBeGreaterThanOrEqual(1)
|
||||
for (const [, moduleCount] of modules) {
|
||||
// Ensure that the number of modules is less than 1000 - otherwise we're
|
||||
// importing the entire library.
|
||||
expect(parseInt(moduleCount)).toBeLessThan(1000)
|
||||
}
|
||||
})
|
||||
|
||||
it('should handle recursive wildcard exports', async () => {
|
||||
const html = await next.render('/recursive')
|
||||
expect(html).toContain('<h1>42</h1>')
|
||||
})
|
||||
|
||||
it('should support visx', async () => {
|
||||
const html = await next.render('/visx')
|
||||
expect(html).toContain('<linearGradient')
|
||||
})
|
||||
|
||||
it('should support MUI', async () => {
|
||||
let logs = ''
|
||||
next.on('stdout', (log) => {
|
||||
logs += log
|
||||
})
|
||||
|
||||
// Ensure that MUI is working
|
||||
const $ = await next.render$('/mui')
|
||||
expect(await $('#button').text()).toContain('button')
|
||||
expect(await $('#typography').text()).toContain('typography')
|
||||
|
||||
const browser = await next.browser('/mui')
|
||||
expect(await hasRedbox(browser)).toBe(false)
|
||||
|
||||
const modules = [...logs.matchAll(/\((\d+) modules\)/g)]
|
||||
expect(modules.length).toBeGreaterThanOrEqual(1)
|
||||
for (const [, moduleCount] of modules) {
|
||||
// Ensure that the number of modules is less than 1500 - otherwise we're
|
||||
// importing the entire library.
|
||||
expect(parseInt(moduleCount)).toBeLessThan(1500)
|
||||
}
|
||||
})
|
||||
|
||||
it('should not break "use client" directive in optimized packages', async () => {
|
||||
const html = await next.render('/client')
|
||||
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>')
|
||||
})
|
||||
)
|
||||
}
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in a new issue