Fix: ready/doneEach order with async afterEach (#1770)

docsifyjs · Mar 16, 2022 · 32c6b38 · 32c6b38 · vercel · Mar 16, 2022
1 parent 63b2535
commit 32c6b38
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/src/core/render/index.js b/src/core/render/index.js
@@ -321,15 +321,15 @@ export function Render(Base) {
             );
           }
 
-          this.callHook('afterEach', html, hookData =>
-            renderMain.call(this, hookData)
-          );
+          this.callHook('afterEach', html, hookData => {
+            renderMain.call(this, hookData);
+            next();
+          });
         };
 
         if (this.isHTML) {
           html = this.result = text;
           callback();
-          next();
         } else {
           prerenderEmbed(
             {
@@ -339,7 +339,6 @@ export function Render(Base) {
             tokens => {
               html = this.compiler.compile(tokens);
               callback();
-              next();
             }
           );
         }

diff --git a/test/e2e/plugins.test.js b/test/e2e/plugins.test.js
@@ -9,7 +9,7 @@ test.describe('Plugins', () => {
       'mounted',
       'beforeEach-async',
       'beforeEach',
-      // 'afterEach-async',
+      'afterEach-async',
       'afterEach',
       'doneEach',
       'ready',
@@ -41,13 +41,12 @@ test.describe('Plugins', () => {
               return markdown;
             });
 
-            // FIXME: https://github.com/docsifyjs/docsify/issues/449
-            // hook.afterEach(function (html, next) {
-            //   setTimeout(function () {
-            //     console.log('afterEach-async');
-            //     next(html);
-            //   }, 100);
-            // });
+            hook.afterEach(function (html, next) {
+              setTimeout(function () {
+                console.log('afterEach-async');
+                next(html);
+              }, 100);
+            });
 
             hook.afterEach(function (html) {
               console.log('afterEach');