Fix refresh pragma (#1348)

* Fix refresh pragma

* Add changeset

---------

Co-authored-by: Ryan Carniato <ryansolid@gmail.com>

.changeset/neat-avocados-teach.md

@@ -0,0 +1,5 @@
+---
+"@solidjs/start": patch
+---
+
+Fix refresh pragma

examples/bare/src/app.tsx

@@ -1,4 +1,3 @@
-// @refresh reload
 import { createSignal } from "solid-js";
 import "./app.css";
 

examples/bare/src/entry-client.tsx

@@ -1,3 +1,4 @@
+// @refresh reload
 import { mount, StartClient } from "@solidjs/start/client";
 
 mount(() => <StartClient />, document.getElementById("app")!);

examples/bare/src/entry-server.tsx

@@ -1,3 +1,4 @@
+// @refresh reload
 import { createHandler, StartServer } from "@solidjs/start/server";
 
 export default createHandler(() => (

examples/basic/src/app.tsx

@@ -1,4 +1,3 @@
-// @refresh reload
 import { MetaProvider, Title } from "@solidjs/meta";
 import { Router } from "@solidjs/router";
 import { FileRoutes } from "@solidjs/start";

examples/basic/src/entry-client.tsx

@@ -1,3 +1,4 @@
+// @refresh reload
 import { mount, StartClient } from "@solidjs/start/client";
 
 mount(() => <StartClient />, document.getElementById("app")!);

examples/basic/src/entry-server.tsx

@@ -1,3 +1,4 @@
+// @refresh reload
 import { createHandler, StartServer } from "@solidjs/start/server";
 
 export default createHandler(() => (

examples/experiments/src/app.tsx

@@ -1,4 +1,3 @@
-// @refresh reload
 import { MetaProvider, Title } from "@solidjs/meta";
 import { Router } from "@solidjs/router";
 import { FileRoutes } from "@solidjs/start";

examples/experiments/src/entry-client.tsx

@@ -1,3 +1,4 @@
+// @refresh reload
 import { mount, StartClient } from "@solidjs/start/client";
 
 mount(() => <StartClient />, document.getElementById("app")!);

examples/experiments/src/entry-server.tsx

@@ -1,3 +1,4 @@
+// @refresh reload
 import { StartServer, createHandler } from "@solidjs/start/server";
 
 declare module "@solidjs/start/server" {

examples/hackernews/src/app.tsx

@@ -1,4 +1,3 @@
-// @refresh reload
 import { Router } from "@solidjs/router";
 import { FileRoutes } from "@solidjs/start";
 import { Suspense } from "solid-js";

examples/hackernews/src/entry-client.tsx

@@ -1,3 +1,4 @@
+// @refresh reload
 import { mount, StartClient } from "@solidjs/start/client";
 
 mount(() => <StartClient />, document.getElementById("app")!);

examples/hackernews/src/entry-server.tsx

@@ -1,3 +1,4 @@
+// @refresh reload
 import { createHandler, StartServer } from "@solidjs/start/server";
 
 export default createHandler(() => (

examples/notes/src/app.tsx

@@ -1,4 +1,3 @@
-// @refresh reload
 import { Router } from "@solidjs/router";
 import { FileRoutes } from "@solidjs/start";
 import { Suspense } from "solid-js";

examples/notes/src/entry-client.tsx

@@ -1,3 +1,4 @@
+// @refresh reload
 import { mount, StartClient } from "@solidjs/start/client";
 
 mount(() => <StartClient />, document.getElementById("app")!);

examples/notes/src/entry-server.tsx

@@ -1,3 +1,4 @@
+// @refresh reload
 import { createHandler, StartServer } from "@solidjs/start/server";
 
 export default createHandler(() => (

examples/todomvc/src/app.tsx

@@ -1,4 +1,3 @@
-// @refresh reload
 import { Router } from "@solidjs/router";
 import { FileRoutes } from "@solidjs/start";
 import { Suspense } from "solid-js";

examples/todomvc/src/entry-client.tsx

@@ -1,3 +1,4 @@
+// @refresh reload
 import { mount, StartClient } from "@solidjs/start/client";
 
 mount(() => <StartClient />, document.getElementById("app")!);

examples/todomvc/src/entry-server.tsx

@@ -1,3 +1,4 @@
+// @refresh reload
 import { createHandler, StartServer } from "@solidjs/start/server";
 
 export default createHandler(() => (

examples/with-auth/src/entry-client.tsx

@@ -1,3 +1,4 @@
+// @refresh reload
 import { mount, StartClient } from "@solidjs/start/client";
 
 mount(() => <StartClient />, document.getElementById("app")!);

examples/with-auth/src/entry-server.tsx

@@ -1,3 +1,4 @@
+// @refresh reload
 import { createHandler, StartServer } from "@solidjs/start/server";
 
 export default createHandler(() => (

examples/with-mdx/src/app.tsx

@@ -1,4 +1,3 @@
-// @refresh reload
 import { Router } from "@solidjs/router";
 import { FileRoutes } from "@solidjs/start";
 import { Suspense } from "solid-js";

examples/with-mdx/src/entry-client.tsx

@@ -1,3 +1,4 @@
+// @refresh reload
 import { mount, StartClient } from "@solidjs/start/client";
 
 mount(() => <StartClient />, document.getElementById("app")!);

examples/with-mdx/src/entry-server.tsx

@@ -1,3 +1,4 @@
+// @refresh reload
 import { createHandler, StartServer } from "@solidjs/start/server";
 
 export default createHandler(() => (

examples/with-prisma/src/app.tsx

@@ -1,4 +1,3 @@
-// @refresh reload
 import { Router } from "@solidjs/router";
 import { FileRoutes } from "@solidjs/start";
 import { Suspense } from "solid-js";

examples/with-prisma/src/entry-client.tsx

@@ -1,3 +1,4 @@
+// @refresh reload
 import { mount, StartClient } from "@solidjs/start/client";
 
 mount(() => <StartClient />, document.getElementById("app")!);

examples/with-prisma/src/entry-server.tsx

@@ -1,3 +1,4 @@
+// @refresh reload
 import { createHandler, StartServer } from "@solidjs/start/server";
 
 export default createHandler(() => (

examples/with-solid-styled/src/app.tsx

@@ -1,4 +1,3 @@
-// @refresh reload
 import { MetaProvider } from "@solidjs/meta";
 import { Router } from "@solidjs/router";
 import { FileRoutes } from "@solidjs/start";

examples/with-solid-styled/src/entry-client.tsx

@@ -1,3 +1,4 @@
+// @refresh reload
 import { mount, StartClient } from "@solidjs/start/client";
 
 mount(() => <StartClient />, document.getElementById("app")!);

examples/with-solid-styled/src/entry-server.tsx

@@ -1,3 +1,4 @@
+// @refresh reload
 import { createHandler, StartServer } from "@solidjs/start/server";
 
 export default createHandler(() => (

examples/with-tailwindcss/src/app.tsx

@@ -1,4 +1,3 @@
-// @refresh reload
 import { Router } from "@solidjs/router";
 import { FileRoutes } from "@solidjs/start";
 import { Suspense } from "solid-js";

examples/with-tailwindcss/src/entry-client.tsx

@@ -1,3 +1,4 @@
+// @refresh reload
 import { mount, StartClient } from "@solidjs/start/client";
 
 mount(() => <StartClient />, document.getElementById("app")!);

examples/with-tailwindcss/src/entry-server.tsx

@@ -1,3 +1,4 @@
+// @refresh reload
 import { createHandler, StartServer } from "@solidjs/start/server";
 
 export default createHandler(() => (

examples/with-trpc/src/app.tsx

@@ -1,4 +1,3 @@
-// @refresh reload
 import { MetaProvider, Title } from "@solidjs/meta";
 import { Router } from "@solidjs/router";
 import { FileRoutes } from "@solidjs/start";

examples/with-trpc/src/entry-client.tsx

@@ -1,3 +1,4 @@
+// @refresh reload
 import { mount, StartClient } from "@solidjs/start/client";
 
 mount(() => <StartClient />, document.getElementById("app")!);

examples/with-trpc/src/entry-server.tsx

@@ -1,3 +1,4 @@
+// @refresh reload
 import { createHandler, StartServer } from "@solidjs/start/server";
 
 export default createHandler(() => (

examples/with-unocss/src/app.tsx

@@ -1,7 +1,6 @@
-import "virtual:uno.css";
 import "@unocss/reset/tailwind.css";
+import "virtual:uno.css";
 
-// @refresh reload
 import { Router } from "@solidjs/router";
 import { FileRoutes } from "@solidjs/start";
 import { Suspense } from "solid-js";

examples/with-unocss/src/entry-client.tsx

@@ -1,3 +1,4 @@
+// @refresh reload
 import { mount, StartClient } from "@solidjs/start/client";
 
 mount(() => <StartClient />, document.getElementById("app")!);

examples/with-unocss/src/entry-server.tsx

@@ -1,3 +1,4 @@
+// @refresh reload
 import { createHandler, StartServer } from "@solidjs/start/server";
 
 export default createHandler(() => (

examples/with-vitest/src/app.tsx

@@ -1,4 +1,3 @@
-// @refresh reload
 import { MetaProvider, Title } from "@solidjs/meta";
 import { Router } from "@solidjs/router";
 import { FileRoutes } from "@solidjs/start";

examples/with-vitest/src/entry-client.tsx

@@ -1,3 +1,4 @@
+// @refresh reload
 import { mount, StartClient } from "@solidjs/start/client";
 
 mount(() => <StartClient />, document.getElementById("app")!);

examples/with-vitest/src/entry-server.tsx

@@ -1,3 +1,4 @@
+// @refresh reload
 import { createHandler, StartServer } from "@solidjs/start/server";
 
 export default createHandler(() => (

packages/start/client/StartClient.tsx

@@ -1,3 +1,4 @@
+// @refresh skip
 // @ts-ignore
 import App from "#start/app";
 import type { JSX } from "solid-js";

packages/start/client/index.tsx

@@ -1,3 +1,6 @@
+// @refresh skip
+// TODO rename to index.tsx?
 import "vinxi/client";
 export { StartClient } from "./StartClient";
 export { mount } from "./mount";
+

packages/start/client/islands.tsx

@@ -1,3 +1,4 @@
+// @refresh skip
 import "vinxi/client";
 export function StartClient() {
   return null;

packages/start/client/spa/index.tsx

@@ -1,3 +1,4 @@
+// @refresh skip
 import type { JSX } from "solid-js";
 import { render, type MountableElement } from "solid-js/web";
 import "vinxi/client";

packages/start/index.tsx

@@ -1 +1,3 @@
+// @refresh skip
+// TODO rename to index.ts?
 export * from "./shared/index";

packages/start/server/StartServer.tsx

@@ -1,3 +1,4 @@
+// @refresh skip
 // @ts-ignore
 import App from "#start/app";
 import type { Component, JSX } from "solid-js";

packages/start/server/index.tsx

@@ -1,3 +1,5 @@
+// @refresh skip
+// TODO rename to index.ts?
 export { StartServer } from "./StartServer";
 export { createHandler } from "./handler";
 export * from "./types";

packages/start/server/islands/index.tsx

@@ -1,5 +1,6 @@
-import { type Component, type ComponentProps, lazy, sharedConfig } from "solid-js";
-import { getRequestEvent, Hydration, NoHydration } from "solid-js/web";
+// @refresh skip
+import { lazy, sharedConfig, type Component, type ComponentProps } from "solid-js";
+import { Hydration, NoHydration, getRequestEvent } from "solid-js/web";
 // import { IslandManifest } from "./types";
 import { splitProps } from "./utils";
 

packages/start/server/islands/utils.tsx

@@ -1,3 +1,5 @@
+// @refresh skip
+// TODO rename to utils.ts?
 // @ts-nocheck
 import { $PROXY } from "solid-js";
 

packages/start/server/renderAsset.tsx

@@ -1,3 +1,5 @@
+// @refresh skip
+// TODO rename to renderAsset.ts?
 import type { JSX } from "solid-js";
 import type { Asset } from "./types";
 

packages/start/server/spa/StartServer.tsx

@@ -1,3 +1,4 @@
+// @refresh skip
 // @ts-ignore
 import type { Component } from "solid-js";
 import { NoHydration, getRequestEvent, ssr } from "solid-js/web";

packages/start/server/spa/index.tsx

@@ -1,3 +1,5 @@
+// @refresh skip
+// TODO rename to index.ts?
 export * from "../types";
 export { StartServer } from "./StartServer";
 export { createHandler } from "./handler";

packages/start/shared/ErrorBoundary.tsx

@@ -1,23 +1,23 @@
+// @refresh skip
 import { ErrorBoundary as DefaultErrorBoundary, type ParentProps } from "solid-js";
 import { isServer } from "solid-js/web";
 import { HttpStatusCode } from "./HttpStatusCode";
 import { DevOverlay } from "./dev-overlay";
 
-export function ErrorBoundary(props: ParentProps) {
-  if (import.meta.env.DEV && import.meta.env.START_DEV_OVERLAY) {
-    return <DevOverlay>{props.children}</DevOverlay>;
-  }
-  const message = isServer ? "500 | Internal Server Error" : "Error | Uncaught Client Exception";
-  return (
-    <DefaultErrorBoundary
-      fallback={
-        <>
-          <span style="font-size:1.5em;text-align:center;position:fixed;left:0px;bottom:55%;width:100%;">{message}</span>
-          <HttpStatusCode code={500} />
-        </>
-      }
-    >
-      {props.children}
-    </DefaultErrorBoundary>
-  );
-}
+export const ErrorBoundary = import.meta.env.DEV && import.meta.env.START_DEV_OVERLAY
+  ? (props: ParentProps) => <DevOverlay>{props.children}</DevOverlay>
+  : (props: ParentProps) => {
+    const message = isServer ? "500 | Internal Server Error" : "Error | Uncaught Client Exception";
+    return (
+      <DefaultErrorBoundary
+        fallback={
+          <>
+            <span style="font-size:1.5em;text-align:center;position:fixed;left:0px;bottom:55%;width:100%;">{message}</span>
+            <HttpStatusCode code={500} />
+          </>
+        }
+      >
+        {props.children}
+      </DefaultErrorBoundary>
+    )
+  };

packages/start/shared/FileRoutes.tsx

@@ -30,6 +30,6 @@ export function createRoutes() {
 }
 
 let routes: any[];
-export const FileRoutes = () => {
-  return isServer ? (getRequestEvent() as PageEvent).routes : routes || (routes = createRoutes());
-};
+export const FileRoutes = isServer 
+  ? () => (getRequestEvent() as PageEvent).routes
+  : () => routes || (routes = createRoutes());

packages/start/shared/HttpHeader.tsx

@@ -1,9 +1,16 @@
+// @refresh skip
 import { onCleanup } from "solid-js";
 import { getRequestEvent, isServer } from "solid-js/web";
 import type { PageEvent } from "../server/types";
 
-export function HttpHeader(props: { name: string; value: string; append?: boolean }) {
-  if (isServer) {
+export interface HttpHeaderProps {
+  name: string;
+  value: string;
+  append?: boolean;
+}
+
+export const HttpHeader = isServer
+  ? (props: HttpHeaderProps) => {
     const event = getRequestEvent() as PageEvent;
 
     if (props.append) event.response.headers.append(props.name, props.value);
@@ -23,7 +30,6 @@ export function HttpHeader(props: { name: string; value: string; append?: boolea
       if (values.length) event.response.headers.set(props.name, values.join(","));
       else event.response.headers.delete(props.name);
     });
+    return null;
   }
-
-  return null;
-}
+  : (_props: HttpHeaderProps) => null;

packages/start/shared/HttpStatusCode.tsx

@@ -1,13 +1,19 @@
+// @refresh skip
 import { onCleanup } from "solid-js";
 import { getRequestEvent, isServer } from "solid-js/web";
 import type { PageEvent } from "../server/types";
 
-export function HttpStatusCode(props: { code: number, text?: string }) {
-  if (isServer) {
+export interface HttpStatusCodeProps {
+  code: number;
+  text?: string;
+}
+
+export const HttpStatusCode = isServer
+  ? (props: HttpStatusCodeProps) => {
     const event = getRequestEvent() as PageEvent;
     event.response.status = props.code;
     event.response.statusText = props.text;
     onCleanup(() => !event.nativeEvent.handled && (event.response.status = 200));
+    return null;
   }
-  return null;
-}
+  : (_props: HttpStatusCodeProps) => null;

packages/start/shared/clientOnly.tsx

@@ -1,3 +1,4 @@
+// @refresh skip
 import type { Component, ComponentProps, JSX } from "solid-js";
 import { createMemo, createSignal, onMount, sharedConfig, splitProps, untrack } from "solid-js";
 import { isServer } from "solid-js/web";

packages/start/shared/dev-overlay/CodeView.tsx

@@ -1,3 +1,4 @@
+// @refresh skip
 import type { BuiltinLanguage, Highlighter } from 'shikiji';
 import { getHighlighterCore, loadWasm } from 'shikiji/core';
 import { createEffect, createResource, type JSX } from 'solid-js';