Merge branch 'main' into docs/plugin-env

.github/workflows/changelogensets.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - 2.x
 
 permissions:
   pull-requests: write

docs/2.guide/2.directory-structure/1.server.md

@@ -111,10 +111,12 @@ For example, you can define a custom handler utility that wraps the original han
 **Example:**
 
 ```ts [server/utils/handler.ts]
-import type { EventHandler } from 'h3'
+import type { EventHandler, EventHandlerRequest } from 'h3'
 
-export const defineWrappedResponseHandler = (handler: EventHandler) =>
-  defineEventHandler(async (event) => {
+export const defineWrappedResponseHandler = <T extends EventHandlerRequest, D> (
+  handler: EventHandler<T, D>
+): EventHandler<T, D> =>
+  defineEventHandler<T>(async event => {
     try {
       // do something before the route handler
       const response = await handler(event)

packages/nuxt/src/head/runtime/plugins/unhead.ts

@@ -26,7 +26,10 @@ export default defineNuxtPlugin({
       head.hooks.hook('dom:beforeRender', (context) => { context.shouldRender = !pauseDOMUpdates })
       nuxtApp.hooks.hook('page:start', () => { pauseDOMUpdates = true })
       // wait for new page before unpausing dom updates (triggered after suspense resolved)
-      nuxtApp.hooks.hook('page:finish', syncHead)
+      nuxtApp.hooks.hook('page:finish', () => {
+        // app:suspense:resolve hook will unpause the DOM
+        if (!nuxtApp.isHydrating) { syncHead() }
+      })
       // unpause on error
       nuxtApp.hooks.hook('app:error', syncHead)
       // unpause the DOM once the mount suspense is resolved

scripts/update-changelog.ts

@@ -4,6 +4,8 @@ import { inc } from 'semver'
 import { generateMarkDown, loadChangelogConfig } from 'changelogen'
 import { determineBumpType, getLatestCommits, loadWorkspace } from './_utils'
 
+const releaseBranch = process.env.BRANCH || 'main'
+
 async function main () {
   const workspace = await loadWorkspace(process.cwd())
   const config = await loadChangelogConfig(process.cwd(), {
@@ -39,7 +41,7 @@ async function main () {
   const releaseNotes = [
     currentPR?.body.replace(/## 👉 Changelog[\s\S]*$/, '') || `> ${newVersion} is the next ${bumpType} release.\n>\n> **Timetable**: to be announced.`,
     '## 👉 Changelog',
-    changelog.replace(/^## v.*?\n/, '').replace('...main', `...v${newVersion}`)
+    changelog.replace(/^## v.*?\n/, '').replace(`...${releaseBranch}`, `...v${newVersion}`)
   ].join('\n')
 
   // Create a PR with release notes if none exists
@@ -52,7 +54,7 @@ async function main () {
       body: {
         title: `v${newVersion}`,
         head: `v${newVersion}`,
-        base: 'main',
+        base: releaseBranch,
         body: releaseNotes,
         draft: true
       }