feat: rolldown full bundle mode

Author: underfin

packages/vite/src/node/build.ts

@@ -86,6 +86,7 @@ import {
 import type { MinimalPluginContext, Plugin, PluginContext } from './plugin'
 import type { RollupPluginHooks } from './typeUtils'
 import { buildOxcPlugin } from './plugins/oxc'
+import type { ViteDevServer } from './server'
 
 export interface BuildEnvironmentOptions {
   /**
@@ -539,20 +540,21 @@ export async function resolveBuildPlugins(config: ResolvedConfig): Promise<{
 export async function build(
   inlineConfig: InlineConfig = {},
 ): Promise<RolldownOutput | RolldownOutput[] /* | RollupWatcher */> {
-  const builder = await createBuilder(inlineConfig, true)
+  const builder = await createBuilder(inlineConfig, true, 'build')
   const environment = Object.values(builder.environments)[0]
   if (!environment) throw new Error('No environment found')
   return builder.build(environment)
 }
 
 function resolveConfigToBuild(
+  command: 'build' | 'serve',
   inlineConfig: InlineConfig = {},
   patchConfig?: (config: ResolvedConfig) => void,
   patchPlugins?: (resolvedPlugins: Plugin[]) => void,
 ): Promise<ResolvedConfig> {
   return resolveConfig(
     inlineConfig,
-    'build',
+    command,
     'production',
     'production',
     false,
@@ -566,6 +568,7 @@ function resolveConfigToBuild(
  **/
 async function buildEnvironment(
   environment: BuildEnvironment,
+  server?: ViteDevServer
 ): Promise<RolldownOutput | RolldownOutput[] /* | RollupWatcher */> {
   const { root, packageCache } = environment.config
   const options = environment.config.build
@@ -651,6 +654,12 @@ async function buildEnvironment(
       ...options.rollupOptions.moduleTypes,
       '.css': 'js',
     },
+    experimental: {
+      hmr: server ? {
+        host: server._currentServerHost!,
+        port: server._currentServerPort!,
+      } : false,
+    }
   }
 
   /**
@@ -885,6 +894,29 @@ async function buildEnvironment(
     logger.info(
       `${colors.green(`✓ built in ${displayTime(Date.now() - startTime)}`)}`,
     )
+
+    if (server) {
+      for(const output of res) {
+        for (const outputFile of output.output) {
+          server.memoryFiles[outputFile.fileName] = outputFile.type === 'chunk' ? outputFile.code : outputFile.source;
+        }
+      }
+      server.watcher.on('change', async (file) => {
+        const patch = await bundle!.generateHmrPatch([file]);
+        if (patch) {
+          const url = `${Date.now()}.js`;
+          server.memoryFiles[url] = patch;
+          // TODO(underfin): fix ws msg typing
+          // @ts-expect-error
+          server.ws.send({
+            type: 'update',
+            url
+          })
+        }
+      })
+      // server.watcher = watcher
+    }
+
     return Array.isArray(outputs) ? res : res[0]
   } catch (e) {
     enhanceRollupError(e)
@@ -1611,9 +1643,10 @@ export class BuildEnvironment extends BaseEnvironment {
 export interface ViteBuilder {
   environments: Record<string, BuildEnvironment>
   config: ResolvedConfig
-  buildApp(): Promise<void>
+  buildApp(server?: ViteDevServer): Promise<void>
   build(
     environment: BuildEnvironment,
+    server?: ViteDevServer
   ): Promise<RolldownOutput | RolldownOutput[] /* | RollupWatcher */>
 }
 
@@ -1632,12 +1665,12 @@ export interface BuilderOptions {
    * @experimental
    */
   sharedPlugins?: boolean
-  buildApp?: (builder: ViteBuilder) => Promise<void>
+  buildApp?: (builder: ViteBuilder, server?: ViteDevServer) => Promise<void>
 }
 
-async function defaultBuildApp(builder: ViteBuilder): Promise<void> {
+async function defaultBuildApp(builder: ViteBuilder, server?: ViteDevServer): Promise<void> {
   for (const environment of Object.values(builder.environments)) {
-    await builder.build(environment)
+    await builder.build(environment, server)
   }
 }
 
@@ -1666,6 +1699,7 @@ export type ResolvedBuilderOptions = Required<BuilderOptions>
 export async function createBuilder(
   inlineConfig: InlineConfig = {},
   useLegacyBuilder: null | boolean = false,
+  command: 'build' | 'serve',
 ): Promise<ViteBuilder> {
   const patchConfig = (resolved: ResolvedConfig) => {
     if (!(useLegacyBuilder ?? !resolved.builder)) return
@@ -1679,7 +1713,7 @@ export async function createBuilder(
       ...resolved.environments[environmentName].build,
     }
   }
-  const config = await resolveConfigToBuild(inlineConfig, patchConfig)
+  const config = await resolveConfigToBuild(command, inlineConfig, patchConfig)
   useLegacyBuilder ??= !config.builder
   const configBuilder = config.builder ?? resolveBuilderOptions({})!
 
@@ -1688,11 +1722,11 @@ export async function createBuilder(
   const builder: ViteBuilder = {
     environments,
     config,
-    async buildApp() {
-      return configBuilder.buildApp(builder)
+    async buildApp(server?: ViteDevServer) {
+      return configBuilder.buildApp(builder, server)
     },
-    async build(environment: BuildEnvironment) {
-      return buildEnvironment(environment)
+    async build(environment: BuildEnvironment, server?: ViteDevServer) {
+      return buildEnvironment(environment, server)
     },
   }
 
@@ -1742,6 +1776,7 @@ export async function createBuilder(
           }
         }
         environmentConfig = await resolveConfigToBuild(
+          command,
           inlineConfig,
           patchConfig,
           patchPlugins,

packages/vite/src/node/cli.ts

@@ -175,7 +175,8 @@ cli
     '--force',
     `[boolean] force the optimizer to ignore the cache and re-bundle`,
   )
-  .action(async (root: string, options: ServerOptions & GlobalCLIOptions) => {
+  // TODO(underfin): Consider how to merge the build option into dev command.
+  .action(async (root: string, options: BuildEnvironmentOptions & BuilderCLIOptions & ServerOptions & GlobalCLIOptions) => {
     filterDuplicateOptions(options)
     // output structure is preserved even after bundling so require()
     // is ok here
@@ -197,6 +198,24 @@ cli
         throw new Error('HTTP server not available')
       }
 
+      const { createBuilder } = await import('./build')
+
+      const buildOptions: BuildEnvironmentOptions = cleanBuilderCLIOptions(options)
+
+      const inlineConfig: InlineConfig = {
+        root,
+        base: options.base,
+        mode: options.mode,
+        configFile: options.config,
+        configLoader: options.configLoader,
+        logLevel: options.logLevel,
+        clearScreen: options.clearScreen,
+        build: buildOptions,
+        ...(options.app ? { builder: {} } : {}),
+      }
+      const builder = await createBuilder(inlineConfig, null, 'serve')
+      await builder.buildApp(server)
+
       await server.listen()
 
       const info = server.config.logger.info
@@ -321,7 +340,7 @@ cli
           build: buildOptions,
           ...(options.app ? { builder: {} } : {}),
         }
-        const builder = await createBuilder(inlineConfig, null)
+        const builder = await createBuilder(inlineConfig, null, 'build')
         await builder.buildApp()
       } catch (e) {
         createLogger(options.logLevel).error(

packages/vite/src/node/plugins/index.ts

@@ -20,16 +20,18 @@ import {
 import { watchPackageDataPlugin } from '../packages'
 import { jsonPlugin } from './json'
 import { oxcResolvePlugin, resolvePlugin } from './resolve'
-import { optimizedDepsPlugin } from './optimizedDeps'
-import { importAnalysisPlugin } from './importAnalysis'
-import { cssAnalysisPlugin, cssPlugin, cssPostPlugin } from './css'
+// import { optimizedDepsPlugin } from './optimizedDeps'
+// import { importAnalysisPlugin } from './importAnalysis'
+import { 
+  // cssAnalysisPlugin,
+   cssPlugin, cssPostPlugin } from './css'
 import { assetPlugin } from './asset'
-import { clientInjectionsPlugin } from './clientInjections'
+// import { clientInjectionsPlugin } from './clientInjections'
 import { buildHtmlPlugin, htmlInlineProxyPlugin } from './html'
 import { wasmFallbackPlugin, wasmHelperPlugin } from './wasm'
 import { modulePreloadPolyfillPlugin } from './modulePreloadPolyfill'
 import { webWorkerPlugin } from './worker'
-import { preAliasPlugin } from './preAlias'
+// import { preAliasPlugin } from './preAlias'
 import { definePlugin } from './define'
 import { workerImportMetaUrlPlugin } from './workerImportMetaUrl'
 import { assetImportMetaUrlPlugin } from './assetImportMetaUrl'
@@ -49,7 +51,7 @@ export async function resolvePlugins(
   normalPlugins: Plugin[],
   postPlugins: Plugin[],
 ): Promise<Plugin[]> {
-  const isBuild = config.command === 'build'
+  const isBuild = true
   const isWorker = config.isWorker
   const buildPlugins = isBuild
     ? await (await import('../build')).resolveBuildPlugins(config)
@@ -58,9 +60,9 @@ export async function resolvePlugins(
   const enableNativePlugin = config.experimental.enableNativePlugin
 
   return [
-    !isBuild ? optimizedDepsPlugin() : null,
+    // !isBuild ? optimizedDepsPlugin() : null,
     !isWorker ? watchPackageDataPlugin(config.packageCache) : null,
-    !isBuild ? preAliasPlugin(config) : null,
+    // !isBuild ? preAliasPlugin(config) : null,
     enableNativePlugin === true
       ? nativeAliasPlugin({
           entries: config.resolve.alias.map((item) => {
@@ -140,7 +142,8 @@ export async function resolvePlugins(
       : wasmFallbackPlugin(),
     definePlugin(config),
     cssPostPlugin(config),
-    isBuild && buildHtmlPlugin(config),
+    // isBuild && 
+    buildHtmlPlugin(config),
     workerImportMetaUrlPlugin(config),
     assetImportMetaUrlPlugin(config),
     ...buildPlugins.pre,
@@ -158,14 +161,14 @@ export async function resolvePlugins(
 
     ...buildPlugins.post,
 
-    // internal server-only plugins are always applied after everything else
-    ...(isBuild
-      ? []
-      : [
-          clientInjectionsPlugin(config),
-          cssAnalysisPlugin(config),
-          importAnalysisPlugin(config),
-        ]),
+    // // internal server-only plugins are always applied after everything else
+    // ...(isBuild
+    //   ? []
+    //   : [
+    //       clientInjectionsPlugin(config),
+    //       cssAnalysisPlugin(config),
+    //       importAnalysisPlugin(config),
+    //     ]),
   ].filter(Boolean) as Plugin[]
 }