Support Plugin return Promise

vuejs · Apr 24, 2018 · 5cdb744 · 5cdb744
1 parent c72bf9d
commit 5cdb744
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/lib/prepare.js b/lib/prepare.js
@@ -5,7 +5,7 @@ const yamlParser = require('js-yaml')
 const tomlParser = require('toml')
 const createMarkdown = require('./markdown')
 const tempPath = path.resolve(__dirname, 'app/.temp')
-const { inferTitle, extractHeaders, parseFrontmatter, loadPlugin, isAsyncFunction } = require('./util')
+const { inferTitle, extractHeaders, parseFrontmatter, loadPlugin } = require('./util')
 
 fs.ensureDirSync(tempPath)
 
@@ -88,10 +88,12 @@ if (!Object.assign) Object.assign = require('object-assign')`
           pluginRequired = pluginRequired(plugin.options)
         }
       }
-      if (isAsyncFunction(pluginRequired)) {
-        await pluginRequired(options)
-      } else {
-        pluginRequired(options)
+      if (pluginRequired) {
+        try {
+          await pluginRequired(options)
+        } catch (e) {
+          throw e
+        }
       }
     }
   }

diff --git a/lib/util/index.js b/lib/util/index.js
@@ -101,8 +101,3 @@ exports.loadPlugin = (pluginPath, options) => {
   }
   return plugin
 }
-
-exports.isAsyncFunction = (func) => {
-  const AsyncFunction = (async () => {}).constructor
-  return (func instanceof AsyncFunction && AsyncFunction !== Function)
-}