fix: handle when base is an external URL

aleclarson · Jul 25, 2021 · c32c5ac · c32c5ac
1 parent 2c1e229
commit c32c5ac
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts
@@ -260,7 +260,7 @@ export function cssPostPlugin(config: ResolvedConfig): Plugin {
           }
           return [
             `import { updateStyle, removeStyle } from ${JSON.stringify(
-              path.posix.join(config.base, CLIENT_PUBLIC_PATH)
+              config.base + CLIENT_PUBLIC_PATH.slice(1)
             )}`,
             `const id = ${JSON.stringify(id)}`,
             `const css = ${JSON.stringify(css)}`,

diff --git a/packages/vite/src/node/plugins/importAnalysis.ts b/packages/vite/src/node/plugins/importAnalysis.ts
@@ -90,7 +90,7 @@ function markExplicitImport(url: string) {
  */
 export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
   const { root, base } = config
-  const clientPublicPath = path.posix.join(base, CLIENT_PUBLIC_PATH)
+  const clientPublicPath = base + CLIENT_PUBLIC_PATH.slice(1)
 
   let server: ViteDevServer
 

diff --git a/packages/vite/src/node/server/middlewares/base.ts b/packages/vite/src/node/server/middlewares/base.ts
@@ -7,7 +7,10 @@ import { Connect } from 'types/connect'
 export function baseMiddleware({
   config
 }: ViteDevServer): Connect.NextHandleFunction {
-  const base = config.base
+  let base = config.base
+  if (/^https?:\/\//.test(base)) {
+    base = parseUrl(base).pathname!
+  }
 
   // Keep the named function. The name is visible in debug logs via `DEBUG=connect:dispatcher ...`
   return function viteBaseMiddleware(req, res, next) {