@solidjs/start 1.0.0-rc.1 → 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,7 +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_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),
@@ -201,7 +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_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),
@@ -213,7 +218,6 @@ export function defineConfig(baseConfig = {}) {
           ];
         }
       },
-
       {
         name: "server-fns",
         type: "http",
@@ -223,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 };
@@ -263,7 +267,9 @@ export function defineConfig(baseConfig = {}) {
                 }
               },
               define: {
-                "import.meta.env.START_APP": JSON.stringify(`${start.appRoot}/app${entryExtension}`),
+                "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;

package/dist/runtime/server-handler.js

@@ -9,6 +9,7 @@ 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 encodeData = new TextEncoder().encode(data);
     const bytes = encodeData.length;
@@ -155,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/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,18 +41,18 @@ 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>

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) => {
@@ -39,7 +51,8 @@ export function createBaseHandler(fn, createPageEvent, 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;
                 }
@@ -66,7 +79,8 @@ export function createBaseHandler(fn, createPageEvent, options = {}) {
                     return fn(context);
                 }, 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;
@@ -81,7 +95,8 @@ 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"));
         }
     };

package/dist/shared/dev-overlay/get-source-map.d.ts

@@ -1,3 +1,2 @@
-/// <reference types=".pnpm/source-map-js@1.2.0/node_modules/source-map-js" />
 import { SourceMapConsumer } from 'source-map-js';
 export default function getSourceMap(url: string, content: string): Promise<SourceMapConsumer | null>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/start",
-  "version": "1.0.0-rc.1",
+  "version": "1.0.0",
   "type": "module",
   "author": "Ryan Carniato",
   "license": "MIT",