Merge branch 'dev'

Author: maoberlehner

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-lazy-hydration",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.3",
   "description": "Lazy hydration of server-side rendered Vue.js components",
   "keywords": [
     "gridsome",

src/utils/nonce.js

@@ -1,7 +1,18 @@
 const isServer = typeof window === `undefined`;
 
+function isAsyncComponentFactory(componentOrFactory) {
+  return typeof componentOrFactory === `function`;
+}
+
+function resolveComponent(componentOrFactory) {
+  if (isAsyncComponentFactory(componentOrFactory)) {
+    return componentOrFactory().then(componentModule => componentModule.default);
+  }
+  return componentOrFactory;
+}
+
 export function makeNonce({ component, hydrationPromise }) {
   if (isServer) return component;
 
-  return () => hydrationPromise.then(() => component);
+  return () => hydrationPromise.then(() => resolveComponent(component));
 }