@solidjs/start 2.0.0-beta.0 → 2.0.0-beta.10

package/dist/server/handler.js

@@ -8,6 +8,7 @@ import { getSsrManifest } from "./manifest/ssr-manifest.js";
 import { matchAPIRoute } from "./routes.js";
 import { handleServerFunction } from "../fns/handler.js";
 import { getExpectedRedirectStatus } from "./util.js";
+import { toWebReadableStream } from "./web-stream.js";
 const SERVER_FN_BASE = "/_server";
 export function createBaseHandler(createPageEvent, fn, options = {}) {
     const handler = defineHandler({
@@ -93,14 +94,9 @@ export function createBaseHandler(createPageEvent, fn, options = {}) {
             if (mode === "async")
                 return await stream;
             delete stream.then;
-            // using TransformStream in dev can cause solid-start-dev-server to crash
-            // when stream is cancelled
-            if (globalThis.USING_SOLID_START_DEV_SERVER)
-                return stream;
-            // returning stream directly breaks cloudflare workers
-            const { writable, readable } = new TransformStream();
-            stream.pipeTo(writable);
-            return readable;
+            // h3 expects a standard web ReadableStream across runtimes. The adapter
+            // also tolerates cancellation while Solid finishes outstanding work.
+            return toWebReadableStream(stream);
         }),
     });
     const app = new H3();

package/dist/server/spa/StartServer.jsx

@@ -18,7 +18,7 @@ export function StartServer(props) {
       <TopErrorBoundary>
         <props.document scripts={<>
               <PatchVirtualDevStyles nonce={nonce}/>
-              <script type="module" src={getSsrManifest("client").path(import.meta.env.START_CLIENT_ENTRY)}/>
+              <script type="module" src={getSsrManifest("client").path(import.meta.env.START_CLIENT_ENTRY_URL)}/>
             </>}/>
       </TopErrorBoundary>
     </NoHydration>);

package/dist/server/spa/handler.d.ts

@@ -1,36 +1,8 @@
+import type { H3 } from "h3/generic";
 import type { JSX } from "solid-js";
 import type { HandlerOptions, PageEvent } from "../types.ts";
 /**
  *
  * Read more: https://docs.solidjs.com/solid-start/reference/server/create-handler
  */
-export declare function createHandler(fn: (context: PageEvent) => JSX.Element, options?: HandlerOptions | ((context: PageEvent) => HandlerOptions)): {
-    "~rou3": import("h3").RouterContext;
-    request(request: import("srvx").ServerRequest | URL | string, options?: RequestInit, context?: import("h3").H3EventContext): Response | Promise<Response>;
-    use(route: string, handler: import("h3").Middleware, opts?: import("h3").MiddlewareOptions): /*elided*/ any;
-    use(handler: import("h3").Middleware, opts?: import("h3").MiddlewareOptions): /*elided*/ any;
-    on(method: import("h3").HTTPMethod | Lowercase<import("h3").HTTPMethod> | "", route: string, handler: import("h3").HTTPHandler, opts?: import("h3").RouteOptions): /*elided*/ any;
-    register(plugin: import("h3").H3Plugin): /*elided*/ any;
-    mount(base: string, input: import("srvx").FetchHandler | {
-        fetch: import("srvx").FetchHandler;
-    } | /*elided*/ any): /*elided*/ any;
-    all(route: string, handler: import("h3").HTTPHandler, opts?: import("h3").RouteOptions): /*elided*/ any;
-    get(route: string, handler: import("h3").HTTPHandler, opts?: import("h3").RouteOptions): /*elided*/ any;
-    post(route: string, handler: import("h3").HTTPHandler, opts?: import("h3").RouteOptions): /*elided*/ any;
-    put(route: string, handler: import("h3").HTTPHandler, opts?: import("h3").RouteOptions): /*elided*/ any;
-    delete(route: string, handler: import("h3").HTTPHandler, opts?: import("h3").RouteOptions): /*elided*/ any;
-    patch(route: string, handler: import("h3").HTTPHandler, opts?: import("h3").RouteOptions): /*elided*/ any;
-    head(route: string, handler: import("h3").HTTPHandler, opts?: import("h3").RouteOptions): /*elided*/ any;
-    options(route: string, handler: import("h3").HTTPHandler, opts?: import("h3").RouteOptions): /*elided*/ any;
-    connect(route: string, handler: import("h3").HTTPHandler, opts?: import("h3").RouteOptions): /*elided*/ any;
-    trace(route: string, handler: import("h3").HTTPHandler, opts?: import("h3").RouteOptions): /*elided*/ any;
-    readonly config: import("h3").H3Config;
-    "~middleware": import("h3").Middleware[];
-    "~routes": import("h3").H3Route[];
-    fetch(_request: import("srvx").ServerRequest): Response | Promise<Response>;
-    handler(event: import("h3").H3Event): unknown | Promise<unknown>;
-    "~request"(request: import("srvx").ServerRequest, context?: import("h3").H3EventContext): Response | Promise<Response>;
-    "~findRoute"(_event: import("h3").H3Event): import("h3").MatchedRoute<import("h3").H3Route> | void;
-    "~getMiddleware"(event: import("h3").H3Event, route: import("h3").MatchedRoute<import("h3").H3Route> | undefined): import("h3").Middleware[];
-    "~addRoute"(_route: import("h3").H3Route): void;
-};
+export declare function createHandler(fn: (context: PageEvent) => JSX.Element, options?: HandlerOptions | ((context: PageEvent) => HandlerOptions)): H3;

package/dist/server/web-stream.d.ts

@@ -0,0 +1,9 @@
+type PipeableStream = {
+    pipe(writable: {
+        write(payload: string): void;
+        end(): void;
+    }): void;
+};
+/** Convert Solid's streaming SSR result into a cancellation-safe web stream. */
+export declare function toWebReadableStream(stream: PipeableStream): ReadableStream<Uint8Array>;
+export {};

package/dist/server/web-stream.js

@@ -0,0 +1,26 @@
+/** Convert Solid's streaming SSR result into a cancellation-safe web stream. */
+export function toWebReadableStream(stream) {
+    const encoder = new TextEncoder();
+    let active = true;
+    return new ReadableStream({
+        start(controller) {
+            stream.pipe({
+                write(payload) {
+                    if (active)
+                        controller.enqueue(encoder.encode(payload));
+                },
+                end() {
+                    if (!active)
+                        return;
+                    active = false;
+                    controller.close();
+                },
+            });
+        },
+        cancel() {
+            // Solid may still resolve Suspense resources after the response is
+            // cancelled. Ignore those writes and let Solid finish its cleanup.
+            active = false;
+        },
+    });
+}

package/dist/shared/HttpHeader.jsx

@@ -1,7 +1,7 @@
 // @refresh skip
 import { onCleanup } from "solid-js";
 import { getRequestEvent, isServer } from "solid-js/web";
-import { appendHeader, setHeader } from "../http/index.js";
+import { appendHeader, setHeader } from "../http/http.js";
 /**
  *
  * Read more: https://docs.solidjs.com/solid-start/reference/server/http-header

package/env.d.ts

@@ -7,3 +7,15 @@ declare namespace App {
     [key: string | symbol]: any;
   }
 }
+
+/**
+ * Import `server-only` to ensure this module is never bundled for the client.
+ * Importing it in a client module will throw a build error.
+ */
+declare module "server-only" {}
+
+/**
+ * Import `client-only` to ensure this module is never bundled for the server.
+ * Importing it in a server module will throw a build error.
+ */
+declare module "client-only" {}

package/package.json

@@ -1,7 +1,12 @@
 {
   "name": "@solidjs/start",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0-beta.10",
   "type": "module",
+  "files": [
+    "dist",
+    "env.d.ts",
+    "CHANGELOG.md"
+  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/solidjs/solid-start.git",
@@ -34,12 +39,11 @@
     "cookie-es": "^2.0.0",
     "defu": "^6.1.4",
     "error-stack-parser": "^2.1.4",
-    "es-module-lexer": "^2.0.0",
-    "esbuild": "^0.27.4",
     "fast-glob": "^3.3.3",
-    "h3": "2.0.1-rc.16",
+    "h3": "^2.0.1-rc.25",
     "html-to-image": "^1.11.13",
     "micromatch": "^4.0.8",
+    "oxc-parser": "^0.139.0",
     "path-to-regexp": "^8.3.0",
     "pathe": "^2.0.3",
     "radix3": "^1.1.2",
@@ -48,27 +52,29 @@
     "shiki": "^1.29.2",
     "solid-js": "^1.9.11",
     "source-map-js": "^1.2.1",
-    "srvx": "^0.11.9",
+    "srvx": "^0.11.22",
     "terracotta": "^1.1.0",
     "vite-plugin-solid": "^2.11.11"
   },
   "engines": {
-    "node": ">=22"
+    "node": ">=24"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
     "@types/node": "^25.5.0",
-    "vite": "^7.3.1",
+    "vite": "^8.0.0",
     "vitest": "^4.1.0"
   },
   "peerDependencies": {
-    "vite": "^7 || ^8"
+    "vite": "^8 || ^9"
   },
   "scripts": {
     "build": "pnpm validate-imports && tsc && node scripts/build.js",
     "dev": "tsc --watch",
     "test": "vitest",
     "test:ci": "vitest run",
+    "typecheck": "tsc --noEmit",
+    "typecheck:dist": "pnpm build && pnpx @arethetypeswrong/cli --pack . --profile esm-only",
     "validate-imports": "node scripts/validate-imports.js"
   }
 }

package/scripts/build.js

@@ -1,15 +0,0 @@
-import * as fs from "node:fs/promises";
-import * as path from "node:path";
-import glob from "fast-glob";
-
-const files = await glob("**/*.{js,css}", { cwd: `${process.cwd()}/src` });
-
-await Promise.all(
-  files.map(file =>
-    fs.cp(
-      path.join(import.meta.dirname, "../src", file),
-      path.join(import.meta.dirname, "../dist", file),
-      { recursive: true },
-    ),
-  ),
-);

package/scripts/validate-imports.js

@@ -1,316 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * Import Extension Validation Script for SolidStart
- *
- * This script validates that all relative imports in the src/ directory have
- * explicit file extensions, which is mandated by Node.js ESM (ES Modules).
- *
- * Node.js requires explicit file extensions for relative imports when using
- * ES modules to avoid ambiguity and improve performance. This script ensures
- * compliance with this requirement.
- *
- * Features:
- * - Scans all .ts and .tsx files in the src/ directory recursively
- * - Detects relative imports (starting with ./ or ../) without extensions
- * - Prevents .js/.jsx imports in TypeScript files (should use .ts/.tsx)
- * - Ignores commented code, CSS imports, and dynamic imports (handled by bundlers)
- * - Provides detailed error reporting with line numbers and suggestions
- * - Exits with appropriate status codes for CI/CD integration
- *
- * Usage:
- *   npm run validate-imports
- *
- * Exit codes:
- *   0 - All relative imports have valid extensions
- *   1 - Found relative imports without extensions
- *
- * Valid extensions for TypeScript files: .ts, .tsx, .json
- * Invalid extensions for TypeScript files: .js, .jsx (use .ts/.tsx instead)
- *
- * @example
- * // ❌ Invalid - missing extension
- * import { config } from "./config/index";
- *
- * // ❌ Invalid - .js extension in TypeScript file
- * import { config } from "./config/index.js";
- *
- * // ✅ Valid - has .ts extension
- * import { config } from "./config/index.ts";
- *
- * // ✅ Valid - external package import (no extension needed)
- * import { something } from "external-package";
- */
-
-import { readFileSync, readdirSync, statSync } from "node:fs";
-import { join, dirname, extname } from "node:path";
-import { fileURLToPath } from "node:url";
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
-// Configuration
-const SRC_DIR = join(__dirname, "..", "src");
-const VALID_EXTENSIONS = [".ts", ".tsx", ".json"];
-const INVALID_EXTENSIONS = [".js", ".jsx"];
-const FILE_EXTENSIONS = [".ts", ".tsx"];
-
-/**
- * Recursively find all files with specified extensions
- */
-function findFiles(dir, extensions, files = []) {
-  try {
-    const entries = readdirSync(dir);
-
-    for (const entry of entries) {
-      const fullPath = join(dir, entry);
-      const stat = statSync(fullPath);
-
-      if (stat.isDirectory()) {
-        findFiles(fullPath, extensions, files);
-      } else if (extensions.includes(extname(entry))) {
-        files.push(fullPath);
-      }
-    }
-  } catch (error) {
-    console.error(`Error reading directory ${dir}: ${error.message}`);
-  }
-
-  return files;
-}
-
-/**
- * Check if a path is a relative import (starts with . or ..)
- */
-function isRelativeImport(path) {
-  return path.startsWith("./") || path.startsWith("../");
-}
-
-/**
- * Check if an import path has a valid file extension
- */
-function hasValidExtension(path) {
-  return VALID_EXTENSIONS.some(ext => path.endsWith(ext));
-}
-
-/**
- * Check if an import path has an invalid extension for TypeScript files
- */
-function hasInvalidExtension(path) {
-  return INVALID_EXTENSIONS.some(ext => path.endsWith(ext));
-}
-
-/**
- * Extract import/export statements from file content
- * Matches both import and export statements with from clauses
- */
-function extractImportExportStatements(content, filePath) {
-  const statements = [];
-  const lines = content.split("\n");
-
-  // Regex patterns for different import/export statements
-  const patterns = [
-    // Standard imports: import { ... } from '...'
-    /import\s+(?:(?:\{[^}]*\}|\*\s+as\s+\w+|\w+)\s+from\s+)?['"`]([^'"`]+)['"`]/g,
-    // Export from: export { ... } from '...'
-    /export\s+(?:\{[^}]*\}|\*)\s+from\s+['"`]([^'"`]+)['"`]/g,
-    // Export default from: export { default } from '...'
-    /export\s+\{\s*default\s*\}\s+from\s+['"`]([^'"`]+)['"`]/g,
-    // Note: Dynamic imports are excluded as they're handled by bundlers
-  ];
-
-  lines.forEach((line, lineNumber) => {
-    const trimmedLine = line.trim();
-
-    // Skip commented lines, dynamic imports, and TypeScript type-only imports in d.ts files
-    if (
-      trimmedLine.startsWith("//") ||
-      trimmedLine.startsWith("/*") ||
-      trimmedLine.startsWith("*") ||
-      (filePath.endsWith(".d.ts") && trimmedLine.includes("import(")) ||
-      // Skip CSS imports as they're handled by bundlers
-      /import\s+['"`][^'"`]*\.css['"`]/.test(trimmedLine) ||
-      // Skip dynamic imports as they're handled by bundlers
-      /import\s*\(\s*['"`]/.test(trimmedLine)
-    ) {
-      return;
-    }
-
-    patterns.forEach(pattern => {
-      let match;
-      // Reset regex lastIndex to avoid issues with global flag
-      pattern.lastIndex = 0;
-      while ((match = pattern.exec(line)) !== null) {
-        const importPath = match[1];
-        if (importPath) {
-          statements.push({
-            path: importPath,
-            line: lineNumber + 1,
-            fullLine: line.trim(),
-            filePath,
-          });
-        }
-      }
-    });
-  });
-
-  return statements;
-}
-
-/**
- * Validate a single file for relative imports without extensions
- */
-function validateFile(filePath) {
-  const errors = [];
-
-  try {
-    const content = readFileSync(filePath, "utf8");
-    const statements = extractImportExportStatements(content, filePath);
-
-    statements.forEach(statement => {
-      if (isRelativeImport(statement.path)) {
-        if (hasInvalidExtension(statement.path)) {
-          errors.push({
-            file: filePath,
-            line: statement.line,
-            importPath: statement.path,
-            fullLine: statement.fullLine,
-            type: "invalid-extension",
-          });
-        } else if (!hasValidExtension(statement.path)) {
-          errors.push({
-            file: filePath,
-            line: statement.line,
-            importPath: statement.path,
-            fullLine: statement.fullLine,
-            type: "missing-extension",
-          });
-        }
-      }
-    });
-  } catch (error) {
-    console.error(`Error reading file ${filePath}: ${error.message}`);
-  }
-
-  return errors;
-}
-
-/**
- * Main validation function
- */
-function validateImports() {
-  console.log("🔍 Validating relative imports in src/ directory...\n");
-
-  // Find all TypeScript/TSX files in src directory
-  const files = findFiles(SRC_DIR, FILE_EXTENSIONS);
-
-  if (files.length === 0) {
-    console.log("⚠️  No TypeScript files found in src/ directory");
-    process.exit(0);
-  }
-
-  console.log(`📁 Scanning ${files.length} files...\n`);
-
-  let totalErrors = 0;
-  const errorsByFile = new Map();
-
-  // Validate each file
-  files.forEach(file => {
-    const errors = validateFile(file);
-    if (errors.length > 0) {
-      errorsByFile.set(file, errors);
-      totalErrors += errors.length;
-    }
-  });
-
-  // Report results
-  if (totalErrors === 0) {
-    console.log("✅ All relative imports have valid extensions!");
-    process.exit(0);
-  } else {
-    const missingExtensionErrors = [];
-    const invalidExtensionErrors = [];
-
-    errorsByFile.forEach(errors => {
-      errors.forEach(error => {
-        if (error.type === "missing-extension") {
-          missingExtensionErrors.push(error);
-        } else if (error.type === "invalid-extension") {
-          invalidExtensionErrors.push(error);
-        }
-      });
-    });
-
-    if (missingExtensionErrors.length > 0) {
-      console.log(
-        `❌ Found ${missingExtensionErrors.length} relative import(s) without extensions:\n`,
-      );
-
-      const missingByFile = new Map();
-      missingExtensionErrors.forEach(error => {
-        if (!missingByFile.has(error.file)) {
-          missingByFile.set(error.file, []);
-        }
-        missingByFile.get(error.file).push(error);
-      });
-
-      missingByFile.forEach((errors, file) => {
-        const relativePath = file.replace(process.cwd(), "").replace(/^\//, "");
-        console.log(`📄 ${relativePath}:`);
-
-        errors.forEach(error => {
-          console.log(`  Line ${error.line}: ${error.importPath}`);
-          console.log(`    ${error.fullLine}`);
-          console.log(
-            `    ${"".padStart(error.fullLine.indexOf(error.importPath), " ")}${"".padStart(error.importPath.length, "^")}`,
-          );
-        });
-        console.log("");
-      });
-    }
-
-    if (invalidExtensionErrors.length > 0) {
-      console.log(
-        `❌ Found ${invalidExtensionErrors.length} relative import(s) with invalid extensions:\n`,
-      );
-
-      const invalidByFile = new Map();
-      invalidExtensionErrors.forEach(error => {
-        if (!invalidByFile.has(error.file)) {
-          invalidByFile.set(error.file, []);
-        }
-        invalidByFile.get(error.file).push(error);
-      });
-
-      invalidByFile.forEach((errors, file) => {
-        const relativePath = file.replace(process.cwd(), "").replace(/^\//, "");
-        console.log(`📄 ${relativePath}:`);
-
-        errors.forEach(error => {
-          console.log(`  Line ${error.line}: ${error.importPath}`);
-          console.log(`    ${error.fullLine}`);
-          console.log(
-            `    ${"".padStart(error.fullLine.indexOf(error.importPath), " ")}${"".padStart(error.importPath.length, "^")}`,
-          );
-        });
-        console.log("");
-      });
-    }
-
-    console.log("💡 Tips:");
-    if (missingExtensionErrors.length > 0) {
-      console.log('  - Add file extensions to relative imports (e.g., "./file" → "./file.ts")');
-    }
-    if (invalidExtensionErrors.length > 0) {
-      console.log("  - Replace .js/.jsx with .ts/.tsx in TypeScript files");
-    }
-    console.log("  - This is required by Node.js ESM modules");
-    console.log("  - Valid extensions for TypeScript files: " + VALID_EXTENSIONS.join(", "));
-    console.log("  - Invalid extensions for TypeScript files: " + INVALID_EXTENSIONS.join(", "));
-
-    process.exit(1);
-  }
-}
-
-// Run the validation
-validateImports();

package/src/client/StartClient.tsx

@@ -1,34 +0,0 @@
-// @refresh skip
-import App from "solid-start:app";
-import type { JSX } from "solid-js";
-import { ErrorBoundary } from "../shared/ErrorBoundary.tsx";
-
-function Dummy(props: { children: JSX.Element }) {
-  return props.children;
-}
-
-/**
- *
- * Read more: https://docs.solidjs.com/solid-start/reference/client/start-client
- */
-export function StartClient() {
-  return (
-    <Dummy>
-      <Dummy>
-        <ErrorBoundary>
-          <App />
-        </ErrorBoundary>
-      </Dummy>
-    </Dummy>
-  );
-}
-
-export function StartClientTanstack() {
-  return (
-    <Dummy>
-      <ErrorBoundary>
-        <App />
-      </ErrorBoundary>
-    </Dummy>
-  );
-}

package/src/client/index.tsx

@@ -1,2 +0,0 @@
-export { mount } from "./mount.ts";
-export { StartClient, StartClientTanstack } from "./StartClient.tsx";

package/src/client/mount.ts

@@ -1 +0,0 @@
-export { hydrate as mount } from "solid-js/web"

package/src/client/spa/index.tsx

@@ -1,9 +0,0 @@
-// @refresh skip
-import type { JSX } from "solid-js";
-import { render, type MountableElement } from "solid-js/web";
-
-export function mount(fn: () => JSX.Element, el: MountableElement) {
-  render(fn, el);
-}
-
-export { StartClient } from "../StartClient.tsx";

package/src/config/constants.ts

@@ -1,19 +0,0 @@
-export const DEFAULT_EXTENSIONS = ["js", "jsx", "ts", "tsx"];
-
-export const CLIENT_BASE_PATH = "_build";
-
-export const VIRTUAL_MODULES = {
-  clientViteManifest: "solid-start:client-vite-manifest",
-  getClientManifest: "solid-start:get-client-manifest",
-  getManifest: "solid-start:get-manifest",
-  middleware: "solid-start:middleware",
-  serverFnManifest: "solid-start:server-fn-manifest",
-  clientEntry: "solid-start:client-entry",
-  serverEntry: "solid-start:server-entry",
-  app: "solid-start:app",
-} as const;
-
-export const VITE_ENVIRONMENTS = {
-  client: "client" as const,
-  server: "ssr" as const,
-};