keep all entries as jsx to ensure treated as src

solidjs · Mar 10, 2024 · 67a469f · 67a469f
1 parent f13b1c8
commit 67a469f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/.changeset/rude-wolves-yawn.md b/.changeset/rude-wolves-yawn.md
@@ -0,0 +1,5 @@
+---
+"@solidjs/start": patch
+---
+
+keep all entries as jsx to ensure treated as src
diff --git a/examples/experiments/src/middleware.ts b/examples/experiments/src/middleware.ts
@@ -3,6 +3,7 @@ import { createMiddleware } from "@solidjs/start/middleware";
 export default createMiddleware({
   onRequest: [
     event => {
+      event.locals.foo = "bar";
       console.log("REQUEST", event.request.url);
     }
   ],

diff --git a/examples/experiments/src/routes/index.tsx b/examples/experiments/src/routes/index.tsx
@@ -2,13 +2,15 @@ import { Title } from "@solidjs/meta";
 import { json } from "@solidjs/router";
 import { clientOnly, GET } from "@solidjs/start";
 import { getServerFunctionMeta } from "@solidjs/start/server";
+import { getRequestEvent } from "solid-js/web";
 import Counter from "~/components/Counter";
 const BreaksOnServer = clientOnly(() => import("~/components/BreaksOnServer"));
 
 const hello = GET(async (name: string) => {
   "use server";
+  const e = getRequestEvent()!;
   const { id } = getServerFunctionMeta()!;
-  console.log("ID", id);
+  console.log("ID", id, e.locals.foo);
   return json(
     { hello: new Promise<string>(r => setTimeout(() => r(name), 1000)) },
     { headers: { "cache-control": "max-age=60" } }

diff --git a/packages/start/package.json b/packages/start/package.json
@@ -20,7 +20,7 @@
   "exports": {
     ".": "./dist/index.jsx",
     "./config": "./config/index.js",
-    "./middleware": "./dist/middleware/index.js",
+    "./middleware": "./dist/middleware/index.jsx",
     "./router": "./dist/router/index.jsx",
     "./server": "./dist/server/index.jsx",
     "./server/spa": "./dist/server/spa/index.jsx",

diff --git a/packages/start/src/middleware/index.ts → packages/start/src/middleware/index.tsx b/packages/start/src/middleware/index.ts → packages/start/src/middleware/index.tsx
@@ -1,9 +1,10 @@
+// @refresh skip
 import {
   HTTPEvent,
   defineMiddleware,
   sendWebResponse
 } from "vinxi/http";
-import { getFetchEvent } from "../server/fetchEvent.js";
+import { getFetchEvent } from "../server/fetchEvent";
 import type { FetchEvent } from "../server/types";
 
 /** Function responsible for receiving an observable [operation]{@link Operation} and returning a [result]{@link OperationResult}. */