test: cleanup testConfig.baseRoute and use testConfig.previewBase

playground/assets/__tests__/relative-base/relative-base-assets.spec.ts

@@ -6,11 +6,8 @@ import {
   getColor,
   isBuild,
   page,
-  viteConfig,
 } from '~utils'
 
-const getBase = () => (viteConfig ? viteConfig?.testConfig?.baseRoute : '')
-
 const absoluteAssetMatch = isBuild
   ? /http.*\/other-assets\/asset-\w{8}\.png/
   : '/nested/asset.png'
@@ -140,8 +137,7 @@ describe('css url() references', () => {
 describe.runIf(isBuild)('index.css URLs', () => {
   let css: string
   beforeAll(() => {
-    const base = getBase()
-    css = findAssetFile(/index.*\.css$/, base, 'other-assets')
+    css = findAssetFile(/index.*\.css$/, 'relative-base', 'other-assets')
   })
 
   test('relative asset URL', () => {
@@ -203,7 +199,7 @@ test('?url import on css', async () => {
     isBuild ? /http.*\/other-assets\/icons-\w{8}\.css/ : '/css/icons.css',
   )
   isBuild &&
-    expect(findAssetFile(/index.*\.js$/, getBase(), 'entries')).toMatch(
+    expect(findAssetFile(/index.*\.js$/, 'relative-base', 'entries')).toMatch(
       /icons-.+\.css(?!\?used)/,
     )
 })

playground/assets/__tests__/url-base/url-base-assets.spec.ts

@@ -6,7 +6,6 @@ import {
   getColor,
   isBuild,
   page,
-  viteConfig,
 } from '~utils'
 
 const urlAssetMatch = isBuild
@@ -132,8 +131,7 @@ describe('css url() references', () => {
 describe.runIf(isBuild)('index.css URLs', () => {
   let css: string
   beforeAll(() => {
-    const base = viteConfig ? viteConfig?.testConfig?.baseRoute : ''
-    css = findAssetFile(/index.*\.css$/, base, 'other-assets')
+    css = findAssetFile(/index.*\.css$/, 'url-base', 'other-assets')
   })
 
   test('use base URL for asset URL', () => {

playground/assets/vite.config-relative-base.js

@@ -1,6 +1,8 @@
 import { defineConfig } from 'vite'
 import baseConfig from './vite.config.js'
 
+let isTestHookCalled = false
+
 export default defineConfig({
   ...baseConfig,
   base: './', // relative base to make dist portable
@@ -18,8 +20,24 @@ export default defineConfig({
       },
     },
   },
-  testConfig: {
-    baseRoute: '/relative-base/',
-  },
   cacheDir: 'node_modules/.vite-relative-base',
+  __test__() {
+    // process.argv is different when running tests
+    // so use this hook instead
+    isTestHookCalled = true
+  },
+  plugins: [
+    {
+      name: 'set-base-if-preview',
+      config() {
+        // TODO: use something like ConfigEnv['cmd'] https://github.com/vitejs/vite/pull/12298
+        const isPreview = isTestHookCalled || process.argv.includes('preview')
+        if (isPreview) {
+          return {
+            base: '/relative-base/',
+          }
+        }
+      },
+    },
+  ],
 })

playground/assets/vite.config-url-base.js

@@ -29,8 +29,5 @@ export default defineConfig({
     port,
     strictPort: true,
   },
-  testConfig: {
-    baseRoute: '/url-base/',
-  },
   cacheDir: 'node_modules/.vite-url-base',
 })

playground/css/vite.config-relative-base.js

@@ -18,8 +18,5 @@ export default defineConfig({
       },
     },
   },
-  testConfig: {
-    baseRoute: '/relative-base/',
-  },
   cacheDir: 'node_modules/.vite-relative-base',
 })

playground/legacy/vite.config-no-polyfills-no-systemjs.js

@@ -24,7 +24,4 @@ export default defineConfig({
       },
     },
   },
-  testConfig: {
-    baseRoute: '/no-polyfills-no-systemjs/',
-  },
 })

playground/legacy/vite.config-no-polyfills.js

@@ -23,7 +23,4 @@ export default defineConfig({
       },
     },
   },
-  testConfig: {
-    baseRoute: '/no-polyfills/',
-  },
 })

playground/vitestSetup.ts

@@ -62,11 +62,6 @@ export let testDir: string
  * Test folder name
  */
 export let testName: string
-/**
- * current test using vite inline config
- * when using serve.[jt]s is not possible to get the config
- */
-export let viteConfig: InlineConfig | undefined
 
 export const serverLogs: string[] = []
 export const browserLogs: string[] = []
@@ -79,22 +74,6 @@ export let browser: Browser = undefined!
 export let viteTestUrl: string = ''
 export let watcher: RollupWatcher | undefined = undefined
 
-declare module 'vite' {
-  interface InlineConfig {
-    testConfig?: {
-      // relative base output use relative path
-      // rewrite the url to truth file path
-      baseRoute: string
-    }
-  }
-
-  interface UserConfig {
-    testConfig?: {
-      baseRoute: string
-    }
-  }
-}
-
 export function setViteUrl(url: string): void {
   viteTestUrl = url
 }
@@ -259,7 +238,6 @@ export async function startDefaultServe(): Promise<void> {
   if (!isBuild) {
     process.env.VITE_INLINE = 'inline-serve'
     const testConfig = mergeConfig(options, config || {})
-    viteConfig = testConfig
     viteServer = server = await (await createServer(testConfig)).listen()
     // use resolved port/base from server
     const devBase = server.config.base
@@ -278,7 +256,6 @@ export async function startDefaultServe(): Promise<void> {
     })
     options.plugins = [resolvedPlugin()]
     const testConfig = mergeConfig(options, config || {})
-    viteConfig = testConfig
     const rollupOutput = await build(testConfig)
     const isWatch = !!resolvedConfig!.build.watch
     // in build watch,call startStaticServer after the build is complete

playground/worker/vite.config-relative-base-iife.js

@@ -1,6 +1,8 @@
 import { defineConfig } from 'vite'
 import workerPluginTestPlugin from './worker-plugin-test-plugin'
 
+let isTestHookCalled = false
+
 export default defineConfig({
   base: './',
   resolve: {
@@ -29,9 +31,25 @@ export default defineConfig({
       },
     },
   },
-  testConfig: {
-    baseRoute: '/relative-base-iife/',
-  },
-  plugins: [workerPluginTestPlugin()],
+  plugins: [
+    {
+      name: 'set-base-if-preview',
+      config() {
+        // TODO: use something like ConfigEnv['cmd'] https://github.com/vitejs/vite/pull/12298
+        const isPreview = isTestHookCalled || process.argv.includes('preview')
+        if (isPreview) {
+          return {
+            base: '/relative-base/',
+          }
+        }
+      },
+    },
+    workerPluginTestPlugin(),
+  ],
   cacheDir: 'node_modules/.vite-relative-base-iife',
+  __test__() {
+    // process.argv is different when running tests
+    // so use this hook instead
+    isTestHookCalled = true
+  },
 })

playground/worker/vite.config-relative-base.js

@@ -1,6 +1,8 @@
 import { defineConfig } from 'vite'
 import workerPluginTestPlugin from './worker-plugin-test-plugin'
 
+let isTestHookCalled = false
+
 export default defineConfig({
   base: './',
   resolve: {
@@ -29,10 +31,19 @@ export default defineConfig({
       },
     },
   },
-  testConfig: {
-    baseRoute: '/relative-base/',
-  },
   plugins: [
+    {
+      name: 'set-base-if-preview',
+      config() {
+        // TODO: use something like ConfigEnv['cmd'] https://github.com/vitejs/vite/pull/12298
+        const isPreview = isTestHookCalled || process.argv.includes('preview')
+        if (isPreview) {
+          return {
+            base: '/relative-base/',
+          }
+        }
+      },
+    },
     workerPluginTestPlugin(),
     {
       name: 'resolve-format-es',
@@ -47,4 +58,9 @@ export default defineConfig({
     },
   ],
   cacheDir: 'node_modules/.vite-relative-base',
+  __test__() {
+    // process.argv is different when running tests
+    // so use this hook instead
+    isTestHookCalled = true
+  },
 })