Skip to content

Commit

Permalink
Turbopack build: Fix build-output tests (#69957)
Browse files Browse the repository at this point in the history
Updates the test to ensure it passes with both Webpack/Turbopack.

<!-- 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 #

-->
  • Loading branch information
timneutkens authored Sep 11, 2024
1 parent 2a87b33 commit 3d303a1
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 43 deletions.
75 changes: 35 additions & 40 deletions test/integration/build-output/test/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,10 @@ describe('Build Output', () => {
}

it('should not include internal pages', async () => {
expect(stdout).toMatch(/\/ (.* )?\d{1,} B/)
expect(stdout).toMatch(/\/ (.* )?\d{1,} k?B/)
expect(stdout).toMatch(/\+ First Load JS shared by all [ 0-9.]* kB/)
expect(stdout).toMatch(/ chunks\/main-[0-9a-z]{16}\.js [ 0-9.]* kB/)
expect(stdout).toMatch(
/ chunks\/framework-[0-9a-z]{16}\.js [ 0-9. ]* kB/
)
expect(stdout).toMatch(/ chunks\/.*\.js [ 0-9.]* kB/)
expect(stdout).toMatch(/ chunks\/.*\.js [ 0-9. ]* kB/)

expect(stdout).not.toContain(' /_document')
expect(stdout).not.toContain(' /_app')
Expand Down Expand Up @@ -208,13 +206,10 @@ describe('Build Output', () => {
stdout: true,
})

expect(stdout).toMatch(/\/ (.* )?\d{1,} B/)
expect(stdout).toMatch(/\/_app (.* )?\d{1,} B/)
expect(stdout).toMatch(/\/ (.* )?\d{1,} k?B/)
expect(stdout).toMatch(/\/_app (.* )?\d{1,} k?B/)
expect(stdout).toMatch(/\+ First Load JS shared by all \s*[0-9.]+ kB/)
expect(stdout).toMatch(/ chunks\/main-[0-9a-z]{16}\.js \s*[0-9.]+ kB/)
expect(stdout).toMatch(
/ chunks\/framework-[0-9a-z]{16}\.js \s*[0-9.]+ kB/
)
expect(stdout).toMatch(/ chunks\/.*\.js \s*[0-9.]+ kB/)

expect(stdout).not.toContain(' /_document')
expect(stdout).not.toContain(' /_error')
Expand All @@ -225,34 +220,37 @@ describe('Build Output', () => {
})
})

describe('With AMP Output', () => {
const appDir = join(fixturesDir, 'with-amp')
// AMP is not supported with Turbopack.
;(process.env.TURBOPACK ? describe.skip : describe)(
'With AMP Output',
() => {
const appDir = join(fixturesDir, 'with-amp')

beforeAll(async () => {
await remove(join(appDir, '.next'))
})

it('should not include custom error', async () => {
const { stdout } = await nextBuild(appDir, [], {
stdout: true,
beforeAll(async () => {
await remove(join(appDir, '.next'))
})

expect(stdout).toMatch(/\/ (.* )?[0-9.]+ B \s*[0-9.]+ kB/)
expect(stdout).toMatch(/\/amp (.* )?AMP/)
expect(stdout).toMatch(/\/hybrid (.* )?[0-9.]+ B/)
expect(stdout).toMatch(/\+ First Load JS shared by all \s*[0-9.]+ kB/)
expect(stdout).toMatch(/ chunks\/main-[0-9a-z]{16}\.js \s*[0-9.]+ kB/)
expect(stdout).toMatch(
/ chunks\/framework-[0-9a-z]{16}\.js \s*[0-9.]+ kB/
)
it('should not include custom error', async () => {
const { stdout } = await nextBuild(appDir, [], {
stdout: true,
})

expect(stdout).not.toContain(' /_document')
expect(stdout).not.toContain(' /_error')
expect(stdout).not.toContain('<buildId>')
expect(stdout).toMatch(/\/ (.* )?[0-9.]+ k?B \s*[0-9.]+ kB/)
expect(stdout).toMatch(/\/amp (.* )?AMP/)
expect(stdout).toMatch(/\/hybrid (.* )?[0-9.]+ k?B/)
expect(stdout).toMatch(
/\+ First Load JS shared by all \s*[0-9.]+ kB/
)
expect(stdout).toMatch(/ chunks\/.*\.js \s*[0-9.]+ kB/)

expect(stdout).toContain('○ /')
})
})
expect(stdout).not.toContain(' /_document')
expect(stdout).not.toContain(' /_error')
expect(stdout).not.toContain('<buildId>')

expect(stdout).toContain('○ /')
})
}
)

describe('Custom Error Output', () => {
const appDir = join(fixturesDir, 'with-error')
Expand All @@ -266,13 +264,10 @@ describe('Build Output', () => {
stdout: true,
})

expect(stdout).toMatch(/\/ (.* )?\d{1,} B/)
expect(stdout).toMatch(/ƒ \/404 (.* )?\d{1,} B/)
expect(stdout).toMatch(/\/ (.* )?\d{1,} k?B/)
expect(stdout).toMatch(/ƒ \/404 (.* )?\d{1,} k?B/)
expect(stdout).toMatch(/\+ First Load JS shared by all [ 0-9.]* kB/)
expect(stdout).toMatch(/ chunks\/main-[0-9a-z]{16}\.js [ 0-9.]* kB/)
expect(stdout).toMatch(
/ chunks\/framework-[0-9a-z]{16}\.js [ 0-9. ]* kB/
)
expect(stdout).toMatch(/ chunks\/.*\.js [ 0-9.]* kB/)

expect(stdout).not.toContain(' /_document')
expect(stdout).not.toContain(' /_app')
Expand Down
5 changes: 2 additions & 3 deletions test/turbopack-build-tests-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -7285,15 +7285,14 @@
"Build Output production mode Basic Application Output (experimental: {}) should not emit extracted comments",
"Build Output production mode Basic Application Output (experimental: {}) should print duration when rendering or get static props takes long",
"Build Output production mode Custom Static Error Output should not specify /404 as lambda when static",
"Build Output production mode With Parallel Routes should not have duplicate paths that resolve to the same route"
],
"failed": [
"Build Output production mode With Parallel Routes should not have duplicate paths that resolve to the same route",
"Build Output production mode Basic Application Output (experimental: {\"gzipSize\":false}) should not include internal pages",
"Build Output production mode Basic Application Output (experimental: {}) should not include internal pages",
"Build Output production mode Custom App Output should not include custom error",
"Build Output production mode Custom Error Output should not include custom app",
"Build Output production mode With AMP Output should not include custom error"
],
"failed": [],
"pending": [
"Build Output production mode Basic Application Output (experimental: {\"gzipSize\":false}) should not deviate from snapshot",
"Build Output production mode Basic Application Output (experimental: {}) should not deviate from snapshot"
Expand Down

0 comments on commit 3d303a1

Please sign in to comment.