Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/vite/src/module-runner/hmrHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,11 @@ export function createHMRHandlerForRunner(
runner.evaluatedModules.clear()

for (const url of clearEntrypointUrls) {
if (runner.isClosed()) break
try {
await runner.import(url)
} catch (err) {
if (runner.isClosed()) break
if (err.code !== ERR_OUTDATED_OPTIMIZED_DEP) {
hmrClient.logger.error(
`An error happened during full reload\n${err.message}\n${err.stack}`,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
import { existsSync, readdirSync } from 'node:fs'
import { posix, win32 } from 'node:path'
import { fileURLToPath } from 'node:url'
import { describe, expect, vi } from 'vitest'
import { setTimeout } from 'node:timers/promises'
import { describe, expect, it, vi } from 'vitest'
import { isWindows } from '../../../../shared/utils'
import type { ExternalFetchResult } from '../../../../shared/invokeMethods'
import { createServer } from '../../../server'
import {
createRunnableDevEnvironment,
isRunnableDevEnvironment,
} from '../../../server/environments/runnableEnvironment'
import type { HMRLogger } from '../../../../../dist/node/module-runner'
import { createModuleRunnerTester } from './utils'

const _URL = URL
Expand Down Expand Up @@ -547,3 +554,74 @@ describe('invalid package', async () => {
`)
})
})

describe('full-reload during close', () => {
it('does not error when server closes during full-reload re-import', async () => {
const errors: (string | Error)[] = []
const logger: HMRLogger = {
error: (msg) => errors.push(msg),
debug: () => {},
}

const server = await createServer({
root: import.meta.dirname,
logLevel: 'error',
server: {
middlewareMode: true,
watch: null,
ws: false,
},
optimizeDeps: {
disabled: true,
noDiscovery: true,
},
environments: {
ssr: {
dev: {
createEnvironment(name, config) {
return createRunnableDevEnvironment(name, config, {
runnerOptions: { hmr: { logger } },
})
},
},
},
},
plugins: [
{
name: 'test-slow-virtual',
enforce: 'pre',
resolveId(source) {
if (source === 'virtual:slow') return '\0virtual:slow'
},
async load(id) {
if (id === '\0virtual:slow') {
await setTimeout(10)
return `export default "ok"`
}
},
},
],
})

const env = server.environments.ssr
if (!isRunnableDevEnvironment(env)) {
throw new Error('expected RunnableDevEnvironment')
}

const mod = await env.runner.import('virtual:slow')
expect(mod.default).toBe('ok')

// re-import will run async via the HMR queue
env.moduleGraph.invalidateAll()
env.hot.send({ type: 'full-reload' })

// server.close() -> environment.close() -> runner.close() ->
// transport.disconnect() rejects the pending fetchModule RPC
await server.close()
await setTimeout(100) // Give the HMR handler time to settle

expect(
errors.some((e) => e.toString().includes('transport was disconnected')),
).toBe(false)
})
})
Loading