Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add docs reference #1509

Merged
merged 2 commits into from
May 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions packages/start/config/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import type { Options } from "vite-plugin-solid";
// atleast until we sort which server options are good to use
type ViteCustomizableConfig = CustomizableConfig & {
server?: InlineConfig["server"];
}
};

type SolidStartInlineConfig = {
ssr?: boolean;
Expand All @@ -16,13 +16,19 @@ type SolidStartInlineConfig = {
appRoot?: string;
routeDir?: string;
middleware?: string;
devOverlay?: boolean;
devOverlay?: boolean;
experimental?: {
islands?: boolean;
}
};
vite?:
| ViteCustomizableConfig
| ((options: { router: "server" | "client" | "server-function" }) => ViteCustomizableConfig);
};

export declare function defineConfig(baseConfig?: SolidStartInlineConfig): ReturnType<typeof createApp>;
/**
*
* Read more: https://docs.solidjs.com/solid-start/reference/entrypoints/app-config
*/
export declare function defineConfig(
baseConfig?: SolidStartInlineConfig
): ReturnType<typeof createApp>;
4 changes: 4 additions & 0 deletions packages/start/src/client/StartClient.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ function Dummy(props: { children: JSX.Element }) {
return props.children;
}

/**
*
* Read more: https://docs.solidjs.com/solid-start/reference/client/start-client
*/
export function StartClient() {
return (
<Dummy>
Expand Down
5 changes: 5 additions & 0 deletions packages/start/src/client/islands.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
// @refresh skip
import "vinxi/client";

/**
*
* Read more: https://docs.solidjs.com/solid-start/reference/client/start-client
*/
export function StartClient() {
return null;
}
Expand Down
21 changes: 18 additions & 3 deletions packages/start/src/client/mount.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
import type { JSX } from "solid-js";
import { createStore } from "solid-js/store";
import { createComponent, getHydrationKey, getOwner, hydrate, type MountableElement } from "solid-js/web";
import {
createComponent,
getHydrationKey,
getOwner,
hydrate,
type MountableElement
} from "solid-js/web";

/**
*
* Read more: https://docs.solidjs.com/solid-start/reference/client/mount
*/
export function mount(fn: () => JSX.Element, el: MountableElement) {
if (import.meta.env.START_ISLANDS) {
const map = new WeakMap();
Expand All @@ -20,7 +30,8 @@ export function mount(fn: () => JSX.Element, el: MountableElement) {

let mod = await import(
/* @vite-ignore */
import.meta.env.MANIFEST["client"]!.chunks[el.dataset.id!.split("#")[0] as string]!.output.path
import.meta.env.MANIFEST["client"]!.chunks[el.dataset.id!.split("#")[0] as string]!.output
.path
);
if (!mod || !el.dataset.hk) return;

Expand Down Expand Up @@ -69,7 +80,11 @@ export function mount(fn: () => JSX.Element, el: MountableElement) {
Promise.all(
[...assets].map(
asset =>
import(/* @vite-ignore */import.meta.env.MANIFEST["client"]!.chunks[asset.split("#")[0] as string]!.output.path)
import(
/* @vite-ignore */ import.meta.env.MANIFEST["client"]!.chunks[
asset.split("#")[0] as string
]!.output.path
)
)
)
.then(() => {
Expand Down
21 changes: 14 additions & 7 deletions packages/start/src/router/FileRoutes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,15 @@ export function createRoutes() {
...(route.$$route ? route.$$route.require().route.info : {}),
filesystem: true
},
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"]
),
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
};
}
Expand All @@ -29,6 +31,11 @@ export function createRoutes() {
}

let routes: any[];

/**
*
* Read more: https://docs.solidjs.com/solid-start/reference/routing/file-routes
*/
export const FileRoutes = isServer
? () => (getRequestEvent() as PageEvent).routes
: () => routes || (routes = createRoutes());
6 changes: 5 additions & 1 deletion packages/start/src/server/StartServer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,16 @@ function matchRoute(matches: any[], routes: any[], matched = []): any[] | undefi
}
}

/**
*
* Read more: https://docs.solidjs.com/solid-start/reference/server/start-server
*/
export function StartServer(props: { document: Component<DocumentComponentProps> }) {
const context = getRequestEvent() as PageEvent;
// @ts-ignore
const nonce = context.nonce;

let assets: Asset[] = [];
let assets: Asset[] = [];
Promise.resolve().then(async () => {
let assetPromises: Promise<Asset[]>[] = [];
// @ts-ignore
Expand Down
4 changes: 4 additions & 0 deletions packages/start/src/server/handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,10 @@ function handleStreamCompleteRedirect(context: PageEvent) {
};
}

/**
*
* Read more: https://docs.solidjs.com/solid-start/reference/server/create-handler
*/
export function createHandler(
fn: (context: PageEvent) => unknown,
options?: HandlerOptions | ((context: PageEvent) => HandlerOptions | Promise<HandlerOptions>)
Expand Down
4 changes: 4 additions & 0 deletions packages/start/src/server/serverFunction.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import { getRequestEvent } from "solid-js/web";
import type { ServerFunctionMeta } from "./types";

/**
*
* Read more: https://docs.solidjs.com/solid-start/reference/server/get-server-function-meta
*/
export function getServerFunctionMeta(): ServerFunctionMeta | undefined {
return getRequestEvent()?.locals.serverFunctionMeta;
}
4 changes: 4 additions & 0 deletions packages/start/src/server/spa/StartServer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ import type { DocumentComponentProps, PageEvent } from "../types";

const docType = ssr("<!DOCTYPE html>");

/**
*
* Read more: https://docs.solidjs.com/solid-start/reference/server/start-server
*/
export function StartServer(props: { document: Component<DocumentComponentProps> }) {
const context = getRequestEvent() as PageEvent;
// @ts-ignore
Expand Down
4 changes: 4 additions & 0 deletions packages/start/src/server/spa/handler.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import { createBaseHandler } from "../handler";
import { FetchEvent, HandlerOptions, PageEvent } from "../types";

/**
*
* Read more: https://docs.solidjs.com/solid-start/reference/server/create-handler
*/
export function createHandler(
fn: (context: PageEvent) => unknown,
options?: HandlerOptions | ((context: PageEvent) => HandlerOptions)
Expand Down
6 changes: 5 additions & 1 deletion packages/start/src/shared/GET.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
/**
*
* Read more: https://docs.solidjs.com/solid-start/reference/server/get
*/
export function GET<T extends (...args: any[]) => any>(fn: T) {
return (...args: Parameters<T>) => {
return (fn as any).GET(...args) as ReturnType<T>;
};
}
}
42 changes: 23 additions & 19 deletions packages/start/src/shared/HttpHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,31 @@ export interface HttpHeaderProps {
append?: boolean;
}

/**
*
* Read more: https://docs.solidjs.com/solid-start/reference/server/http-header
*/
export const HttpHeader = isServer
? (props: HttpHeaderProps) => {
const event = getRequestEvent() as PageEvent;
const event = getRequestEvent() as PageEvent;

if (props.append) event.response.headers.append(props.name, props.value);
else event.response.headers.set(props.name, props.value);
if (props.append) event.response.headers.append(props.name, props.value);
else event.response.headers.set(props.name, props.value);

onCleanup(() => {
if (event.nativeEvent.handled || event.complete) return;
const value = event.response.headers.get(props.name);
if (!value) return;
if (!value.includes(", ")) {
if (value === props.value) event.response.headers.delete(props.name);
return;
}
const values = value.split(", ");
const index = values.indexOf(props.value);
index !== -1 && values.splice(index, 1);
if (values.length) event.response.headers.set(props.name, values.join(","));
else event.response.headers.delete(props.name);
});
return null;
}
onCleanup(() => {
if (event.nativeEvent.handled || event.complete) return;
const value = event.response.headers.get(props.name);
if (!value) return;
if (!value.includes(", ")) {
if (value === props.value) event.response.headers.delete(props.name);
return;
}
const values = value.split(", ");
const index = values.indexOf(props.value);
index !== -1 && values.splice(index, 1);
if (values.length) event.response.headers.set(props.name, values.join(","));
else event.response.headers.delete(props.name);
});
return null;
}
: (_props: HttpHeaderProps) => null;
18 changes: 12 additions & 6 deletions packages/start/src/shared/HttpStatusCode.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,18 @@ export interface HttpStatusCodeProps {
text?: string;
}

/**
*
* Read more: https://docs.solidjs.com/solid-start/reference/server/http-status-code
*/
export const HttpStatusCode = isServer
? (props: HttpStatusCodeProps) => {
const event = getRequestEvent() as PageEvent;
event.response.status = props.code;
event.response.statusText = props.text;
onCleanup(() => !event.nativeEvent.handled && !event.complete && (event.response.status = 200));
return null;
}
const event = getRequestEvent() as PageEvent;
event.response.status = props.code;
event.response.statusText = props.text;
onCleanup(
() => !event.nativeEvent.handled && !event.complete && (event.response.status = 200)
);
return null;
}
: (_props: HttpStatusCodeProps) => null;
4 changes: 4 additions & 0 deletions packages/start/src/shared/clientOnly.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ import type { Component, ComponentProps, JSX } from "solid-js";
import { createMemo, createSignal, onMount, sharedConfig, splitProps, untrack } from "solid-js";
import { isServer } from "solid-js/web";

/**
*
* Read more: https://docs.solidjs.com/solid-start/reference/client/client-only
*/
// not using Suspense
export default function clientOnly<T extends Component<any>>(
fn: () => Promise<{
Expand Down
Loading