Skip to content

Commit a06c8b9

Browse files
authored
Merge branch 'main' into improve-doc
2 parents 82b57da + f76285a commit a06c8b9

Some content is hidden

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

61 files changed

+1901
-487
lines changed

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ updates:
88
- 'github_actions:pull-request'
99
commit-message:
1010
prefix: meta
11+
cooldown:
12+
default-days: 3
1113
open-pull-requests-limit: 10
1214

1315
- package-ecosystem: npm
@@ -19,6 +21,8 @@ updates:
1921
- 'github_actions:pull-request'
2022
commit-message:
2123
prefix: meta
24+
cooldown:
25+
default-days: 3
2226
groups:
2327
lint:
2428
patterns:

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v22
1+
v22.14.0

apps/site/next.config.mjs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,16 @@ const nextConfig = {
9595
'shiki',
9696
],
9797
},
98+
// If we're building for the Cloudflare deployment we want to set
99+
// an appropriate deploymentId (needed for skew protection)
100+
// TODO: The `OPEN_NEXT_CLOUDFLARE` environment variable is being
101+
// defined in the worker building script, ideally the open-next
102+
// adapter should set it itself when it invokes the Next.js build
103+
// process, onces it does that remove the manual `OPEN_NEXT_CLOUDFLARE`
104+
// definition in the package.json script.
105+
deploymentId: process.env.OPEN_NEXT_CLOUDFLARE
106+
? (await import('@opennextjs/cloudflare')).getDeploymentId()
107+
: undefined,
98108
};
99109

100110
const withNextIntl = createNextIntlPlugin('./i18n.tsx');

apps/site/open-next.config.ts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
1+
import type { OpenNextConfig } from '@opennextjs/cloudflare';
12
import { defineCloudflareConfig } from '@opennextjs/cloudflare';
23
import incrementalCache from '@opennextjs/cloudflare/overrides/incremental-cache/kv-incremental-cache';
34

45
const cloudflareConfig = defineCloudflareConfig({ incrementalCache });
56

6-
export default { ...cloudflareConfig, buildCommand: 'pnpm build:default' };
7+
const openNextConfig: OpenNextConfig = {
8+
...cloudflareConfig,
9+
buildCommand: 'pnpm build:default',
10+
cloudflare: {
11+
skewProtection: {
12+
enabled: true,
13+
},
14+
},
15+
};
16+
17+
export default openNextConfig;

apps/site/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
"build:blog-data": "cross-env NODE_NO_WARNINGS=1 node ./scripts/blog-data/generate.mjs",
88
"build:blog-data:watch": "node --watch --watch-path=pages/en/blog ./scripts/blog-data/generate.mjs",
99
"build:default": "cross-env NODE_NO_WARNINGS=1 next build",
10-
"cloudflare:build:worker": "opennextjs-cloudflare build",
11-
"cloudflare:deploy": "wrangler deploy",
10+
"cloudflare:build:worker": "OPEN_NEXT_CLOUDFLARE=true opennextjs-cloudflare build",
11+
"cloudflare:deploy": "opennextjs-cloudflare deploy",
1212
"cloudflare:preview": "wrangler dev",
1313
"predeploy": "node --run build:blog-data",
14-
"deploy": "cross-env NEXT_PUBLIC_STATIC_EXPORT=true node --run build:default",
14+
"deploy": "cross-env NEXT_PUBLIC_STATIC_EXPORT=true node --run build:default -- --turbo",
1515
"predev": "node --run build:blog-data",
1616
"dev": "cross-env NODE_NO_WARNINGS=1 next dev --turbo",
1717
"lint": "turbo run lint:md lint:js lint:css",
@@ -57,7 +57,7 @@
5757
"feed": "~5.1.0",
5858
"github-slugger": "~2.0.0",
5959
"gray-matter": "~4.0.3",
60-
"next": "15.3.4",
60+
"next": "15.4.3",
6161
"next-intl": "~4.3.4",
6262
"next-themes": "~0.4.6",
6363
"postcss-calc": "~10.1.1",
@@ -79,11 +79,11 @@
7979
"@eslint/eslintrc": "~3.3.1",
8080
"@flarelabs-net/wrangler-build-time-fs-assets-polyfilling": "^0.0.0",
8181
"@next/eslint-plugin-next": "15.3.4",
82-
"@opennextjs/cloudflare": "^1.3.0",
82+
"@opennextjs/cloudflare": "^1.6.0",
8383
"@playwright/test": "^1.53.2",
8484
"@testing-library/user-event": "~14.6.1",
8585
"@types/semver": "~7.7.0",
86-
"eslint-config-next": "15.3.5",
86+
"eslint-config-next": "15.4.3",
8787
"eslint-import-resolver-typescript": "~4.4.4",
8888
"eslint-plugin-mdx": "~3.6.0",
8989
"eslint-plugin-react": "~7.37.4",
@@ -110,7 +110,7 @@
110110
"typescript": "catalog:",
111111
"typescript-eslint": "~8.35.1",
112112
"user-agent-data-types": "0.4.2",
113-
"wrangler": "^4.22.0"
113+
"wrangler": "^4.25.1"
114114
},
115115
"imports": {
116116
"#site/*": [

apps/site/pages/en/learn/getting-started/introduction-to-nodejs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Node.js is an open-source and cross-platform JavaScript runtime environment. It
1010

1111
Node.js runs the V8 JavaScript engine, the core of Google Chrome, outside of the browser. This allows Node.js to be very performant.
1212

13-
A Node.js app runs in a single process, without creating a new thread for every request. Node.js provides a set of asynchronous I/O primitives in its standard library that prevent JavaScript code from blocking and generally, libraries in Node.js are written using non-blocking paradigms, making blocking behavior the exception rather than the norm.
13+
A Node.js app runs in a single process, without creating a new thread for every request. Node.js provides a set of asynchronous I/O primitives in its standard library that prevent JavaScript code from blocking. In addition, libraries in Node.js are generally written using non-blocking paradigms. Accordingly, blocking behavior is the exception rather than the norm in Node.js.
1414

1515
When Node.js performs an I/O operation, like reading from the network, accessing a database or the filesystem, instead of blocking the thread and wasting CPU cycles waiting, Node.js will resume the operations when the response comes back.
1616

apps/site/pages/es/about/previous-releases.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Los detalles del calendario de lanzamiento de Node.js están disponibles [en Git
1818

1919
### Soporte Comercial
2020

21-
El soporte comercial para versiones posteriores a la fase de Mantenimiento está disponible a través de nuestro socio del Programa de Sostenibilidad del Ecosistema OpenJS, [HeroDevs.](https://herodevs.com/).
21+
El soporte comercial para las versiones que han superado la fase de Mantenimiento está disponible a través de nuestro socio del programa OpenJS Ecosystem Sustainability, [HeroDevs](https://www.herodevs.com/support/node-nes?utm_source=NodeJS+&utm_medium=Link&utm_campaign=Version_support_page).
2222

2323
## ¿Buscando las últimas versiones de una rama específica?
2424

apps/site/pages/es/download/current.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ title: Descarga Node.js®
1717
</section>
1818

1919
<section>
20-
Lee el <Release.ChangelogLink>historial de cambios</Release.ChangelogLink> para esta versión.
20+
Lee <Release.ChangelogLink>el historial</Release.ChangelogLink> o <Release.BlogPostLink>el artículo del blog</Release.BlogPostLink> para esta versión.
2121

22-
Lee el <Release.BlogPostLink>artículo del blog</Release.BlogPostLink> para esta versión.
22+
Aprende más sobre [los lanzamientos de Node.js](/about/previous-releases), incluyendo el calendario de lanzamientos y el estado LTS (soporte de largo plazo).
2323

2424
Aprende a <LinkWithArrow href="https://github.com/nodejs/node#verifying-binaries">verificar</LinkWithArrow> la firma SHASUMS.
2525

apps/site/pages/es/download/index.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ title: Descarga Node.js®
1717
</section>
1818

1919
<section>
20-
Lee el <Release.ChangelogLink>historial</Release.ChangelogLink> para esta versión.
20+
Lee <Release.ChangelogLink>el historial</Release.ChangelogLink> o <Release.BlogPostLink>el artículo del blog</Release.BlogPostLink> para esta versión.
2121

22-
Lee el <Release.BlogPostLink>artículo del blog</Release.BlogPostLink> para esta versión.
22+
Aprende más sobre [los lanzamientos de Node.js](/about/previous-releases), incluyendo el calendario de lanzamientos y el estado LTS (soporte de largo plazo).
2323

2424
Aprende a <LinkWithArrow href="https://github.com/nodejs/node#verifying-binaries">verificar</LinkWithArrow> la firma SHASUMS.
2525

apps/site/pages/es/download/package-manager/all.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ Te permite tener **diferentes versiones para diferentes proyectos**, **diferente
343343

344344
Soporta todas las shells populares (Bash, Zsh, Fish, PowerShell, Clink, Cmder).
345345

346-
Consulta el [inicio rápido](https://vfox.lhan.me/guides/quick-start.html) para usar vfox rápidamente y todos los detalles de uso.
346+
Consulta el [inicio rápido](https://vfox.dev/guides/quick-start.html) para usar vfox rápidamente y leer todos los detalles de uso.
347347

348348
## Void Linux
349349

0 commit comments

Comments
 (0)