fix: support multi entry for dev

fix vitejs#160
rolldown · May 16, 2020 · 72cd992 · 72cd992
1 parent fcf250e
commit 72cd992
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 5 deletions.
diff --git a/playground/test.html b/playground/test.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Vite App</title>
+  <link rel="icon" href="/public/icon.png" />
+</head>
+<body>
+  <div id="app"></div>
+  <script type="module" src="/main.js"></script>
+</body>
+</html>
diff --git a/playground/vite.config.ts b/playground/vite.config.ts
@@ -6,6 +6,9 @@ const config: UserConfig = {
   alias: {
     alias: '/aliased'
   },
+  entry: {
+    test: './test.html'
+  },
   jsx: 'preact',
   minify: false,
   serviceWorker: !!process.env.USE_SW,

diff --git a/src/node/config.ts b/src/node/config.ts
@@ -26,6 +26,11 @@ export interface SharedConfig {
    * @default process.cwd()
    */
   root?: string
+  /**
+   * todo work for build
+   * Project entry. The `index.html` is default included.
+   * */
+  entry?: Record<string, string>
   /**
    * Import alias. Can only be exact mapping, does not support wildcard syntax.
    */

diff --git a/src/node/server/serverPluginModuleRewrite.ts b/src/node/server/serverPluginModuleRewrite.ts
@@ -58,10 +58,9 @@ export const moduleRewritePlugin: ServerPlugin = ({
   const scriptRE = /(<script\b[^>]*>)([\s\S]*?)<\/script>/gm
   const srcRE = /\bsrc=(?:"([^"]+)"|'([^']+)'|([^'"\s]+)\b)/
 
-  async function rewriteIndex(html: string) {
+  async function rewriteIndex(html: string, importer: string = '/index.html') {
     await initLexer
     let hasInjectedDevFlag = false
-    const importer = '/index.html'
     const devFlag = hasInjectedDevFlag ? `` : devInjectionCode
     return (
       devFlag +
@@ -99,13 +98,16 @@ export const moduleRewritePlugin: ServerPlugin = ({
       return
     }
 
-    if (ctx.path === '/index.html') {
+    if (
+      ctx.path === '/index.html' ||
+      Object.values(config.entry as object).includes(ctx.path)
+    ) {
       let html = await readBody(ctx.body)
       if (html && rewriteCache.has(html)) {
-        debug('/index.html: serving from cache')
+        debug(`${ctx.path}: serving from cache`)
         ctx.body = rewriteCache.get(html)
       } else if (html) {
-        ctx.body = await rewriteIndex(html)
+        ctx.body = await rewriteIndex(html, ctx.path)
         rewriteCache.set(html, ctx.body)
       }
       return

diff --git a/test/test.js b/test/test.js
@@ -372,6 +372,11 @@ describe('vite', () => {
 
     declareTests(false)
 
+    test('multi entry', async () => {
+      await page.goto('http://localhost:3000/test.html')
+      expect(await getText('h1')).toMatch('Vite Playground')
+    })
+
     // Assert that all edited files are reflected on page reload
     // i.e. service-worker cache is correctly busted
     test('sw cache busting', async () => {