@solidjs/start 1.2.0 → 2.0.0-alpha.0

package/config/index.js

@@ -1,304 +0,0 @@
-import { createTanStackServerFnPlugin } from "@tanstack/server-functions-plugin";
-import defu from "defu";
-import { existsSync } from "node:fs";
-import { join } from "node:path";
-import { fileURLToPath } from "node:url";
-import { createApp, resolve } from "vinxi";
-import { normalize } from "vinxi/lib/path";
-import { config } from "vinxi/plugins/config";
-import solid from "vite-plugin-solid";
-import { SolidStartClientFileRouter, SolidStartServerFileRouter } from "./fs-router.js";
-import { serverComponents } from "./server-components.js";
-
-const DEFAULT_EXTENSIONS = ["js", "jsx", "ts", "tsx"];
-
-function solidStartClientFsRouter(config) {
-  return (router, app) =>
-    new SolidStartClientFileRouter(
-      {
-        dir: resolve.absolute(config.dir, router.root),
-        extensions: config.extensions ?? DEFAULT_EXTENSIONS
-      },
-      router,
-      app
-    );
-}
-
-function solidStartServerFsRouter(config) {
-  return (router, app) =>
-    new SolidStartServerFileRouter(
-      {
-        dir: resolve.absolute(config.dir, router.root),
-        extensions: config.extensions ?? DEFAULT_EXTENSIONS,
-        dataOnly: config.dataOnly
-      },
-      router,
-      app
-    );
-}
-
-const SolidStartServerFnsPlugin = createTanStackServerFnPlugin({
-  // This is the ID that will be available to look up and import
-  // our server function manifest and resolve its module
-  manifestVirtualImportId: "solidstart:server-fn-manifest",
-  client: {
-    getRuntimeCode: () =>
-      `import { createServerReference } from "${normalize(
-        fileURLToPath(new URL("../dist/runtime/server-runtime.js", import.meta.url))
-      )}"`,
-    replacer: opts =>
-      `createServerReference(${() => {}}, '${opts.functionId}', '${opts.extractedFilename}')`
-  },
-  ssr: {
-    getRuntimeCode: () =>
-      `import { createServerReference } from '${normalize(
-        fileURLToPath(new URL("../dist/runtime/server-fns-runtime.js", import.meta.url))
-      )}'`,
-    replacer: opts =>
-      `createServerReference(${opts.fn}, '${opts.functionId}', '${opts.extractedFilename}')`
-  },
-  server: {
-    getRuntimeCode: () =>
-      `import { createServerReference } from '${normalize(
-        fileURLToPath(new URL("../dist/runtime/server-fns-runtime.js", import.meta.url))
-      )}'`,
-    replacer: opts =>
-      `createServerReference(${opts.fn}, '${opts.functionId}', '${opts.extractedFilename}')`
-  }
-});
-
-export function defineConfig(baseConfig = {}) {
-  let { vite = {}, ...start } = baseConfig;
-  const extensions = [...DEFAULT_EXTENSIONS, ...(start.extensions || [])];
-  start = defu(start, {
-    publicDir: "./public",
-    appRoot: "./src",
-    routeDir: "./routes",
-    ssr: true,
-    devOverlay: true,
-    experimental: {
-      islands: false
-    },
-    solid: {},
-    server: {
-      routeRules: {
-        "/_build/assets/**": { headers: { "cache-control": "public, immutable, max-age=31536000" } }
-      },
-      experimental: {
-        asyncContext: true
-      }
-    }
-  });
-  const routeDir = join(start.appRoot, start.routeDir);
-  let server = start.server;
-  if (!start.ssr) {
-    server = { ...server, prerender: { routes: ["/"] } };
-  }
-  let entryExtension = ".tsx";
-  if (existsSync(join(process.cwd(), start.appRoot, "app.jsx"))) {
-    entryExtension = ".jsx";
-  }
-
-  return createApp({
-    server: {
-      compressPublicAssets: {
-        brotli: process.versions.bun ? false : true
-      },
-      ...server
-    },
-    routers: [
-      {
-        name: "public",
-        type: "static",
-        base: "/",
-        dir: start.publicDir
-      },
-      {
-        name: "ssr",
-        type: "http",
-        link: {
-          client: start.experimental.islands ? undefined : "client"
-        },
-        handler: `${start.appRoot}/entry-server${entryExtension}`,
-        middleware: start.middleware,
-        routes: solidStartServerFsRouter({ dir: routeDir, extensions, dataOnly: !start.ssr }),
-        extensions,
-        target: "server",
-        plugins: async () => {
-          const userConfig =
-            typeof vite === "function" ? await vite({ router: "server" }) : { ...vite };
-          const plugins = userConfig.plugins || [];
-          delete userConfig.plugins;
-          return [
-            config("user", {
-              ...userConfig,
-              optimizeDeps: {
-                ...(userConfig.optimizeDeps || {}),
-                include: [
-                  ...(userConfig.optimizeDeps?.include || []),
-                  "@solidjs/start > source-map-js",
-                  "@solidjs/start > error-stack-parser"
-                ]
-              }
-            }),
-            ...plugins,
-            SolidStartServerFnsPlugin.ssr,
-            start.experimental.islands ? serverComponents.server() : null,
-            solid({ ...start.solid, ssr: true, extensions: extensions.map(ext => `.${ext}`) }),
-            config("app-server", {
-              resolve: {
-                alias: {
-                  "#start/app": join(process.cwd(), start.appRoot, `app${entryExtension}`),
-                  "~": join(process.cwd(), start.appRoot),
-                  ...(!start.ssr
-                    ? {
-                        "@solidjs/start/server": "@solidjs/start/server/spa"
-                      }
-                    : {}),
-                  ...userConfig.resolve?.alias
-                }
-              },
-              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),
-                "import.meta.env.START_DEV_OVERLAY": JSON.stringify(start.devOverlay),
-                ...userConfig.define
-              }
-            })
-          ];
-        }
-      },
-      {
-        name: "client",
-        type: "client",
-        base: "/_build",
-        handler: `${start.appRoot}/entry-client${entryExtension}`,
-        ...(start.experimental.islands
-          ? {}
-          : {
-              routes: solidStartClientFsRouter({ dir: routeDir, extensions })
-            }),
-        extensions,
-        target: "browser",
-        plugins: async () => {
-          const userConfig =
-            typeof vite === "function" ? await vite({ router: "client" }) : { ...vite };
-          const plugins = userConfig.plugins || [];
-          delete userConfig.plugins;
-          return [
-            config("user", {
-              ...userConfig,
-              optimizeDeps: {
-                ...(userConfig.optimizeDeps || {}),
-                include: [
-                  ...(userConfig.optimizeDeps?.include || []),
-                  "@solidjs/start > source-map-js",
-                  "@solidjs/start > error-stack-parser"
-                ]
-              }
-            }),
-            ...plugins,
-            SolidStartServerFnsPlugin.client,
-            start.experimental.islands ? serverComponents.client() : null,
-            solid({ ...start.solid, ssr: start.ssr, extensions: extensions.map(ext => `.${ext}`) }),
-            config("app-client", {
-              resolve: {
-                alias: {
-                  "#start/app": join(process.cwd(), start.appRoot, `app${entryExtension}`),
-                  "~": join(process.cwd(), start.appRoot),
-                  ...(start.experimental.islands
-                    ? {
-                        "@solidjs/start/client": "@solidjs/start/client/islands"
-                      }
-                    : {}),
-                  ...(!start.ssr
-                    ? {
-                        "@solidjs/start/client": "@solidjs/start/client/spa"
-                      }
-                    : {}),
-                  ...userConfig.resolve?.alias
-                }
-              },
-              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),
-                "import.meta.env.START_DEV_OVERLAY": JSON.stringify(start.devOverlay),
-                "import.meta.env.SERVER_BASE_URL": JSON.stringify(server?.baseURL ?? ""),
-                ...userConfig.define
-              }
-            })
-          ];
-        }
-      },
-      {
-        name: "server-fns",
-        type: "http",
-        base: "/_server",
-        handler: normalize(
-          fileURLToPath(new URL("../dist/runtime/server-handler.js", import.meta.url))
-        ),
-        middleware: start.middleware,
-        target: "server",
-        routes: solidStartServerFsRouter({ dir: routeDir, extensions, dataOnly: !start.ssr }),
-        plugins: async () => {
-          const userConfig =
-            typeof vite === "function" ? await vite({ router: "server-function" }) : { ...vite };
-          const plugins = userConfig.plugins || [];
-          delete userConfig.plugins;
-          return [
-            config("user", {
-              ...userConfig,
-              optimizeDeps: {
-                ...(userConfig.optimizeDeps || {}),
-                include: [
-                  ...(userConfig.optimizeDeps?.include || []),
-                  "@solidjs/start > source-map-js",
-                  "@solidjs/start > error-stack-parser"
-                ]
-              },
-              cacheDir: "node_modules/.vinxi/server-fns"
-            }),
-            ...plugins,
-            SolidStartServerFnsPlugin.server,
-            start.experimental.islands ? serverComponents.server() : null,
-            solid({ ...start.solid, ssr: true, extensions: extensions.map(ext => `.${ext}`) }),
-            config("app-server", {
-              resolve: {
-                alias: {
-                  "#start/app": join(process.cwd(), start.appRoot, `app${entryExtension}`),
-                  "~": join(process.cwd(), start.appRoot),
-                  ...(!start.ssr
-                    ? {
-                        "@solidjs/start/server": "@solidjs/start/server/spa"
-                      }
-                    : {}),
-                  ...userConfig.resolve?.alias
-                }
-              },
-              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),
-                "import.meta.env.START_DEV_OVERLAY": JSON.stringify(start.devOverlay),
-                ...userConfig.define
-              }
-            })
-          ];
-        }
-      }
-    ]
-  });
-}

package/config/server-components.js

@@ -1,106 +0,0 @@
-import {
-  decorateExportsPlugin,
-  directives,
-  shimExportsPlugin,
-  wrapExportsPlugin
-} from "@vinxi/plugin-directives";
-import { client as clientComponents } from "@vinxi/server-components/client";
-import { SERVER_REFERENCES_MANIFEST } from "@vinxi/server-components/constants";
-import { buildServerComponents } from "@vinxi/server-components/server";
-import { fileURLToPath } from "node:url";
-import { chunkify } from "vinxi/lib/chunks";
-import { normalize } from "vinxi/lib/path";
-
-function client() {
-  return clientComponents({
-    server: "ssr",
-    transpileDeps: [],
-    manifest: SERVER_REFERENCES_MANIFEST
-  });
-}
-
-function server() {
-  const runtime = normalize(fileURLToPath(new URL("../dist/runtime/server-runtime.js", import.meta.url)));
-  // export function serverComponents({
-  // 	resolve = {
-  // 		conditions: ["react-server"],
-  // 	},
-  // 	runtime = "@vinxi/react-server-dom-vite/runtime",
-  // 	transpileDeps = ["react", "react-dom", "@vinxi/react-server-dom-vite"],
-  // 	manifest = SERVER_REFERENCES_MANIFEST,
-  // 	transforms = undefined,
-  // } = {}) {
-  const serverModules = new Set();
-  const clientModules = new Set();
-
-  function onReference(type, reference) {
-    if (type === "server") {
-      serverModules.add(reference);
-    } else {
-      clientModules.add(reference);
-    }
-  }
-
-  return [
-    directives({
-      hash: chunkify,
-      runtime,
-      onReference: onReference,
-      transforms: [
-        shimExportsPlugin({
-          runtime: {
-            module: runtime,
-            function: "createServerReference"
-          },
-          onModuleFound: mod => onReference("server", mod),
-          hash: chunkify,
-          apply: (code, id, options) => {
-            return !options.ssr;
-          },
-          pragma: "use server"
-        }),
-        decorateExportsPlugin({
-          runtime: {
-            module: runtime,
-            function: "createServerReference"
-          },
-          onModuleFound: mod => onReference("server", mod),
-          hash: chunkify,
-          apply: (code, id, options) => {
-            return options.ssr;
-          },
-          pragma: "use server"
-        }),
-        wrapExportsPlugin({
-          runtime: {
-            module: runtime,
-            function: "createClientReference"
-          },
-          onModuleFound: mod => onReference("client", mod),
-          hash: chunkify,
-          apply: (code, id, options) => {
-            return options.ssr;
-          },
-          pragma: "use client"
-        })
-      ]
-    }),
-    buildServerComponents({
-      resolve: {
-        conditions: ["solid"]
-      },
-      transpileDeps: [],
-      manifest: SERVER_REFERENCES_MANIFEST,
-      modules: {
-        server: serverModules,
-        client: clientModules
-      }
-    })
-  ];
-  // }
-}
-
-export const serverComponents = {
-  client,
-  server
-};

package/dist/client/islands.d.ts

@@ -1,7 +0,0 @@
-import "vinxi/client";
-/**
- *
- * Read more: https://docs.solidjs.com/solid-start/reference/client/start-client
- */
-export declare function StartClient(): null;
-export { mount } from "./mount";

package/dist/client/islands.jsx

@@ -1,10 +0,0 @@
-// @refresh skip
-import "vinxi/client";
-/**
- *
- * Read more: https://docs.solidjs.com/solid-start/reference/client/start-client
- */
-export function StartClient() {
-    return null;
-}
-export { mount } from "./mount";

package/dist/middleware/index.jsx

@@ -1,35 +0,0 @@
-// @refresh skip
-import { defineMiddleware, sendWebResponse } from "vinxi/http";
-import { getFetchEvent } from "../server/fetchEvent";
-function wrapRequestMiddleware(onRequest) {
-    return async (h3Event) => {
-        const fetchEvent = getFetchEvent(h3Event);
-        const response = await onRequest(fetchEvent);
-        if (response) {
-            await sendWebResponse(h3Event, response);
-        }
-    };
-}
-function wrapResponseMiddleware(onBeforeResponse) {
-    return async (h3Event, response) => {
-        const fetchEvent = getFetchEvent(h3Event);
-        const mwResponse = await onBeforeResponse(fetchEvent, response);
-        if (mwResponse) {
-            await sendWebResponse(h3Event, mwResponse);
-        }
-    };
-}
-export function createMiddleware({ onRequest, onBeforeResponse }) {
-    return defineMiddleware({
-        onRequest: typeof onRequest === "function"
-            ? wrapRequestMiddleware(onRequest)
-            : Array.isArray(onRequest)
-                ? onRequest.map(wrapRequestMiddleware)
-                : undefined,
-        onBeforeResponse: typeof onBeforeResponse === "function"
-            ? wrapResponseMiddleware(onBeforeResponse)
-            : Array.isArray(onBeforeResponse)
-                ? onBeforeResponse.map(wrapResponseMiddleware)
-                : undefined
-    });
-}

package/dist/router/index.d.ts

@@ -1 +0,0 @@
-export { FileRoutes } from "./FileRoutes";

package/dist/router/index.jsx

@@ -1,2 +0,0 @@
-/* @refresh skip */
-export { FileRoutes } from "./FileRoutes";

package/dist/router/lazyRoute.d.ts

@@ -1,6 +0,0 @@
-import { type Component } from "solid-js";
-export default function lazyRoute<T extends Record<string, any>>(component: any, clientManifest: any, serverManifest: any, exported?: string): Component<T> & {
-    preload: () => Promise<{
-        default: Component<T>;
-    }>;
-};

package/dist/router/lazyRoute.js

@@ -1,53 +0,0 @@
-/// <reference types="vinxi/types/client" />
-import { createComponent, lazy, onCleanup } from "solid-js";
-import { appendStyles, cleanupStyles, preloadStyles, updateStyles } from "vinxi/css";
-import { renderAsset } from "../server/renderAsset";
-export default function lazyRoute(component, clientManifest, serverManifest, exported = "default") {
-    return lazy(async () => {
-        if (import.meta.env.DEV) {
-            let manifest = import.meta.env.SSR ? serverManifest : clientManifest;
-            // import() throws if a module doesn't exist, which includes any
-            // modules loaded by the route itself, so it's important we catch here
-            const mod = await manifest.inputs[component.src].import().catch(() => null);
-            // fallback to an empty component as any errors will surface in the vite overlay
-            if (!mod)
-                return { default: () => [] };
-            if (!mod[exported])
-                console.error(`Module ${component.src} does not export ${exported}`);
-            const Component = mod[exported];
-            let assets = await clientManifest.inputs?.[component.src]?.assets();
-            const styles = assets.filter((asset) => asset.tag === "style");
-            if (typeof window !== "undefined" && import.meta.hot) {
-                import.meta.hot.on("css-update", data => {
-                    updateStyles(styles, data);
-                });
-            }
-            const Comp = props => {
-                if (typeof window !== "undefined") {
-                    appendStyles(styles);
-                }
-                onCleanup(() => {
-                    if (typeof window !== "undefined") {
-                        // remove style tags added by vite when a CSS file is imported
-                        cleanupStyles(styles);
-                    }
-                });
-                return [...assets.map((asset) => renderAsset(asset)), createComponent(Component, props)];
-            };
-            return { default: Comp };
-        }
-        else {
-            const mod = await component.import();
-            const Component = mod[exported];
-            let assets = await clientManifest.inputs?.[component.src].assets();
-            const styles = assets.filter((asset) => asset.tag === "style" || asset.attrs.rel === "stylesheet");
-            if (typeof window !== "undefined") {
-                preloadStyles(styles);
-            }
-            const Comp = props => {
-                return [...styles.map((asset) => renderAsset(asset)), createComponent(Component, props)];
-            };
-            return { default: Comp };
-        }
-    });
-}

package/dist/runtime/server-handler.d.ts

@@ -1,2 +0,0 @@
-declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<unknown>>;
-export default _default;

package/dist/runtime/server-runtime.d.ts

@@ -1,3 +0,0 @@
-import { type Component } from "solid-js";
-export declare function createServerReference(fn: Function, id: string, name: string): Function;
-export declare function createClientReference(Component: Component<any>, id: string, name: string): Component<any>;

package/dist/server/islands/index.d.ts

@@ -1,19 +0,0 @@
-import { type Component } from "solid-js";
-declare module "solid-js" {
-    namespace JSX {
-        interface IntrinsicElements {
-            "solid-island": {
-                "data-props": string;
-                "data-id": string;
-                "data-when": "idle" | "load";
-                children: JSX.Element;
-            };
-            "solid-children": {
-                children: JSX.Element;
-            };
-        }
-    }
-}
-export declare function createIslandReference<T extends Component<any>>(Comp: T | (() => Promise<{
-    default: T;
-}>), id: string, name: string): T;

package/dist/server/islands/index.jsx

@@ -1,62 +0,0 @@
-// @refresh skip
-import { lazy, sharedConfig } from "solid-js";
-import { Hydration, NoHydration, getRequestEvent } from "solid-js/web";
-// import { IslandManifest } from "./types";
-import { splitProps } from "./utils";
-export function createIslandReference(Comp, id, name) {
-    let Component = Comp;
-    if (!import.meta.env.START_ISLANDS) {
-        // TODO: have some sane semantics for islands used in non-island mode
-        return lazy(Comp);
-    }
-    function IslandComponent(props) {
-        return (<Component {...props}>
-        <NoHydration>{props.children}</NoHydration>
-      </Component>);
-    }
-    return ((compProps) => {
-        if (import.meta.env.SSR) {
-            const context = getRequestEvent();
-            const [, props] = splitProps(compProps, ["children"]);
-            const [, spreadProps] = splitProps(compProps, []);
-            let fpath;
-            let styles = [];
-            // if (import.meta.env.PROD) {
-            //   let x = context.env.manifest?.[path] as IslandManifest;
-            //   context.$islands.add(path);
-            //   if (x) {
-            //     fpath = x.script.href;
-            //     styles = x.assets.filter(v => v.type == "style").map(v => v.href);
-            //   }
-            // } else {
-            fpath = id + "#" + name;
-            // }
-            const serialize = (props) => {
-                let offset = 0;
-                let el = JSON.stringify(props, (key, value) => {
-                    if (value && value.t) {
-                        offset++;
-                        return undefined;
-                    }
-                    return value;
-                });
-                return {
-                    "data-props": el,
-                    "data-offset": offset
-                };
-            };
-            // @ts-expect-error
-            if (!sharedConfig.context?.noHydrate) {
-                return <Component {...compProps}/>;
-            }
-            return (<Hydration>
-          <solid-island data-id={fpath} data-when={props["client:idle"] ? "idle" : "load"} data-css={JSON.stringify(styles)} {...serialize(props)}>
-            <IslandComponent {...spreadProps}/>
-          </solid-island>
-        </Hydration>);
-        }
-        else {
-            return <Component {...compProps}/>;
-        }
-    });
-}

package/dist/server/islands/utils.d.ts

@@ -1 +0,0 @@
-export declare function splitProps<T>(props: T, ...keys: (keyof T)[]): [T, T];