Merge branch 'main' into release/3.0.0.rc.12

docs/content/2.guide/2.directory-structure/1.pages.md

@@ -335,10 +335,10 @@ It is possible to customize [vue-router options](https://router.vuejs.org/api/in
 This is the recommended way to specify router options.
 
 ```js [app/router.options.ts]
-import type { RouterOptions } from '@nuxt/schema'
+import type { RouterConfig } from '@nuxt/schema'
 
 // https://router.vuejs.org/api/interfaces/routeroptions.html
-export default <RouterOptions> {
+export default <RouterConfig> {
 }
 ```
 
@@ -348,10 +348,10 @@ You can optionally override routes using a function that accepts scanned routes
 If returning `null` or `undefined`, Nuxt will fallback to the default routes. (useful to modify input array)
 
 ```js [app/router.options.ts]
-import type { RouterOptions } from '@nuxt/schema'
+import type { RouterConfig } from '@nuxt/schema'
 
 // https://router.vuejs.org/api/interfaces/routeroptions.html
-export default <RouterOptions> {
+export default <RouterConfig> {
   routes: (_routes) => [
     {
       name: 'home',
@@ -368,11 +368,11 @@ You can optionally override history mode using a function that accepts base url
 If returning `null` or `undefined`, Nuxt will fallback to the default history.
 
 ```js [app/router.options.ts]
-import type { RouterOptions } from '@nuxt/schema'
+import type { RouterConfig } from '@nuxt/schema'
 import { createMemoryHistory } from 'vue-router'
 
 // https://router.vuejs.org/api/interfaces/routeroptions.html
-export default <RouterOptions> {
+export default <RouterConfig> {
   history: base => process.client ? createMemoryHistory(base) : null /* default */
 }
 ```

docs/content/2.guide/4.going-further/10.runtime-config.md

@@ -35,6 +35,10 @@ console.log(runtimeConfig.apiSecret)
 console.log(runtimeConfig.public.apiBase)
 ```
 
+::alert{type=info}
+When using Options API the public runtime config is available via `this.$config.public`.
+::
+
 ### Environment Variables
 
 The most common way to provide configuration is by using [Environment Variables](https://medium.com/chingu/an-introduction-to-environment-variables-and-how-to-use-them-f602f66d15fa).

docs/package.json

@@ -10,7 +10,7 @@
     "gendocs": "jiti ./scripts/gen-docs.ts"
   },
   "dependencies": {
-    "@nuxt-themes/docus": "npm:@nuxt-themes/docus-edge@0.1.0-f39f325",
+    "@nuxt-themes/docus": "npm:@nuxt-themes/docus-edge@0.1.0-2a7c428",
     "@nuxt-themes/website": "0.1.6",
     "jiti": "^1.16.0",
     "nuxt": "^3.0.0-rc.11"

docs/yarn.lock

@@ -838,9 +838,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nuxt-themes/docus@npm:@nuxt-themes/docus-edge@0.1.0-6533b67":
-  version: 0.1.0-6533b67
-  resolution: "@nuxt-themes/docus-edge@npm:0.1.0-6533b67"
+"@nuxt-themes/docus@npm:@nuxt-themes/docus-edge@0.1.0-2a7c428":
+  version: 0.1.0-2a7c428
+  resolution: "@nuxt-themes/docus-edge@npm:0.1.0-2a7c428"
   dependencies:
     "@docsearch/css": ^3.2.1
     "@docsearch/js": ^3.2.1
@@ -859,19 +859,19 @@ __metadata:
     pinceau: latest
     socket.io-client: ^4.5.2
     vue-plausible: ^1.3.2
-  checksum: c2a11a5a1c19591bec01e5fdf6ef9b4f2d37df7ae9bdb5cc514217b447e8db2f14ac21ef8c1a0cff715d16346399df3f71e9da6430859f8655eb75309c6c5517
+  checksum: aa02ef4a05cc809d2b15d2857bc3663dd8778570b5727b2add9a99779ca676f098d43fa04a76b5f72ba7e389215d1ae1ee830c551eca71b35be914fa4283724f
   languageName: node
   linkType: hard
 
-"@nuxt-themes/docus@npm:@nuxt-themes/docus-edge@0.1.0-f39f325":
-  version: 0.1.0-f39f325
-  resolution: "@nuxt-themes/docus-edge@npm:0.1.0-f39f325"
+"@nuxt-themes/docus@npm:@nuxt-themes/docus-edge@0.1.0-6533b67":
+  version: 0.1.0-6533b67
+  resolution: "@nuxt-themes/docus-edge@npm:0.1.0-6533b67"
   dependencies:
     "@docsearch/css": ^3.2.1
     "@docsearch/js": ^3.2.1
     "@fontsource/inter": ^4.5.12
     "@iconify/vue": ^4.0.0
-    "@nuxt/content": 2.1.1
+    "@nuxt/content": "npm:@nuxt/content-edge@latest"
     "@nuxtjs/algolia": ^1.1.1
     "@nuxtjs/color-mode": ^3.1.5
     "@nuxtjs/tailwindcss": ^5.3.3
@@ -882,8 +882,9 @@ __metadata:
     "@vueuse/core": ^9.2.0
     "@vueuse/nuxt": ^9.2.0
     pinceau: latest
+    socket.io-client: ^4.5.2
     vue-plausible: ^1.3.2
-  checksum: 7630f1cc848e9735ec1ebf4e819d773cf2563795b52f31bc1f0d939b28a7b8feeb5653eb5b921a8cf3e9168f4e368aa7389b2a7d74e47e5c941690faa227e1c6
+  checksum: c2a11a5a1c19591bec01e5fdf6ef9b4f2d37df7ae9bdb5cc514217b447e8db2f14ac21ef8c1a0cff715d16346399df3f71e9da6430859f8655eb75309c6c5517
   languageName: node
   linkType: hard
 
@@ -901,49 +902,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nuxt/content@npm:2.1.1":
-  version: 2.1.1
-  resolution: "@nuxt/content@npm:2.1.1"
-  dependencies:
-    "@nuxt/kit": ^3.0.0-rc.10
-    consola: ^2.15.3
-    defu: ^6.1.0
-    destr: ^1.1.1
-    detab: ^3.0.1
-    html-tags: ^3.2.0
-    json5: ^2.2.1
-    knitwork: ^0.1.2
-    listhen: ^0.2.15
-    mdast-util-to-hast: ^12.2.2
-    mdurl: ^1.0.1
-    ohash: ^0.1.5
-    pathe: ^0.3.7
-    property-information: ^6.1.1
-    rehype-external-links: ^2.0.1
-    rehype-raw: ^6.1.1
-    rehype-slug: ^5.0.1
-    rehype-sort-attribute-values: ^4.0.0
-    rehype-sort-attributes: ^4.0.0
-    remark-emoji: ^3.0.2
-    remark-gfm: ^3.0.1
-    remark-mdc: ^1.0.7
-    remark-parse: ^10.0.1
-    remark-rehype: ^10.1.0
-    remark-squeeze-paragraphs: ^5.0.1
-    scule: ^0.3.2
-    shiki-es: ^0.1.2
-    slugify: ^1.6.5
-    ufo: ^0.8.5
-    unified: ^10.1.2
-    unist-builder: ^3.0.0
-    unist-util-position: ^4.0.3
-    unist-util-visit: ^4.1.1
-    unstorage: ^0.5.6
-    ws: ^8.8.1
-  checksum: c1cf817168bb19c63a0a222aae5d77dd1866daa224b21673fffee66ed5382b3429f79340c0a65ea5a2c18ef795983a88ed547203090db1db867807e6bb43d52c
-  languageName: node
-  linkType: hard
-
 "@nuxt/content@npm:@nuxt/content-edge@latest":
   version: 2.1.1-27749525.428cf8f
   resolution: "@nuxt/content-edge@npm:2.1.1-27749525.428cf8f"
@@ -3536,7 +3494,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "docs@workspace:."
   dependencies:
-    "@nuxt-themes/docus": "npm:@nuxt-themes/docus-edge@0.1.0-f39f325"
+    "@nuxt-themes/docus": "npm:@nuxt-themes/docus-edge@0.1.0-2a7c428"
     "@nuxt-themes/website": 0.1.6
     jiti: ^1.16.0
     nuxt: ^3.0.0-rc.11