@solidjs/start 0.4.6 → 0.4.8

package/config/index.js

@@ -104,7 +104,8 @@ export function defineConfig(baseConfig = {}) {
                 "~": join(process.cwd(), start.appRoot),
                 ...(!start.ssr
                   ? {
-                      "@solidjs/start/server": "@solidjs/start/server/spa"
+                      "@solidjs/start/server": "@solidjs/start/server/spa",
+                      "@solidjs/start/entry": "@solidjs/start/entry/spa"
                     }
                   : {}),
                 ...userConfig.resolve?.alias

package/{server/handler.tsx → entry/index.ts}

@@ -12,12 +12,12 @@ import {
   setHeader,
   setResponseStatus
 } from "vinxi/server";
+import { getFetchEvent } from "../server/middleware";
+import { createPageEvent } from "../server/page-event";
+import { APIEvent, FetchEvent, PageEvent } from "../server/types";
 import { matchAPIRoute } from "../shared/routes";
-import { getFetchEvent } from "./middleware";
-import { createPageEvent } from "./page-event";
-import { APIEvent, FetchEvent, PageEvent } from "./types";
 
-export function createHandler(
+export function createBaseHandler(
   fn: (context: PageEvent) => unknown,
   options: {
     nonce?: string;
@@ -97,3 +97,10 @@ function handleStreamCompleteRedirect(context: PageEvent) {
     to && write(`<script>window.location="${to}"</script>`);
   };
 }
+
+export function createHandler(
+  fn: (context: PageEvent) => unknown,
+  options: Parameters<typeof createBaseHandler>[1] = {}
+) {
+  return createBaseHandler(fn, { ...options, createPageEvent });
+}

package/{server/spa/handler.tsx → entry/spa/index.ts}

@@ -1,5 +1,5 @@
-import { createHandler as createBaseHandler } from "../handler";
-import { FetchEvent, PageEvent } from "../types";
+import { createBaseHandler } from "..";
+import { FetchEvent, PageEvent } from "../../server/types";
 
 export function createHandler(
   fn: (context: PageEvent) => unknown,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/start",
-  "version": "0.4.6",
+  "version": "0.4.8",
   "type": "module",
   "author": "Ryan Carniato",
   "publishConfig": {
@@ -9,6 +9,7 @@
   "files": [
     "client",
     "config",
+    "entry",
     "server",
     "shared",
     "*.d.ts"
@@ -17,11 +18,12 @@
   "exports": {
     ".": "./shared/index.tsx",
     "./config": "./config/index.js",
+    "./entry": "./entry/index.ts",
+    "./entry/spa": "./entry/spa/index.ts",
     "./server": "./server/index.tsx",
     "./server/spa": "./server/spa/index.tsx",
     "./client": "./client/index.tsx",
     "./client/islands": "./client/islands.tsx",
-    "./middleware": "./server/middleware.ts",
     "./client/spa": "./client/spa/index.tsx"
   },
   "typesVersions": {
@@ -29,6 +31,9 @@
       ".": [
         "./shared/index.tsx"
       ],
+      "./entry": [
+        "./entry/index.ts"
+      ],
       "./server": [
         "./server/index.tsx"
       ],

package/server/index.tsx

@@ -2,13 +2,3 @@ export * from "vinxi/server";
 export { StartServer } from "./StartServer";
 export * from "./middleware";
 export * from "./types";
-import { createHandler as createBaseHandler } from "./handler";
-import { createPageEvent } from "./page-event";
-import type { PageEvent } from "./types";
-
-export function createHandler(
-  fn: (context: PageEvent) => unknown,
-  options: Parameters<typeof createBaseHandler>[1] = {}
-) {
-  return createBaseHandler(fn, { ...options, createPageEvent });
-}

package/server/spa/index.tsx

@@ -1,5 +1,4 @@
 export * from "vinxi/server";
-export * from "../handler";
 export * from "../middleware";
 export * from "../types";
 export { StartServer } from "./StartServer";

package/shared/routes.ts

@@ -33,7 +33,7 @@ export const pageRoutes = defineRoutes((fileRoutes as unknown as Route[]).filter
 const apiRoutes = defineAPIRoutes((fileRoutes as unknown as Route[]).filter(o => o.type === "api"));
 
 export function matchAPIRoute(path: string, method: HTTPMethod) {
-  const segments = path.split("/").filter(Boolean);
+  const segments = path.replace(import.meta.env.SERVER_BASE_URL, "").split("/").filter(Boolean);
 
   routeLoop: for (const route of apiRoutes) {
     const matchSegments = route.matchSegments;