chore: upgrade rollup to 3.25.2

package.json

@@ -81,7 +81,7 @@
     "prettier": "2.8.8",
     "resolve": "^1.22.2",
     "rimraf": "^5.0.1",
-    "rollup": "^3.21.0",
+    "rollup": "^3.25.2",
     "simple-git-hooks": "^2.8.1",
     "tslib": "^2.5.3",
     "tsx": "^3.12.7",

packages/vite/package.json

@@ -69,7 +69,7 @@
   "dependencies": {
     "esbuild": "^0.18.6",
     "postcss": "^8.4.24",
-    "rollup": "^3.21.0"
+    "rollup": "^3.25.2"
   },
   "optionalDependencies": {
     "fsevents": "~2.3.2"

packages/vite/src/node/build.ts

@@ -5,16 +5,17 @@ import type {
   ExternalOption,
   InputOption,
   InternalModuleFormat,
+  LoggingFunction,
   ModuleFormat,
   OutputOptions,
   Plugin,
   RollupBuild,
   RollupError,
+  RollupLog,
   RollupOptions,
   RollupOutput,
   RollupWarning,
   RollupWatcher,
-  WarningHandler,
   WatcherOptions,
 } from 'rollup'
 import type { Terser } from 'dep-types/terser'
@@ -867,47 +868,58 @@ const dynamicImportWarningIgnoreList = [
 
 export function onRollupWarning(
   warning: RollupWarning,
-  warn: WarningHandler,
+  warn: LoggingFunction,
   config: ResolvedConfig,
 ): void {
-  function viteWarn(warning: RollupWarning) {
-    if (warning.code === 'UNRESOLVED_IMPORT') {
-      const id = warning.id
-      const exporter = warning.exporter
-      // throw unless it's commonjs external...
-      if (!id || !/\?commonjs-external$/.test(id)) {
-        throw new Error(
-          `[vite]: Rollup failed to resolve import "${exporter}" from "${id}".\n` +
-            `This is most likely unintended because it can break your application at runtime.\n` +
-            `If you do want to externalize this module explicitly add it to\n` +
-            `\`build.rollupOptions.external\``,
-        )
-      }
-    }
+  const viteWarn: LoggingFunction = (warnLog) => {
+    let warning: string | RollupLog
 
-    if (
-      warning.plugin === 'rollup-plugin-dynamic-import-variables' &&
-      dynamicImportWarningIgnoreList.some((msg) =>
-        warning.message.includes(msg),
-      )
-    ) {
-      return
+    if (typeof warnLog === 'function') {
+      warning = warnLog()
+    } else {
+      warning = warnLog
     }
 
-    if (warningIgnoreList.includes(warning.code!)) {
-      return
-    }
+    if (typeof warning === 'object') {
+      if (warning.code === 'UNRESOLVED_IMPORT') {
+        const id = warning.id
+        const exporter = warning.exporter
+        // throw unless it's commonjs external...
+        if (!id || !/\?commonjs-external$/.test(id)) {
+          throw new Error(
+            `[vite]: Rollup failed to resolve import "${exporter}" from "${id}".\n` +
+              `This is most likely unintended because it can break your application at runtime.\n` +
+              `If you do want to externalize this module explicitly add it to\n` +
+              `\`build.rollupOptions.external\``,
+          )
+        }
+      }
 
-    if (warning.code === 'PLUGIN_WARNING') {
-      config.logger.warn(
-        `${colors.bold(
-          colors.yellow(`[plugin:${warning.plugin}]`),
-        )} ${colors.yellow(warning.message)}`,
-      )
-      return
+      if (
+        warning.plugin === 'rollup-plugin-dynamic-import-variables' &&
+        dynamicImportWarningIgnoreList.some((msg) =>
+          // @ts-expect-error warning is RollupLog
+          warning.message.includes(msg),
+        )
+      ) {
+        return
+      }
+
+      if (warningIgnoreList.includes(warning.code!)) {
+        return
+      }
+
+      if (warning.code === 'PLUGIN_WARNING') {
+        config.logger.warn(
+          `${colors.bold(
+            colors.yellow(`[plugin:${warning.plugin}]`),
+          )} ${colors.yellow(warning.message)}`,
+        )
+        return
+      }
     }
 
-    warn(warning)
+    warn(warnLog)
   }
 
   const tty = process.stdout.isTTY && !process.env.CI

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

@@ -606,6 +606,7 @@ export function buildHtmlPlugin(config: ResolvedConfig): Plugin {
 
     async generateBundle(options, bundle) {
       const analyzedChunk: Map<OutputChunk, number> = new Map()
+      const inlineEntryChunk = new Set<string>()
       const getImportedChunks = (
         chunk: OutputChunk,
         seen: Set<string> = new Set(),
@@ -826,8 +827,7 @@ export function buildHtmlPlugin(config: ResolvedConfig): Plugin {
         })
 
         if (chunk && canInlineEntry) {
-          // all imports from entry have been inlined to html, prevent rollup from outputting it
-          delete bundle[chunk.fileName]
+          inlineEntryChunk.add(chunk.fileName)
         }
 
         const shortEmitName = normalizePath(path.relative(config.root, id))
@@ -837,6 +837,11 @@ export function buildHtmlPlugin(config: ResolvedConfig): Plugin {
           source: result,
         })
       }
+
+      for (const fileName of inlineEntryChunk) {
+        // all imports from entry have been inlined to html, prevent rollup from outputting it
+        delete bundle[fileName]
+      }
     },
   }
 }

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

@@ -221,7 +221,7 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {
       try {
         imports = parseImports(source)[0]
       } catch (e: any) {
-        this.error(e, e.idx)
+        this.error(e)
       }
 
       if (!imports.length) {
@@ -462,7 +462,7 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {
           try {
             imports = parseImports(code)[0].filter((i) => i.d > -1)
           } catch (e: any) {
-            this.error(e, e.idx)
+            this.error(e)
           }
 
           const s = new MagicString(code)

packages/vite/src/node/server/middlewares/error.ts

@@ -15,7 +15,7 @@ export function prepareError(err: Error | RollupError): ErrorPayload['err'] {
     id: (err as RollupError).id,
     frame: strip((err as RollupError).frame || ''),
     plugin: (err as RollupError).plugin,
-    pluginCode: (err as RollupError).pluginCode,
+    pluginCode: (err as RollupError).pluginCode?.toString(),
     loc: (err as RollupError).loc,
   }
 }

packages/vite/src/node/server/pluginContainer.ts

@@ -50,6 +50,7 @@ import type {
   PartialResolvedId,
   ResolvedId,
   RollupError,
+  RollupLog,
   PluginContext as RollupPluginContext,
   SourceDescription,
   SourceMap,
@@ -84,6 +85,8 @@ import { createPluginHookUtils } from '../plugins'
 import { buildErrorMessage } from './middlewares/error'
 import type { ModuleGraph } from './moduleGraph'
 
+const noop = () => {}
+
 export const ERR_CLOSED_SERVER = 'ERR_CLOSED_SERVER'
 
 export function throwClosedServerError(): never {
@@ -186,6 +189,11 @@ export async function createPluginContainer(
       rollupVersion,
       watchMode: true,
     },
+    debug: noop,
+    info: noop,
+    warn: noop,
+    // @ts-expect-error noop
+    error: noop,
   }
 
   function warnIncompatibleMethod(method: string, plugin: string) {
@@ -271,7 +279,7 @@ export async function createPluginContainer(
   // active plugin in that pipeline can be tracked in a concurrency-safe manner.
   // using a class to make creating new contexts more efficient
   class Context implements PluginContext {
-    meta = minimalContext.meta
+    meta = minimalContext.meta!
     ssr = false
     _scan = false
     _activePlugin: Plugin | null
@@ -377,10 +385,10 @@ export async function createPluginContainer(
     }
 
     warn(
-      e: string | RollupError,
+      e: string | RollupLog | (() => string | RollupLog),
       position?: number | { column: number; line: number },
     ) {
-      const err = formatError(e, position, this)
+      const err = formatError(typeof e === 'function' ? e() : e, position, this)
       const msg = buildErrorMessage(
         err,
         [colors.yellow(`warning: ${err.message}`)],
@@ -400,6 +408,9 @@ export async function createPluginContainer(
       // the the error middleware.
       throw formatError(e, position, this)
     }
+
+    debug = noop
+    info = noop
   }
 
   function formatError(
@@ -493,7 +504,7 @@ export async function createPluginContainer(
           }
         }
         if (code) {
-          err.frame = generateCodeFrame(code, err.loc)
+          err.frame = generateCodeFrame(`${code}`, err.loc)
         }
       }
     }

packages/vite/src/node/ssr/ssrManifestPlugin.ts

@@ -42,7 +42,7 @@ export function ssrManifestPlugin(config: ResolvedConfig): Plugin {
             try {
               imports = parseImports(code)[0].filter((i) => i.n && i.d > -1)
             } catch (e: any) {
-              this.error(e, e.idx)
+              this.error(e)
             }
             if (imports.length) {
               for (let index = 0; index < imports.length; index++) {

playground/html/__tests__/html.spec.ts

@@ -150,7 +150,7 @@ describe.runIf(isBuild)('build', () => {
     const countPreloadTags = _countTags.bind(this, 'link[rel=modulepreload]')
 
     test('is inlined', async () => {
-      await page.goto(viteTestUrl + '/inline/shared-1.html?v=1')
+      await page.goto(viteTestUrl + '/inline/shared-2.html?v=1')
       expect(await countScriptTags()).toBeGreaterThan(1)
       expect(await countPreloadTags()).toBe(0)
     })
@@ -162,6 +162,10 @@ describe.runIf(isBuild)('build', () => {
     })
 
     test('execution order when inlined', async () => {
+      await page.goto(viteTestUrl + '/inline/shared-1.html?v=1')
+      expect((await page.textContent('#output')).trim()).toBe(
+        'dep1 common dep2 dep3 shared',
+      )
       await page.goto(viteTestUrl + '/inline/shared-2.html?v=1')
       expect((await page.textContent('#output')).trim()).toBe(
         'dep1 common dep2 dep3 shared',