Skip to content

Commit ca89b76

Browse files
committed
Merge remote-tracking branch 'origin/main' into v4
# Conflicts: # pnpm-lock.yaml
2 parents bbb5b08 + 432524b commit ca89b76

File tree

12 files changed

+81
-81
lines changed

12 files changed

+81
-81
lines changed

docs/src/components/CodeSnippets.tsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -293,23 +293,23 @@ function buildOutput() {
293293
<span className="line">
294294
<span data-token="text">┌ ● /</span>
295295
<span data-token="text"> </span>
296-
<span data-token="text">{' '}2.5 kB</span>
296+
<span data-token="text">{' '}1.5 kB</span>
297297
<span data-token="text">{' '}</span>
298-
<span data-token="string">115 kB</span>
298+
<span data-token="string">102 kB</span>
299299
</span>
300300
<span className="line">
301301
<span data-token="text">├ ● /about</span>
302302
<span data-token="text">{' '}</span>
303-
<span data-token="text">2.6 kB</span>
303+
<span data-token="text">2.2 kB</span>
304304
<span data-token="text">{' '}</span>
305-
<span data-token="string">116 kB</span>
305+
<span data-token="string">102 kB</span>
306306
</span>
307307
<span className="line">
308308
<span data-token="text">└ λ /[username]</span>
309309
<span data-token="text">{' '}</span>
310-
<span data-token="text">3.2 kB</span>
310+
<span data-token="text">3.6 kB</span>
311311
<span data-token="text">{' '}</span>
312-
<span data-token="string">117 kB</span>
312+
<span data-token="string">104 kB</span>
313313
</span>
314314
<span className="line"> </span>
315315
<span className="line">

examples/example-app-router-migration/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"start": "next start"
1010
},
1111
"dependencies": {
12-
"next": "^15.2.0",
12+
"next": "^15.2.2",
1313
"next-intl": "^3.0.0",
1414
"react": "^18.3.1",
1515
"react-dom": "^18.3.1"

examples/example-app-router-mixed-routing/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"start": "next start"
1010
},
1111
"dependencies": {
12-
"next": "^15.2.0",
12+
"next": "^15.2.2",
1313
"next-intl": "^3.0.0",
1414
"react": "^18.3.1",
1515
"react-dom": "^18.3.1",

examples/example-app-router-next-auth/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"start": "next start"
1010
},
1111
"dependencies": {
12-
"next": "^15.2.0",
12+
"next": "^15.2.2",
1313
"next-auth": "^4.24.11",
1414
"next-intl": "^3.0.0",
1515
"react": "^18.3.1",

examples/example-app-router-playground/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@radix-ui/react-dropdown-menu": "^2.1.1",
1616
"lodash": "^4.17.21",
1717
"ms": "2.1.3",
18-
"next": "^15.2.0",
18+
"next": "^15.2.2",
1919
"next-intl": "^3.0.0",
2020
"react": "^18.3.1",
2121
"react-dom": "^18.3.1",

examples/example-app-router-single-locale/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"start": "next start"
1010
},
1111
"dependencies": {
12-
"next": "^15.2.0",
12+
"next": "^15.2.2",
1313
"next-intl": "^3.0.0",
1414
"react": "^18.3.1",
1515
"react-dom": "^18.3.1"

examples/example-app-router-without-i18n-routing/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"@radix-ui/react-select": "^2.1.1",
1414
"clsx": "^2.1.1",
1515
"lodash": "^4.17.21",
16-
"next": "^15.2.0",
16+
"next": "^15.2.2",
1717
"next-intl": "^3.0.0",
1818
"react": "^18.3.1",
1919
"react-dom": "^18.3.1",

examples/example-app-router/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"dependencies": {
1414
"clsx": "^2.1.1",
15-
"next": "^15.2.0",
15+
"next": "^15.2.2",
1616
"next-intl": "^3.0.0",
1717
"react": "^18.3.1",
1818
"react-dom": "^18.3.1",

examples/example-pages-router-advanced/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"dependencies": {
1212
"accept-language-parser": "^1.5.0",
1313
"lodash": "^4.17.21",
14-
"next": "^15.2.0",
14+
"next": "^15.2.2",
1515
"next-intl": "^3.0.0",
1616
"react": "^18.3.1",
1717
"react-dom": "^18.3.1"

examples/example-pages-router/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"dependencies": {
1212
"date-fns": "^3.6.0",
13-
"next": "^15.2.0",
13+
"next": "^15.2.2",
1414
"next-intl": "^3.0.0",
1515
"react": "^18.3.1",
1616
"react-dom": "^18.3.1"

packages/next-intl/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
"eslint": "^9.11.1",
137137
"eslint-config-molindo": "^8.0.0",
138138
"eslint-plugin-react-compiler": "0.0.0-experimental-8e3b87c-20240822",
139-
"next": "^15.2.0",
139+
"next": "^15.2.2",
140140
"path-to-regexp": "^6.2.2",
141141
"prettier": "^3.3.3",
142142
"publint": "^0.2.8",

0 commit comments

Comments
 (0)