Skip to content

Commit

Permalink
Upgrade Turbopack (#67017)
Browse files Browse the repository at this point in the history
Upgrades Turbopack

* vercel/turborepo#8421 <!-- Tim Neutkens - Fix
Turbopack benchmark for next@canary -->
* vercel/turborepo#8396 <!-- Tim Neutkens - Rename
dev_runtime to browser_runtime -->
* vercel/turborepo#8397 <!-- Tim Neutkens - Rename
runtime/none to runtime/edge -->
* vercel/turborepo#8398 <!-- Tim Neutkens - Remove
unused Node.js runtime -->
* vercel/turborepo#8399 <!-- Tim Neutkens - Rename
build runtime to nodejs -->
* vercel/turborepo#8400 <!-- Tim Neutkens - Rename
dev runtime to browser -->

<!-- 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 Jun 20, 2024
1 parent 16f5c28 commit b515bbc
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 49 deletions.
74 changes: 37 additions & 37 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ swc_core = { version = "0.95.2", features = [
testing = { version = "0.35.25" }

# Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240617.2" }
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240619.2" }
# [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240617.2" }
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240619.2" }
# [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240617.2" }
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240619.2" }

# General Deps

Expand Down
2 changes: 1 addition & 1 deletion packages/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@
"@types/ws": "8.2.0",
"@vercel/ncc": "0.34.0",
"@vercel/nft": "0.27.1",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240617.2",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240619.2",
"acorn": "8.11.3",
"amphtml-validator": "1.0.35",
"anser": "1.4.9",
Expand Down
5 changes: 3 additions & 2 deletions packages/next/src/build/create-compiler-aliases.ts
Original file line number Diff line number Diff line change
Expand Up @@ -323,8 +323,9 @@ export function createRSCAliases(
`next/dist/compiled/react-dom${bundledReactChannel}/profiling`
}

alias['@vercel/turbopack-ecmascript-runtime/dev/client/hmr-client.ts'] =
`next/dist/client/dev/noop-turbopack-hmr`
alias[
'@vercel/turbopack-ecmascript-runtime/browser/dev/hmr-client/hmr-client.ts'
] = `next/dist/client/dev/noop-turbopack-hmr`

return alias
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export function useTurbopack(

import(
// @ts-expect-error requires "moduleResolution": "node16" in tsconfig.json and not .ts extension
'@vercel/turbopack-ecmascript-runtime/dev/client/hmr-client.ts'
'@vercel/turbopack-ecmascript-runtime/browser/dev/hmr-client/hmr-client.ts'
).then(({ connect }) => {
const { current } = turbopackState
connect({
Expand Down
2 changes: 1 addition & 1 deletion packages/next/src/client/next-dev-turbopack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import initHMR from './dev/hot-middleware-client'

import { pageBootrap } from './page-bootstrap'
//@ts-expect-error requires "moduleResolution": "node16" in tsconfig.json and not .ts extension
import { connect } from '@vercel/turbopack-ecmascript-runtime/dev/client/hmr-client.ts'
import { connect } from '@vercel/turbopack-ecmascript-runtime/browser/dev/hmr-client/hmr-client.ts'
import type { TurbopackMsgToBrowser } from '../server/dev/hot-reloader-types'

window.next = {
Expand Down
Loading

0 comments on commit b515bbc

Please sign in to comment.