@solidjs/start 1.0.0-rc.0 → 1.0.0

package/config/fs-router.js

@@ -24,6 +24,7 @@ export class SolidStartClientFileRouter extends BaseFileSystemRouter {
 
     if (src.endsWith(".md") || src.endsWith(".mdx")) {
       return {
+        page: true,
         $component: {
           src: src,
           pick: ["$css"]
@@ -35,10 +36,11 @@ export class SolidStartClientFileRouter extends BaseFileSystemRouter {
     }
 
     const [_, exports] = analyzeModule(src);
-    const hasDefault = exports.find(e => e.n === "default");
-    const hasRouteConfig = exports.find(e => e.n === "route");
+    const hasDefault = !!exports.find(e => e.n === "default");
+    const hasRouteConfig = !!exports.find(e => e.n === "route");
     if (hasDefault) {
       return {
+        page: true,
         $component: {
           src: src,
           pick: ["default", "$css"]
@@ -93,6 +95,7 @@ export class SolidStartServerFileRouter extends BaseFileSystemRouter {
     let path = this.toPath(src);
     if (src.endsWith(".md") || src.endsWith(".mdx")) {
       return {
+        page: true,
         $component: {
           src: src,
           pick: ["$css"]
@@ -105,16 +108,18 @@ export class SolidStartServerFileRouter extends BaseFileSystemRouter {
 
     const [_, exports] = analyzeModule(src);
     const hasRouteConfig = exports.find(e => e.n === "route");
-    const hasDefault = exports.find(e => e.n === "default");
-    const hasAPIRoutes = exports.find(exp => HTTP_METHODS.includes(exp.n));
+    const hasDefault = !!exports.find(e => e.n === "default");
+    const hasAPIRoutes = !!exports.find(exp => HTTP_METHODS.includes(exp.n));
     if (hasDefault || hasAPIRoutes) {
       return {
-        $component: hasDefault
-          ? {
-              src: src,
-              pick: ["default", "$css"]
-            }
-          : undefined,
+        page: hasDefault,
+        $component:
+          !this.config.dataOnly && hasDefault
+            ? {
+                src: src,
+                pick: ["default", "$css"]
+              }
+            : undefined,
         $$route: hasRouteConfig
           ? {
               src: src,

package/config/index.js

@@ -30,7 +30,8 @@ function solidStartServerFsRouter(config) {
     new SolidStartServerFileRouter(
       {
         dir: resolve.absolute(config.dir, router.root),
-        extensions: config.extensions ?? DEFAULT_EXTENSIONS
+        extensions: config.extensions ?? DEFAULT_EXTENSIONS,
+        dataOnly: config.dataOnly
       },
       router,
       app
@@ -90,7 +91,7 @@ export function defineConfig(baseConfig = {}) {
         },
         handler: `${start.appRoot}/entry-server${entryExtension}`,
         middleware: start.middleware,
-        routes: solidStartServerFsRouter({ dir: routeDir, extensions }),
+        routes: solidStartServerFsRouter({ dir: routeDir, extensions, dataOnly: !start.ssr }),
         extensions,
         target: "server",
         plugins: async () => {
@@ -133,6 +134,9 @@ export function defineConfig(baseConfig = {}) {
               },
               cacheDir: "node_modules/.vinxi/server",
               define: {
+                "import.meta.env.START_APP": JSON.stringify(
+                  `${start.appRoot}/app${entryExtension}`
+                ),
                 "import.meta.env.START_ISLANDS": JSON.stringify(start.experimental.islands),
                 "import.meta.env.SSR": JSON.stringify(true),
                 "import.meta.env.START_SSR": JSON.stringify(start.ssr),
@@ -200,6 +204,9 @@ export function defineConfig(baseConfig = {}) {
               },
               cacheDir: "node_modules/.vinxi/client",
               define: {
+                "import.meta.env.START_APP": JSON.stringify(
+                  `${start.appRoot}/app${entryExtension}`
+                ),
                 "import.meta.env.START_ISLANDS": JSON.stringify(start.experimental.islands),
                 "import.meta.env.SSR": JSON.stringify(false),
                 "import.meta.env.START_SSR": JSON.stringify(start.ssr),
@@ -211,7 +218,6 @@ export function defineConfig(baseConfig = {}) {
           ];
         }
       },
-
       {
         name: "server-fns",
         type: "http",
@@ -221,7 +227,7 @@ export function defineConfig(baseConfig = {}) {
         ),
         middleware: start.middleware,
         target: "server",
-        routes: solidStartServerFsRouter({ dir: routeDir, extensions }),
+        routes: solidStartServerFsRouter({ dir: routeDir, extensions, dataOnly: !start.ssr }),
         plugins: async () => {
           const userConfig =
             typeof vite === "function" ? await vite({ router: "server-function" }) : { ...vite };
@@ -261,6 +267,9 @@ export function defineConfig(baseConfig = {}) {
                 }
               },
               define: {
+                "import.meta.env.START_APP": JSON.stringify(
+                  `${start.appRoot}/app${entryExtension}`
+                ),
                 "import.meta.env.START_ISLANDS": JSON.stringify(start.experimental.islands),
                 "import.meta.env.SSR": JSON.stringify(true),
                 "import.meta.env.START_SSR": JSON.stringify(start.ssr),

package/dist/router/FileRoutes.js

@@ -10,7 +10,7 @@ export function createRoutes() {
                 ...(route.$$route ? route.$$route.require().route.info : {}),
                 filesystem: true
             },
-            component: lazyRoute(route.$component, import.meta.env.START_ISLANDS
+            component: route.$component && lazyRoute(route.$component, import.meta.env.START_ISLANDS
                 ? import.meta.env.MANIFEST["ssr"]
                 : import.meta.env.MANIFEST["client"], import.meta.env.MANIFEST["ssr"]),
             children: route.children ? route.children.map(createRoute) : undefined

package/dist/router/routes.d.ts

@@ -2,6 +2,7 @@ interface Route {
     path: string;
     id: string;
     children?: Route[];
+    page?: boolean;
     $component?: any;
     $GET?: any;
     $POST?: any;

package/dist/router/routes.js

@@ -1,6 +1,6 @@
 import { createRouter } from "radix3";
 import fileRoutes from "vinxi/routes";
-export const pageRoutes = defineRoutes(fileRoutes.filter(o => o.$component));
+export const pageRoutes = defineRoutes(fileRoutes.filter(o => o.page));
 function defineRoutes(fileRoutes) {
     function processRoute(routes, route, id, full) {
         const parentRoute = Object.values(routes).find(o => {
@@ -21,7 +21,7 @@ function defineRoutes(fileRoutes) {
 }
 export function matchAPIRoute(path, method) {
     const match = router.lookup(path);
-    if (match) {
+    if (match && match.route) {
         const handler = match.route[`$${method}`];
         if (handler === undefined)
             return;
@@ -38,7 +38,7 @@ const router = createRouter({
     routes: fileRoutes.reduce((memo, route) => {
         if (!containsHTTP(route))
             return memo;
-        let path = route.path.replace(/\([^)/]+\)/g, "").replace(/\*([^/]*)/g, (_, m) => `**:${m}`);
+        let path = route.path.replace(/\/\([^)/]+\)/g, "").replace(/\([^)/]+\)/g, "").replace(/\*([^/]*)/g, (_, m) => `**:${m}`);
         if (/:[^/]*\?/g.test(path)) {
             throw new Error(`Optional parameters are not supported in API routes: ${path}`);
         }

package/dist/runtime/server-handler.js

@@ -9,11 +9,17 @@ import { eventHandler, setHeader, setResponseStatus } from "vinxi/http";
 import invariant from "vinxi/lib/invariant";
 import { cloneEvent, getFetchEvent, mergeResponseHeaders } from "../server/fetchEvent";
 import { createPageEvent } from "../server/pageEvent";
+import { getExpectedRedirectStatus } from "../server/handler";
 function createChunk(data) {
-    const bytes = data.length;
+    const encodeData = new TextEncoder().encode(data);
+    const bytes = encodeData.length;
     const baseHex = bytes.toString(16);
     const totalHex = "00000000".substring(0, 8 - baseHex.length) + baseHex; // 32-bit
-    return new TextEncoder().encode(`;0x${totalHex};${data}`);
+    const head = new TextEncoder().encode(`;0x${totalHex};`);
+    const chunk = new Uint8Array(12 + bytes);
+    chunk.set(head);
+    chunk.set(encodeData, 12);
+    return chunk;
 }
 function serializeToStream(id, value) {
     return new ReadableStream({
@@ -150,11 +156,13 @@ async function handleServerFunction(h3Event) {
         if (!instance) {
             const isError = result instanceof Error;
             let redirectUrl = new URL(request.headers.get("referer")).toString();
+            let statusCode = 302;
             if (result instanceof Response && result.headers.has("Location")) {
                 redirectUrl = new URL(result.headers.get("Location"), new URL(request.url).origin + import.meta.env.SERVER_BASE_URL).toString();
+                statusCode = getExpectedRedirectStatus(result);
             }
             return new Response(null, {
-                status: 302,
+                status: statusCode,
                 headers: {
                     Location: redirectUrl,
                     ...(result

package/dist/runtime/server-runtime.js

@@ -7,7 +7,7 @@ class SerovalChunkReader {
     done;
     constructor(stream) {
         this.reader = stream.getReader();
-        this.buffer = "";
+        this.buffer = new Uint8Array(0);
         this.done = false;
     }
     async readChunk() {
@@ -15,7 +15,10 @@ class SerovalChunkReader {
         const chunk = await this.reader.read();
         if (!chunk.done) {
             // repopulate the buffer
-            this.buffer += new TextDecoder().decode(chunk.value);
+            let newBuffer = new Uint8Array(this.buffer.length + chunk.value.length);
+            newBuffer.set(this.buffer);
+            newBuffer.set(chunk.value, this.buffer.length);
+            this.buffer = newBuffer;
         }
         else {
             this.done = true;
@@ -23,7 +26,7 @@ class SerovalChunkReader {
     }
     async next() {
         // Check if the buffer is empty
-        if (this.buffer === "") {
+        if (this.buffer.length === 0) {
             // if we are already done...
             if (this.done) {
                 return {
@@ -39,7 +42,8 @@ class SerovalChunkReader {
         // The byte header tells us how big the expected data is
         // so we know how much data we should wait before we
         // deserialize the data
-        const bytes = Number.parseInt(this.buffer.substring(1, 11), 16); // ;0x00000000;
+        const head = new TextDecoder().decode(this.buffer.subarray(1, 11));
+        const bytes = Number.parseInt(head, 16); // ;0x00000000;
         // Check if the buffer has enough bytes to be parsed
         while (bytes > this.buffer.length - 12) {
             // If it's not enough, and the reader is done
@@ -51,9 +55,9 @@ class SerovalChunkReader {
             await this.readChunk();
         }
         // Extract the exact chunk as defined by the byte header
-        const partial = this.buffer.substring(12, 12 + bytes);
+        const partial = new TextDecoder().decode(this.buffer.subarray(12, 12 + bytes));
         // The rest goes to the buffer
-        this.buffer = this.buffer.substring(12 + bytes);
+        this.buffer = this.buffer.subarray(12 + bytes);
         // Deserialize the chunk
         return {
             done: false,
@@ -163,7 +167,7 @@ export function createServerReference(fn, id, name) {
                     const fn = async (...args) => {
                         const encodeArgs = options.method && options.method.toUpperCase() === "GET";
                         return fetchServerFunction(encodeArgs
-                            ? url + (args.length ? `&args=${JSON.stringify(await Promise.resolve(toJSONAsync(args, { plugins })))}` : "")
+                            ? url + (args.length ? `&args=${encodeURIComponent(JSON.stringify(await Promise.resolve(toJSONAsync(args, { plugins }))))}` : "")
                             : `${baseURL}/_server`, `${id}#${name}`, options, encodeArgs ? [] : args);
                     };
                     fn.url = url;

package/dist/server/StartServer.jsx

@@ -26,8 +26,9 @@ export function StartServer(props) {
     const context = getRequestEvent();
     // @ts-ignore
     const nonce = context.nonce;
-    let assets = [];
+    let assets;
     Promise.resolve().then(async () => {
+        let assetPromises = [];
         // @ts-ignore
         if (context.router && context.router.matches) {
             // @ts-ignore
@@ -40,25 +41,25 @@ export function StartServer(props) {
                     const segment = matched[i];
                     const part = import.meta.env.MANIFEST[import.meta.env.START_ISLANDS ? "ssr" : "client"]
                         .inputs[segment["$component"].src];
-                    const asset = (await part.assets());
-                    assets.push.apply(assets, asset);
+                    assetPromises.push(part.assets());
                 }
             }
-            else
+            else if (import.meta.env.DEV)
                 console.warn("No route matched for preloading js assets");
         }
+        assets = await Promise.all(assetPromises).then(a => 
         // dedupe assets
-        assets = [...new Map(assets.map(item => [item.attrs.key, item])).values()].filter(asset => import.meta.env.START_ISLANDS
+        [...new Map(a.flat().map(item => [item.attrs.key, item])).values()].filter(asset => import.meta.env.START_ISLANDS
             ? false
             : asset.attrs.rel === "modulepreload" &&
-                !context.assets.find((a) => a.attrs.key === asset.attrs.key));
+                !context.assets.find((a) => a.attrs.key === asset.attrs.key)));
     });
     useAssets(() => (assets.length ? assets.map(m => renderAsset(m)) : undefined));
     return (<NoHydration>
       {docType}
       <props.document assets={<>
             <HydrationScript />
-            {context.assets.map((m) => renderAsset(m))}
+            {context.assets.map((m) => renderAsset(m, nonce))}
           </>} scripts={nonce ? (<>
               <script nonce={nonce} innerHTML={`window.manifest = ${JSON.stringify(context.manifest)}`}/>
               <script type="module" nonce={nonce} async src={import.meta.env.MANIFEST["client"].inputs[import.meta.env.MANIFEST["client"].handler].output.path}/>

package/dist/server/fetchEvent.js

@@ -1,4 +1,4 @@
-import { appendResponseHeader, getRequestIP, getResponseHeader, getResponseHeaders, getResponseStatus, getResponseStatusText, getWebRequest, removeResponseHeader, setHeader, setResponseHeader, setResponseStatus } from "vinxi/http";
+import { appendResponseHeader, getRequestIP, getResponseHeader, getResponseHeaders, getResponseStatus, getResponseStatusText, getWebRequest, removeResponseHeader, setResponseHeader, setResponseStatus } from "vinxi/http";
 const fetchEventSymbol = Symbol("fetchEvent");
 export function createFetchEvent(event) {
     return {
@@ -23,7 +23,7 @@ export function getFetchEvent(h3Event) {
 }
 export function mergeResponseHeaders(h3Event, headers) {
     for (const [key, value] of headers.entries()) {
-        setHeader(h3Event, key, value);
+        appendResponseHeader(h3Event, key, value);
     }
 }
 class HeaderProxy {

package/dist/server/handler.d.ts

@@ -1,3 +1,8 @@
-import type { FetchEvent, HandlerOptions, PageEvent } from "./types";
+import type { FetchEvent, HandlerOptions, PageEvent, ResponseStub } from "./types";
+/**
+ * Checks if user has set a redirect status in the response.
+ * If not, falls back to the 302 (temporary redirect)
+ */
+export declare function getExpectedRedirectStatus(response: ResponseStub): number;
 export declare function createBaseHandler(fn: (context: PageEvent) => unknown, createPageEvent: (event: FetchEvent) => Promise<PageEvent>, options?: HandlerOptions | ((context: PageEvent) => HandlerOptions | Promise<HandlerOptions>)): import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<any>>;
 export declare function createHandler(fn: (context: PageEvent) => unknown, options?: HandlerOptions | ((context: PageEvent) => HandlerOptions | Promise<HandlerOptions>)): import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<any>>;

package/dist/server/handler.js

@@ -5,6 +5,18 @@ import { eventHandler, sendRedirect, setHeader, setResponseStatus } from "vinxi/
 import { matchAPIRoute } from "../router/routes";
 import { getFetchEvent } from "./fetchEvent";
 import { createPageEvent } from "./pageEvent";
+// according to https://developer.mozilla.org/en-US/docs/Web/HTTP/Status#redirection_messages
+const validRedirectStatuses = new Set([301, 302, 303, 307, 308]);
+/**
+ * Checks if user has set a redirect status in the response.
+ * If not, falls back to the 302 (temporary redirect)
+ */
+export function getExpectedRedirectStatus(response) {
+    if (response.status && validRedirectStatuses.has(response.status)) {
+        return response.status;
+    }
+    return 302;
+}
 export function createBaseHandler(fn, createPageEvent, options = {}) {
     return eventHandler({
         handler: (e) => {
@@ -27,47 +39,48 @@ export function createBaseHandler(fn, createPageEvent, options = {}) {
                 }
                 // render
                 const context = await createPageEvent(event);
-                if (typeof options === "function")
-                    options = await options(context);
-                const mode = options.mode || "stream";
+                const resolvedOptions = typeof options == "function" ? await options(context) : { ...options };
+                const mode = resolvedOptions.mode || "stream";
                 // @ts-ignore
-                if (options.nonce)
-                    context.nonce = options.nonce;
+                if (resolvedOptions.nonce)
+                    context.nonce = resolvedOptions.nonce;
                 if (mode === "sync" || !import.meta.env.START_SSR) {
                     const html = renderToString(() => {
                         sharedConfig.context.event = context;
                         return fn(context);
-                    }, options);
+                    }, resolvedOptions);
+                    context.complete = true;
                     if (context.response && context.response.headers.get("Location")) {
-                        return sendRedirect(e, context.response.headers.get("Location"));
+                        const status = getExpectedRedirectStatus(context.response);
+                        return sendRedirect(e, context.response.headers.get("Location"), status);
                     }
                     return html;
                 }
-                let cloned = { ...options };
-                if (cloned.onCompleteAll) {
-                    const og = cloned.onCompleteAll;
-                    cloned.onCompleteAll = options => {
+                if (resolvedOptions.onCompleteAll) {
+                    const og = resolvedOptions.onCompleteAll;
+                    resolvedOptions.onCompleteAll = options => {
                         handleStreamCompleteRedirect(context)(options);
                         og(options);
                     };
                 }
                 else
-                    cloned.onCompleteAll = handleStreamCompleteRedirect(context);
-                if (cloned.onCompleteShell) {
-                    const og = cloned.onCompleteShell;
-                    cloned.onCompleteShell = options => {
+                    resolvedOptions.onCompleteAll = handleStreamCompleteRedirect(context);
+                if (resolvedOptions.onCompleteShell) {
+                    const og = resolvedOptions.onCompleteShell;
+                    resolvedOptions.onCompleteShell = options => {
                         handleShellCompleteRedirect(context, e)();
                         og(options);
                     };
                 }
                 else
-                    cloned.onCompleteShell = handleShellCompleteRedirect(context, e);
+                    resolvedOptions.onCompleteShell = handleShellCompleteRedirect(context, e);
                 const stream = renderToStream(() => {
                     sharedConfig.context.event = context;
                     return fn(context);
-                }, cloned);
+                }, resolvedOptions);
                 if (context.response && context.response.headers.get("Location")) {
-                    return sendRedirect(e, context.response.headers.get("Location"));
+                    const status = getExpectedRedirectStatus(context.response);
+                    return sendRedirect(e, context.response.headers.get("Location"), status);
                 }
                 if (mode === "async")
                     return stream;
@@ -82,13 +95,15 @@ export function createBaseHandler(fn, createPageEvent, options = {}) {
 function handleShellCompleteRedirect(context, e) {
     return () => {
         if (context.response && context.response.headers.get("Location")) {
-            setResponseStatus(e, 302);
+            const status = getExpectedRedirectStatus(context.response);
+            setResponseStatus(e, status);
             setHeader(e, "Location", context.response.headers.get("Location"));
         }
     };
 }
 function handleStreamCompleteRedirect(context) {
     return ({ write }) => {
+        context.complete = true;
         const to = context.response && context.response.headers.get("Location");
         to && write(`<script>window.location="${to}"</script>`);
     };

package/dist/server/pageEvent.js

@@ -26,6 +26,7 @@ export async function createPageEvent(ctx) {
         manifest: await clientManifest.json(),
         assets: [
             ...(await clientManifest.inputs[clientManifest.handler].assets()),
+            ...(import.meta.env.DEV ? await clientManifest.inputs[import.meta.env.START_APP].assets() : []),
             ...(import.meta.env.START_ISLANDS
                 ? (await serverManifest.inputs[serverManifest.handler].assets()).filter(s => s.attrs.rel !== "modulepreload")
                 : [])
@@ -37,6 +38,7 @@ export async function createPageEvent(ctx) {
         // prevUrl: prevPath || "",
         // mutation: mutation,
         // $type: FETCH_EVENT,
+        complete: false,
         $islands: new Set()
     });
     return pageEvent;

package/dist/server/renderAsset.d.ts

@@ -1,2 +1,2 @@
 import type { Asset } from "./types";
-export declare function renderAsset(asset: Asset): any;
+export declare function renderAsset(asset: Asset, nonce?: string): any;

package/dist/server/renderAsset.jsx

@@ -7,7 +7,7 @@ const assetMap = {
       </script>) : null;
     }
 };
-export function renderAsset(asset) {
+export function renderAsset(asset, nonce) {
     let { tag, attrs: { key, ...attrs } = { key: undefined }, children } = asset;
-    return assetMap[tag]({ attrs, key, children });
+    return assetMap[tag]({ attrs: { ...attrs, nonce }, key, children });
 }

package/dist/server/spa/handler.js

@@ -8,6 +8,7 @@ export async function createPageEvent(ctx) {
         manifest: await clientManifest.json(),
         assets: [...(await clientManifest.inputs[clientManifest.handler].assets())],
         routes: [],
+        complete: false,
         // prevUrl: "",
         // mutation: false,
         // $type: FETCH_EVENT,

package/dist/server/types.d.ts

@@ -60,6 +60,7 @@ export interface PageEvent extends RequestEvent {
     assets: any;
     routes: any[];
     $islands: Set<string>;
+    complete: boolean;
 }
 export interface APIEvent extends FetchEvent {
     params: {

package/dist/shared/HttpHeader.jsx

@@ -9,7 +9,7 @@ export const HttpHeader = isServer
         else
             event.response.headers.set(props.name, props.value);
         onCleanup(() => {
-            if (event.nativeEvent.handled)
+            if (event.nativeEvent.handled || event.complete)
                 return;
             const value = event.response.headers.get(props.name);
             if (!value)

package/dist/shared/HttpStatusCode.jsx

@@ -6,7 +6,7 @@ export const HttpStatusCode = isServer
         const event = getRequestEvent();
         event.response.status = props.code;
         event.response.statusText = props.text;
-        onCleanup(() => !event.nativeEvent.handled && (event.response.status = 200));
+        onCleanup(() => !event.nativeEvent.handled && !event.complete && (event.response.status = 200));
         return null;
     }
     : (_props) => null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/start",
-  "version": "1.0.0-rc.0",
+  "version": "1.0.0",
   "type": "module",
   "author": "Ryan Carniato",
   "license": "MIT",
@@ -51,8 +51,8 @@
     }
   },
   "devDependencies": {
-    "solid-js": "^1.8.16",
-    "vinxi": "^0.3.10",
+    "solid-js": "^1.8.17",
+    "vinxi": "^0.3.11",
     "typescript": "^5.4.2"
   },
   "dependencies": {
@@ -70,7 +70,7 @@
     "source-map-js": "^1.0.2",
     "terracotta": "^1.0.4",
     "vite-plugin-inspect": "^0.7.33",
-    "vite-plugin-solid": "~2.9.1"
+    "vite-plugin-solid": "^2.10.2"
   },
   "scripts": {
     "typecheck": "tsc --noEmit",