Skip to content

Commit 69c54d2

Browse files
timneutkenstimneutkens
authored
Merge branch 'canary' into fs-extra-copy
2 parents 3b43e7a + 7281cd3 commit 69c54d2

File tree

259 files changed

+2846
-1167
lines changed

Some content is hidden

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

259 files changed

+2846
-1167
lines changed

‎.github/workflows/build_and_deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ jobs:
450450
with:
451451
fetch-depth: 25
452452
- name: Install Vercel CLI
453-
run: npm i -g vercel@28.16.15
453+
run: npm i -g vercel@latest
454454
- name: Deploy preview examples
455455
if: ${{ needs.build.outputs.isRelease != 'true' }}
456456
run: ./scripts/deploy-examples.sh

‎.github/workflows/update-turbopack-test-manifest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
run: node scripts/automated-update-workflow.js
3737
env:
3838
GITHUB_TOKEN: ${{ secrets.GH_TOKEN_PULL_REQUESTS }}
39-
BRANCH_NAME: fonts-data
39+
BRANCH_NAME: turbopack-manifest
4040
SCRIPT: test/build-turbopack-tests-manifest.js
4141
PR_TITLE: Update Turbopack test manifest
4242
PR_BODY: This auto-generated PR updates the integration test manifest used when testing Turbopack.

‎Cargo.lock

Lines changed: 33 additions & 33 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
@@ -40,11 +40,11 @@ next-transform-strip-page-exports = { path = "packages/next-swc/crates/next-tran
4040
testing = { version = "0.35.7" }
4141

4242
# Turbo crates
43-
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231108.1" }
43+
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231113.3" }
4444
# [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
45-
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231108.1" }
45+
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231113.3" }
4646
# [TODO]: need to refactor embed_directory! macro usage in next-core
47-
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231108.1" }
47+
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231113.3" }
4848

4949
# General Deps
5050

‎docs/02-app/01-building-your-application/01-routing/08-parallel-routes.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ On reload, Next.js will first try to render the unmatched slot's `default.js` fi
115115
116116
## `useSelectedLayoutSegment(s)`
117117

118-
Both [`useSelectedLayoutSegment`](/docs/app/api-reference/functions/use-selected-layout-segment) and [`useSelectedLayoutSegments`](/docs/app/api-reference/functions/use-selected-layout-segments) accept a `parallelRoutesKey`, which allows you read the active route segment within that slot.
118+
Both [`useSelectedLayoutSegment`](/docs/app/api-reference/functions/use-selected-layout-segment) and [`useSelectedLayoutSegments`](/docs/app/api-reference/functions/use-selected-layout-segments) accept a `parallelRoutesKey`, which allows you to read the active route segment within that slot.
119119

120120
```tsx filename="app/layout.tsx" switcher
121121
'use client'

‎docs/02-app/01-building-your-application/03-rendering/04-edge-and-nodejs-runtimes.mdx

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@ On the server, there are two runtimes where parts of your application code can b
1616

1717
There are many considerations to make when choosing a runtime. This table shows the major differences at a glance. If you want a more in-depth analysis of the differences, check out the sections below.
1818

19-
| | Node | Serverless | Edge |
20-
| --------------------------------------------------------------------------------------------------------------------------------------------------- | ------ | ---------- | ---------------- |
21-
| [Cold Boot](https://vercel.com/docs/concepts/get-started/compute#cold-and-hot-boots?utm_source=next-site&utm_medium=docs&utm_campaign=next-website) | / | ~250ms | Instant |
22-
| [HTTP Streaming](/docs/app/building-your-application/routing/loading-ui-and-streaming) | Yes | Yes | Yes |
23-
| IO | All | All | `fetch` |
24-
| Scalability | / | High | Highest |
25-
| Security | Normal | High | High |
26-
| Latency | Normal | Low | Lowest |
27-
| npm Packages | All | All | A smaller subset |
28-
| [Static Rendering](/docs/app/building-your-application/rendering/server-components#static-rendering-default) | Yes | Yes | No |
29-
| [Dynamic Rendering](/docs/app/building-your-application/rendering/server-components#dynamic-rendering) | Yes | Yes | Yes |
30-
| [Data Revalidation w/ `fetch`](/docs/app/building-your-application/data-fetching/fetching-caching-and-revalidating#revalidating-data) | Yes | Yes | Yes |
19+
| | Node | Serverless | Edge |
20+
| ------------------------------------------------------------------------------------------------------------------------------------- | ------ | ---------- | ---------------- |
21+
| Cold Boot | / | Normal | Low |
22+
| [HTTP Streaming](/docs/app/building-your-application/routing/loading-ui-and-streaming) | Yes | Yes | Yes |
23+
| IO | All | All | `fetch` |
24+
| Scalability | / | High | Highest |
25+
| Security | Normal | High | High |
26+
| Latency | Normal | Low | Lowest |
27+
| npm Packages | All | All | A smaller subset |
28+
| [Static Rendering](/docs/app/building-your-application/rendering/server-components#static-rendering-default) | Yes | Yes | No |
29+
| [Dynamic Rendering](/docs/app/building-your-application/rendering/server-components#dynamic-rendering) | Yes | Yes | Yes |
30+
| [Data Revalidation w/ `fetch`](/docs/app/building-your-application/data-fetching/fetching-caching-and-revalidating#revalidating-data) | Yes | Yes | Yes |
3131

3232
### Edge Runtime
3333

0 commit comments

Comments
 (0)