Merge branch 'develop' into b33639c-master-into-develop

Author: lmiller1990

npm/vite-dev-server/src/makeCypressPlugin.ts

@@ -103,7 +103,7 @@ export const makeCypressPlugin = (
         for (const mod of moduleImporters.values()) {
           if (specsPathsSet.has(mod.file)) {
             debug('handleHotUpdate - compile success')
-            devServerEvents.emit('dev-server:compile:success')
+            devServerEvents.emit('dev-server:compile:success', { specFile: mod.file })
 
             return []
           }

packages/runner-shared/src/event-manager.js

@@ -113,6 +113,12 @@ export const eventManager = {
       localBus.emit('script:error', error)
     })
 
+    ws.on('dev-server:compile:success', ({ specFile }) => {
+      if (!specFile || specFile === state.spec.absolute) {
+        rerun()
+      }
+    })
+
     _.each(socketRerunEvents, (event) => {
       ws.on(event, rerun)
     })

packages/server-ct/src/socket-ct.ts

@@ -16,8 +16,8 @@ export class SocketCt extends SocketBase {
 
     // should we use this option at all for component testing 😕?
     if (config.watchForFileChanges) {
-      devServer.emitter.on('dev-server:compile:success', () => {
-        this.toRunner('runner:restart')
+      devServer.emitter.on('dev-server:compile:success', ({ specFile }) => {
+        this.toRunner('dev-server:compile:success', { specFile })
       })
     }
   }

packages/server/lib/plugins/child/dev-server.js

@@ -12,8 +12,8 @@ const wrap = (ipc, invoke, ids, [options]) => {
     ipc.send('dev-server:compile:error', error)
   })
 
-  devServerEvents.on('dev-server:compile:success', () => {
-    ipc.send('dev-server:compile:success')
+  devServerEvents.on('dev-server:compile:success', ({ specFile } = {}) => {
+    ipc.send('dev-server:compile:success', { specFile })
   })
 
   options.devServerEvents = devServerEvents

packages/server/lib/plugins/dev-server.js

@@ -16,8 +16,8 @@ plugins.registerHandler((ipc) => {
     baseEmitter.emit('dev-server:compile:error', error)
   })
 
-  ipc.on('dev-server:compile:success', () => {
-    baseEmitter.emit('dev-server:compile:success')
+  ipc.on('dev-server:compile:success', ({ specFile } = {}) => {
+    baseEmitter.emit('dev-server:compile:success', { specFile })
   })
 
   return baseEmitter.on('dev-server:close', () => {