diff --git a/packages/start/src/config/index.ts b/packages/start/src/config/index.ts index 9ad41a3f7..551304a90 100644 --- a/packages/start/src/config/index.ts +++ b/packages/start/src/config/index.ts @@ -245,6 +245,7 @@ export function solidStart(options?: SolidStartOptions): Array { configEnvironment(name) { return { resolve: { + conditions: ["generic"], // remove when https://github.com/solidjs/vite-plugin-solid/pull/228 is released externalConditions: ["solid", "node"], }, diff --git a/packages/start/src/server/handler.ts b/packages/start/src/server/handler.ts index 18f2ddca5..c57e98cdf 100644 --- a/packages/start/src/server/handler.ts +++ b/packages/start/src/server/handler.ts @@ -1,13 +1,5 @@ import middleware from "solid-start:middleware"; -import { - defineHandler, - getCookie, - H3, - type H3Event, - iterable, - redirect, - setCookie, -} from "h3/generic"; +import { defineHandler, getCookie, H3, type H3Event, iterable, redirect, setCookie } from "h3"; import type { JSX } from "solid-js"; import { sharedConfig } from "solid-js"; import { getRequestEvent, renderToStream, renderToString } from "solid-js/web";