Merge branch 'main' into unused-dep

solidjs · Sep 26, 2024 · d4678d8 · d4678d8
2 parents 2c7638a + 894594c
commit d4678d8
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/.changeset/sixty-news-fly.md b/.changeset/sixty-news-fly.md
@@ -0,0 +1,5 @@
+---
+"@solidjs/start": patch
+---
+
+fix dev overlay being pulled in even when not used
diff --git a/.changeset/twelve-carrots-brush.md b/.changeset/twelve-carrots-brush.md
@@ -0,0 +1,5 @@
+---
+"@solidjs/start": patch
+---
+
+Update env.d.ts
diff --git a/packages/start/env.d.ts b/packages/start/env.d.ts
@@ -13,8 +13,8 @@ interface ImportMetaEnv extends Record<`VITE_${string}`, any>, SolidStartMetaEnv
 }
 
 interface SolidStartMetaEnv {
-  START_SSR: string;
-  START_ISLANDS: string;
-  START_DEV_OVERLAY: string;
+  START_SSR: boolean;
+  START_ISLANDS: boolean;
+  START_DEV_OVERLAY: boolean;
   SERVER_BASE_URL: string;
 }
diff --git a/packages/start/src/shared/ErrorBoundary.tsx b/packages/start/src/shared/ErrorBoundary.tsx
@@ -1,8 +1,8 @@
 // @refresh skip
-import { ErrorBoundary as DefaultErrorBoundary, catchError, type ParentProps } from "solid-js";
+import { ErrorBoundary as DefaultErrorBoundary, catchError, type ParentProps, lazy } from "solid-js";
 import { isServer } from "solid-js/web";
 import { HttpStatusCode } from "./HttpStatusCode";
-import { DevOverlay } from "./dev-overlay";
+const DevOverlay = lazy(() => import("./dev-overlay"));
 
 export const ErrorBoundary =
   import.meta.env.DEV && import.meta.env.START_DEV_OVERLAY

diff --git a/packages/start/src/shared/dev-overlay/index.tsx b/packages/start/src/shared/dev-overlay/index.tsx
@@ -22,7 +22,7 @@ const DevOverlayDialog =
       }
     : /* #__PURE__ */ clientOnly(() => import("./DevOverlayDialog"));
 
-export function DevOverlay(props: DevOverlayProps): JSX.Element {
+export default function DevOverlay(props: DevOverlayProps): JSX.Element {
   const [errors, setErrors] = createSignal<unknown[]>([]);
 
   function resetError() {