From afa3e6f428be215e510e54a904829520ec6320b3 Mon Sep 17 00:00:00 2001 From: Michal Piechowiak Date: Mon, 14 Apr 2025 18:32:04 +0200 Subject: [PATCH 1/2] feat: allow use of nitro zero conf --- packages/react-start-config/src/index.ts | 2 +- packages/react-start-config/src/schema.ts | 28 ++++++++++++----------- packages/solid-start-config/src/index.ts | 2 +- packages/solid-start-config/src/schema.ts | 28 ++++++++++++----------- packages/start-config/src/index.ts | 2 +- packages/start-config/src/schema.ts | 28 ++++++++++++----------- 6 files changed, 48 insertions(+), 42 deletions(-) diff --git a/packages/react-start-config/src/index.ts b/packages/react-start-config/src/index.ts index 7d8c8475df9..345ff3b7e0b 100644 --- a/packages/react-start-config/src/index.ts +++ b/packages/react-start-config/src/index.ts @@ -88,7 +88,7 @@ export async function defineConfig( serverSchema.parse(opts.server || {}) const deploymentPreset = checkDeploymentPresetInput( - configDeploymentPreset || 'node-server', + configDeploymentPreset, ) const tsr = setTsrDefaults(opts.tsr) const tsrConfig = getConfig(tsr) diff --git a/packages/react-start-config/src/schema.ts b/packages/react-start-config/src/schema.ts index 516e4e86fa5..2586abd6ee0 100644 --- a/packages/react-start-config/src/schema.ts +++ b/packages/react-start-config/src/schema.ts @@ -80,19 +80,21 @@ const testedDeploymentPresets: Array = [ 'node-server', ] -export function checkDeploymentPresetInput(preset: string): DeploymentPreset { - if (!vinxiDeploymentPresets.includes(preset as any)) { - console.warn( - `Invalid deployment preset "${preset}". Available presets are: ${vinxiDeploymentPresets - .map((p) => `"${p}"`) - .join(', ')}.`, - ) - } - - if (!testedDeploymentPresets.includes(preset as any)) { - console.warn( - `The deployment preset '${preset}' is not fully supported yet and may not work as expected.`, - ) +export function checkDeploymentPresetInput(preset?: string): DeploymentPreset | undefined { + if (preset) { + if (!vinxiDeploymentPresets.includes(preset as any)) { + console.warn( + `Invalid deployment preset "${preset}". Available presets are: ${vinxiDeploymentPresets + .map((p) => `"${p}"`) + .join(', ')}.`, + ) + } + + if (!testedDeploymentPresets.includes(preset as any)) { + console.warn( + `The deployment preset '${preset}' is not fully supported yet and may not work as expected.`, + ) + } } return preset diff --git a/packages/solid-start-config/src/index.ts b/packages/solid-start-config/src/index.ts index b148a4470c7..70c3cbb4d38 100644 --- a/packages/solid-start-config/src/index.ts +++ b/packages/solid-start-config/src/index.ts @@ -88,7 +88,7 @@ export async function defineConfig( serverSchema.parse(opts.server || {}) const deploymentPreset = checkDeploymentPresetInput( - configDeploymentPreset || 'node-server', + configDeploymentPreset, ) const tsr = setTsrDefaults(opts.tsr) const tsrConfig = getConfig(tsr) diff --git a/packages/solid-start-config/src/schema.ts b/packages/solid-start-config/src/schema.ts index caa4ecbc41b..8cb6c145256 100644 --- a/packages/solid-start-config/src/schema.ts +++ b/packages/solid-start-config/src/schema.ts @@ -80,19 +80,21 @@ const testedDeploymentPresets: Array = [ 'node-server', ] -export function checkDeploymentPresetInput(preset: string): DeploymentPreset { - if (!vinxiDeploymentPresets.includes(preset as any)) { - console.warn( - `Invalid deployment preset "${preset}". Available presets are: ${vinxiDeploymentPresets - .map((p) => `"${p}"`) - .join(', ')}.`, - ) - } - - if (!testedDeploymentPresets.includes(preset as any)) { - console.warn( - `The deployment preset '${preset}' is not fully supported yet and may not work as expected.`, - ) +export function checkDeploymentPresetInput(preset?: string): DeploymentPreset | undefined { + if (preset) { + if (!vinxiDeploymentPresets.includes(preset as any)) { + console.warn( + `Invalid deployment preset "${preset}". Available presets are: ${vinxiDeploymentPresets + .map((p) => `"${p}"`) + .join(', ')}.`, + ) + } + + if (!testedDeploymentPresets.includes(preset as any)) { + console.warn( + `The deployment preset '${preset}' is not fully supported yet and may not work as expected.`, + ) + } } return preset diff --git a/packages/start-config/src/index.ts b/packages/start-config/src/index.ts index 60043bfa9c3..5b0e2f2b2a7 100644 --- a/packages/start-config/src/index.ts +++ b/packages/start-config/src/index.ts @@ -88,7 +88,7 @@ export async function defineConfig( serverSchema.parse(opts.server || {}) const deploymentPreset = checkDeploymentPresetInput( - configDeploymentPreset || 'node-server', + configDeploymentPreset, ) const tsr = setTsrDefaults(opts.tsr) const tsrConfig = getConfig(tsr) diff --git a/packages/start-config/src/schema.ts b/packages/start-config/src/schema.ts index 516e4e86fa5..2586abd6ee0 100644 --- a/packages/start-config/src/schema.ts +++ b/packages/start-config/src/schema.ts @@ -80,19 +80,21 @@ const testedDeploymentPresets: Array = [ 'node-server', ] -export function checkDeploymentPresetInput(preset: string): DeploymentPreset { - if (!vinxiDeploymentPresets.includes(preset as any)) { - console.warn( - `Invalid deployment preset "${preset}". Available presets are: ${vinxiDeploymentPresets - .map((p) => `"${p}"`) - .join(', ')}.`, - ) - } - - if (!testedDeploymentPresets.includes(preset as any)) { - console.warn( - `The deployment preset '${preset}' is not fully supported yet and may not work as expected.`, - ) +export function checkDeploymentPresetInput(preset?: string): DeploymentPreset | undefined { + if (preset) { + if (!vinxiDeploymentPresets.includes(preset as any)) { + console.warn( + `Invalid deployment preset "${preset}". Available presets are: ${vinxiDeploymentPresets + .map((p) => `"${p}"`) + .join(', ')}.`, + ) + } + + if (!testedDeploymentPresets.includes(preset as any)) { + console.warn( + `The deployment preset '${preset}' is not fully supported yet and may not work as expected.`, + ) + } } return preset From 6b7c912bd592419d790af7cdc9d28c6623b5d7bc Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Mon, 14 Apr 2025 17:51:59 +0000 Subject: [PATCH 2/2] ci: apply automated fixes --- packages/react-start-config/src/index.ts | 4 +--- packages/react-start-config/src/schema.ts | 4 +++- packages/solid-start-config/src/index.ts | 4 +--- packages/solid-start-config/src/schema.ts | 4 +++- packages/start-config/src/index.ts | 4 +--- packages/start-config/src/schema.ts | 4 +++- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/react-start-config/src/index.ts b/packages/react-start-config/src/index.ts index 345ff3b7e0b..ac30bf21406 100644 --- a/packages/react-start-config/src/index.ts +++ b/packages/react-start-config/src/index.ts @@ -87,9 +87,7 @@ export async function defineConfig( const { preset: configDeploymentPreset, ...serverOptions } = serverSchema.parse(opts.server || {}) - const deploymentPreset = checkDeploymentPresetInput( - configDeploymentPreset, - ) + const deploymentPreset = checkDeploymentPresetInput(configDeploymentPreset) const tsr = setTsrDefaults(opts.tsr) const tsrConfig = getConfig(tsr) diff --git a/packages/react-start-config/src/schema.ts b/packages/react-start-config/src/schema.ts index 2586abd6ee0..45294837939 100644 --- a/packages/react-start-config/src/schema.ts +++ b/packages/react-start-config/src/schema.ts @@ -80,7 +80,9 @@ const testedDeploymentPresets: Array = [ 'node-server', ] -export function checkDeploymentPresetInput(preset?: string): DeploymentPreset | undefined { +export function checkDeploymentPresetInput( + preset?: string, +): DeploymentPreset | undefined { if (preset) { if (!vinxiDeploymentPresets.includes(preset as any)) { console.warn( diff --git a/packages/solid-start-config/src/index.ts b/packages/solid-start-config/src/index.ts index 70c3cbb4d38..3a5c597f0d6 100644 --- a/packages/solid-start-config/src/index.ts +++ b/packages/solid-start-config/src/index.ts @@ -87,9 +87,7 @@ export async function defineConfig( const { preset: configDeploymentPreset, ...serverOptions } = serverSchema.parse(opts.server || {}) - const deploymentPreset = checkDeploymentPresetInput( - configDeploymentPreset, - ) + const deploymentPreset = checkDeploymentPresetInput(configDeploymentPreset) const tsr = setTsrDefaults(opts.tsr) const tsrConfig = getConfig(tsr) diff --git a/packages/solid-start-config/src/schema.ts b/packages/solid-start-config/src/schema.ts index 8cb6c145256..9c8a6dc8106 100644 --- a/packages/solid-start-config/src/schema.ts +++ b/packages/solid-start-config/src/schema.ts @@ -80,7 +80,9 @@ const testedDeploymentPresets: Array = [ 'node-server', ] -export function checkDeploymentPresetInput(preset?: string): DeploymentPreset | undefined { +export function checkDeploymentPresetInput( + preset?: string, +): DeploymentPreset | undefined { if (preset) { if (!vinxiDeploymentPresets.includes(preset as any)) { console.warn( diff --git a/packages/start-config/src/index.ts b/packages/start-config/src/index.ts index 5b0e2f2b2a7..4f676105046 100644 --- a/packages/start-config/src/index.ts +++ b/packages/start-config/src/index.ts @@ -87,9 +87,7 @@ export async function defineConfig( const { preset: configDeploymentPreset, ...serverOptions } = serverSchema.parse(opts.server || {}) - const deploymentPreset = checkDeploymentPresetInput( - configDeploymentPreset, - ) + const deploymentPreset = checkDeploymentPresetInput(configDeploymentPreset) const tsr = setTsrDefaults(opts.tsr) const tsrConfig = getConfig(tsr) diff --git a/packages/start-config/src/schema.ts b/packages/start-config/src/schema.ts index 2586abd6ee0..45294837939 100644 --- a/packages/start-config/src/schema.ts +++ b/packages/start-config/src/schema.ts @@ -80,7 +80,9 @@ const testedDeploymentPresets: Array = [ 'node-server', ] -export function checkDeploymentPresetInput(preset?: string): DeploymentPreset | undefined { +export function checkDeploymentPresetInput( + preset?: string, +): DeploymentPreset | undefined { if (preset) { if (!vinxiDeploymentPresets.includes(preset as any)) { console.warn(