@solidjs/start 2.0.0-beta.5 → 2.0.0-beta.7

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @solidjs/start
 
+## 2.0.0-beta.7
+
+### Patch Changes
+
+- d2f0621: Support JavaScript projects whose app and client/server entries use `.jsx`.
+
+## 2.0.0-beta.6
+
+### Patch Changes
+
+- 25769f2: Fix Vite preview for non-HTML responses and projects whose server build uses an `.mjs`
+  entry.
+
 ## 2.0.0-beta.5
 
 ### Patch Changes

package/dist/config/dev-server.d.ts

@@ -1,2 +1,4 @@
 import { type PluginOption } from "vite";
-export declare function devServer(): Array<PluginOption>;
+export declare function devServer(serverEntryPath: string): Array<PluginOption>;
+export declare function resolvePreviewServerEntry(root: string): string;
+export declare function isHtmlResponse(response: Response): boolean;

package/dist/config/dev-server.js

@@ -6,22 +6,27 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
     }
     return path;
 };
+import { existsSync } from "node:fs";
 import { join } from "node:path";
 import { pathToFileURL } from "node:url";
 import { NodeRequest, sendNodeResponse } from "srvx/node";
 import { isRunnableDevEnvironment, } from "vite";
 import { VITE_ENVIRONMENTS } from "./constants.js";
-export function devServer() {
+export function devServer(serverEntryPath) {
     return [
         {
             name: "solid-start-dev-server",
             configurePreviewServer(server) {
+                const serverEntryUrl = pathToFileURL(resolvePreviewServerEntry(server.config.root)).href;
                 return () => {
                     server.middlewares.use(async (req, res) => {
-                        res.setHeader("content-encoding", "identity");
                         const webReq = new NodeRequest({ req, res });
-                        const def = await import(__rewriteRelativeImportExtension(pathToFileURL(join(process.cwd(), "dist/server/entry-server.js")).href, true));
-                        sendNodeResponse(res, await def.default.fetch(webReq));
+                        const def = await import(__rewriteRelativeImportExtension(serverEntryUrl, true));
+                        const webRes = await def.default.fetch(webReq);
+                        if (isHtmlResponse(webRes)) {
+                            res.setHeader("content-encoding", "identity");
+                        }
+                        sendNodeResponse(res, webRes);
                     });
                 };
             },
@@ -49,7 +54,7 @@ export function devServer() {
                         }
                         const webReq = new NodeRequest({ req, res });
                         try {
-                            const serverEntry = await serverEnv.runner.import("./src/entry-server.tsx");
+                            const serverEntry = await serverEnv.runner.import(serverEntryPath);
                             const webRes = await serverEntry.default.fetch(webReq);
                             return sendNodeResponse(res, webRes);
                         }
@@ -94,6 +99,19 @@ export function devServer() {
         },
     ];
 }
+export function resolvePreviewServerEntry(root) {
+    const serverDirectory = join(root, "dist/server");
+    const serverEntry = ["js", "mjs"]
+        .map(extension => join(serverDirectory, `entry-server.${extension}`))
+        .find(existsSync);
+    if (!serverEntry) {
+        throw new Error(`Could not find the SolidStart server entry in ${serverDirectory}`);
+    }
+    return serverEntry;
+}
+export function isHtmlResponse(response) {
+    return response.headers.get("content-type")?.startsWith("text/html") ?? false;
+}
 /**
  * Removes Vite internal middleware
  *

package/dist/config/index.js

@@ -44,8 +44,8 @@ export function solidStart(options) {
         serverFunctionsPlugin({
             manifest: VIRTUAL_MODULES.serverFnManifest,
             runtime: {
-                server: '@solidjs/start/fns/server',
-                client: '@solidjs/start/fns/client',
+                server: "@solidjs/start/fns/server",
+                client: "@solidjs/start/fns/client",
             },
             filter: options?.serverFunctions?.filter,
         }),
@@ -110,7 +110,7 @@ export function solidStart(options) {
                                 manifest: true,
                                 copyPublicDir: false,
                                 rollupOptions: {
-                                    input: "~/entry-server.tsx",
+                                    input: handlers.server,
                                 },
                                 outDir: "dist/server",
                                 commonjsOptions: {
@@ -214,7 +214,7 @@ export function solidStart(options) {
                 globalThis.START_CLIENT_OUT_DIR = options.dir;
             },
         },
-        devServer(),
+        devServer(handlers.server),
         solid({
             ...start.solid,
             ssr: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/start",
-  "version": "2.0.0-beta.5",
+  "version": "2.0.0-beta.7",
   "type": "module",
   "files": [
     "dist",