Skip to content
This repository was archived by the owner on Apr 6, 2023. It is now read-only.

Commit f1e88d1

Browse files
authored
Merge branch 'main' into docs/api-composable-use-hydration
2 parents aa8f760 + 07dc5fd commit f1e88d1

9 files changed

Lines changed: 261 additions & 423 deletions

File tree

docs/content/3.api/2.components/2.nuxt-page.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ For example, passing `static` key, `NuxtPage` component is rendered only once wh
3131

3232
```html
3333
<!-- static key -->
34-
<NuxtPage page-key=static />
34+
<NuxtPage page-key="static" />
3535
```
3636

3737
Alternatively, `pageKey` can be passed as a `key` value via `definePageMeta` from the `<script>` section of your Vue component in the `/pages` directory.
@@ -51,7 +51,7 @@ definePageMeta({
5151
In addition, `NuxtPage` also accepts custom props that you may need to pass further down the hierarchy. These custom props are accessible via `attrs` in the Nuxt app.
5252

5353
```html
54-
<NuxtPage :foobar=123 />
54+
<NuxtPage :foobar="123" />
5555
```
5656

5757
For example, in above example, value of `foobar` will be available using `attrs.foobar`.

docs/content/5.community/5.roadmap.md

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ This page lists the current status and schedule of our planned releases.
2222

2323
## 📅 Release Schedule
2424

25-
Release | Expected date | Description
26-
--------------------|-----------------|---------------------------------------------------
27-
`nuxt@2.16` | Autumn, 2022 | Nuxt v2 cumulative updates for future compatibility with Bridge
28-
`nuxt@3.0.0` | Autumn, 2022 | Nuxt v3 final release
25+
Release | Expected date | Description
26+
--------------------|------------------------|---------------------------------------------------
27+
`nuxt@2.16` | Autumn, 2022 | Nuxt v2 cumulative updates for future compatibility with Bridge
28+
`nuxt@3.0.0` | 16th November, 2022 | Nuxt v3 final release
2929

3030
### Current Releases
3131

@@ -50,23 +50,21 @@ In roadmap below are the major expected features that are coming soon with Nuxt
5050

5151
Milestone | Expected date | Notes | Description
5252
-------------|------------------|--------|-----------------------
53-
Test Utils | 2022 | [nuxt/framework#3198](https://github.com/nuxt/framework/issues/3198) | A rewrite of [nuxt/test-utils](https://github.com/nuxt/test-utils) for testing Nuxt 3 and new modules
5453
Image | 2022 | [nuxt/image#548](https://github.com/nuxt/image/discussions/548) | Stable image optimization for Nuxt 3
54+
Test Utils | 2022 | [nuxt/framework#3198](https://github.com/nuxt/framework/issues/3198) | A rewrite of [nuxt/test-utils](https://github.com/nuxt/test-utils) for testing Nuxt 3 and new modules
5555
SEO & PWA | 2022 | [nuxt/framework#1823](https://github.com/nuxt/framework/discussions/1823) | Migrating from [nuxt-community/pwa-module](https://github.com/nuxt-community/pwa-module) for built-in SEO utils and service worker support
56-
Hybrid Rendering | 2022 | [nuxt/framework#560](https://github.com/nuxt/framework/discussions/560) | Flexible routing routes for caching strategies, proxy and more
57-
Scripts | 2022 | [nuxt/framework#5856](https://github.com/nuxt/framework/discussions/5856) | Easy 3rd party script management.
58-
Devtools | 2022 | - | Integrated and modular devtools experience for Nuxt
59-
Translations | 2022 | [nuxt/translations#4](https://github.com/nuxt/translations/discussions/4) ([request access](https://github.com/nuxt/framework/discussions/765)) | A collaborative project for a stable translation process for Nuxt 3 docs. Currently pending for ideas and documentation tooling support (content v2 with remote sources).
60-
Auth | 2022 | - | A rewrite of [nuxt-community/auth-module](https://github.com/nuxt-community/auth-module) for Nuxt 3 support
56+
Scripts | - | [nuxt/framework#5856](https://github.com/nuxt/framework/discussions/5856) | Easy 3rd party script management.
57+
Devtools | - | - | Integrated and modular devtools experience for Nuxt
58+
Translations | - | [nuxt/translations#4](https://github.com/nuxt/translations/discussions/4) ([request access](https://github.com/nuxt/framework/discussions/765)) | A collaborative project for a stable translation process for Nuxt 3 docs. Currently pending for ideas and documentation tooling support (content v2 with remote sources).
59+
Auth | - | - | A rewrite of [nuxt-community/auth-module](https://github.com/nuxt-community/auth-module) for Nuxt 3 support
6160

6261
## 📦 Core Modules
6362

6463
In addition to the Nuxt framework, there are modules that are vital for the ecosystem. Their status will be updated below.
6564

6665
Module | Status | Nuxt Support | Repository | Description
6766
---------------|---------------------|--------------|------------|-------------------
68-
Content 1.x | Maintenance | 2.x | [nuxt/content](https://github.com/nuxt/content/tree/v1) | Maintenance only
69-
Content 2.x | Active | 3.x | [nuxt/content](https://github.com/nuxt/content) | Released
70-
Auth | WIP | 3.x | `nuxt/auth` to be announced | Nuxt 3 support is planned after session support
67+
Content | Active | 3.x | [nuxt/content](https://github.com/nuxt/content) | Released
68+
Auth | Planned | 3.x | `nuxt/auth` to be announced | Nuxt 3 support is planned after session support
7169
Image | Active | 2.x and 3.x | [nuxt/image](https://github.com/nuxt/image) | Nuxt 3 support is in progress: [nuxt/image#548](https://github.com/nuxt/image/discussions/548)
7270
Telemetry | Active | 2.x and 3.x | [nuxt/telemetry](https://github.com/nuxt/telemetry/) | Nuxt 3 is supported. Stats to be public soon!

examples/experimental/wasm/server/api/sum.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { defineLazyHandler } from 'h3'
1+
import { defineLazyEventHandler } from 'h3'
22

3-
export default defineLazyHandler(async () => {
3+
export default defineLazyEventHandler(async () => {
44
const { exports: { sum } } = await loadWasmInstance(
55
// @ts-ignore
66
() => import('~/server/wasm/sum.wasm')

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"nuxt": "workspace:*",
3737
"nuxt3": "workspace:nuxt@*",
3838
"unbuild": "^0.9.4",
39-
"vite": "^3.2.2",
39+
"vite": "^3.2.3",
4040
"vue": "3.2.41"
4141
},
4242
"devDependencies": {
@@ -55,7 +55,7 @@
5555
"case-police": "^0.5.10",
5656
"changelogen": "^0.3.5",
5757
"crawler": "^1.3.0",
58-
"eslint": "^8.26.0",
58+
"eslint": "^8.27.0",
5959
"eslint-plugin-jsdoc": "^39.6.2",
6060
"execa": "^6.1.0",
6161
"expect-type": "^0.15.0",
@@ -72,7 +72,7 @@
7272
"typescript": "^4.8.4",
7373
"ufo": "^0.8.6",
7474
"unbuild": "^0.9.4",
75-
"vite": "^3.2.2",
75+
"vite": "^3.2.3",
7676
"vitest": "^0.24.5",
7777
"vue-tsc": "^1.0.9"
7878
},

packages/nuxt/src/core/runtime/nitro/renderer.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export interface NuxtRenderHTMLContext {
2121
htmlAttrs: string[]
2222
head: string[]
2323
bodyAttrs: string[]
24-
bodyPreprend: string[]
24+
bodyPrepend: string[]
2525
body: string[]
2626
bodyAppend: string[]
2727
}
@@ -223,7 +223,7 @@ export default defineRenderHandler(async (event) => {
223223
ssrContext.styles
224224
]),
225225
bodyAttrs: normalizeChunks([renderedMeta.bodyAttrs!]),
226-
bodyPreprend: normalizeChunks([
226+
bodyPrepend: normalizeChunks([
227227
renderedMeta.bodyScriptsPrepend,
228228
ssrContext.teleports?.body
229229
]),
@@ -288,7 +288,7 @@ function renderHTMLDocument (html: NuxtRenderHTMLContext) {
288288
return `<!DOCTYPE html>
289289
<html ${joinAttrs(html.htmlAttrs)}>
290290
<head>${joinTags(html.head)}</head>
291-
<body ${joinAttrs(html.bodyAttrs)}>${joinTags(html.bodyPreprend)}${joinTags(html.body)}${joinTags(html.bodyAppend)}</body>
291+
<body ${joinAttrs(html.bodyAttrs)}>${joinTags(html.bodyPrepend)}${joinTags(html.body)}${joinTags(html.bodyAppend)}</body>
292292
</html>`
293293
}
294294

packages/schema/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"@vueuse/head": "~1.0.0-rc.14",
2121
"nitropack": "^0.6.1",
2222
"unbuild": "latest",
23-
"vite": "~3.2.2"
23+
"vite": "~3.2.3"
2424
},
2525
"dependencies": {
2626
"c12": "^0.2.13",

packages/vite/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"@nuxt/kit": "3.0.0-rc.13",
2323
"@rollup/plugin-replace": "^5.0.1",
2424
"@vitejs/plugin-vue": "^3.2.0",
25-
"@vitejs/plugin-vue-jsx": "^2.1.0",
25+
"@vitejs/plugin-vue-jsx": "^2.1.1",
2626
"autoprefixer": "^10.4.13",
2727
"chokidar": "^3.5.3",
2828
"cssnano": "^5.1.14",
@@ -48,7 +48,7 @@
4848
"rollup-plugin-visualizer": "^5.8.3",
4949
"ufo": "^0.8.6",
5050
"unplugin": "^0.10.2",
51-
"vite": "~3.2.2",
51+
"vite": "~3.2.3",
5252
"vite-node": "^0.24.5",
5353
"vite-plugin-checker": "^0.5.1",
5454
"vue-bundle-renderer": "^0.5.0"

packages/webpack/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"prepack": "unbuild"
1717
},
1818
"dependencies": {
19-
"@babel/core": "^7.19.6",
19+
"@babel/core": "^7.20.2",
2020
"@nuxt/friendly-errors-webpack-plugin": "^2.5.2",
2121
"@nuxt/kit": "3.0.0-rc.13",
2222
"autoprefixer": "^10.4.13",

0 commit comments

Comments
 (0)