From d719c6ceb25404d21c0f7be9c1fb768a7effbdd6 Mon Sep 17 00:00:00 2001
From: huseeiin <122984423+huseeiin@users.noreply.github.com>
Date: Wed, 25 Sep 2024 16:54:21 -0400
Subject: [PATCH 1/2] Update env.d.ts (#1621)

* Update env.d.ts

set START_SSR, START_ISLANDS, START_DEV_OVERLAY to boolean to match runtime

* Create twelve-carrots-brush.md

---------

Co-authored-by: Ryan Carniato <ryansolid@gmail.com>
---
 .changeset/twelve-carrots-brush.md | 5 +++++
 packages/start/env.d.ts            | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/twelve-carrots-brush.md

diff --git a/.changeset/twelve-carrots-brush.md b/.changeset/twelve-carrots-brush.md
new file mode 100644
index 000000000..5e690934c
--- /dev/null
+++ 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
index 58d5f5377..7fb838fd6 100644
--- 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;
 }

From 894594cf0ddd019d90c6381c87d7db9293f7c78e Mon Sep 17 00:00:00 2001
From: Russell <russelgal@gmail.com>
Date: Fri, 27 Sep 2024 02:08:22 +0500
Subject: [PATCH 2/2] fix
 https://discord.com/channels/722131463138705510/910635844119982080/1280563749773639770
 (#1635)

* Update ErrorBoundary.tsx

* Update index.tsx

* Update ErrorBoundary.tsx

* Create sixty-news-fly.md

---------

Co-authored-by: Ryan Carniato <ryansolid@gmail.com>
---
 .changeset/sixty-news-fly.md                    | 5 +++++
 packages/start/src/shared/ErrorBoundary.tsx     | 4 ++--
 packages/start/src/shared/dev-overlay/index.tsx | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/sixty-news-fly.md

diff --git a/.changeset/sixty-news-fly.md b/.changeset/sixty-news-fly.md
new file mode 100644
index 000000000..769eb62de
--- /dev/null
+++ 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/packages/start/src/shared/ErrorBoundary.tsx b/packages/start/src/shared/ErrorBoundary.tsx
index 1decec18c..4f28f9ed1 100644
--- 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
index addc7184b..6054db2b9 100644
--- 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() {