refactor($core): simplify code of additionalPages option

Author: ulivz

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

@@ -30,7 +30,7 @@ class AsyncOption extends Option {
         this.add(
           name,
           isFunction(value)
-            ? await Promise.resolve(value(...args))
+            ? await value(...args)
             : value
         )
       } catch (error) {
@@ -60,7 +60,7 @@ class AsyncOption extends Option {
         this.add(
           name,
           isFunction(value)
-            ? await Promise.resolve(value(...args))
+            ? await value(...args)
             : value
         )
       } catch (error) {
@@ -84,7 +84,7 @@ class AsyncOption extends Option {
 
   async pipeline (input) {
     for (const fn of this.values) {
-      input = await Promise.resolve(fn(input))
+      input = await fn(input)
     }
     return input
   }

packages/@vuepress/core/lib/plugin-api/constants.js

@@ -16,7 +16,7 @@ const PLUGIN_OPTION_META_MAP = {
   CHAIN_MARKDOWN: { name: 'chainMarkdown', types: [Function] },
   CLIENT_DYNAMIC_MODULES: { name: 'clientDynamicModules', types: [Object, Function] },
   CLIENT_ROOT_MIXIN: { name: 'clientRootMixin', types: [String] },
-  ADDITIONAL_PAGES: { name: 'additionalPages', types: [Function, Array] },
+  ADDITIONAL_PAGES: { name: 'additionalPages', types: [Function, Array], async: true },
   GLOBAL_UI_COMPONENTS: { name: 'globalUIComponents', types: [String, Array] },
   DEFINE: { name: 'define', types: [Function, Object] },
   ALIAS: { name: 'alias', types: [Function, Object] },

packages/@vuepress/core/lib/plugin-api/override/AdditionalPagesOption.js

@@ -4,7 +4,6 @@ const GlobalUIComponentsOption = require('./GlobalUIComponentsOption')
 const DefineOption = require('./DefineOption')
 const AliasOption = require('./AliasOption')
 const AsyncOption = require('../abstract/AsyncOption')
-const AdditionalPagesOption = require('./AdditionalPagesOption')
 const Option = require('../abstract/Option')
 const { PLUGIN_OPTION_MAP } = require('../constants')
 
@@ -25,9 +24,6 @@ module.exports = function instantiateOption ({ name, async }) {
   case PLUGIN_OPTION_MAP.ALIAS.name:
     return new AliasOption(name)
 
-  case PLUGIN_OPTION_MAP.ADDITIONAL_PAGES.name:
-    return new AdditionalPagesOption(name)
-
   default: return async ? new AsyncOption(name) : new Option(name)
   }
 }

packages/@vuepress/core/lib/plugin-api/override/instantiateOption.js

@@ -105,6 +105,11 @@ module.exports = class AppContext {
 
     await this.resolvePages()
     await this.pluginAPI.options.additionalPages.apply(this)
+    await Promise.all(
+      this.pluginAPI.options.additionalPages.appliedValues.map(async (options) => {
+        await this.addPage(options)
+      })
+    )
 
     await this.pluginAPI.options.ready.apply()
     await Promise.all([