Merge remote-tracking branch 'upstream/main'

# Conflicts: # docs/1.getting-started/6.data-fetching.md # docs/3.api/5.kit/12.resolving.md # docs/3.api/5.kit/5.components.md
translation-gang · Jun 18, 2024 · b5b749d · b5b749d
2 parents 645c2d9 + 7d942f1
commit b5b749d
Show file tree

Hide file tree

Showing 12 changed files with 199 additions and 70 deletions.
diff --git a/docs/1.getting-started/6.data-fetching.md b/docs/1.getting-started/6.data-fetching.md
@@ -227,7 +227,7 @@ const { pending, data: posts } = useLazyFetch('/api/posts')
 const articles = await useFetch('/api/article')
 
 /* Этот вызов будет выполнен только на клиенте */
-const { pending, data: posts } = useFetch('/api/comments', {
+const { pending, data: comments } = useFetch('/api/comments', {
  lazy: true,
  server: false
 })

diff --git a/docs/2.guide/2.directory-structure/1.modules.md b/docs/2.guide/2.directory-structure/1.modules.md
@@ -61,6 +61,6 @@ modules/
 
 :read-more{to="/docs/guide/going-further/modules"}
 
-::tip{icon="i-ph-video-duotone" to="https://vueschool.io/lessons/creating-your-first-module-from-scratch" target="_blank"}
+::tip{icon="i-ph-video-duotone" to="https://vueschool.io/lessons/creating-your-first-module-from-scratch?friend=nuxt" target="_blank"}
 Watch Vue School video about Nuxt private modules.
 ::
diff --git a/docs/2.guide/3.going-further/3.modules.md b/docs/2.guide/3.going-further/3.modules.md
@@ -30,7 +30,7 @@ This will create a `my-module` project with all the boilerplate necessary to dev
 
 Learn how to perform basic tasks with the module starter.
 
-::tip{icon="i-ph-video-duotone" to="https://vueschool.io/lessons/navigating-the-official-starter-template" target="_blank"}
+::tip{icon="i-ph-video-duotone" to="https://vueschool.io/lessons/navigating-the-official-starter-template?friend=nuxt" target="_blank"}
 Watch Vue School video about Nuxt module starter template.
 ::
 
@@ -259,7 +259,7 @@ export default defineNuxtModule({
 
 When you need to handle more complex configuration alterations, you should consider using [defu](https://github.com/unjs/defu).
 
-::tip{icon="i-ph-video-duotone" to="https://vueschool.io/lessons/extending-and-altering-nuxt-configuration-and-options" target="_blank"}
+::tip{icon="i-ph-video-duotone" to="https://vueschool.io/lessons/extending-and-altering-nuxt-configuration-and-options?friend=nuxt" target="_blank"}
 Watch Vue School video about altering Nuxt configuration.
 ::
 
@@ -296,7 +296,7 @@ Be careful not to expose any sensitive module configuration on the public runtim
 
 :read-more{to="/docs/guide/going-further/runtime-config"}
 
-::tip{icon="i-ph-video-duotone" to="https://vueschool.io/lessons/passing-and-exposing-module-options" target="_blank"}
+::tip{icon="i-ph-video-duotone" to="https://vueschool.io/lessons/passing-and-exposing-module-options?friend=nuxt" target="_blank"}
 Watch Vue School video about passing and exposing Nuxt module options.
 ::
 
@@ -523,7 +523,7 @@ export default defineNuxtModule({
 
 :read-more{to="/docs/api/advanced/hooks"}
 
-::tip{icon="i-ph-video-duotone" to="https://vueschool.io/lessons/nuxt-lifecycle-hooks" target="_blank"}
+::tip{icon="i-ph-video-duotone" to="https://vueschool.io/lessons/nuxt-lifecycle-hooks?friend=nuxt" target="_blank"}
 Watch Vue School video about using Nuxt lifecycle hooks in modules.
 ::
 
@@ -749,7 +749,7 @@ The module starter comes with a default set of tools and configurations (e.g. ES
 
 [Nuxt Module ecosystem](/modules) represents more than 15 million monthly NPM downloads and provides extended functionalities and integrations with all sort of tools. You can be part of this ecosystem!
 
-::tip{icon="i-ph-video-duotone" to="https://vueschool.io/lessons/exploring-nuxt-modules-ecosystem-and-module-types" target="_blank"}
+::tip{icon="i-ph-video-duotone" to="https://vueschool.io/lessons/exploring-nuxt-modules-ecosystem-and-module-types?friend=nuxt" target="_blank"}
 Watch Vue School video about Nuxt module types.
 ::
 

diff --git a/docs/3.api/5.kit/12.resolving.md b/docs/3.api/5.kit/12.resolving.md
@@ -211,7 +211,7 @@ interface ResolvePathOptions {
 
 Создает резолвер относительно базового пути.
 
-::tip{icon="i-ph-video-duotone" to="https://vueschool.io/lessons/resolving-paths-and-injecting-assets-to-the-app" target="_blank"}
+::tip{icon="i-ph-video-duotone" to="https://vueschool.io/lessons/resolving-paths-and-injecting-assets-to-the-app?friend=nuxt" target="_blank"}
 Посмотрите видео от Vue School о createResolver.
 ::
 

diff --git a/docs/3.api/5.kit/4.autoimports.md b/docs/3.api/5.kit/4.autoimports.md
@@ -18,7 +18,7 @@ These functions are designed for registering your own utils, composables and Vue
 
 Nuxt auto-imports helper functions, composables and Vue APIs to use across your application without explicitly importing them. Based on the directory structure, every Nuxt application can also use auto-imports for its own composables and plugins. Composables or plugins can use these functions.
 
-::tip{icon="i-ph-video-duotone" to="https://vueschool.io/lessons/expanding-nuxt-s-auto-imports" target="_blank"}
+::tip{icon="i-ph-video-duotone" to="https://vueschool.io/lessons/expanding-nuxt-s-auto-imports?friend=nuxt" target="_blank"}
 Watch Vue School video about Auto-imports Nuxt Kit utilities.
 ::
 

diff --git a/docs/3.api/5.kit/5.components.md b/docs/3.api/5.kit/5.components.md
@@ -10,7 +10,7 @@ links:
 
 Компоненты - это строительные блоки вашего Nuxt приложения. Они представляют собой переиспользуемые инстансы Vue, которые могут быть использованы для создания пользовательского интерфейса. В Nuxt компоненты из директории components по умолчанию импортируются автоматически. Однако, если вам нужно импортировать компоненты из альтернативной директории или вы хотите выборочно импортировать их по мере необходимости, `@nuxt/kit` предоставляет методы `addComponentsDir` и `addComponent`. Эти утилиты позволяют настроить конфигурацию компонентов в соответствии с вашими потребностями.
 
-::tip{icon="i-ph-video-duotone" to="https://vueschool.io/lessons/injecting-components-and-component-directories" target="_blank"}
+::tip{icon="i-ph-video-duotone" to="https://vueschool.io/lessons/injecting-components-and-component-directories?friend=nuxt" target="_blank"}
 Посмотрите видео от Vue School об инжектировании компонентов.
 ::
 

diff --git a/docs/3.api/5.kit/7.pages.md b/docs/3.api/5.kit/7.pages.md
@@ -12,7 +12,7 @@ links:
 
 In Nuxt 3, routes are automatically generated based on the structure of the files in the `pages` directory. However, there may be scenarios where you'd want to customize these routes. For instance, you might need to add a route for a dynamic page not generated by Nuxt, remove an existing route, or modify the configuration of a route. For such customizations, Nuxt 3 offers the `extendPages` feature, which allows you to extend and alter the pages configuration.
 
-::tip{icon="i-ph-video-duotone" to="https://vueschool.io/lessons/extend-and-alter-nuxt-pages" target="_blank"}
+::tip{icon="i-ph-video-duotone" to="https://vueschool.io/lessons/extend-and-alter-nuxt-pages?friend=nuxt" target="_blank"}
 Watch Vue School video about extendPages.
 ::
 
@@ -71,7 +71,7 @@ Nuxt is powered by the [Nitro](https://nitro.unjs.io) server engine. With Nitro,
 You can read more about Nitro route rules in the [Nitro documentation](https://nitro.unjs.io/guide/routing#route-rules).
 ::
 
-::tip{icon="i-ph-video-duotone" to="https://vueschool.io/lessons/adding-route-rules-and-route-middlewares" target="_blank"}
+::tip{icon="i-ph-video-duotone" to="https://vueschool.io/lessons/adding-route-rules-and-route-middlewares?friend=nuxt" target="_blank"}
 Watch Vue School video about adding route rules and route middelwares.
 ::
 
@@ -192,7 +192,7 @@ Route middlewares can be also defined in plugins via [`addRouteMiddleware`](/doc
 Read more about route middlewares in the [Route middleware documentation](/docs/getting-started/routing#route-middleware).
 ::
 
-::tip{icon="i-ph-video-duotone" to="https://vueschool.io/lessons/adding-route-rules-and-route-middlewares" target="_blank"}
+::tip{icon="i-ph-video-duotone" to="https://vueschool.io/lessons/adding-route-rules-and-route-middlewares?friend=nuxt" target="_blank"}
 Watch Vue School video about adding route rules and route middelwares.
 ::
 

diff --git a/docs/3.api/5.kit/9.plugins.md b/docs/3.api/5.kit/9.plugins.md
@@ -14,7 +14,7 @@ Plugins are self-contained code that usually add app-level functionality to Vue.
 
 Registers a Nuxt plugin and to the plugins array.
 
-::tip{icon="i-ph-video-duotone" to="https://vueschool.io/lessons/injecting-plugins" target="_blank"}
+::tip{icon="i-ph-video-duotone" to="https://vueschool.io/lessons/injecting-plugins?friend=nuxt" target="_blank"}
 Watch Vue School video about addPlugin.
 ::
 
@@ -114,7 +114,7 @@ export default defineNuxtPlugin((nuxtApp) => {
 
 Adds a template and registers as a nuxt plugin. This is useful for plugins that need to generate code at build time.
 
-::tip{icon="i-ph-video-duotone" to="https://vueschool.io/lessons/injecting-plugin-templates" target="_blank"}
+::tip{icon="i-ph-video-duotone" to="https://vueschool.io/lessons/injecting-plugin-templates?friend=nuxt" target="_blank"}
 Watch Vue School video about addPluginTemplate.
 ::
 

diff --git a/package.json b/package.json
@@ -54,7 +54,7 @@
  "@testing-library/vue": "8.1.0",
  "@types/eslint__js": "8.42.3",
  "@types/fs-extra": "11.0.4",
- "@types/node": "20.14.2",
+ "@types/node": "20.14.3",
  "@types/semver": "7.5.8",
  "@unhead/schema": "1.9.13",
  "@vitejs/plugin-vue": "5.0.4",
@@ -93,7 +93,7 @@
  "vue-router": "4.3.3",
  "vue-tsc": "2.0.21"
  },
- "packageManager": "pnpm@9.3.0",
+ "packageManager": "pnpm@9.4.0",
  "engines": {
  "node": "^16.10.0 || >=18.0.0"
  },

diff --git a/packages/schema/package.json b/packages/schema/package.json
@@ -46,7 +46,7 @@
  "@vue/compiler-sfc": "3.4.29",
  "@vue/language-core": "2.0.21",
  "c12": "1.11.1",
- "esbuild-loader": "4.1.0",
+ "esbuild-loader": "4.2.0",
  "h3": "1.11.1",
  "ignore": "5.3.1",
  "nitropack": "2.9.6",

diff --git a/packages/webpack/package.json b/packages/webpack/package.json
@@ -32,7 +32,7 @@
  "css-minimizer-webpack-plugin": "^7.0.0",
  "cssnano": "^7.0.2",
  "defu": "^6.1.4",
- "esbuild-loader": "^4.1.0",
+ "esbuild-loader": "^4.2.0",
  "escape-string-regexp": "^5.0.0",
  "estree-walker": "^3.0.3",
  "file-loader": "^6.2.0",