Merge branch 'main' into tanstack-server-fn-plugin

.changeset/twenty-singers-fetch.md

@@ -0,0 +1,5 @@
+---
+"@solidjs/start": minor
+---
+
+move the RequestEventLocals definition into the App namespace for easier end user retyping

.github/workflows/server-function.yml

@@ -0,0 +1,50 @@
+name: ci
+
+on:
+  pull_request:
+    branches: [ main ]
+  push:
+    branches: [ main ]
+
+jobs:
+
+  e2e-tests:
+    name: "E2E tests using ${{ matrix.browser }}"
+    strategy:
+      fail-fast: false
+      matrix:
+        browser: [chrome, firefox]
+
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 9
+
+      - name: Install project dependencies
+        run: pnpm i
+
+      - name: Install project dependencies
+        run: pnpm run build
+
+      - name: Install dependencies
+        uses: cypress-io/github-action@v6
+        with:
+          working-directory: .
+          runTests: false
+
+      - name: Cypress test
+        uses: cypress-io/github-action@v6
+        with:
+          install: false
+          working-directory: tests/server-function
+          build: pnpm run build
+          start: pnpm run start
+          browser: ${{ matrix.browser }}
+

.nvmrc

@@ -0,0 +1 @@
+20.5.0

examples/todomvc/src/global.d.ts

@@ -1 +1,7 @@
-/// <reference types="@solidjs/start/env" />
+declare module App {
+  interface RequestEventLocals {
+    /**
+     * Declare your getRequestEvent().locals here
+     */
+  }
+}

examples/with-tailwindcss/package.json

@@ -9,12 +9,14 @@
   "dependencies": {
     "@solidjs/router": "^0.15.0",
     "@solidjs/start": "^1.0.11",
-    "autoprefixer": "^10.4.19",
-    "postcss": "^8.4.38",
     "solid-js": "^1.9.2",
-    "tailwindcss": "^3.4.3",
     "vinxi": "^0.4.3"
   },
+  "devDependencies": {
+    "autoprefixer": "^10.4.19",
+    "postcss": "^8.4.38",
+    "tailwindcss": "^3.4.3"
+  },
   "overrides": {
     "vite": "5.4.10"
   },

examples/with-vitest/package.json

@@ -23,7 +23,7 @@
     "vinxi": "^0.4.3",
     "vite": "^5.4.10",
     "vite-plugin-solid": "^2.10.2",
-    "vitest": "^2.1.4"
+    "vitest": "^3.0.2"
   },
   "overrides": {
     "vite": "5.4.10"

package.json

@@ -32,15 +32,20 @@
     "@cloudflare/kv-asset-handler": "^0.2.0",
     "citty": "^0.1.5",
     "coveralls": "^3.1.1",
+    "cypress": "^14.0.0",
     "debug": "^4.3.4",
     "rimraf": "^3.0.2",
     "tinyglobby": "^0.2.2",
     "tippy.js": "^6.3.7",
-    "typescript": "5.3.3",
+    "typescript": "catalog:",
     "valibot": "~0.29.0"
   },
   "dependencies": {
     "cross-env": "^7.0.3",
     "wrangler": "3.22.1"
+  },
+  "engines": {
+    "pnpm": "^9.0.0",
+    "node": "^20.5.0"
   }
 }

packages/start/env.d.ts

@@ -4,6 +4,12 @@
 
 /* eslint-disable @typescript-eslint/consistent-type-imports */
 
+declare namespace App {
+  export interface RequestEventLocals {
+    [key: string | symbol]: any;
+  }
+}
+
 interface ImportMetaEnv extends Record<`VITE_${string}`, any>, SolidStartMetaEnv {
   BASE_URL: string;
   MODE: string;

packages/start/package.json

@@ -59,9 +59,9 @@
     }
   },
   "devDependencies": {
-    "solid-js": "^1.9.2",
-    "typescript": "^5.4.2",
-    "vinxi": "^0.4.3"
+    "solid-js": "catalog:",
+    "typescript": "catalog:",
+    "vinxi": "catalog:"
   },
   "dependencies": {
     "@vinxi/plugin-directives": "^0.4.3",

packages/start/src/server/index.tsx

@@ -3,16 +3,7 @@ export { StartServer } from "./StartServer";
 export { createHandler } from "./handler";
 export { getServerFunctionMeta } from "./serverFunction";
 export type {
-  DocumentComponentProps,
-  Asset,
-  HandlerOptions,
-  ContextMatches,
-  ResponseStub,
-  FetchEvent,
-  RequestEventLocals,
-  PageEvent,
   APIEvent,
-  APIHandler,
-  ServerFunctionMeta
+  APIHandler, Asset, ContextMatches, DocumentComponentProps, FetchEvent, HandlerOptions, PageEvent, ResponseStub, ServerFunctionMeta
 } from "./types";
 

packages/start/src/server/types.ts

@@ -42,16 +42,15 @@ export interface ResponseStub {
   statusText?: string;
   headers: Headers;
 }
+
 export interface FetchEvent {
   request: Request;
   response: ResponseStub;
   clientAddress?: string;
-  locals: RequestEventLocals;
+  locals: App.RequestEventLocals;
   nativeEvent: HTTPEvent;
 }
-export interface RequestEventLocals {
-  [key: string | symbol]: any;
-}
+
 export interface PageEvent extends RequestEvent {
   manifest: any;
   assets: any;