feat($core): flatten return array of functional option

Author: ulivz

Diff for: packages/@vuepress/core/lib/plugin-api/abstract/AsyncOption.js

@@ -19,21 +19,25 @@ class AsyncOption extends Option {
    */
 
   async asyncApply (...args) {
-    const items = []
-    for (const { name, value } of this.items) {
+    const rawItems = this.items
+    this.items = []
+    this.appliedItems = this.items
+
+    for (const { name, value } of rawItems) {
       try {
-        items.push({
+        this.add(
           name,
-          value: isFunction(value)
+          isFunction(value)
             ? await value(...args)
             : value
-        })
+        )
       } catch (error) {
         logger.error(`${chalk.cyan(name)} apply ${chalk.cyan(this.key)} failed.`)
         throw error
       }
     }
-    this.appliedItems = items
+
+    this.items = rawItems
   }
 
   /**
@@ -43,23 +47,27 @@ class AsyncOption extends Option {
    */
 
   async parallelApply (...args) {
-    const items = []
-    await Promise.all(this.items.map(async ({ name, value }) => {
+    const rawItems = this.items
+    this.items = []
+    this.appliedItems = this.items
+
+    await Promise.all(rawItems.map(async ({ name, value }) => {
       try {
-        items.push({
+        this.add(
           name,
-          value: isFunction(value)
+          isFunction(value)
             ? await value(...args)
             : value
-        })
+        )
       } catch (error) {
         logger.error(`${chalk.cyan(name)} apply ${chalk.cyan(this.key)} failed.`)
         throw error
       }
     })).catch(error => {
       throw error
     })
-    return items
+
+    this.items = rawItems
   }
 
   /**

Diff for: packages/@vuepress/core/lib/plugin-api/abstract/Option.js

@@ -84,21 +84,25 @@ class Option {
    */
 
   syncApply (...args) {
-    const items = []
-    for (const { name, value } of this.items) {
+    const rawItems = this.items
+    this.items = []
+    this.appliedItems = this.items
+
+    for (const { name, value } of rawItems) {
       try {
-        items.push({
+        this.add(
           name,
-          value: isFunction(value)
+          isFunction(value)
             ? value(...args)
             : value
-        })
+        )
       } catch (error) {
         logger.error(`${chalk.cyan(name)} apply ${chalk.cyan(this.key)} failed.`)
         throw error
       }
     }
-    this.appliedItems = items
+
+    this.items = rawItems
   }
 
   /**

Diff for: packages/@vuepress/core/lib/plugin-api/override/ClientDynamicModulesOption.js

@@ -14,24 +14,16 @@ module.exports = class ClientDynamicModulesOption extends AsyncOption {
   async apply (ctx) {
     await super.asyncApply()
 
-    for (const item of this.appliedItems) {
-      let { value: modules } = item
-      const { name: pluginName } = item
-
-      if (!Array.isArray(modules)) {
-        modules = [modules]
-      }
-
-      await Promise.all(modules.map(async ({ name, content, dirname = 'dynamic' }) => {
-        await ctx.writeTemp(
-          `${dirname}/${name}`,
-          `
+    for (const { value, name: pluginName } of this.appliedItems) {
+      const { name, content, dirname = 'dynamic' } = value
+      await ctx.writeTemp(
+        `${dirname}/${name}`,
+        `
 /**
  * Generated by "${pluginName}"
  */
 ${content}\n\n
         `.trim())
-      }))
     }
   }
 }