fix: invalidate in circular dep

Author: underfin

packages/vite/src/node/build.ts

@@ -938,10 +938,17 @@ async function buildEnvironment(
           server!.ws.send({
             type: 'full-reload',
           })
-          logger.info(colors.green(`page reload `) + colors.dim(file), {
-            clear: !hmrOutput.firstInvalidatedBy,
-            timestamp: true,
-          })
+          const reason = hmrOutput.fullReloadReason
+            ? colors.dim(` (${hmrOutput.fullReloadReason})`)
+            : ''
+          logger.info(
+            colors.green(`page reload `) + colors.dim(file) + reason,
+            {
+              clear: !hmrOutput.firstInvalidatedBy,
+              timestamp: true,
+            },
+          )
+          return
         }
 
         if (hmrOutput.patch) {
@@ -953,6 +960,7 @@ async function buildEnvironment(
               url,
               path: boundary.boundary,
               acceptedPath: boundary.acceptedVia,
+              firstInvalidatedBy: hmrOutput.firstInvalidatedBy,
               timestamp: 0,
             }
           }) as Update[]
@@ -985,9 +993,8 @@ async function buildEnvironment(
       server.hot.on(
         'vite:invalidate',
         async ({ path: file, message, firstInvalidatedBy }) => {
-          file = path.join(root, file)
           const hmrOutput = (await bundle!.hmrInvalidate(
-            file,
+            path.join(root, file),
             firstInvalidatedBy,
           ))!
           if (hmrOutput) {

playground/hmr/__tests__/hmr.spec.ts

@@ -247,31 +247,31 @@ if (!isBuild) {
     })
   }
 
-  if (!process.env.VITE_TEST_FULL_BUNDLE_MODE) {
-    test('invalidate in circular dep should not trigger infinite HMR', async () => {
-      const el = await page.$('.invalidation-circular-deps')
-      await untilUpdated(() => el.textContent(), 'child')
-      editFile(
-        'invalidation-circular-deps/circular-invalidate/child.js',
-        (code) => code.replace('child', 'child updated'),
-      )
-      await page.waitForEvent('load')
-      await untilUpdated(
-        () => page.textContent('.invalidation-circular-deps'),
-        'child updated',
-      )
-    })
+  test('invalidate in circular dep should not trigger infinite HMR', async () => {
+    const el = await page.$('.invalidation-circular-deps')
+    await untilUpdated(() => el.textContent(), 'child')
+    editFile(
+      'invalidation-circular-deps/circular-invalidate/child.js',
+      (code) => code.replace('child', 'child updated'),
+    )
+    await page.waitForEvent('load')
+    await untilUpdated(
+      () => page.textContent('.invalidation-circular-deps'),
+      'child updated',
+    )
+  })
 
-    test('invalidate in circular dep should be hot updated if possible', async () => {
-      const el = await page.$('.invalidation-circular-deps-handled')
-      await untilUpdated(() => el.textContent(), 'child')
-      editFile(
-        'invalidation-circular-deps/invalidate-handled-in-circle/child.js',
-        (code) => code.replace('child', 'child updated'),
-      )
-      await untilUpdated(() => el.textContent(), 'child updated')
-    })
+  test('invalidate in circular dep should be hot updated if possible', async () => {
+    const el = await page.$('.invalidation-circular-deps-handled')
+    await untilUpdated(() => el.textContent(), 'child')
+    editFile(
+      'invalidation-circular-deps/invalidate-handled-in-circle/child.js',
+      (code) => code.replace('child', 'child updated'),
+    )
+    await untilUpdated(() => el.textContent(), 'child updated')
+  })
 
+  if (!process.env.VITE_TEST_FULL_BUNDLE_MODE) {
     test('plugin hmr handler + custom event', async () => {
       const el = await page.$('.custom')
       editFile('customFile.js', (code) => code.replace('custom', 'edited'))