Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(nuxi): hard-reload nuxt when .env changes #20501

Merged
merged 5 commits into from May 11, 2023
Merged

fix(nuxi): hard-reload nuxt when .env changes #20501

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
56de4b0
fix(nuxi): hard-reload nuxt when `.env` changes
danielroe Apr 25, 2023
b5728f5
fix: print reason when hard-restarting
danielroe Apr 25, 2023
bb06712
Merge remote-tracking branch 'origin/main' into fix/env-reload
danielroe May 11, 2023
2c56c2e
fix: respect passed `--dotenv` flag
danielroe May 11, 2023
a4de3ed
[autofix.ci] apply automated fixes
autofix-ci[bot] May 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 18 additions & 10 deletions packages/nuxi/src/commands/dev.ts
View file
Open in desktop
Expand Up @@ -77,6 +77,20 @@ export default defineNuxtCommand({
baseURL: withTrailingSlash(currentNuxt?.options.app.baseURL) || '/'
})
}
async function hardRestart (reason?: string) {
if (process.send) {
await listener.close().catch(() => {})
await currentNuxt.close().catch(() => {})
await watcher.close().catch(() => {})
await distWatcher.close().catch(() => {})
if (reason) {
consola.info(`${reason ? reason + '. ' : ''}Restarting nuxt...`)
}
process.send({ type: 'nuxt:restart' })
} else {
await load(true, reason)
}
}
const load = async (isRestart: boolean, reason?: string) => {
try {
loadingMessage = `${reason ? reason + '. ' : ''}${isRestart ? 'Restarting' : 'Starting'} nuxt...`
Expand Down Expand Up @@ -123,15 +137,8 @@ export default defineNuxtCommand({

const unsub = currentNuxt.hooks.hook('restart', async (options) => {
unsub() // we use this instead of `hookOnce` for Nuxt Bridge support
if (options?.hard && process.send) {
await listener.close().catch(() => {})
await currentNuxt.close().catch(() => {})
await watcher.close().catch(() => {})
await distWatcher.close().catch(() => {})
process.send({ type: 'nuxt:restart' })
} else {
await load(true)
}
if (options?.hard) { return hardRestart() }
await load(true)
})

await currentNuxt.hooks.callHook('listen', listener.server, listener)
Expand Down Expand Up @@ -163,7 +170,8 @@ export default defineNuxtCommand({
const watcher = chokidar.watch([rootDir], { ignoreInitial: true, depth: 0 })
watcher.on('all', (_event, _file) => {
const file = relative(rootDir, _file)
if (file.match(/^(nuxt\.config\.(js|ts|mjs|cjs)|\.nuxtignore|\.env|\.nuxtrc)$/)) {
if (file === '.env') { return hardRestart('.env updated') }
if (file.match(/^(nuxt\.config\.(js|ts|mjs|cjs)|\.nuxtignore|\.nuxtrc)$/)) {
dLoad(true, `${file} updated`)
}
})
Expand Down