diff --git a/package.json b/package.json
index a5ba4d9ea10b62..27a555bf973c39 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "@types/picomatch": "^4.0.3",
     "@types/stylus": "^0.48.43",
     "@types/ws": "^8.18.1",
-    "@vitejs/release-scripts": "^1.7.0",
+    "@vitejs/release-scripts": "^1.7.1",
     "eslint": "^9.39.4",
     "eslint-plugin-import-x": "^4.16.2",
     "eslint-plugin-n": "^18.0.1",
diff --git a/packages/plugin-legacy/CHANGELOG.md b/packages/plugin-legacy/CHANGELOG.md
index 9f4875dd1db7fb..5926915bc33387 100644
--- a/packages/plugin-legacy/CHANGELOG.md
+++ b/packages/plugin-legacy/CHANGELOG.md
@@ -1,3 +1,26 @@
+## <small>[8.0.2](https://github.com/vitejs/vite/compare/plugin-legacy@8.0.1...plugin-legacy@8.0.2) (2026-05-14)</small>
+### Bug Fixes
+
+* **deps:** update all non-major dependencies ([#22143](https://github.com/vitejs/vite/issues/22143)) ([22b0166](https://github.com/vitejs/vite/commit/22b016612703320db45c64a2fe44472051ef5ec5))
+* **deps:** update all non-major dependencies ([#22382](https://github.com/vitejs/vite/issues/22382)) ([5c0cfcb](https://github.com/vitejs/vite/commit/5c0cfcb83dde2c6e25b6c3215dd622956bf29631))
+* **plugin-legacy:** remove modulepreload links for legacy-only builds ([#22332](https://github.com/vitejs/vite/issues/22332)) ([f3a0bc9](https://github.com/vitejs/vite/commit/f3a0bc90bcc529a12a520469b9d0fb6fa751107c))
+
+### Miscellaneous Chores
+
+* **deps:** update dependency tsdown to ^0.21.10 ([#22333](https://github.com/vitejs/vite/issues/22333)) ([3b51e05](https://github.com/vitejs/vite/commit/3b51e050214c5a817c163838ab8643fe34c7d0c3))
+* **deps:** update dependency tsdown to ^0.21.9 ([#22267](https://github.com/vitejs/vite/issues/22267)) ([a0aef50](https://github.com/vitejs/vite/commit/a0aef50f6b51120df95cc11a7354af2afabe6a4a))
+* **deps:** update rolldown-related dependencies ([#21989](https://github.com/vitejs/vite/issues/21989)) ([0ded627](https://github.com/vitejs/vite/commit/0ded6274579e8bda6b22a7ba93b15d15b4c28b78))
+* **deps:** update rolldown-related dependencies ([#22421](https://github.com/vitejs/vite/issues/22421)) ([66b9eb3](https://github.com/vitejs/vite/commit/66b9eb35188007e0e9a1bd03b4be820016cad60b))
+
+### Code Refactoring
+
+* upgrade to typescript 6 ([#22110](https://github.com/vitejs/vite/issues/22110)) ([cc41398](https://github.com/vitejs/vite/commit/cc41398c2cf0bb5061cf0ca5dc3b408ae7e41191))
+
+### Build System
+
+* handle tsdown inlineOnly deprecation ([#22111](https://github.com/vitejs/vite/issues/22111)) ([86cbc6e](https://github.com/vitejs/vite/commit/86cbc6e5571aefd6278d6ecbbfb5ede8d4061940))
+* improve typecheck and linting ([#22230](https://github.com/vitejs/vite/issues/22230)) ([3770a53](https://github.com/vitejs/vite/commit/3770a53064e8da27d4cb8d595a2b038413e6abdb))
+
 ## <small>[8.0.1](https://github.com/vitejs/vite/compare/plugin-legacy@8.0.0...plugin-legacy@8.0.1) (2026-03-26)</small>
 ### Bug Fixes
 
diff --git a/packages/plugin-legacy/package.json b/packages/plugin-legacy/package.json
index 91c21093abc78e..ce175cdf193eb3 100644
--- a/packages/plugin-legacy/package.json
+++ b/packages/plugin-legacy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-legacy",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
diff --git a/packages/plugin-legacy/src/__tests__/index.spec.ts b/packages/plugin-legacy/src/__tests__/index.spec.ts
new file mode 100644
index 00000000000000..2cbbc93d0b8028
--- /dev/null
+++ b/packages/plugin-legacy/src/__tests__/index.spec.ts
@@ -0,0 +1,45 @@
+import { describe, expect, test } from 'vitest'
+import { modulePreloadLinkRE } from '../index'
+
+describe('modulePreloadLinkRE', () => {
+  const matches: Array<[string, string]> = [
+    ['rel first', '<link rel="modulepreload" crossorigin href="/assets/x.js">'],
+    [
+      'rel after other attributes',
+      '<link href="/assets/x.js" rel="modulepreload">',
+    ],
+    ['rel only', '<link rel="modulepreload">'],
+    ['self-closing', '<link rel="modulepreload"/>'],
+    ['self-closing with space', '<link rel="modulepreload" />'],
+    ['single quotes', "<link rel='modulepreload' href='/assets/x.js'>"],
+    [
+      'attributes across multiple lines',
+      '<link\n  rel="modulepreload"\n  href="/assets/x.js"\n>',
+    ],
+  ]
+
+  for (const [name, html] of matches) {
+    test(`matches: ${name}`, () => {
+      expect(html.replace(modulePreloadLinkRE, '')).toBe('')
+    })
+  }
+
+  const nonMatches: Array<[string, string]> = [
+    ['tag name with suffix', '<linkfoo rel="modulepreload">'],
+    ['custom element with hyphen', '<link-preview rel="modulepreload">'],
+    ['bare link tag', '<link>'],
+    ['stylesheet link', '<link rel="stylesheet" href="/assets/x.css">'],
+    ['preload (not modulepreload)', '<link rel="preload" href="/assets/x.js">'],
+    [
+      'attribute name ending in rel',
+      '<link xrel="modulepreload" href="/assets/x.js">',
+    ],
+    ['mismatched quotes', `<link rel="modulepreload'>`],
+  ]
+
+  for (const [name, html] of nonMatches) {
+    test(`does not match: ${name}`, () => {
+      expect(html.replace(modulePreloadLinkRE, '')).toBe(html)
+    })
+  }
+})
diff --git a/packages/plugin-legacy/src/index.ts b/packages/plugin-legacy/src/index.ts
index 728b6866329577..4f5c7e19223717 100644
--- a/packages/plugin-legacy/src/index.ts
+++ b/packages/plugin-legacy/src/index.ts
@@ -125,6 +125,8 @@ const _require = createRequire(import.meta.url)
 
 const nonLeadingHashInFileNameRE = /[^/]+\[hash(?::\d+)?\]/
 const prefixedHashInFileNameRE = /\W?\[hash(?::\d+)?\]/
+export const modulePreloadLinkRE: RegExp =
+  /<link(?![\w-])[^>]*?\srel=(['"])modulepreload\1[^>]*>/g
 
 // browsers supporting dynamic import + import.meta.resolve + async generator
 const modernTargetsEsbuild = [
@@ -641,7 +643,9 @@ function viteLegacyPlugin(options: Options = {}): Plugin[] {
         }
       }
       if (!genModern) {
-        html = html.replace(/<script type="module".*?<\/script>/g, '')
+        html = html
+          .replace(/<script type="module".*?<\/script>/g, '')
+          .replace(modulePreloadLinkRE, '')
       }
 
       const tags: HtmlTagDescriptor[] = []
diff --git a/packages/vite/CHANGELOG.md b/packages/vite/CHANGELOG.md
index ebcd218cd5cc44..12ea4f6eaa8523 100644
--- a/packages/vite/CHANGELOG.md
+++ b/packages/vite/CHANGELOG.md
@@ -1,3 +1,23 @@
+## <small>[8.0.13](https://github.com/vitejs/vite/compare/v8.0.12...v8.0.13) (2026-05-14)</small>
+### Features
+
+* **bundled-dev:** add lazy bundling support ([#21406](https://github.com/vitejs/vite/issues/21406)) ([4f0949f](https://github.com/vitejs/vite/commit/4f0949f3f13e4b2b34d32bf7b2b4de5f26bea192))
+* **optimizer:** improve the esbuild plugin converter to pass some properties of build result to `onEnd` ([#22357](https://github.com/vitejs/vite/issues/22357)) ([47071ce](https://github.com/vitejs/vite/commit/47071ce53f21726cf39e999c4407c4828ecbe957))
+* update rolldown to 1.0.1 ([#22444](https://github.com/vitejs/vite/issues/22444)) ([8c766a6](https://github.com/vitejs/vite/commit/8c766a6c5ee014969c4e32f29cc265e8e2c96e18))
+
+### Bug Fixes
+
+* **build:** copy public directory after building same environment with `write=false` ([#22328](https://github.com/vitejs/vite/issues/22328)) ([158e8ae](https://github.com/vitejs/vite/commit/158e8ae8efdf7075ab295727e36b5ff68da3243e))
+* **css:** await sass/less/styl worker disposal on teardown (fix [#22274](https://github.com/vitejs/vite/issues/22274)) ([#22275](https://github.com/vitejs/vite/issues/22275)) ([b7edcb7](https://github.com/vitejs/vite/commit/b7edcb7d0dd17ddfeef4ace78d610c099216dade))
+* **css:** keep deprecated `name`/`originalFileName` in synthetic `assetFileNames` call ([#22439](https://github.com/vitejs/vite/issues/22439)) ([8e59c97](https://github.com/vitejs/vite/commit/8e59c97a44d923c4c06f67287a793c9aa5a4ebaa))
+* make `isBundled` per environment ([#22257](https://github.com/vitejs/vite/issues/22257)) ([a576326](https://github.com/vitejs/vite/commit/a5763266170f8606836da5c6f987b4b2fd6ddc55))
+* **ssr:** avoid rewriting labels that collide with imports ([#22451](https://github.com/vitejs/vite/issues/22451)) ([d9b18e0](https://github.com/vitejs/vite/commit/d9b18e0387a253628d3d834288e79c5f7e85d566))
+
+### Miscellaneous Chores
+
+* remove irrelevant commits from changelog ([#22430](https://github.com/vitejs/vite/issues/22430)) ([6ea3838](https://github.com/vitejs/vite/commit/6ea383859aaf0ef8e673b458f164e84aeb6ff51d))
+* update changelog ([#22413](https://github.com/vitejs/vite/issues/22413)) ([fcdc87c](https://github.com/vitejs/vite/commit/fcdc87cc6799857e2bab0f44f333a681694fff74))
+
 ## <small>[8.0.12](https://github.com/vitejs/vite/compare/v8.0.11...v8.0.12) (2026-05-11)</small>
 ### Features
 
diff --git a/packages/vite/package.json b/packages/vite/package.json
index ba6a1f2c7598f8..617f5bca6c9cda 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "8.0.12",
+  "version": "8.0.13",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
diff --git a/packages/vite/src/client/client.ts b/packages/vite/src/client/client.ts
index b6bfb63534b2a7..b8f7eb76cbe121 100644
--- a/packages/vite/src/client/client.ts
+++ b/packages/vite/src/client/client.ts
@@ -644,6 +644,15 @@ if (isBundleMode && typeof DevRuntime !== 'undefined') {
     }
   }
 
+  const clientId = nanoid()
+
+  // notify client id
+  transport.send({
+    type: 'custom',
+    event: 'vite:module-loaded',
+    data: { modules: [], clientId },
+  })
+
   const wrappedSocket: Messenger = {
     send(message) {
       switch (message.type) {
@@ -652,7 +661,7 @@ if (isBundleMode && typeof DevRuntime !== 'undefined') {
             type: 'custom',
             event: 'vite:module-loaded',
             // clone array as the runtime reuses the array instance
-            data: { modules: message.modules.slice() },
+            data: { modules: message.modules.slice(), clientId },
           })
           break
         }
@@ -661,7 +670,6 @@ if (isBundleMode && typeof DevRuntime !== 'undefined') {
       }
     },
   }
-  const clientId = nanoid()
   ;(globalThis as any).__rolldown_runtime__ ??= new ViteDevRuntime(
     wrappedSocket,
     clientId,
diff --git a/packages/vite/src/node/__tests__/build.spec.ts b/packages/vite/src/node/__tests__/build.spec.ts
index d978dcfe2e2613..141fc682f9edbd 100644
--- a/packages/vite/src/node/__tests__/build.spec.ts
+++ b/packages/vite/src/node/__tests__/build.spec.ts
@@ -1187,6 +1187,29 @@ test('watch rebuild manifest', async (ctx) => {
   `)
 })
 
+test('copies public directory after building same environment with write false first', async (ctx) => {
+  const root = resolve(dirname, 'fixtures/public-dir-write-false')
+  ctx.onTestFinished(() =>
+    fsp.rm(resolve(root, 'dist'), { recursive: true, force: true }),
+  )
+
+  const builder = await createBuilder({
+    root,
+    configFile: false,
+    logLevel: 'silent',
+  })
+
+  builder.environments.client.config.build.write = false
+  await builder.build(builder.environments.client)
+
+  builder.environments.client.config.build.write = true
+  await builder.build(builder.environments.client)
+
+  await expect(
+    fsp.readFile(resolve(root, 'dist/favicon.svg'), 'utf-8'),
+  ).resolves.toBe('<svg></svg>')
+})
+
 /**
  * for each chunks in output1, if there's a chunk in output2 with the same fileName,
  * ensure that the chunk code is the same. if not, the chunk hash should have changed.
diff --git a/packages/vite/src/node/__tests__/fixtures/public-dir-write-false/index.html b/packages/vite/src/node/__tests__/fixtures/public-dir-write-false/index.html
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/packages/vite/src/node/__tests__/fixtures/public-dir-write-false/public/favicon.svg b/packages/vite/src/node/__tests__/fixtures/public-dir-write-false/public/favicon.svg
new file mode 100644
index 00000000000000..dc1ced5b6b300c
--- /dev/null
+++ b/packages/vite/src/node/__tests__/fixtures/public-dir-write-false/public/favicon.svg
@@ -0,0 +1 @@
+<svg></svg>
\ No newline at end of file
diff --git a/packages/vite/src/node/__tests__/optimizer/pluginConverter.spec.ts b/packages/vite/src/node/__tests__/optimizer/pluginConverter.spec.ts
new file mode 100644
index 00000000000000..e25e17bb64aee6
--- /dev/null
+++ b/packages/vite/src/node/__tests__/optimizer/pluginConverter.spec.ts
@@ -0,0 +1,34 @@
+import type * as esbuild from 'esbuild'
+import { describe, expect, test } from 'vitest'
+import { convertEsbuildPluginToRolldownPlugin } from '../../optimizer/pluginConverter'
+import type { Plugin } from '../../plugin'
+
+type ConvertedPluginHooks = {
+  options: Extract<Plugin['options'], Function>
+  generateBundle: Extract<Plugin['generateBundle'], Function>
+}
+
+describe('convertEsbuildPluginToRolldownPlugin', () => {
+  test('passes a BuildResult to onEnd callbacks', async () => {
+    let buildResult: esbuild.BuildResult | undefined
+
+    const plugin = convertEsbuildPluginToRolldownPlugin({
+      name: 'read-metafile',
+      setup(build) {
+        build.onEnd((result) => {
+          buildResult = result
+          expect(result.metafile).toBeUndefined()
+        })
+      },
+    }) as ConvertedPluginHooks
+
+    await plugin.options.call({} as any, { plugins: [], platform: 'browser' })
+    await plugin.generateBundle.call({} as any, {} as any, {} as any, true)
+
+    expect(buildResult).toEqual({
+      outputFiles: undefined,
+      metafile: undefined,
+      mangleCache: undefined,
+    })
+  })
+})
diff --git a/packages/vite/src/node/optimizer/pluginConverter.ts b/packages/vite/src/node/optimizer/pluginConverter.ts
index 0fc1e3f7e32281..3e2d49b551fb6d 100644
--- a/packages/vite/src/node/optimizer/pluginConverter.ts
+++ b/packages/vite/src/node/optimizer/pluginConverter.ts
@@ -134,15 +134,22 @@ export function convertEsbuildPluginToRolldownPlugin(
         cb()
       }
     },
-    generateBundle() {
+    generateBundle(_outputOpts, _bundle, isWrite) {
       const buildResult = new Proxy(
-        {},
         {
-          get(_target, _prop) {
-            throw new Error('Not implemented')
+          metafile: undefined,
+          mangleCache: undefined,
+          ...(isWrite ? { outputFiles: undefined } : {}),
+        } as esbuild.BuildResult,
+        {
+          get(_target, prop) {
+            if (prop in _target || typeof prop === 'symbol') {
+              return (_target as any)[prop]
+            }
+            throw new Error('Not implemented property: ' + prop)
           },
         },
-      ) as esbuild.BuildResult
+      )
       for (const cb of onEndCallbacks) {
         cb(buildResult)
       }
diff --git a/packages/vite/src/node/plugins/prepareOutDir.ts b/packages/vite/src/node/plugins/prepareOutDir.ts
index eb8fd6554c6d21..6f5f16544cabdc 100644
--- a/packages/vite/src/node/plugins/prepareOutDir.ts
+++ b/packages/vite/src/node/plugins/prepareOutDir.ts
@@ -20,10 +20,10 @@ export function prepareOutDirPlugin(): Plugin {
         if (rendered.has(this.environment)) {
           return
         }
-        rendered.add(this.environment)
 
         const { config } = this.environment
         if (config.build.write) {
+          rendered.add(this.environment)
           const { root, build: options } = config
           const resolvedOutDirs = getResolvedOutDirs(
             root,
diff --git a/packages/vite/src/node/server/environments/fullBundleEnvironment.ts b/packages/vite/src/node/server/environments/fullBundleEnvironment.ts
index 4d5d86b0fc12bc..f57f5f230eb1b9 100644
--- a/packages/vite/src/node/server/environments/fullBundleEnvironment.ts
+++ b/packages/vite/src/node/server/environments/fullBundleEnvironment.ts
@@ -1,4 +1,3 @@
-import { randomUUID } from 'node:crypto'
 import { setTimeout } from 'node:timers/promises'
 import {
   type BindingClientHmrUpdate,
@@ -61,6 +60,7 @@ export class MemoryFiles {
 
 export class FullBundleDevEnvironment extends DevEnvironment {
   private devEngine!: DevEngine
+  private initialBuildCompleted = false
   private clients = new Clients()
   private invalidateCalledModules = new Map<
     NormalizedHotChannelClient,
@@ -106,8 +106,8 @@ export class FullBundleDevEnvironment extends DevEnvironment {
     )!
 
     this.hot.on('vite:module-loaded', (payload, client) => {
-      const clientId = this.clients.setupIfNeeded(client)
-      this.devEngine.registerModules(clientId, payload.modules)
+      this.clients.setupIfNeeded(client, payload.clientId)
+      this.devEngine.registerModules(payload.clientId, payload.modules)
     })
     this.hot.on('vite:client:disconnect', (_payload, client) => {
       const clientId = this.clients.delete(client)
@@ -184,6 +184,7 @@ export class FullBundleDevEnvironment extends DevEnvironment {
     this.waitForInitialBuildFinish().then(() => {
       debug?.('INITIAL: build done')
       this.hot.send({ type: 'full-reload', path: '*' })
+      this.initialBuildCompleted = true
     })
   }
 
@@ -260,7 +261,9 @@ export class FullBundleDevEnvironment extends DevEnvironment {
   async triggerBundleRegenerationIfStale(): Promise<boolean> {
     const bundleState = await this.devEngine.getBundleState()
     const shouldTrigger =
-      bundleState.hasStaleOutput && !bundleState.lastFullBuildFailed
+      bundleState.hasStaleOutput &&
+      !bundleState.lastFullBuildFailed &&
+      this.initialBuildCompleted
     if (shouldTrigger) {
       this.devEngine.ensureLatestBuildOutput().then(() => {
         this.debouncedFullReload()
@@ -270,9 +273,23 @@ export class FullBundleDevEnvironment extends DevEnvironment {
     return shouldTrigger
   }
 
+  async triggerLazyBundling(
+    moduleId: string | null,
+    clientId: string | null,
+  ): Promise<string | undefined> {
+    if (!moduleId || !clientId) {
+      return
+    }
+    debug?.(
+      `TRIGGER-LAZY: trigger lazy bundling for module ${moduleId} for client ${clientId}`,
+    )
+    return await this.devEngine.compileEntry(moduleId, clientId)
+  }
+
   override async close(): Promise<void> {
     this.memoryFiles.clear()
     await Promise.all([super.close(), this.devEngine.close()])
+    this.initialBuildCompleted = false
   }
 
   private async getRolldownOptions() {
@@ -280,6 +297,10 @@ export class FullBundleDevEnvironment extends DevEnvironment {
     const rolldownOptions = resolveRolldownOptions(this, chunkMetadataMap)
     rolldownOptions.experimental ??= {}
     rolldownOptions.experimental.devMode = {
+      lazy: true,
+      ...(typeof rolldownOptions.experimental.devMode === 'object'
+        ? rolldownOptions.experimental.devMode
+        : {}),
       implement: await getHmrImplementation(this.getTopLevelConfig()),
     }
 
@@ -382,14 +403,15 @@ class Clients {
   private clientToId = new Map<NormalizedHotChannelClient, string>()
   private idToClient = new Map<string, NormalizedHotChannelClient>()
 
-  setupIfNeeded(client: NormalizedHotChannelClient): string {
+  setupIfNeeded(client: NormalizedHotChannelClient, clientId: string) {
     const id = this.clientToId.get(client)
-    if (id) return id
-
-    const newId = randomUUID()
-    this.clientToId.set(client, newId)
-    this.idToClient.set(newId, client)
-    return newId
+    if (id && id !== clientId) {
+      throw new Error(
+        'client ID conflict detected. Please restart the dev server.',
+      )
+    }
+    this.clientToId.set(client, clientId)
+    this.idToClient.set(clientId, client)
   }
 
   get(id: string): NormalizedHotChannelClient | undefined {
diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts
index a7318e3fd04d7e..7ed06d8c1c3d29 100644
--- a/packages/vite/src/node/server/index.ts
+++ b/packages/vite/src/node/server/index.ts
@@ -107,6 +107,7 @@ import type { DevEnvironment } from './environment'
 import { hostValidationMiddleware } from './middlewares/hostCheck'
 import { rejectInvalidRequestMiddleware } from './middlewares/rejectInvalidRequest'
 import { memoryFilesMiddleware } from './middlewares/memoryFiles'
+import { triggerLazyBundlingMiddleware } from './middlewares/triggerLazyBundling'
 
 const usedConfigs = new WeakSet<ResolvedConfig>()
 
@@ -993,6 +994,7 @@ export async function _createServer(
   }
 
   if (config.experimental.bundledDev) {
+    middlewares.use(triggerLazyBundlingMiddleware(server))
     middlewares.use(memoryFilesMiddleware(server))
   } else {
     // main transform middleware
diff --git a/packages/vite/src/node/server/middlewares/triggerLazyBundling.ts b/packages/vite/src/node/server/middlewares/triggerLazyBundling.ts
new file mode 100644
index 00000000000000..c1dc7bc7732e0f
--- /dev/null
+++ b/packages/vite/src/node/server/middlewares/triggerLazyBundling.ts
@@ -0,0 +1,41 @@
+import type { Connect } from '#dep-types/connect'
+import type { ViteDevServer } from '..'
+import { FullBundleDevEnvironment } from '../environments/fullBundleEnvironment'
+
+export function triggerLazyBundlingMiddleware(
+  server: ViteDevServer,
+): Connect.NextHandleFunction {
+  const environment =
+    server.environments.client instanceof FullBundleDevEnvironment
+      ? server.environments.client
+      : undefined
+  if (!environment) {
+    throw new Error(
+      'triggerLazyBundlingMiddleware can only be used for fullBundleMode',
+    )
+  }
+
+  return async function viteTriggerLazyBundlingMiddleware(req, res, next) {
+    if (!req.url?.startsWith('/@vite/lazy?')) {
+      return next()
+    }
+
+    let params: URLSearchParams
+    try {
+      params = new URL(`http://localhost${req.url}`).searchParams
+    } catch {
+      // Malformed URL
+      return next()
+    }
+
+    const moduleId = params.get('id')
+    const clientId = params.get('clientId')
+    const code = await environment.triggerLazyBundling(moduleId, clientId)
+    if (code == null) {
+      return next()
+    }
+
+    res!.setHeader('Content-Type', 'application/javascript')
+    return res!.end(code)
+  }
+}
diff --git a/packages/vite/src/node/ssr/__tests__/ssrTransform.spec.ts b/packages/vite/src/node/ssr/__tests__/ssrTransform.spec.ts
index ac47c732fdaa60..47b94f8179b7e5 100644
--- a/packages/vite/src/node/ssr/__tests__/ssrTransform.spec.ts
+++ b/packages/vite/src/node/ssr/__tests__/ssrTransform.spec.ts
@@ -49,6 +49,19 @@ test('named import: arbitrary module namespace specifier', async () => {
   )
 })
 
+test('named import colliding with label', async () => {
+  expect(
+    await ssrTransformSimpleCode(
+      `import { query } from 'vue';function foo() { query: while (true) { continue query; break query } }`,
+    ),
+  ).toMatchInlineSnapshot(
+    `
+    "const __vite_ssr_import_0__ = await __vite_ssr_import__("vue", {"importedNames":["query"]});
+    function foo() { query: while (true) { continue query; break query } }"
+  `,
+  )
+})
+
 test('namespace import', async () => {
   expect(
     await ssrTransformSimpleCode(
diff --git a/packages/vite/src/node/ssr/ssrTransform.ts b/packages/vite/src/node/ssr/ssrTransform.ts
index 927661424a0c28..bdb0f42802ca45 100644
--- a/packages/vite/src/node/ssr/ssrTransform.ts
+++ b/packages/vite/src/node/ssr/ssrTransform.ts
@@ -712,6 +712,16 @@ function isRefIdentifier(
     return false
   }
 
+  // label declaration or break/continue target
+  if (
+    (parent.type === 'LabeledStatement' ||
+      parent.type === 'BreakStatement' ||
+      parent.type === 'ContinueStatement') &&
+    parent.label === id
+  ) {
+    return false
+  }
+
   // meta property (e.g. import.meta)
   if (parent.type === 'MetaProperty') {
     return false
diff --git a/packages/vite/types/customEvent.d.ts b/packages/vite/types/customEvent.d.ts
index c971a9609bdcd0..7ca838895fba26 100644
--- a/packages/vite/types/customEvent.d.ts
+++ b/packages/vite/types/customEvent.d.ts
@@ -18,7 +18,7 @@ export interface CustomEventMap {
   /** @internal */
   'vite:forward-console': ForwardConsolePayload
   /** @internal */
-  'vite:module-loaded': { modules: string[] }
+  'vite:module-loaded': { modules: string[]; clientId: string }
 
   // server events
   'vite:client:connect': undefined
diff --git a/playground/hmr-full-bundle-mode/__tests__/hmr-full-bundle-mode.spec.ts b/playground/hmr-full-bundle-mode/__tests__/hmr-full-bundle-mode.spec.ts
index 9edac35690fdea..0b37df9d612125 100644
--- a/playground/hmr-full-bundle-mode/__tests__/hmr-full-bundle-mode.spec.ts
+++ b/playground/hmr-full-bundle-mode/__tests__/hmr-full-bundle-mode.spec.ts
@@ -183,4 +183,9 @@ if (isBuild) {
     )
     await expect.poll(() => page.textContent('.worker-url')).toBe('worker-url')
   })
+
+  test('lazy bundling', async () => {
+    await page.click('#load-dynamic')
+    await expect.poll(() => page.textContent('.dynamic')).toBe('loaded')
+  })
 }
diff --git a/playground/hmr-full-bundle-mode/dynamic.js b/playground/hmr-full-bundle-mode/dynamic.js
new file mode 100644
index 00000000000000..c19beab71ac1eb
--- /dev/null
+++ b/playground/hmr-full-bundle-mode/dynamic.js
@@ -0,0 +1,5 @@
+text('.dynamic', 'loaded')
+
+function text(el, text) {
+  document.querySelector(el).textContent = text
+}
diff --git a/playground/hmr-full-bundle-mode/index.html b/playground/hmr-full-bundle-mode/index.html
index c5259e11e5d184..54694110256bec 100644
--- a/playground/hmr-full-bundle-mode/index.html
+++ b/playground/hmr-full-bundle-mode/index.html
@@ -5,5 +5,9 @@ <h1>HMR Full Bundle Mode</h1>
 <div class="asset"></div>
 <div class="worker-query"></div>
 <div class="worker-url"></div>
+<div>
+  <button id="load-dynamic">Load dynamic</button>
+  <div class="dynamic"></div>
+</div>
 
 <script type="module" src="./main.js"></script>
diff --git a/playground/hmr-full-bundle-mode/main.js b/playground/hmr-full-bundle-mode/main.js
index 9438bf643f1960..752e33219a2537 100644
--- a/playground/hmr-full-bundle-mode/main.js
+++ b/playground/hmr-full-bundle-mode/main.js
@@ -19,6 +19,10 @@ workerUrl.addEventListener('message', (e) => {
   text('.worker-url', e.data)
 })
 
+document.querySelector('#load-dynamic').addEventListener('click', () => {
+  import('./dynamic.js')
+})
+
 function text(el, text) {
   document.querySelector(el).textContent = text
 }
diff --git a/playground/legacy/__tests__/no-polyfills/legacy-no-polyfills.spec.ts b/playground/legacy/__tests__/no-polyfills/legacy-no-polyfills.spec.ts
index 4e6a3d7d0eb58b..4a57a8386ca13b 100644
--- a/playground/legacy/__tests__/no-polyfills/legacy-no-polyfills.spec.ts
+++ b/playground/legacy/__tests__/no-polyfills/legacy-no-polyfills.spec.ts
@@ -14,3 +14,11 @@ test.runIf(isBuild)('includes a script tag for SystemJS', async () => {
     .poll(() => page.getAttribute('#vite-legacy-entry', 'data-src'))
     .toMatch(/.\/assets\/index-legacy-(.+)\.js/)
 })
+
+test.runIf(isBuild)(
+  'does not emit modulepreload links for legacy-only output',
+  async () => {
+    await page.goto(viteTestUrl + '/no-polyfills.html')
+    expect(await page.content()).not.toContain('modulepreload')
+  },
+)
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b86df33c6d3e43..ba5417aaf9cef7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -64,8 +64,8 @@ importers:
         specifier: ^8.18.1
         version: 8.18.1
       '@vitejs/release-scripts':
-        specifier: ^1.7.0
-        version: 1.7.0(conventional-commits-filter@5.0.0)
+        specifier: ^1.7.1
+        version: 1.7.1(conventional-commits-filter@5.0.0)
       eslint:
         specifier: ^9.39.4
         version: 9.39.4(jiti@2.6.1)(ms@2.1.3)
@@ -4528,8 +4528,8 @@ packages:
       vite: workspace:*
       vue: ^3.2.25
 
-  '@vitejs/release-scripts@1.7.0':
-    resolution: {integrity: sha512-4C+eoDs6yp/6kmnfOtuOWK+Dq0W3ws0eCs9k7w50P4YD7z+gMRUIyDbs0sGsJ4GjxN1WsS3qNfTT7ZpimtgeyA==}
+  '@vitejs/release-scripts@1.7.1':
+    resolution: {integrity: sha512-8YpovUu73Yb+ZnXIsR9VoF/yhbd2wTMhvJKDOjlB0bbOdm+ATl1l7Z7rskdX4CGzN7UfdvLcE6vGaHDCsirdpw==}
 
   '@vitejs/require@file:playground/json/dep-json-require':
     resolution: {directory: playground/json/dep-json-require, type: directory}
@@ -7472,8 +7472,8 @@ packages:
     resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
     hasBin: true
 
-  semver@7.7.4:
-    resolution: {integrity: sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==}
+  semver@7.8.0:
+    resolution: {integrity: sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==}
     engines: {node: '>=10'}
     hasBin: true
 
@@ -9121,7 +9121,7 @@ snapshots:
     dependencies:
       '@simple-libs/child-process-utils': 1.0.1
       '@simple-libs/stream-utils': 1.2.0
-      semver: 7.7.4
+      semver: 7.8.0
     optionalDependencies:
       conventional-commits-filter: 5.0.0
       conventional-commits-parser: 6.4.0
@@ -9948,7 +9948,7 @@ snapshots:
       '@pnpm/error': 1000.1.0
       '@pnpm/semver.peer-range': 1000.0.0
       '@pnpm/types': 1001.3.0
-      semver: 7.7.4
+      semver: 7.8.0
 
   '@pnpm/read-project-manifest@1001.2.6':
     dependencies:
@@ -9968,7 +9968,7 @@ snapshots:
 
   '@pnpm/semver.peer-range@1000.0.0':
     dependencies:
-      semver: 7.7.4
+      semver: 7.8.0
 
   '@pnpm/text.comments-parser@1000.0.0':
     dependencies:
@@ -10598,7 +10598,7 @@ snapshots:
       '@typescript-eslint/visitor-keys': 8.59.2
       debug: obug@1.0.2(ms@2.1.3)
       minimatch: 10.2.5
-      semver: 7.7.4
+      semver: 7.8.0
       tinyglobby: 0.2.16
       ts-api-utils: 2.5.0(typescript@6.0.2)
       typescript: 6.0.2
@@ -10826,7 +10826,7 @@ snapshots:
       vite: link:packages/vite
       vue: 3.5.34(typescript@6.0.2)
 
-  '@vitejs/release-scripts@1.7.0(conventional-commits-filter@5.0.0)':
+  '@vitejs/release-scripts@1.7.1(conventional-commits-filter@5.0.0)':
     dependencies:
       conventional-changelog: 7.2.0(conventional-commits-filter@5.0.0)
       conventional-changelog-conventionalcommits: 9.3.1
@@ -10834,7 +10834,7 @@ snapshots:
       picocolors: 1.1.1
       prompts: 2.4.2
       publint: 0.3.20
-      semver: 7.7.4
+      semver: 7.8.0
       tinyexec: 1.1.2
     transitivePeerDependencies:
       - conventional-commits-filter
@@ -11668,7 +11668,7 @@ snapshots:
       conventional-commits-filter: 5.0.0
       handlebars: 4.7.8
       meow: 13.2.0
-      semver: 7.7.4
+      semver: 7.8.0
 
   conventional-changelog@7.2.0(conventional-commits-filter@5.0.0):
     dependencies:
@@ -11943,7 +11943,7 @@ snapshots:
   eslint-compat-utils@0.5.1(eslint@9.39.4):
     dependencies:
       eslint: 9.39.4(jiti@2.6.1)(ms@2.1.3)
-      semver: 7.7.4
+      semver: 7.8.0
 
   eslint-import-context@0.1.9(unrs-resolver@1.11.1):
     dependencies:
@@ -11969,7 +11969,7 @@ snapshots:
       eslint-import-context: 0.1.9(unrs-resolver@1.11.1)
       is-glob: 4.0.3
       minimatch: 10.2.5
-      semver: 7.7.4
+      semver: 7.8.0
       stable-hash-x: 0.2.0
       unrs-resolver: 1.11.1
     optionalDependencies:
@@ -11987,7 +11987,7 @@ snapshots:
       globals: 15.15.0
       globrex: 0.1.2
       ignore: 5.3.2
-      semver: 7.7.4
+      semver: 7.8.0
     optionalDependencies:
       typescript: 6.0.2
 
@@ -13182,7 +13182,7 @@ snapshots:
   normalize-package-data@7.0.1:
     dependencies:
       hosted-git-info: 8.1.0
-      semver: 7.7.4
+      semver: 7.8.0
       validate-npm-package-license: 3.0.4
 
   normalize-path@3.0.0: {}
@@ -14032,7 +14032,7 @@ snapshots:
 
   semver@6.3.1: {}
 
-  semver@7.7.4: {}
+  semver@7.8.0: {}
 
   send@1.2.1:
     dependencies:
@@ -14061,7 +14061,7 @@ snapshots:
     dependencies:
       '@img/colour': 1.0.0
       detect-libc: 2.1.2
-      semver: 7.7.4
+      semver: 7.8.0
     optionalDependencies:
       '@img/sharp-darwin-arm64': 0.34.5
       '@img/sharp-darwin-x64': 0.34.5
@@ -14448,7 +14448,7 @@ snapshots:
       picomatch: 4.0.4
       rolldown: 1.0.1
       rolldown-plugin-dts: 0.25.0(rolldown@1.0.1)(typescript@6.0.2)(vue-tsc@3.2.8)
-      semver: 7.7.4
+      semver: 7.8.0
       tinyexec: 1.1.2
       tinyglobby: 0.2.16
       tree-kill: 1.2.2