feat: support base option during dev, deprecate build.base (#1556)

vitejs · Jan 22, 2021 · ba4bce2 · ba4bce2
1 parent 705bfc3
commit ba4bce2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/packages/plugin-vue/src/template.ts b/packages/plugin-vue/src/template.ts
@@ -108,7 +108,9 @@ export function resolveTemplateCompilerOptions(
     // request
     if (filename.startsWith(options.root)) {
       assetUrlOptions = {
-        base: '/' + slash(path.relative(options.root, path.dirname(filename)))
+        base:
+          options.devServer.config.base +
+          slash(path.relative(options.root, path.dirname(filename)))
       }
     }
   } else {

diff --git a/scripts/jestPerTestSetup.ts b/scripts/jestPerTestSetup.ts
@@ -66,8 +66,9 @@ beforeAll(async () => {
       if (!isBuildTest) {
         process.env.VITE_INLINE = 'inline-serve'
         server = await (await createServer(options)).listen()
-        // use resolved port from server
-        const url = ((global as any).viteTestUrl = `http://localhost:${server.config.server.port}`)
+        // use resolved port/base from server
+        const base = server.config.base === '/' ? '' : server.config.base
+        const url = ((global as any).viteTestUrl = `http://localhost:${server.config.server.port}${base}`)
         await page.goto(url)
       } else {
         process.env.VITE_INLINE = 'inline-build'
@@ -100,7 +101,7 @@ function startStaticServer(): Promise<string> {
   try {
     config = require(configFile)
   } catch (e) {}
-  const base = config?.build?.base || ''
+  const base = (config?.base || '/') === '/' ? '' : config.base
 
   // @ts-ignore
   if (config && config.__test__) {