From bedd7af68f34c1164940de776b97a44d94651724 Mon Sep 17 00:00:00 2001
From: Divyansh Singh <40380293+brc-dd@users.noreply.github.com>
Date: Fri, 24 Jun 2022 22:22:05 +0530
Subject: [PATCH] feat: use ESM in SSR

---
 src/node/alias.ts        | 19 -------------------
 src/node/build/bundle.ts |  8 +-------
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/src/node/alias.ts b/src/node/alias.ts
index 899aa71c..57b69a97 100644
--- a/src/node/alias.ts
+++ b/src/node/alias.ts
@@ -1,9 +1,7 @@
-import { createRequire } from 'module'
 import { resolve, join } from 'path'
 import { fileURLToPath } from 'url'
 import { Alias, AliasOptions } from 'vite'
 
-const require = createRequire(import.meta.url)
 const PKG_ROOT = resolve(fileURLToPath(import.meta.url), '../..')
 
 export const DIST_CLIENT_PATH = resolve(PKG_ROOT, 'client')
@@ -17,8 +15,6 @@ export const DEFAULT_THEME_PATH = join(DIST_CLIENT_PATH, 'theme-default')
 export const SITE_DATA_ID = '@siteData'
 export const SITE_DATA_REQUEST_PATH = '/' + SITE_DATA_ID
 
-const vueRuntimePath = 'vue/dist/vue.runtime.esm-bundler.js'
-
 export function resolveAliases(root: string, themeDir: string): AliasOptions {
   const paths: Record<string, string> = {
     '/@theme': themeDir,
@@ -26,15 +22,6 @@ export function resolveAliases(root: string, themeDir: string): AliasOptions {
     [SITE_DATA_ID]: SITE_DATA_REQUEST_PATH
   }
 
-  // prioritize vue installed in project root and fallback to
-  // vue that comes with vitepress itself.
-  let vuePath
-  try {
-    vuePath = require.resolve(vueRuntimePath, { paths: [root] })
-  } catch (e) {
-    vuePath = require.resolve(vueRuntimePath)
-  }
-
   const aliases: Alias[] = [
     ...Object.keys(paths).map((p) => ({
       find: p,
@@ -52,12 +39,6 @@ export function resolveAliases(root: string, themeDir: string): AliasOptions {
     {
       find: /^vitepress\//,
       replacement: PKG_ROOT + '/'
-    },
-    // make sure it always use the same vue dependency that comes
-    // with vitepress itself
-    {
-      find: /^vue$/,
-      replacement: vuePath
     }
   ]
 
diff --git a/src/node/build/bundle.ts b/src/node/build/bundle.ts
index e82e09e5..dceab459 100644
--- a/src/node/build/bundle.ts
+++ b/src/node/build/bundle.ts
@@ -55,10 +55,6 @@ export async function bundle(
     ssr: {
       noExternal: ['vitepress', '@docsearch/css']
     },
-    // // TODO: remove this workaround
-    // legacy: {
-    //   buildSsrCjsExternalHeuristics: true
-    // },
     build: {
       ...options,
       emptyOutDir: true,
@@ -102,9 +98,7 @@ export async function bundle(
                 }
               })
         }
-      },
-      // minify with esbuild in MPA mode (for CSS)
-      minify: ssr ? (config.mpa ? 'esbuild' : false) : !process.env.DEBUG
+      }
     }
   })