feat: support esm ssr build (#707)

vuejs · Jun 23, 2022 · c90baae · c90baae
1 parent 75dcaa2
commit c90baae
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ dist
 node_modules
 pnpm-global
 TODOs.md
+.temp
diff --git a/src/client/app/router.ts b/src/client/app/router.ts
@@ -187,7 +187,6 @@ export function useRouter(): Router {
   if (!router) {
     throw new Error('useRouter() is called without provider.')
   }
-  // @ts-ignore
   return router
 }
 

diff --git a/src/node/build/build.ts b/src/node/build/build.ts
@@ -84,7 +84,7 @@ export async function build(
       pageToHashMap
     )
   } finally {
-    await fs.remove(siteConfig.tempDir)
+    fs.rmSync(siteConfig.tempDir, { recursive: true, force: true })
   }
 
   console.log(`build complete in ${((Date.now() - start) / 1000).toFixed(2)}s.`)

diff --git a/src/node/build/bundle.ts b/src/node/build/bundle.ts
@@ -52,10 +52,13 @@ export async function bundle(
       pageToHashMap,
       clientJSMap
     ),
-    // @ts-ignore
     ssr: {
       noExternal: ['vitepress']
     },
+    // TODO: remove this workaround
+    legacy: {
+      buildSsrCjsExternalHeuristics: true
+    },
     build: {
       ...options,
       emptyOutDir: true,
@@ -71,7 +74,11 @@ export async function bundle(
         output: {
           ...rollupOptions?.output,
           ...(ssr
-            ? {}
+            ? {
+                entryFileNames: `[name].js`,
+                chunkFileNames: `[name].[hash].js`,
+                assetFileNames: `[name].[ext]`
+              }
             : {
                 chunkFileNames(chunk) {
                   // avoid ads chunk being intercepted by adblock

diff --git a/src/node/build/render.ts b/src/node/build/render.ts
@@ -20,9 +20,8 @@ export async function renderPage(
   pageToHashMap: Record<string, string>,
   hashMapString: string
 ) {
-  const { createApp } = await import(
-    pathToFileURL(path.join(config.tempDir, `app.js`)).toString()
-  )
+  const entryPath = path.join(config.tempDir, 'app.js')
+  const { createApp } = await import(pathToFileURL(entryPath).toString())
   const { app, router } = createApp()
   const routePath = `/${page.replace(/\.md$/, '')}`
   const siteData = resolveSiteDataByRoute(config.site, routePath)

diff --git a/src/node/plugin.ts b/src/node/plugin.ts
@@ -216,6 +216,14 @@ export async function createVitePressPlugin(
             delete bundle[name]
           }
         }
+
+        if (config.ssr?.format === 'esm') {
+          this.emitFile({
+            type: 'asset',
+            fileName: 'package.json',
+            source: '{ "private": true, "type": "module" }'
+          })
+        }
       } else {
         // client build:
         // for each .md entry chunk, adjust its name to its correct path.

diff --git a/src/shared/shared.ts b/src/shared/shared.ts
@@ -13,7 +13,6 @@ export type {
 export const EXTERNAL_URL_RE = /^https?:/i
 export const APPEARANCE_KEY = 'vitepress-theme-appearance'
 
-// @ts-ignore
 export const inBrowser = typeof window !== 'undefined'
 
 export const notFoundPageData: PageData = {