fix: addWatchFile doesn't work if base is specified (fixes #19792) (#19794)

Author: anatawa12

packages/vite/src/node/plugins/importAnalysis.ts

@@ -806,7 +806,7 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
             await Promise.all(
               [...pluginImports].map((id) => normalizeUrl(id, 0, true)),
             )
-          ).forEach(([url]) => importedUrls.add(url))
+          ).forEach(([url]) => importedUrls.add(stripBase(url, base)))
         }
         // HMR transforms are no-ops in SSR, so an `accept` call will
         // never be injected. Avoid updating the `isSelfAccepting`

playground/transform-plugin/__tests__/base/transform-plugin.spec.ts

@@ -0,0 +1,3 @@
+import { tests } from '../tests'
+
+tests()

playground/transform-plugin/__tests__/tests.ts

@@ -0,0 +1,15 @@
+import { expect, test } from 'vitest'
+import { editFile, isBuild, page, untilUpdated } from '~utils'
+
+export const tests = () => {
+  test('should re-run transform when dependencies are edited', async () => {
+    expect(await page.textContent('#transform-count')).toBe('1')
+
+    if (isBuild) return
+    editFile('plugin-dep.js', (str) => str)
+    await untilUpdated(() => page.textContent('#transform-count'), '2')
+
+    editFile('plugin-dep-load.js', (str) => str)
+    await untilUpdated(() => page.textContent('#transform-count'), '3')
+  })
+}

playground/transform-plugin/__tests__/transform-plugin.spec.ts

@@ -1,13 +1,3 @@
-import { expect, test } from 'vitest'
-import { editFile, isBuild, page, untilUpdated } from '~utils'
+import { tests } from './tests'
 
-test('should re-run transform when dependencies are edited', async () => {
-  expect(await page.textContent('#transform-count')).toBe('1')
-
-  if (isBuild) return
-  editFile('plugin-dep.js', (str) => str)
-  await untilUpdated(() => page.textContent('#transform-count'), '2')
-
-  editFile('plugin-dep-load.js', (str) => str)
-  await untilUpdated(() => page.textContent('#transform-count'), '3')
-})
+tests()

playground/transform-plugin/vite.config-base.js

@@ -0,0 +1,7 @@
+import { defineConfig } from 'vite'
+import baseConfig from './vite.config.js'
+
+export default defineConfig({
+  ...baseConfig,
+  base: '/vite/',
+})