vitejs · userquin · Jul 23, 2022 · Jul 23, 2022 · Jul 23, 2022 · Jul 23, 2022
diff --git a/packages/vite/src/node/plugin.ts b/packages/vite/src/node/plugin.ts
@@ -153,4 +153,8 @@ export interface Plugin extends RollupPlugin {
     id: string,
     options?: { ssr?: boolean }
   ) => Promise<TransformResult> | TransformResult
+  /**
+   * Invoked between `writeBundle` and `closeBundle` hooks.
+   */
+  preCloseBundle?: (this: PluginContext) => void | Promise<void>
 }
diff --git a/packages/vite/src/node/plugins/index.ts b/packages/vite/src/node/plugins/index.ts
@@ -24,6 +24,7 @@ import { ensureWatchPlugin } from './ensureWatch'
 import { metadataPlugin } from './metadata'
 import { dynamicImportVarsPlugin } from './dynamicImportVars'
 import { importGlobPlugin } from './importMetaGlob'
+import { preCloseBundlePlugin } from './preCloseBundle'
 
 export async function resolvePlugins(
   config: ResolvedConfig,
@@ -37,7 +38,7 @@ export async function resolvePlugins(
     ? (await import('../build')).resolveBuildPlugins(config)
     : { pre: [], post: [] }
 
-  return [
+  const plugins: Plugin[] = [
     isWatch ? ensureWatchPlugin() : null,
     isBuild ? metadataPlugin() : null,
     preAliasPlugin(config),
@@ -98,4 +99,14 @@ export async function resolvePlugins(
       ? []
       : [clientInjectionsPlugin(config), importAnalysisPlugin(config)])
   ].filter(Boolean) as Plugin[]
+
+  if (!isBuild) return plugins
+
+  const preClosePlugins = plugins.filter(
+    (p) => typeof (p as any).preCloseBundle === 'function'
+  )
+
+  return preClosePlugins.length > 0
+    ? preCloseBundlePlugin(plugins, preClosePlugins)
+    : plugins
 }
diff --git a/packages/vite/src/node/plugins/preCloseBundle.ts b/packages/vite/src/node/plugins/preCloseBundle.ts
@@ -0,0 +1,28 @@
+import type { Plugin as RollupPlugin } from 'rollup'
+import type { Plugin } from '../plugin'
+
+export function preCloseBundlePlugin(
+  plugins: RollupPlugin[],
+  preClosePlugins: RollupPlugin[]
+): RollupPlugin[] {
+  plugins
+    .filter((p) => typeof p.closeBundle === 'function')
+    .forEach((p) => {
+      const _closeBundle = p.closeBundle
+      delete p.closeBundle
+      ;(p as any)._closeBundle = _closeBundle
+    })
+  plugins.push(<Plugin>{
+    name: 'vite:pre-close-bundle',
+    apply: 'build',
+    async closeBundle() {
+      await Promise.all(
+        preClosePlugins.map((p) => (p as any).preCloseBundle?.apply(this))
+      )
+      await Promise.all(
+        plugins.map((p) => (p as any)._closeBundle?.apply(this))
+      )
+    }
+  })
+  return plugins
+}
diff --git a/playground/pre-close-bundle-hook/index.html b/playground/pre-close-bundle-hook/index.html
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <h1>Hello</h1>
+  </body>
+</html>
diff --git a/playground/pre-close-bundle-hook/package.json b/playground/pre-close-bundle-hook/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "test-pre-close-bundle-hook",
+  "private": true,
+  "version": "0.0.0",
+  "scripts": {
+    "build": "vite build"
+  }
+}
diff --git a/playground/pre-close-bundle-hook/vite.config.js b/playground/pre-close-bundle-hook/vite.config.js
@@ -0,0 +1,70 @@
+const { resolve } = require('path')
+
+async function awaiting(timeout = 1000) {
+  await new Promise((resolve) => setTimeout(resolve, timeout))
+}
+
+let called1 = false
+let called2 = false
+let called3 = false
+
+/**
+ * @type {import('vite').UserConfig}
+ */
+module.exports = {
+  base: './',
+  build: {
+    rollupOptions: {
+      input: {
+        main: resolve(__dirname, 'index.html')
+      }
+    }
+  },
+  plugins: [
+    {
+      name: 'pre-close-bundle-1',
+      enforce: 'pre',
+      apply: 'build',
+      async preCloseBundle() {
+        await awaiting(1200)
+        called1 = true
+      }
+    },
+    {
+      name: 'pre-close-bundle-2',
+      async preCloseBundle() {
+        await awaiting(1100)
+        called2 = true
+      }
+    },
+    {
+      name: 'pre-close-bundle-2',
+      enforce: 'post',
+      apply: 'build',
+      async preCloseBundle() {
+        await awaiting()
+        called3 = true
+      }
+    },
+    {
+      name: 'close-bundle-pre',
+      enforce: 'pre',
+      apply: 'build',
+      closeBundle() {
+        if (!called1 || !called2 || !called3) {
+          throw new Error('some pre-close-bundle not being called!')
+        }
+      }
+    },
+    {
+      name: 'close-bundle-post',
+      enforce: 'post',
+      apply: 'build',
+      closeBundle() {
+        if (!called1 || !called2 || !called3) {
+          throw new Error('some pre-close-bundle not being called!')
+        }
+      }
+    }
+  ]
+}
diff --git a/scripts/patchCJS.ts b/scripts/patchCJS.ts
@@ -41,7 +41,7 @@ if (matchMixed) {
   writeFileSync(indexPath, lines.join('\n'))
 
   console.log(colors.bold(`${indexPath} CJS patched`))
-  process.exit()
+  process.exit(0)
 }
 
 const matchDefault = code.match(/\nmodule.exports = (\w+);/)
@@ -50,7 +50,7 @@ if (matchDefault) {
   code += `module.exports["default"] = ${matchDefault[1]};\n`
   writeFileSync(indexPath, code)
   console.log(colors.bold(`${indexPath} CJS patched`))
-  process.exit()
+  process.exit(0)
 }
 
 console.error(colors.red(`${indexPath} CJS patch failed`))