feat!: relative base (#7644)

vitejs · May 18, 2022 · 029288a · 029288a
1 parent d02b8ac
commit 029288a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/playground/test-utils.ts b/playground/test-utils.ts
@@ -122,8 +122,12 @@ export function listAssets(base = ''): string[] {
   return fs.readdirSync(assetsDir)
 }
 
-export function findAssetFile(match: string | RegExp, base = ''): string {
-  const assetsDir = path.join(testDir, 'dist', base, 'assets')
+export function findAssetFile(
+  match: string | RegExp,
+  base = '',
+  assets = 'assets'
+): string {
+  const assetsDir = path.join(testDir, 'dist', base, assets)
   const files = fs.readdirSync(assetsDir)
   const file = files.find((file) => {
     return file.match(match)

diff --git a/playground/vitestSetup.ts b/playground/vitestSetup.ts
@@ -54,6 +54,8 @@ export const serverLogs: string[] = []
 export const browserLogs: string[] = []
 export const browserErrors: Error[] = []
 
+export let resolvedConfig: ResolvedConfig = undefined!
+
 export let page: Page = undefined!
 export let browser: Browser = undefined!
 export let viteTestUrl: string = ''
@@ -199,7 +201,6 @@ export async function startDefaultServe() {
   } else {
     process.env.VITE_INLINE = 'inline-build'
     // determine build watch
-    let resolvedConfig: ResolvedConfig
     const resolvedPlugin: () => PluginOption = () => ({
       name: 'vite-plugin-watcher',
       configResolved(config) {
@@ -229,7 +230,10 @@ function startStaticServer(config?: InlineConfig): Promise<string> {
   }
 
   // fallback internal base to ''
-  const base = (config?.base ?? '/') === '/' ? '' : config?.base ?? ''
+  let base = config?.base
+  if (!base || base === '/' || base === './') {
+    base = ''
+  }
 
   // @ts-ignore
   if (config && config.__test__) {