Skip to content

Commit 1a29226

Browse files
authored
Merge branch 'canary' into bump-react
2 parents e494c71 + 9229f74 commit 1a29226

File tree

41 files changed

+447
-175
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+447
-175
lines changed

Cargo.lock

Lines changed: 37 additions & 37 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ swc_core = { version = "0.79.40" }
4444
testing = { version = "0.33.21" }
4545

4646
# Turbo crates
47-
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230808.2" }
47+
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230809.2" }
4848
# [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
49-
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230808.2" }
49+
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230809.2" }
5050
# [TODO]: need to refactor embed_directory! macro usage in next-core
51-
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230808.2" }
51+
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230809.2" }
5252

5353
# General Deps
5454

contributing/examples/adding-examples.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Deploy the example using [Vercel](https://vercel.com?utm_source=github&utm_mediu
3939

4040
## How to use
4141

42-
Execute [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app) with [npm](https://docs.npmjs.com/cli/init), [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/), or [pnpm](https://pnpm.io) to bootstrap the example:
42+
Execute [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app) with [npm](https://docs.npmjs.com/cli/init), [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/), [pnpm](https://pnpm.io), or [Bun](https://bun.sh/docs/cli/bunx) to bootstrap the example:
4343

4444
```bash
4545
npx create-next-app --example DIRECTORY_NAME DIRECTORY_NAME-app
@@ -53,5 +53,9 @@ yarn create next-app --example DIRECTORY_NAME DIRECTORY_NAME-app
5353
pnpm create next-app --example DIRECTORY_NAME DIRECTORY_NAME-app
5454
```
5555

56+
```bash
57+
bunx create-next-app --example DIRECTORY_NAME DIRECTORY_NAME-app
58+
```
59+
5660
Deploy it to the cloud with [Vercel](https://vercel.com/new?utm_source=github&utm_medium=readme&utm_campaign=next-example) ([Documentation](https://nextjs.org/docs/deployment)).
5761
````

docs/02-app/01-building-your-application/01-routing/09-intercepting-routes.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ related:
88
- app/building-your-application/routing/parallel-routes
99
---
1010

11-
Intercepting routes allows you to load a route within the current layout while keeping the context for the current page. This routing paradigm can be useful when you want to "intercept" a certain route to show a different route.
11+
Intercepting routes allows you to load a route from another part of your application within the current layout. This routing paradigm can be useful when you want to display the content of a route without the user switching to a different context.
1212

13-
For example, when clicking on a photo from within a feed, a modal overlaying the feed should show up with the photo. In this case, Next.js intercepts the `/feed` route and "masks" this URL to show `/photo/123` instead.
13+
For example, when clicking on a photo in a feed, you can display the photo in a modal, overlaying the feed. In this case, Next.js intercepts the `/photo/123` route, masks the URL, and overlays it over `/feed`.
1414

1515
<Image
1616
alt="Intercepting routes soft navigation"

0 commit comments

Comments
 (0)