fix: run mutiple output builds sequantially

vitejs · Jan 5, 2021 · ab80522 · ab80522
1 parent ef100d0
commit ab80522
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/packages/vite/src/node/build.ts b/packages/vite/src/node/build.ts
@@ -170,7 +170,6 @@ export function resolveBuildPlugins(
   const options = config.build
   return {
     pre: [
-      ...(options.rollupOptions.plugins || []),
       commonjsPlugin({
         include: [/node_modules/],
         extensions: ['.js', '.cjs']
@@ -180,7 +179,8 @@ export function resolveBuildPlugins(
       dynamicImportVars({
         warnOnError: true,
         exclude: [/node_modules/]
-      })
+      }),
+      ...(options.rollupOptions.plugins || [])
     ],
     post: [
       buildEsbuildPlugin(config),
@@ -299,7 +299,11 @@ async function doBuild(
       config.logger
     )
     if (Array.isArray(outputs)) {
-      return Promise.all(outputs.map(generate))
+      const res = []
+      for (const output of outputs) {
+        res.push(await generate(output))
+      }
+      return res
     } else {
       return generate(outputs)
     }

diff --git a/packages/vite/src/node/plugins/html.ts b/packages/vite/src/node/plugins/html.ts
@@ -207,8 +207,6 @@ export function buildHtmlPlugin(config: ResolvedConfig): Plugin {
           )
         }
 
-        // TODO should store the imported entries for each page
-        // and inject corresponding assets
         processedHtml.set(id, s.toString())
         return js
       }