Skip to content

fix(dev): automatically set allowedHosts + origin w/ --host#704

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

Merged
danielroe merged 3 commits into from
Jan 26, 2025
Merged

fix(dev): automatically set allowedHosts + origin w/ --host#704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1ef015
fix(dev): automatically set allowedHosts + origin for --host
danielroe Jan 25, 2025
7533986
fix: update protocol ternary
danielroe Jan 26, 2025
b2bef6f
Merge remote-tracking branch 'origin/main' into fix/allowed-hosts
danielroe Jan 26, 2025
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
11 changes: 11 additions & 0 deletions packages/nuxi/src/commands/dev-child.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import type { NuxtDevContext, NuxtDevIPCMessage } from '../utils/dev'
import process from 'node:process'

import { defineCommand } from 'citty'
import defu from 'defu'
import { resolve } from 'pathe'
import { isTest } from 'std-env'

Expand DownExpand Up@@ -58,6 +59,16 @@ export default defineCommand({
process.exit()
})

const hostname = devContext.hostname
if (hostname) {
ctx.data ||= {}
const protocol = devContext.proxy?.https ? 'https' : 'http'
ctx.data.overrides = defu(ctx.data.overrides, {
devServer: { cors: { origin: [`${protocol}://${hostname}`] } },
vite: { server: { allowedHosts: [hostname] } },
})
}

// Init Nuxt dev
const nuxtDev = await createNuxtDevServer({
cwd,
Expand Down
14 changes: 12 additions & 2 deletions packages/nuxi/src/commands/dev.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import process from 'node:process'

import { setupDotenv } from 'c12'
import { defineCommand } from 'citty'
import defu from 'defu'
import { createJiti } from 'jiti'
import { getArgs as getListhenArgs, parseArgs as parseListhenArgs } from 'listhen/cli'
import { resolve } from 'pathe'
Expand DownExpand Up@@ -70,12 +71,20 @@ const command = defineCommand({
if (ctx.args.fork) {
// Fork Nuxt dev process
const devProxy = await _createDevProxy(nuxtOptions, listenOptions)
await _startSubprocess(devProxy, ctx.rawArgs)
await _startSubprocess(devProxy, ctx.rawArgs, listenOptions.hostname)
return { listener: devProxy?.listener }
}
else {
// Directly start Nuxt dev
const { createNuxtDevServer } = await import('../utils/dev')
if (listenOptions.hostname) {
ctx.data ||= {}
const protocol = listenOptions.https ? 'https' : 'http'
ctx.data.overrides = defu(ctx.data.overrides, {
devServer: { cors: { origin: [`${protocol}://${listenOptions.hostname}`] } },
vite: { server: { allowedHosts: [listenOptions.hostname] } },
})
}
const devServer = await createNuxtDevServer(
{
cwd,
Expand DownExpand Up@@ -158,7 +167,7 @@ async function _createDevProxy(nuxtOptions: NuxtOptions, listenOptions: Partial<
}
}

async function _startSubprocess(devProxy: DevProxy, rawArgs: string[]) {
async function _startSubprocess(devProxy: DevProxy, rawArgs: string[], hostname?: string) {
let childProc: ChildProcess | undefined

const kill = (signal: NodeJS.Signals | number) => {
Expand All@@ -185,6 +194,7 @@ async function _startSubprocess(devProxy: DevProxy, rawArgs: string[]) {
env: {
...process.env,
__NUXT_DEV__: JSON.stringify({
hostname,
proxy: {
url: devProxy.listener.url,
urls: await devProxy.listener.getURLs(),
Expand Down
1 change: 1 addition & 0 deletions packages/nuxi/src/utils/dev.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@ export type NuxtDevIPCMessage =
| { type: 'nuxt:internal:dev:rejection', message: string }

export interface NuxtDevContext {
hostname?: string
proxy?: {
url?: string
urls?: ListenURL[]
Expand Down