fix api endpoints

Brendonovich · Brendonovich · commit 8e6a2fb5f872 · 2025-08-16T15:23:01.000+08:00
diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json
@@ -7,7 +7,7 @@
   },
   "dependencies": {
     "@solidjs/router": "^0.15.0",
-    "@solidjs/start-vite": "file:../../packages/start-vite",
+    "@solidjs/start": "file:../../packages/start",
     "solid-js": "^1.9.5",
     "vite": "6.3.5"
   },
diff --git a/examples/pnpm-lock.yaml b/examples/pnpm-lock.yaml
diff --git a/examples/pnpm-workspace.yaml b/examples/pnpm-workspace.yaml
@@ -1,6 +1,6 @@
 packages:
-  - ./hackernews
-  # - ./vite-rewrite
+  # - ./hackernews
+  - ./vite-rewrite
   # - ./todomvc
 
 patchedDependencies:
diff --git a/examples/todomvc/package.json b/examples/todomvc/package.json
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@solidjs/router": "^0.15.0",
-    "@solidjs/start-vite": "file:../../packages/start-vite",
+    "@solidjs/start": "file:../../packages/start",
     "solid-js": "^1.9.5",
     "unstorage": "1.10.2",
     "vite": "6.3.5"
diff --git a/examples/vite-rewrite/package.json b/examples/vite-rewrite/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@solidjs/meta": "^0.29.4",
     "@solidjs/router": "^0.15.3",
-    "@solidjs/start-vite": "file:../../packages/start-vite",
+    "@solidjs/start": "file:../../packages/start",
     "@tanstack/server-functions-plugin": "^1.115.0",
     "@types/micromatch": "^4.0.9",
     "defu": "^6.1.4",
diff --git a/examples/vite-rewrite/src/app.tsx b/examples/vite-rewrite/src/app.tsx
@@ -1,5 +1,5 @@
 import { MetaProvider } from "@solidjs/meta";
-import { FileRoutes } from "@solidjs/start-vite/router";
+import { FileRoutes } from "@solidjs/start/router";
 import { Router } from "@solidjs/router";
 import { Suspense } from "solid-js";
 
diff --git a/examples/vite-rewrite/src/entry-client.tsx b/examples/vite-rewrite/src/entry-client.tsx
@@ -1,5 +1,5 @@
 // @refresh reload
 import { hydrate } from "solid-js/web";
-import { StartClient } from "@solidjs/start-vite/client";
+import { StartClient } from "@solidjs/start/client";
 
 hydrate(() => <StartClient />, document.getElementById("app")!);
diff --git a/examples/vite-rewrite/src/entry-server.tsx b/examples/vite-rewrite/src/entry-server.tsx
@@ -1,5 +1,5 @@
 // @refresh reload
-import { createHandler, StartServer } from "@solidjs/start-vite/server";
+import { createHandler, StartServer } from "@solidjs/start/server";
 
 export default createHandler(() => (
   <StartServer
diff --git a/examples/vite-rewrite/src/routes/index.tsx b/examples/vite-rewrite/src/routes/index.tsx
@@ -1,5 +1,3 @@
-import { useLocation, useMatch, useNavigate } from "@solidjs/router";
-
 export default function Home() {
   return <a href="/other">Other</a>;
 }
diff --git a/examples/vite-rewrite/src/routes/test-api.ts b/examples/vite-rewrite/src/routes/test-api.ts
@@ -0,0 +1,3 @@
+export async function GET() {
+  return new Response("bruh")
+}
diff --git a/examples/vite-rewrite/vite.config.ts b/examples/vite-rewrite/vite.config.ts
@@ -1,8 +1,8 @@
+import { solidStart } from "@solidjs/start/config";
 import { defineConfig } from "vite";
-import { solidStart } from "@solidjs/start-vite/config";
 
 export default defineConfig({
-  plugins: [solidStart()],
+  plugins: [solidStart({ ssr: true })],
   build: {
     minify: false
   }
diff --git a/packages/start/src/config/fs-routes/index.ts b/packages/start/src/config/fs-routes/index.ts
@@ -82,7 +82,6 @@ ${this.environment.name === "server"
             ? ""
             : `
 function clientManifestImport(id) {
-  console.log("client manifest import", {id});
   return import(/* @vite-ignore */ globalThis.MANIFEST.inputs[id].output.path)
 }`
           }
diff --git a/packages/start/src/config/index.ts b/packages/start/src/config/index.ts
@@ -163,7 +163,8 @@ function solidStartVitePlugin(options: SolidStartOptions): Array<PluginOption> {
             }
           },
           define: {
-            "import.meta.env.MANIFEST": `globalThis.MANIFEST`
+            "import.meta.env.MANIFEST": `globalThis.MANIFEST`,
+            "import.meta.env.START_SSR": JSON.stringify(start.ssr)
           }
         };
       }
@@ -254,14 +255,7 @@ export default window.manifest;
         globalThis.START_CLIENT_BUNDLE = bundle;
       }
     },
-    {
-      name: "solid-start:solid",
-      applyToEnvironment(env) {
-        if (env.name === "server") return solid({ ...start.solid, ssr: true, extensions: extensions.map(ext => `.${ext}`) });
-        return solid({ ...start.solid, ssr: start.ssr, extensions: extensions.map(ext => `.${ext}`) });
-      }
-    }
-
+    solid({ ...start.solid, ssr: true, extensions: extensions.map(ext => `.${ext}`) })
   ];
 }
 
diff --git a/packages/start/src/env.d.ts b/packages/start/src/env.d.ts
@@ -26,7 +26,7 @@ interface ImportMetaEnv extends Record<`VITE_${string}`, any>, SolidStartMetaEnv
 
 interface SolidStartMetaEnv {
   START_SSR: boolean;
-  START_ISLANDS: boolean;
-  START_DEV_OVERLAY: boolean;
-  SERVER_BASE_URL: string;
+  // START_ISLANDS: boolean;
+  // START_DEV_OVERLAY: boolean;
+  // SERVER_BASE_URL: string;
 }
diff --git a/packages/start/src/server/StartServer.tsx b/packages/start/src/server/StartServer.tsx
@@ -46,37 +46,41 @@ export function StartServer(props: { document: Component<DocumentComponentProps>
   const nonce = context.nonce;
 
   let assets: Asset[] = [];
-  Promise.resolve().then(async () => {
-    let assetPromises: Promise<Asset[]>[] = [];
-    // @ts-ignore
-    if (context.router && context.router.matches) {
+  Promise.resolve()
+    .then(async () => {
+      let assetPromises: Promise<Asset[]>[] = [];
       // @ts-ignore
-      const matches = [...context.router.matches];
-      while (matches.length && (!matches[0].info || !matches[0].info.filesystem)) matches.shift();
-      const matched = matches.length && matchRoute(matches, context.routes);
-      if (matched) {
-        // const inputs = import.meta.env.MANIFEST[
-        //   import.meta.env.START_ISLANDS ? "server" : "client"
-        // ]!.inputs;
-        for (let i = 0; i < matched.length; i++) {
-          const segment = matched[i];
-          const assets = getManifestEntryCssTags(segment["$component"].src);
-          // console.log({ id: segment["$component"].src, assets });
-          // const part = inputs[segment["$component"].src]!;
-          // assetPromises.push(part.assets() as any);
-        }
-      } else if (import.meta.env.DEV) console.warn("No route matched for preloading js assets");
-    }
-    //   assets = await Promise.all(assetPromises).then(a =>
-    //     // dedupe assets
-    //     [...new Map(a.flat().map(item => [item.attrs.key, item])).values()].filter(asset =>
-    //       import.meta.env.START_ISLANDS
-    //         ? false
-    //         : (asset.attrs as JSX.LinkHTMLAttributes<HTMLLinkElement>).rel === "modulepreload" &&
-    //           !context.assets.find((a: Asset) => a.attrs.key === asset.attrs.key)
-    //     )
-    // );
-  });
+      if (context.router && context.router.matches) {
+        // @ts-ignore
+        const matches = [...context.router.matches];
+        while (matches.length && (!matches[0].info || !matches[0].info.filesystem)) matches.shift();
+        const matched = matches.length && matchRoute(matches, context.routes);
+        // console.log({ router: context.router });
+        if (matched) {
+          // const inputs = import.meta.env.MANIFEST[
+          //   import.meta.env.START_ISLANDS ? "server" : "client"
+          // ]!.inputs;
+          for (let i = 0; i < matched.length; i++) {
+            const segment = matched[i];
+            // console.log(segment["$component"]);
+            const assets = getManifestEntryCssTags(segment["$component"].src);
+            // console.log({ id: segment["$component"].src, assets });
+            // const part = inputs[segment["$component"].src]!;
+            // assetPromises.push(part.assets() as any);
+          }
+        } else if (import.meta.env.DEV) console.warn("No route matched for preloading js assets");
+      }
+      //   assets = await Promise.all(assetPromises).then(a =>
+      //     // dedupe assets
+      //     [...new Map(a.flat().map(item => [item.attrs.key, item])).values()].filter(asset =>
+      //       import.meta.env.START_ISLANDS
+      //         ? false
+      //         : (asset.attrs as JSX.LinkHTMLAttributes<HTMLLinkElement>).rel === "modulepreload" &&
+      //           !context.assets.find((a: Asset) => a.attrs.key === asset.attrs.key)
+      //     )
+      // );
+    })
+    .catch(console.error);
 
   // useAssets(() => (assets.length ? assets.map(m => renderAsset(m)) : undefined));
 
diff --git a/packages/start/src/server/index.tsx b/packages/start/src/server/index.tsx
diff --git a/packages/start/src/server/routes.ts b/packages/start/src/server/routes.ts

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-import { useLocation, useMatch, useNavigate } from "@solidjs/router";`
`2`		`-`
`3`	`1`	`export default function Home() {`
`4`	`2`	`return <a href="/other">Other</a>;`
`5`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export async function GET() {`
	`2`	`+ return new Response("bruh")`
	`3`	`+}`