Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add compiler error for conflicting App Router and Pages Router in Turbopack #62531

Conversation

timneutkens
Copy link
Member

@timneutkens timneutkens commented Feb 26, 2024

What?

Working on fixing test/e2e/conflicting-app-page-error, this adds a compiler error for the case where App Router routes conflict with Pages Router routes. It's not 1:1 the same error as in webpack because in the webpack version we hijacked the App Router resolving logic to assume there's a certain set of paths, where Turbopack has the full route to route tree resolving implementation which doesn't assume there's a single page that can be resolved.

The tests are updated to reflect this change.

Closes NEXT-2592

@ijjk
Copy link
Member

ijjk commented Feb 26, 2024

Stats from current PR

Default Build
General
vercel/next.js canary vercel/next.js 02-26-Add_compiler_error_for_conflicting_App_Router_and_Pages_Router_in_Turbopack Change
buildDuration 13.9s 13.9s N/A
buildDurationCached 7.7s 6.4s N/A
nodeModulesSize 197 MB 197 MB N/A
nextStartRea..uration (ms) 407ms 407ms
Client Bundles (main, webpack)
vercel/next.js canary vercel/next.js 02-26-Add_compiler_error_for_conflicting_App_Router_and_Pages_Router_in_Turbopack Change
2453-HASH.js gzip 30.2 kB 30.2 kB N/A
3304.HASH.js gzip 181 B 181 B
3f784ff6-HASH.js gzip 53.7 kB 53.7 kB N/A
8299-HASH.js gzip 5.04 kB 5.04 kB N/A
framework-HASH.js gzip 45.2 kB 45.2 kB
main-app-HASH.js gzip 241 B 242 B N/A
main-HASH.js gzip 32.2 kB 32.2 kB N/A
webpack-HASH.js gzip 1.68 kB 1.68 kB N/A
Overall change 45.4 kB 45.4 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary vercel/next.js 02-26-Add_compiler_error_for_conflicting_App_Router_and_Pages_Router_in_Turbopack Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary vercel/next.js 02-26-Add_compiler_error_for_conflicting_App_Router_and_Pages_Router_in_Turbopack Change
_app-HASH.js gzip 196 B 197 B N/A
_error-HASH.js gzip 184 B 184 B
amp-HASH.js gzip 505 B 505 B
css-HASH.js gzip 324 B 325 B N/A
dynamic-HASH.js gzip 2.5 kB 2.5 kB N/A
edge-ssr-HASH.js gzip 258 B 258 B
head-HASH.js gzip 352 B 352 B
hooks-HASH.js gzip 370 B 371 B N/A
image-HASH.js gzip 4.2 kB 4.2 kB
index-HASH.js gzip 259 B 259 B
link-HASH.js gzip 2.67 kB 2.67 kB N/A
routerDirect..HASH.js gzip 314 B 312 B N/A
script-HASH.js gzip 386 B 386 B
withRouter-HASH.js gzip 309 B 309 B
1afbb74e6ecf..834.css gzip 106 B 106 B
Overall change 6.56 kB 6.56 kB
Client Build Manifests
vercel/next.js canary vercel/next.js 02-26-Add_compiler_error_for_conflicting_App_Router_and_Pages_Router_in_Turbopack Change
_buildManifest.js gzip 483 B 485 B N/A
Overall change 0 B 0 B
Rendered Page Sizes
vercel/next.js canary vercel/next.js 02-26-Add_compiler_error_for_conflicting_App_Router_and_Pages_Router_in_Turbopack Change
index.html gzip 530 B 529 B N/A
link.html gzip 542 B 542 B
withRouter.html gzip 525 B 523 B N/A
Overall change 542 B 542 B
Edge SSR bundle Size
vercel/next.js canary vercel/next.js 02-26-Add_compiler_error_for_conflicting_App_Router_and_Pages_Router_in_Turbopack Change
edge-ssr.js gzip 95 kB 95 kB N/A
page.js gzip 3.07 kB 3.07 kB N/A
Overall change 0 B 0 B
Middleware size
vercel/next.js canary vercel/next.js 02-26-Add_compiler_error_for_conflicting_App_Router_and_Pages_Router_in_Turbopack Change
middleware-b..fest.js gzip 621 B 625 B N/A
middleware-r..fest.js gzip 151 B 151 B
middleware.js gzip 25.5 kB 25.5 kB N/A
edge-runtime..pack.js gzip 839 B 839 B
Overall change 990 B 990 B
Next Runtimes
vercel/next.js canary vercel/next.js 02-26-Add_compiler_error_for_conflicting_App_Router_and_Pages_Router_in_Turbopack Change
app-page-exp...dev.js gzip 171 kB 171 kB
app-page-exp..prod.js gzip 96.7 kB 96.7 kB
app-page-tur..prod.js gzip 98.5 kB 98.5 kB
app-page-tur..prod.js gzip 92.9 kB 92.9 kB
app-page.run...dev.js gzip 150 kB 150 kB
app-page.run..prod.js gzip 91.4 kB 91.4 kB
app-route-ex...dev.js gzip 21.3 kB 21.3 kB
app-route-ex..prod.js gzip 15 kB 15 kB
app-route-tu..prod.js gzip 15 kB 15 kB
app-route-tu..prod.js gzip 14.8 kB 14.8 kB
app-route.ru...dev.js gzip 20.9 kB 20.9 kB
app-route.ru..prod.js gzip 14.8 kB 14.8 kB
pages-api-tu..prod.js gzip 9.51 kB 9.51 kB
pages-api.ru...dev.js gzip 9.79 kB 9.79 kB
pages-api.ru..prod.js gzip 9.51 kB 9.51 kB
pages-turbo...prod.js gzip 22.3 kB 22.3 kB
pages.runtim...dev.js gzip 23 kB 23 kB
pages.runtim..prod.js gzip 22.3 kB 22.3 kB
server.runti..prod.js gzip 50.6 kB 50.6 kB
Overall change 950 kB 950 kB
build cache
vercel/next.js canary vercel/next.js 02-26-Add_compiler_error_for_conflicting_App_Router_and_Pages_Router_in_Turbopack Change
0.pack gzip 1.56 MB 1.56 MB N/A
index.pack gzip 105 kB 105 kB N/A
Overall change 0 B 0 B
Diff details
Diff for middleware.js

Diff too large to display

Commit: 4163aab

@timneutkens timneutkens force-pushed the 02-26-Add_compiler_error_for_conflicting_App_Router_and_Pages_Router_in_Turbopack branch from 2337ece to e9068fb Compare February 26, 2024 10:18
@ijjk
Copy link
Member

ijjk commented Feb 26, 2024

Tests Passed

@ijjk ijjk added create-next-app Related to our CLI tool for quickly starting a new Next.js application. area: tests labels Feb 26, 2024
Copy link

New and removed dependencies detected. Learn more about Socket for GitHub ↗︎

Package New capabilities Transitives Size Publisher
npm/@next/bundle-analyzer@14.1.1-canary.73 Transitive: environment, filesystem, network, shell +14 2.15 MB matt.straka, rauchg, timer, ...2 more
npm/@next/env@14.1.1-canary.73 None 0 11.7 kB matt.straka, rauchg, timer, ...2 more
npm/@next/eslint-plugin-next@14.1.1-canary.73 Transitive: environment, filesystem, shell +33 2.99 MB matt.straka, rauchg, timer, ...2 more
npm/@next/font@14.1.1-canary.73 Transitive: environment, filesystem, shell, unsafe +98 1.16 GB vercel-release-bot
npm/@next/mdx@14.1.1-canary.73 Transitive: environment, eval, filesystem, network, shell, unsafe +197 25.8 MB vercel-release-bot
npm/@next/plugin-storybook@14.1.1-canary.73 None 0 2.23 kB vercel-release-bot
npm/@next/polyfill-module@14.1.1-canary.73 None 0 6.37 kB matt.straka, rauchg, timer, ...2 more
npm/@next/polyfill-nomodule@14.1.1-canary.73 None 0 95.5 kB matt.straka, rauchg, timer, ...2 more
npm/@next/react-refresh-utils@14.1.1-canary.73 Transitive: environment, eval, filesystem, network, shell, unsafe +80 19.4 MB matt.straka, rauchg, timer, ...2 more
npm/@next/third-parties@14.1.1-canary.73 Transitive: environment, filesystem, shell, unsafe +99 1.16 GB vercel-release-bot
npm/create-next-app@14.1.1-canary.73 None 0 877 kB vercel-release-bot
npm/eslint-config-next@14.1.1-canary.73 Transitive: environment, eval, filesystem, shell, unsafe +286 98.2 MB timer, timneutkens, vercel-release-bot
npm/next@14.1.1-canary.73 Transitive: environment, filesystem, shell, unsafe +97 1.16 GB rauchg, timneutkens, vercel-release-bot

🚮 Removed packages: npm/@next/bundle-analyzer@14.1.1-canary.72, npm/@next/env@14.1.1-canary.72, npm/@next/eslint-plugin-next@14.1.1-canary.72, npm/@next/font@14.1.1-canary.72, npm/@next/mdx@14.1.1-canary.72, npm/@next/plugin-storybook@14.1.1-canary.72, npm/@next/polyfill-module@14.1.1-canary.72, npm/@next/polyfill-nomodule@14.1.1-canary.72, npm/@next/react-refresh-utils@14.1.1-canary.72, npm/@next/third-parties@14.1.1-canary.72, npm/create-next-app@14.1.1-canary.72, npm/eslint-config-next@14.1.1-canary.72, npm/next@14.1.1-canary.72

View full report↗︎

Copy link

New and removed dependencies detected. Learn more about Socket for GitHub ↗︎

Package New capabilities Transitives Size Publisher
npm/@next/bundle-analyzer@14.1.1-canary.73 Transitive: environment, filesystem, network, shell +14 2.15 MB matt.straka, rauchg, timer, ...2 more
npm/@next/env@14.1.1-canary.73 None 0 11.7 kB matt.straka, rauchg, timer, ...2 more
npm/@next/eslint-plugin-next@14.1.1-canary.73 Transitive: environment, filesystem, shell +33 2.99 MB matt.straka, rauchg, timer, ...2 more
npm/@next/font@14.1.1-canary.73 Transitive: environment, filesystem, shell, unsafe +98 1.16 GB vercel-release-bot
npm/@next/mdx@14.1.1-canary.73 Transitive: environment, eval, filesystem, network, shell, unsafe +197 25.8 MB vercel-release-bot
npm/@next/plugin-storybook@14.1.1-canary.73 None 0 2.23 kB vercel-release-bot
npm/@next/polyfill-module@14.1.1-canary.73 None 0 6.37 kB matt.straka, rauchg, timer, ...2 more
npm/@next/polyfill-nomodule@14.1.1-canary.73 None 0 95.5 kB matt.straka, rauchg, timer, ...2 more
npm/@next/react-refresh-utils@14.1.1-canary.73 Transitive: environment, eval, filesystem, network, shell, unsafe +80 19.4 MB matt.straka, rauchg, timer, ...2 more
npm/@next/third-parties@14.1.1-canary.73 Transitive: environment, filesystem, shell, unsafe +99 1.16 GB vercel-release-bot
npm/create-next-app@14.1.1-canary.73 None 0 877 kB vercel-release-bot
npm/eslint-config-next@14.1.1-canary.73 Transitive: environment, eval, filesystem, shell, unsafe +286 98.2 MB timer, timneutkens, vercel-release-bot
npm/next@14.1.1-canary.73 Transitive: environment, filesystem, shell, unsafe +97 1.16 GB rauchg, timneutkens, vercel-release-bot

🚮 Removed packages: npm/@next/bundle-analyzer@14.1.1-canary.72, npm/@next/env@14.1.1-canary.72, npm/@next/eslint-plugin-next@14.1.1-canary.72, npm/@next/font@14.1.1-canary.72, npm/@next/mdx@14.1.1-canary.72, npm/@next/plugin-storybook@14.1.1-canary.72, npm/@next/polyfill-module@14.1.1-canary.72, npm/@next/polyfill-nomodule@14.1.1-canary.72, npm/@next/react-refresh-utils@14.1.1-canary.72, npm/@next/third-parties@14.1.1-canary.72, npm/create-next-app@14.1.1-canary.72, npm/eslint-config-next@14.1.1-canary.72, npm/next@14.1.1-canary.72

View full report↗︎

@timneutkens timneutkens marked this pull request as ready for review February 26, 2024 12:51
@timneutkens timneutkens force-pushed the 02-26-Handle_top_level_errors_coming_from_Turbopack_entrypoints_subscription branch from 90770f8 to aa300d7 Compare February 26, 2024 12:56
@timneutkens timneutkens force-pushed the 02-26-Add_compiler_error_for_conflicting_App_Router_and_Pages_Router_in_Turbopack branch from 46ad42b to 4fa3fe0 Compare February 26, 2024 12:56
@timneutkens timneutkens force-pushed the 02-26-Handle_top_level_errors_coming_from_Turbopack_entrypoints_subscription branch 2 times, most recently from b186df8 to 0d71e34 Compare February 26, 2024 19:54
@timneutkens timneutkens force-pushed the 02-26-Handle_top_level_errors_coming_from_Turbopack_entrypoints_subscription branch from 0d71e34 to e8146d1 Compare February 29, 2024 18:27
@timneutkens timneutkens force-pushed the 02-26-Add_compiler_error_for_conflicting_App_Router_and_Pages_Router_in_Turbopack branch from 4fa3fe0 to 3f45e57 Compare February 29, 2024 18:29
@timneutkens timneutkens force-pushed the 02-26-Handle_top_level_errors_coming_from_Turbopack_entrypoints_subscription branch from e8146d1 to e7b50b9 Compare March 1, 2024 09:23
Base automatically changed from 02-26-Handle_top_level_errors_coming_from_Turbopack_entrypoints_subscription to canary March 1, 2024 13:47
@timneutkens timneutkens force-pushed the 02-26-Add_compiler_error_for_conflicting_App_Router_and_Pages_Router_in_Turbopack branch from 3f45e57 to 5c0ea9d Compare March 1, 2024 13:48
.to_string(),
)
.cell(),
severity: IssueSeverity::Error.cell(),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically you could omit severity and description since they are constant. Just return the fixed value in the issue implementation

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah wasn't sure if there was a reason this wasn't done in the other issues, copied this one from app_structure.rs DirectoryTreeIssue

@timneutkens timneutkens merged commit 8034042 into canary Mar 1, 2024
70 checks passed
@timneutkens timneutkens deleted the 02-26-Add_compiler_error_for_conflicting_App_Router_and_Pages_Router_in_Turbopack branch March 1, 2024 16:39
timneutkens added a commit that referenced this pull request Mar 2, 2024
## What?

Fixes the check for Turbopack. Follow-up to #62531 which fixes the
underlying issue but it wasn't checking the right value.

<!-- 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-2665
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 16, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
create-next-app Related to our CLI tool for quickly starting a new Next.js application. created-by: Next.js team PRs by the Next.js team locked Turbopack Related to Turbopack with Next.js. type: next
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants