Merge remote-tracking branch 'refs/remotes/upstream/main'

# Conflicts: # docs/3.api/2.composables/on-prehydrate.md
translation-gang · Jun 11, 2024 · 7bc9479 · 7bc9479
2 parents 971af41 + 41fc45d
commit 7bc9479
Show file tree

Hide file tree

Showing 16 changed files with 33 additions and 158 deletions.
diff --git a/docs/1.getting-started/12.upgrade.md b/docs/1.getting-started/12.upgrade.md
@@ -23,7 +23,7 @@ To use the latest Nuxt build and test features before their release, read about
 
 Nuxt 4 is planned to be released **on or before June 14** (though obviously this is dependent on having enough time after Nitro's major release to be properly tested in the community, so be aware that this is not an exact date).
 
-Until then, it is possible to test many of Nuxt 4's breaking changes on the nightly release channel.
+Until then, it is possible to test many of Nuxt 4's breaking changes from Nuxt version 3.12 or via the nightly release channel.
 
 ::tip{icon="i-ph-video-duotone" to="https://www.youtube.com/watch?v=r4wFKlcJK6c" target="_blank"}
 Watch a video from Alexander Lichter showing how to opt in to Nuxt 4's breaking changes already.

diff --git a/docs/2.guide/3.going-further/1.features.md b/docs/2.guide/3.going-further/1.features.md
@@ -40,7 +40,7 @@ There is also a `future` namespace for early opting-in to new features that will
 ### compatibilityVersion
 
 ::important
-This configuration option is available in Nuxt v3.12+ or in [the nightly release channel](/docs/guide/going-further/nightly-release-channel).
+This configuration option is available in Nuxt v3.12+.
 ::
 
 This enables early access to Nuxt features or flags.

diff --git a/docs/3.api/1.components/12.nuxt-route-announcer.md b/docs/3.api/1.components/12.nuxt-route-announcer.md
@@ -11,7 +11,7 @@ links:
 ---
 
 ::important
-This component will be available in Nuxt v3.12 or in [the nightly release channel](/docs/guide/going-further/nightly-release-channel).
+This component is available in Nuxt v3.12+.
 ::
 
 ## Использование

diff --git a/docs/3.api/2.composables/on-prehydrate.md b/docs/3.api/2.composables/on-prehydrate.md
@@ -9,7 +9,7 @@ links:
 ---
 
 ::important
-Этот коллбэк будет доступен в Nuxt v3.12+ или в [канале ночных релизов](/docs/guide/going-further/nightly-release-channel).
+Этот коллбэк доступен в Nuxt v3.12+.
 ::
 
 `onPrehydrate` это коллбэк хука жизненного цикла, который позволяет запускать коллбэк-функцию на клиенте непосредственно перед тем, как Nuxt гидратирует страницу.

diff --git a/docs/3.api/2.composables/use-route-announcer.md b/docs/3.api/2.composables/use-route-announcer.md
@@ -11,7 +11,7 @@ links:
 ---
 
 ::important
-This composable will be available in Nuxt v3.12 or in [the nightly release channel](/docs/guide/going-further/nightly-release-channel).
+This composable is available in Nuxt v3.12+.
 ::
 
 ## Описание

diff --git a/package.json b/package.json
@@ -76,7 +76,7 @@
  "jiti": "1.21.6",
  "markdownlint-cli": "0.41.0",
  "nitropack": "2.9.6",
- "nuxi": "3.11.1",
+ "nuxi": "3.12.0",
  "nuxt": "workspace:*",
  "nuxt-content-twoslash": "0.0.10",
  "ofetch": "1.3.4",

diff --git a/packages/kit/package.json b/packages/kit/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@nuxt/kit",
- "version": "3.12.0",
+ "version": "3.12.1",
  "repository": {
  "type": "git",
  "url": "git+https://github.com/nuxt/nuxt.git",

diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
@@ -1,6 +1,6 @@
 {
  "name": "nuxt",
- "version": "3.12.0",
+ "version": "3.12.1",
  "repository": {
  "type": "git",
  "url": "git+https://github.com/nuxt/nuxt.git",
@@ -90,7 +90,7 @@
  "magic-string": "^0.30.10",
  "mlly": "^1.7.1",
  "nitropack": "^2.9.6",
- "nuxi": "^3.11.1",
+ "nuxi": "^3.12.0",
  "nypm": "^0.3.8",
  "ofetch": "^1.3.4",
  "ohash": "^1.1.3",

diff --git a/packages/schema/package.json b/packages/schema/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@nuxt/schema",
- "version": "3.12.0",
+ "version": "3.12.1",
  "repository": {
  "type": "git",
  "url": "git+https://github.com/nuxt/nuxt.git",

diff --git a/packages/schema/src/config/common.ts b/packages/schema/src/config/common.ts
@@ -28,7 +28,7 @@ export default defineUntypedSchema({
  *
  * We plan to improve the tooling around this feature in the future.
  *
- * @type {typeof import('compatx').DateString | Record<string, typeof import('compatx').DateString>}
+ * @type {typeof import('compatx').CompatibilityDateSpec}
  */
  compatibilityDate: undefined,
 

diff --git a/packages/ui-templates/package.json b/packages/ui-templates/package.json
@@ -30,7 +30,7 @@
  "knitwork": "1.1.0",
  "lodash-es": "4.17.21",
  "pathe": "1.1.2",
- "prettier": "3.3.1",
+ "prettier": "3.3.2",
  "scule": "1.3.0",
  "unocss": "0.60.4",
  "vite": "5.2.13"

diff --git a/packages/vite/package.json b/packages/vite/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@nuxt/vite-builder",
- "version": "3.12.0",
+ "version": "3.12.1",
  "repository": {
  "type": "git",
  "url": "git+https://github.com/nuxt/nuxt.git",

diff --git a/packages/webpack/package.json b/packages/webpack/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@nuxt/webpack-builder",
- "version": "3.12.0",
+ "version": "3.12.1",
  "repository": {
  "type": "git",
  "url": "git+https://github.com/nuxt/nuxt.git",