@solidjs/start 0.5.3 → 0.5.5

package/config/index.js

@@ -114,8 +114,7 @@ export function defineConfig(baseConfig = {}) {
                 "~": join(process.cwd(), start.appRoot),
                 ...(!start.ssr
                   ? {
-                      "@solidjs/start/server": "@solidjs/start/server/spa",
-                      "@solidjs/start/entry": "@solidjs/start/entry/spa"
+                      "@solidjs/start/server": "@solidjs/start/server/spa"
                     }
                   : {}),
                 ...userConfig.resolve?.alias

package/config/server-handler.ts

@@ -168,7 +168,6 @@ async function handleServerFunction(h3Event) {
         }
       });
     }
-    if (!result || typeof result === "string") return result || null;
     setHeader(h3Event, "content-type", "text/javascript");
     return serializeToStream(instance, result);
   } catch (x) {
@@ -201,29 +200,36 @@ async function handleSingleFlight(sourceEvent: FetchEvent, result: any) {
   return await provideRequestEvent(event, async () => {
     await createPageEvent(event);
     /* @ts-ignore */
-    sharedConfig.context = { event };
-    /* @ts-ignore */
     event.router.dataOnly = revalidate || true;
     /* @ts-ignore */
     event.router.previousUrl = sourceEvent.request.headers.get("referer");
-    renderToStringAsync(App);
+    (async () => {
+      try {
+        await renderToStringAsync(() => {
+          /* @ts-ignore */
+          sharedConfig.context = { event };
+          App();
+        });
+      } catch (e) {
+        console.log(e);
+      }
+    })();
     /* @ts-ignore */
     const body = event.router.data;
-    if (body) {
-      let containsKey = false;
-      for (const key in body) {
-        if (body[key] === undefined) delete body[key];
-        else containsKey = true;
-      }
-      if (!containsKey) return result;
-      if (!(result instanceof Response)) {
-        body["_$value"] = result;
-        result = new Response(null, { status: 200 });
-      }
-      result.customBody = () => body;
-      result.headers.set("X-Single-Flight", "true");
-      return result;
+    if (!body) return result;
+    let containsKey = false;
+    for (const key in body) {
+      if (body[key] === undefined) delete body[key];
+      else containsKey = true;
+    }
+    if (!containsKey) return result;
+    if (!(result instanceof Response)) {
+      body["_$value"] = result;
+      result = new Response(null, { status: 200 });
     }
+    result.customBody = () => body;
+    result.headers.set("X-Single-Flight", "true");
+    return result;
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/start",
-  "version": "0.5.3",
+  "version": "0.5.5",
   "type": "module",
   "author": "Ryan Carniato",
   "publishConfig": {

package/server/islands/index.tsx

@@ -1,4 +1,4 @@
-import { Component, ComponentProps, lazy, sharedConfig } from "solid-js";
+import { type Component, type ComponentProps, lazy, sharedConfig } from "solid-js";
 import { getRequestEvent, Hydration, NoHydration } from "solid-js/web";
 // import { IslandManifest } from "./types";
 import { splitProps } from "./utils";

package/server/pageEvent.ts

@@ -1,6 +1,6 @@
 import {
-    getCookie,
-    setCookie
+  getCookie,
+  setCookie
 } from "vinxi/http";
 import { createRoutes } from "../shared/FileRoutes";
 import { FetchEvent, PageEvent } from "./types";
@@ -22,7 +22,7 @@ function initFromFlash(ctx: FetchEvent) {
 export async function createPageEvent(ctx: FetchEvent) {
   const clientManifest = import.meta.env.MANIFEST["client"];
   const serverManifest = import.meta.env.MANIFEST["ssr"];
-  ctx.response.headers.set("Cache-Control", "no-cache");
+  ctx.response.headers.set("Content-Type", "text/html");
   // const prevPath = ctx.request.headers.get("x-solid-referrer");
   // const mutation = ctx.request.headers.get("x-solid-mutation") === "true";
   const pageEvent: PageEvent = Object.assign(ctx, {

package/shared/dev-overlay/DevOverlayDialog.tsx

@@ -6,7 +6,7 @@ import { Portal } from 'solid-js/web';
 import { Dialog, DialogOverlay, DialogPanel, Select, SelectOption } from 'terracotta';
 import info from '../../package.json';
 import { CodeView } from './CodeView';
-import { StackFrameSource, createStackFrame } from './createStackFrame';
+import { type StackFrameSource, createStackFrame } from './createStackFrame';
 import download from './download';
 import { ArrowLeftIcon, ArrowRightIcon, CameraIcon, DiscordIcon, GithubIcon, RefreshIcon, SolidStartIcon, ViewCompiledIcon, ViewOriginalIcon } from './icons';
 import './styles.css';

package/shared/dev-overlay/createStackFrame.ts

@@ -1,4 +1,4 @@
-import { Accessor, createMemo, createResource } from "solid-js";
+import { type Accessor, createMemo, createResource } from "solid-js";
 import getSourceMap from "./get-source-map";
 
 export interface StackFrameSource {
@@ -53,12 +53,11 @@ export function createStackFrame(
     const { source, content, sourceMap } = current;
 
     
-    if (!isCompiled() && source.line && source.column) {
+    if (!isCompiled() && source.line && source.column && sourceMap) {
       const result = sourceMap.originalPositionFor({
         line: source.line,
         column: source.column,
       });
-      console.log('sourcemap', result);
 
       return {
         ...result,