Merge branch 'main' into 1512-fix

solidjs · Jun 11, 2024 · a654a66 · a654a66
2 parents 2a69216 + d932ebd
commit a654a66
Show file tree

Hide file tree

Showing 4 changed files with 309 additions and 8 deletions.
diff --git a/.changeset/clever-jars-explode.md b/.changeset/clever-jars-explode.md
@@ -0,0 +1,5 @@
+---
+"@solidjs/start": patch
+---
+
+Omit some keys from Vite server config
diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
     "fast-glob": "^3.3.0",
     "graphql": "^16.7.1",
     "postcss": "^8.4.38",
-    "rimraf": "^3.0.2",
+    "rimraf": "^5.0.7",
     "solid-js": "^1.8.17",
     "solid-mdx": "^0.0.7",
     "solid-start-mdx": "workspace:*",

diff --git a/packages/start/config/index.d.ts b/packages/start/config/index.d.ts
@@ -3,9 +3,14 @@ import type { CustomizableConfig } from "vinxi/dist/types/lib/vite-dev";
 import { InlineConfig } from "vite";
 import type { Options } from "vite-plugin-solid";
 
-// atleast until we sort which server options are good to use
+// should probably be maintained by Vinxi
+type VinxiViteServerOptions = Omit<
+  InlineConfig["server"],
+  "port" | "strictPort" | "host" | "middlewareMode" | "open"
+>;
+
 type ViteCustomizableConfig = CustomizableConfig & {
-  server?: InlineConfig["server"];
+  server?: VinxiViteServerOptions;
 };
 
 type SolidStartInlineConfig = {