From 57d782c6f1bad9f313df3140e8aec9c3355a3f7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BF=A0=20/=20green?= <green@sapphi.red>
Date: Sat, 25 Jun 2022 23:42:17 +0900
Subject: [PATCH] fix: ESM SSR (#855)

---
 src/client/app/router.ts | 7 +------
 src/node/build/render.ts | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/client/app/router.ts b/src/client/app/router.ts
index a36c94745c42..d91eebd740f2 100644
--- a/src/client/app/router.ts
+++ b/src/client/app/router.ts
@@ -60,12 +60,7 @@ export function createRouter(
     const targetLoc = new URL(href, fakeHost)
     const pendingPath = (latestPendingPath = targetLoc.pathname)
     try {
-      let page = loadPageModule(pendingPath)
-      // only await if it returns a Promise - this allows sync resolution
-      // on initial render in SSR.
-      if ('then' in page && typeof page.then === 'function') {
-        page = await page
-      }
+      let page = await loadPageModule(pendingPath)
       if (latestPendingPath === pendingPath) {
         latestPendingPath = null
 
diff --git a/src/node/build/render.ts b/src/node/build/render.ts
index 247d7b51ef7c..f0993c4dc371 100644
--- a/src/node/build/render.ts
+++ b/src/node/build/render.ts
@@ -25,7 +25,7 @@ export async function renderPage(
   const { app, router } = createApp()
   const routePath = `/${page.replace(/\.md$/, '')}`
   const siteData = resolveSiteDataByRoute(config.site, routePath)
-  router.go(routePath)
+  await router.go(routePath)
 
   // lazy require server-renderer for production build
   // prioritize project root over vitepress' own dep