fix(build): resolve user provided index.html, close #51

antfu · antfu · commit fa3b12e290d7 · 2021-05-10T14:52:59.000+08:00
diff --git a/demo/composable-vue/index.html b/demo/composable-vue/index.html
@@ -0,0 +1,3 @@
+<head>
+  <link rel="icon" type="image/svg" href="https://antfu.me/favicon.svg" />
+</head>
diff --git a/packages/slidev/node/build.ts b/packages/slidev/node/build.ts
@@ -1,6 +1,6 @@
-import { promises as fs } from 'fs'
 import { resolve, join } from 'path'
 import http from 'http'
+import fs from 'fs-extra'
 import { build as viteBuild, InlineConfig, mergeConfig, ResolvedConfig } from 'vite'
 import connect from 'connect'
 import sirv from 'sirv'
@@ -14,6 +14,11 @@ export async function build(
   viteConfig: InlineConfig = {},
 ) {
   const indexPath = resolve(options.userRoot, 'index.html')
+
+  let originalIndexHTML: string | undefined
+  if (fs.existsSync(indexPath))
+    originalIndexHTML = await fs.readFile(indexPath, 'utf-8')
+
   await fs.writeFile(indexPath, await getIndexHtml(options), 'utf-8')
   let config: ResolvedConfig = undefined!
 
@@ -36,7 +41,10 @@ export async function build(
     )
   }
   finally {
-    await fs.unlink(indexPath)
+    if (originalIndexHTML != null)
+      await fs.writeFile(indexPath, originalIndexHTML, 'utf-8')
+    else
+      await fs.unlink(indexPath)
   }
 
   if (options.data.config.download === true || options.data.config.download === 'auto') {
diff --git a/packages/slidev/node/common.ts b/packages/slidev/node/common.ts
@@ -4,14 +4,14 @@ import { uniq } from '@antfu/utils'
 import { ResolvedSlidevOptions } from './options'
 import { toAtFS } from './utils'
 
-export async function getIndexHtml({ clientRoot, themeRoots, data }: ResolvedSlidevOptions): Promise<string> {
+export async function getIndexHtml({ clientRoot, themeRoots, data, userRoot }: ResolvedSlidevOptions): Promise<string> {
   let main = await fs.readFile(join(clientRoot, 'index.html'), 'utf-8')
   let head = ''
   let body = ''
 
   const roots = uniq([
     ...themeRoots,
-    // userRoot,
+    userRoot,
   ])
 
   for (const root of roots) {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<head>`
	`2`	`+ <link rel="icon" type="image/svg" href="https://antfu.me/favicon.svg" />`
	`3`	`+</head>`