Merge branch 'main' into fix-onBeforeResponse

Author: atilafassina

.changeset/fifty-flies-yell.md

@@ -0,0 +1,5 @@
+---
+"@solidjs/start": minor
+---
+
+fix text/html missing when ssr is false

.changeset/fresh-eyes-bet.md

@@ -0,0 +1,5 @@
+---
+"@solidjs/vite-plugin-nitro-2": minor
+---
+
+fix edge presets like netlify and cloudflare

.changeset/moody-hands-check.md

@@ -0,0 +1,5 @@
+---
+"@solidjs/start": minor
+---
+
+add `vite preview` support

.changeset/tricky-hounds-relate.md

@@ -0,0 +1,5 @@
+---
+"@solidjs/vite-plugin-nitro-2": minor
+---
+
+needed to avoid weird issues like Cannot resolve "@tailwindcss/oxide-android-arm64/package.json"

.vscode/settings.json

@@ -1,6 +1,8 @@
 {
   "editor.codeActionsOnSave": {
-    "source.organizeImports": "explicit"
+    // "source.organizeImports": "explicit"
   },
-  "typescript.tsdk": "node_modules/typescript/lib"
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "editor.formatOnSave": true,
+  "editor.defaultFormatter": "oxc.oxc-vscode"
 }

package.json

@@ -31,7 +31,7 @@
   "devDependencies": {
     "@changesets/cli": "^2.29.8",
     "citty": "^0.1.5",
-    "oxfmt": "^0.14.0",
+    "oxfmt": "^0.28.0",
     "tinyglobby": "^0.2.2",
     "tippy.js": "^6.3.7",
     "typescript": "^5.7.0"

packages/start-nitro-v2-vite-plugin/src/index.ts

@@ -84,13 +84,21 @@ export function nitroV2Plugin(nitroConfig?: UserNitroConfig): PluginOption {
                 },
                 ...nitroConfig,
                 dev: false,
+                routeRules: {
+                  "/_build/assets/**": {
+                    headers: {
+                      "cache-control": "public, immutable, max-age=31536000",
+                    },
+                  },
+                },
                 publicAssets: [
                   {
                     dir: client.config.build.outDir,
                     maxAge: 31536000, // 1 year
                     baseURL: "/",
                   },
                 ],
+                noExternals: false,
                 renderer: virtualEntry,
                 rollupConfig: {
                   ...nitroConfig?.rollupConfig,
@@ -116,14 +124,19 @@ export function nitroV2Plugin(nitroConfig?: UserNitroConfig): PluginOption {
         };
       },
     },
-    nitroConfig?.preset === "netlify" && {
-      name: "solid-start-nitro-netlify-fix",
+    {
+      name: "solid-start-nitro-edge-fix",
       enforce: "post",
-      config() {
+      async config() {
+        await fsp.rm(".solid-start", { recursive: true, force: true });
         return {
           environments: {
             client: { build: { outDir: ".solid-start/client" } },
-            ssr: { build: { outDir: ".solid-start/server" } },
+            ssr: {
+              build: nitroConfig?.preset?.toLowerCase().includes("static")
+                ? undefined
+                : { outDir: ".solid-start/server" },
+            },
           },
         };
       },

packages/start/src/config/dev-server.ts

@@ -11,6 +11,18 @@ export function devServer(): Array<PluginOption> {
   return [
     {
       name: "solid-start-dev-server",
+      configurePreviewServer(server) {
+        return () => {
+          server.middlewares.use(async (req, res) => {
+            res.setHeader("content-encoding", "identity");
+            const webReq = new NodeRequest({ req, res });
+            const def: {
+              default: { fetch: (req: Request) => Promise<Response> };
+            } = await import(process.cwd() + "/dist/server/entry-server.js");
+            sendNodeResponse(res, await def.default.fetch(webReq));
+          });
+        };
+      },
       configureServer(viteDevServer) {
         (globalThis as any).VITE_DEV_SERVER = viteDevServer;
         return async () => {

packages/start/src/server/handler.ts

@@ -79,6 +79,8 @@ export function createBaseHandler(
           return redirect(context.response.headers.get("Location")!, status);
         }
 
+        event.response.headers.set("content-type", "text/html");
+
         return html;
       }