Skip to content

Commit 6709dae

Browse files
atsushi196323atsushi196323
committed
Merge branch 'fix-docs-typos' of https://github.com/atsushi196323/next.js into fix-docs-typos
2 parents c1da2ed + f27097c commit 6709dae

File tree

58 files changed

+561
-207
lines changed

Some content is hidden

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

58 files changed

+561
-207
lines changed

‎.github/workflows/build_and_deploy.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ env:
2828
jobs:
2929
deploy-target:
3030
runs-on: ubuntu-latest
31+
# Don't trigger this job on `pull_request` events from upstream branches.
32+
# Those would already run this job on the `push` event
33+
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork }}
3134
outputs:
3235
value: ${{ steps.deploy-target.outputs.value }}
3336
steps:
@@ -693,7 +696,7 @@ jobs:
693696

694697
buildPassed:
695698
needs: ['deploy-target', 'build', 'build-wasm', 'build-native']
696-
if: always()
699+
if: ${{ always() && needs.deploy-target.outputs.value != '' }}
697700
name: thank you, build
698701
runs-on: ubuntu-latest
699702
steps:

‎.github/workflows/turbopack-benchmark.yml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ on:
55
push:
66
branches:
77
- canary
8-
paths:
9-
- '**/crates/**'
10-
- '**/Cargo.toml'
11-
- '**/Cargo.lock'
128
pull_request:
139
types: ['opened', 'reopened', 'synchronize', 'labeled']
1410
paths:
@@ -30,29 +26,6 @@ env:
3026
TURBO_TOKEN: ${{ secrets.HOSTED_TURBO_TOKEN }}
3127

3228
jobs:
33-
benchmark-tiny:
34-
name: Benchmark Rust Crates (tiny)
35-
runs-on: ['self-hosted', 'linux', 'x64', 'metal']
36-
steps:
37-
- uses: actions/checkout@v4
38-
39-
- name: Setup Rust toolchain
40-
uses: ./.github/actions/setup-rust
41-
42-
- name: Install cargo-codspeed
43-
uses: taiki-e/install-action@v2
44-
with:
45-
tool: [email protected]
46-
47-
- name: Build the benchmark target(s)
48-
run: cargo codspeed build -p turbo-rcstr
49-
50-
- name: Run the benchmarks
51-
uses: CodSpeedHQ/action@v3
52-
with:
53-
run: cargo codspeed run
54-
token: ${{ secrets.CODSPEED_TOKEN }}
55-
5629
benchmark-small-apps:
5730
name: Benchmark Rust Crates (small apps)
5831
runs-on: ['self-hosted', 'linux', 'x64', 'metal']

‎Cargo.lock

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

‎crates/napi/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ supports-hyperlinks = "3.1.0"
6969
terminal_hyperlink = "0.1.0"
7070
tracing = { workspace = true }
7171
tracing-subscriber = { workspace = true }
72-
tracing-chrome = "0.5.0"
72+
tracing-chrome = "0.7.2"
7373
url = { workspace = true }
7474
urlencoding = { workspace = true }
7575
once_cell = { workspace = true }

‎crates/next-core/src/next_image/module.rs

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use anyhow::Result;
2-
use turbo_tasks::{ResolvedVc, TaskInput, Vc, fxindexmap};
2+
use serde::{Deserialize, Serialize};
3+
use turbo_tasks::{NonLocalValue, ResolvedVc, TaskInput, Vc, fxindexmap, trace::TraceRawVcs};
34
use turbopack::{ModuleAssetContext, module_options::CustomModuleType};
45
use turbopack_core::{
56
context::AssetContext, module::Module, reference_type::ReferenceType, resolve::ModulePart,
@@ -9,8 +10,21 @@ use turbopack_static::ecma::StaticUrlJsModule;
910

1011
use super::source_asset::StructuredImageFileSource;
1112

12-
#[turbo_tasks::value(serialization = "auto_for_input")]
13-
#[derive(Clone, Copy, Debug, PartialOrd, Ord, Hash, TaskInput)]
13+
#[derive(
14+
Eq,
15+
PartialEq,
16+
Clone,
17+
Copy,
18+
Debug,
19+
PartialOrd,
20+
Ord,
21+
Hash,
22+
TaskInput,
23+
TraceRawVcs,
24+
NonLocalValue,
25+
Serialize,
26+
Deserialize,
27+
)]
1428
pub enum BlurPlaceholderMode {
1529
/// Do not generate a blur placeholder at all.
1630
None,

‎docs/01-app/01-getting-started/02-project-structure.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ Since files in the `app` directory can be [safely colocated by default](#colocat
261261
> **Good to know**:
262262
>
263263
> - While not a framework convention, you might also consider marking files outside private folders as "private" using the same underscore pattern.
264-
> - You can create URL segments that start with an underscore by prefixing the folder name with `%5F` (the URL-encoded form of an underscore): `%5FfolderName`.
264+
> - You can create URL segments that start with an underscore by prefixing the folder name with `%5F` (the URL-encoded form of an underscore): `%5FolderName`.
265265
> - If you don't use private folders, it would be helpful to know Next.js [special file conventions](/docs/app/getting-started/project-structure#routing-files) to prevent unexpected naming conflicts.
266266
267267
### Route groups

‎docs/04-community/02-rspack.mdx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
title: Rspack Integration
3+
nav_title: Rspack
4+
description: Use the `next-rspack` plugin to bundle your Next.js with Rspack.
5+
version: experimental
6+
---
7+
8+
The Rspack team has created a community plugin for Next.js, which is part of a [partnering effort](https://rspack.rs/blog/rspack-next-partner) with the Rspack team.
9+
10+
This plugin is currently experimental. Please use this [discussion thread](https://github.com/vercel/next.js/discussions/77800) to give feedback on any issues you encounter.
11+
12+
Learn more on the [Rspack docs](https://rspack.rs/guide/tech/next) and try out [this example](https://github.com/vercel/next.js/tree/canary/examples/with-rspack).

‎lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
"registry": "https://registry.npmjs.org/"
1717
}
1818
},
19-
"version": "15.4.0-canary.72"
19+
"version": "15.4.0-canary.74"
2020
}

‎packages/create-next-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "create-next-app",
3-
"version": "15.4.0-canary.72",
3+
"version": "15.4.0-canary.74",
44
"keywords": [
55
"react",
66
"next",

‎packages/eslint-config-next/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "eslint-config-next",
3-
"version": "15.4.0-canary.72",
3+
"version": "15.4.0-canary.74",
44
"description": "ESLint configuration used by Next.js.",
55
"main": "index.js",
66
"license": "MIT",
@@ -10,7 +10,7 @@
1010
},
1111
"homepage": "https://nextjs.org/docs/app/api-reference/config/eslint",
1212
"dependencies": {
13-
"@next/eslint-plugin-next": "15.4.0-canary.72",
13+
"@next/eslint-plugin-next": "15.4.0-canary.74",
1414
"@rushstack/eslint-patch": "^1.10.3",
1515
"@typescript-eslint/eslint-plugin": "^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0",
1616
"@typescript-eslint/parser": "^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0",

‎packages/eslint-plugin-internal/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@next/eslint-plugin-internal",
33
"private": true,
4-
"version": "15.4.0-canary.72",
4+
"version": "15.4.0-canary.74",
55
"description": "ESLint plugin for working on Next.js.",
66
"exports": {
77
".": "./src/eslint-plugin-internal.js"

‎packages/eslint-plugin-next/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@next/eslint-plugin-next",
3-
"version": "15.4.0-canary.72",
3+
"version": "15.4.0-canary.74",
44
"description": "ESLint plugin for Next.js.",
55
"main": "dist/index.js",
66
"types": "dist/index.d.ts",

‎packages/font/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@next/font",
33
"private": true,
4-
"version": "15.4.0-canary.72",
4+
"version": "15.4.0-canary.74",
55
"repository": {
66
"url": "vercel/next.js",
77
"directory": "packages/font"

0 commit comments

Comments
 (0)