@quilted/quilt 0.8.7 → 0.8.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +12 -0
- package/build/esm/server.browser.mjs +1 -5
- package/build/esm/server.mjs +0 -2
- package/build/esnext/server.browser.esnext +1 -6
- package/build/esnext/server.esnext +0 -2
- package/build/tsconfig.tsbuildinfo +1 -1
- package/build/typescript/server.browser.d.ts +0 -4
- package/build/typescript/server.browser.d.ts.map +1 -1
- package/build/typescript/server.d.ts +0 -2
- package/build/typescript/server.d.ts.map +1 -1
- package/package.json +6 -6
- package/source/server.browser.ts +0 -8
- package/source/server.ts +0 -7
- package/build/esm/server/ServerContext.mjs +0 -20
- package/build/esm/server/request-router.mjs +0 -251
- package/build/esnext/server/ServerContext.esnext +0 -14
- package/build/esnext/server/request-router.esnext +0 -270
- package/source/server/ServerContext.tsx +0 -38
- package/source/server/request-router.tsx +0 -389
|
@@ -1,389 +0,0 @@
|
|
|
1
|
-
import {isValidElement, type VNode} from 'preact';
|
|
2
|
-
import {
|
|
3
|
-
renderToStaticMarkup,
|
|
4
|
-
renderToStringAsync,
|
|
5
|
-
} from 'preact-render-to-string';
|
|
6
|
-
|
|
7
|
-
import {
|
|
8
|
-
styleAssetPreloadAttributes,
|
|
9
|
-
scriptAssetPreloadAttributes,
|
|
10
|
-
type BrowserAssets,
|
|
11
|
-
type BrowserAssetsEntry,
|
|
12
|
-
} from '@quilted/assets';
|
|
13
|
-
import {
|
|
14
|
-
Title,
|
|
15
|
-
Link,
|
|
16
|
-
Meta,
|
|
17
|
-
Serialization,
|
|
18
|
-
BrowserResponse,
|
|
19
|
-
ScriptAsset,
|
|
20
|
-
ScriptAssetPreload,
|
|
21
|
-
StyleAsset,
|
|
22
|
-
StyleAssetPreload,
|
|
23
|
-
BrowserEffectsAreActiveContext,
|
|
24
|
-
} from '@quilted/preact-browser/server';
|
|
25
|
-
|
|
26
|
-
import {HTMLResponse, EnhancedResponse} from '@quilted/request-router';
|
|
27
|
-
|
|
28
|
-
import {ServerContext} from './ServerContext.tsx';
|
|
29
|
-
|
|
30
|
-
export interface RenderHTMLFunction {
|
|
31
|
-
(
|
|
32
|
-
content: ReadableStream<string>,
|
|
33
|
-
context: {
|
|
34
|
-
readonly response: BrowserResponse;
|
|
35
|
-
},
|
|
36
|
-
): ReadableStream<any> | string | Promise<ReadableStream<any> | string>;
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
export interface RenderToResponseOptions {
|
|
40
|
-
readonly request: Request;
|
|
41
|
-
readonly status?: number;
|
|
42
|
-
readonly stream?: 'headers' | false;
|
|
43
|
-
readonly headers?: HeadersInit;
|
|
44
|
-
readonly assets?: BrowserAssets;
|
|
45
|
-
readonly serializations?: Iterable<[string, unknown]>;
|
|
46
|
-
readonly renderHTML?: boolean | 'fragment' | 'document' | RenderHTMLFunction;
|
|
47
|
-
waitUntil?(promise: Promise<any>): void;
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
export async function renderToResponse(
|
|
51
|
-
element: VNode<any>,
|
|
52
|
-
options: RenderToResponseOptions,
|
|
53
|
-
): Promise<EnhancedResponse>;
|
|
54
|
-
export async function renderToResponse(
|
|
55
|
-
options: RenderToResponseOptions,
|
|
56
|
-
): Promise<EnhancedResponse>;
|
|
57
|
-
export async function renderToResponse(
|
|
58
|
-
optionsOrElement: VNode<any> | RenderToResponseOptions,
|
|
59
|
-
definitelyOptions?: RenderToResponseOptions,
|
|
60
|
-
): Promise<EnhancedResponse> {
|
|
61
|
-
let element: VNode<any> | undefined;
|
|
62
|
-
let options: RenderToResponseOptions;
|
|
63
|
-
|
|
64
|
-
if (isValidElement(optionsOrElement)) {
|
|
65
|
-
element = optionsOrElement;
|
|
66
|
-
options = definitelyOptions!;
|
|
67
|
-
} else {
|
|
68
|
-
options = optionsOrElement as any;
|
|
69
|
-
}
|
|
70
|
-
|
|
71
|
-
const {
|
|
72
|
-
request,
|
|
73
|
-
assets,
|
|
74
|
-
status: explicitStatus,
|
|
75
|
-
headers: explicitHeaders,
|
|
76
|
-
serializations: explicitSerializations,
|
|
77
|
-
waitUntil = noop,
|
|
78
|
-
stream: shouldStream = false,
|
|
79
|
-
renderHTML = true,
|
|
80
|
-
} = options;
|
|
81
|
-
|
|
82
|
-
const baseURL = (request as any).URL ?? new URL(request.url);
|
|
83
|
-
|
|
84
|
-
const browserResponse = new BrowserResponse({
|
|
85
|
-
request,
|
|
86
|
-
status: explicitStatus,
|
|
87
|
-
headers: new Headers(explicitHeaders),
|
|
88
|
-
serializations: explicitSerializations,
|
|
89
|
-
});
|
|
90
|
-
|
|
91
|
-
let appStream: ReadableStream<any> | undefined;
|
|
92
|
-
|
|
93
|
-
if (shouldStream === false && element != null) {
|
|
94
|
-
let rendered: string;
|
|
95
|
-
|
|
96
|
-
try {
|
|
97
|
-
rendered = await renderToStringAsync(
|
|
98
|
-
<ServerContext assets={assets} browser={browserResponse}>
|
|
99
|
-
{element}
|
|
100
|
-
</ServerContext>,
|
|
101
|
-
);
|
|
102
|
-
} catch (error) {
|
|
103
|
-
if (error instanceof Response) {
|
|
104
|
-
const mergedHeaders = new Headers(browserResponse.headers);
|
|
105
|
-
|
|
106
|
-
// Copy headers from error response, potentially overwriting existing ones
|
|
107
|
-
for (const [key, value] of error.headers) {
|
|
108
|
-
if (key.toLowerCase() === 'set-cookie') continue;
|
|
109
|
-
mergedHeaders.set(key, value);
|
|
110
|
-
}
|
|
111
|
-
|
|
112
|
-
for (const setCookie of error.headers.getSetCookie()) {
|
|
113
|
-
mergedHeaders.append('Set-Cookie', setCookie);
|
|
114
|
-
}
|
|
115
|
-
|
|
116
|
-
const mergedResponse = new EnhancedResponse(error.body, {
|
|
117
|
-
status: Math.max(browserResponse.status.value, error.status),
|
|
118
|
-
headers: mergedHeaders,
|
|
119
|
-
});
|
|
120
|
-
|
|
121
|
-
return mergedResponse;
|
|
122
|
-
}
|
|
123
|
-
|
|
124
|
-
throw error;
|
|
125
|
-
}
|
|
126
|
-
|
|
127
|
-
const appTransformStream = new TransformStream();
|
|
128
|
-
const appWriter = appTransformStream.writable.getWriter();
|
|
129
|
-
appStream = appTransformStream.readable;
|
|
130
|
-
|
|
131
|
-
appWriter.write(rendered);
|
|
132
|
-
appWriter.close();
|
|
133
|
-
}
|
|
134
|
-
|
|
135
|
-
if (appStream == null) {
|
|
136
|
-
const appTransformStream = new TransformStream();
|
|
137
|
-
appStream = appTransformStream.readable;
|
|
138
|
-
|
|
139
|
-
const renderAppStream = async function renderAppStream() {
|
|
140
|
-
const appWriter = appTransformStream.writable.getWriter();
|
|
141
|
-
|
|
142
|
-
if (element != null) {
|
|
143
|
-
// TODO: how could we handle redirects automatically? For now, if people want
|
|
144
|
-
// this, they will explicitly turn on streaming and will have to use some in-app
|
|
145
|
-
// to manually handle redirects (e.g., by rendering a script tag that uses JavaScript
|
|
146
|
-
// to redirect)
|
|
147
|
-
const rendered = await renderToStringAsync(
|
|
148
|
-
<ServerContext assets={assets} browser={browserResponse}>
|
|
149
|
-
{element}
|
|
150
|
-
</ServerContext>,
|
|
151
|
-
);
|
|
152
|
-
|
|
153
|
-
appWriter.write(rendered);
|
|
154
|
-
}
|
|
155
|
-
|
|
156
|
-
appWriter.close();
|
|
157
|
-
};
|
|
158
|
-
|
|
159
|
-
waitUntil(renderAppStream());
|
|
160
|
-
}
|
|
161
|
-
|
|
162
|
-
const body = await renderToHTMLBody(appStream);
|
|
163
|
-
|
|
164
|
-
return new HTMLResponse(body, {
|
|
165
|
-
status: browserResponse.status.value,
|
|
166
|
-
headers: browserResponse.headers,
|
|
167
|
-
});
|
|
168
|
-
|
|
169
|
-
async function renderToHTMLBody(
|
|
170
|
-
content: ReadableStream<any>,
|
|
171
|
-
): Promise<ReadableStream<any> | string> {
|
|
172
|
-
if (typeof renderHTML === 'function') {
|
|
173
|
-
const body = await renderHTML(content, {
|
|
174
|
-
response: browserResponse,
|
|
175
|
-
});
|
|
176
|
-
|
|
177
|
-
return body;
|
|
178
|
-
} else if (renderHTML === false || renderHTML === 'fragment') {
|
|
179
|
-
return content;
|
|
180
|
-
}
|
|
181
|
-
|
|
182
|
-
const responseStream = new TextEncoderStream();
|
|
183
|
-
const body = responseStream.readable;
|
|
184
|
-
|
|
185
|
-
const renderFullHTML = async function renderFullHTML() {
|
|
186
|
-
const writer = responseStream.writable.getWriter();
|
|
187
|
-
|
|
188
|
-
writer.write(`<!DOCTYPE html>`);
|
|
189
|
-
|
|
190
|
-
const synchronousAssets = assets?.entry({
|
|
191
|
-
request,
|
|
192
|
-
modules: browserResponse.assets.get({timing: 'load'}),
|
|
193
|
-
});
|
|
194
|
-
const preloadAssets = assets?.modules(
|
|
195
|
-
browserResponse.assets.get({timing: 'preload'}),
|
|
196
|
-
{
|
|
197
|
-
request,
|
|
198
|
-
},
|
|
199
|
-
);
|
|
200
|
-
|
|
201
|
-
if (synchronousAssets) {
|
|
202
|
-
for (const style of synchronousAssets.styles) {
|
|
203
|
-
browserResponse.headers.append(
|
|
204
|
-
'Link',
|
|
205
|
-
preloadHeader(styleAssetPreloadAttributes(style)),
|
|
206
|
-
);
|
|
207
|
-
}
|
|
208
|
-
|
|
209
|
-
for (const script of synchronousAssets.scripts) {
|
|
210
|
-
browserResponse.headers.append(
|
|
211
|
-
'Link',
|
|
212
|
-
preloadHeader(scriptAssetPreloadAttributes(script)),
|
|
213
|
-
);
|
|
214
|
-
}
|
|
215
|
-
}
|
|
216
|
-
|
|
217
|
-
const htmlContent = renderToStaticMarkup(
|
|
218
|
-
<BrowserEffectsAreActiveContext.Provider value={false}>
|
|
219
|
-
<html {...browserResponse.htmlAttributes.value}>
|
|
220
|
-
<head>
|
|
221
|
-
<Title>{browserResponse.title.value}</Title>
|
|
222
|
-
{browserResponse.links.value.map((link) => (
|
|
223
|
-
<Link {...link} />
|
|
224
|
-
))}
|
|
225
|
-
{browserResponse.metas.value.map((meta) => (
|
|
226
|
-
<Meta {...meta} />
|
|
227
|
-
))}
|
|
228
|
-
{browserResponse.serializations.value.map(({name, content}) => (
|
|
229
|
-
<Serialization name={name} content={content} />
|
|
230
|
-
))}
|
|
231
|
-
{synchronousAssets?.scripts.map((script) => (
|
|
232
|
-
<ScriptAsset
|
|
233
|
-
key={script.source}
|
|
234
|
-
asset={script}
|
|
235
|
-
baseURL={baseURL}
|
|
236
|
-
/>
|
|
237
|
-
))}
|
|
238
|
-
{synchronousAssets?.styles.map((style) => (
|
|
239
|
-
<StyleAsset
|
|
240
|
-
key={style.source}
|
|
241
|
-
asset={style}
|
|
242
|
-
baseURL={baseURL}
|
|
243
|
-
/>
|
|
244
|
-
))}
|
|
245
|
-
{preloadAssets?.styles.map((style) => (
|
|
246
|
-
<StyleAssetPreload
|
|
247
|
-
key={style.source}
|
|
248
|
-
asset={style}
|
|
249
|
-
baseURL={baseURL}
|
|
250
|
-
/>
|
|
251
|
-
))}
|
|
252
|
-
{preloadAssets?.scripts.map((script) => (
|
|
253
|
-
<ScriptAssetPreload
|
|
254
|
-
key={script.source}
|
|
255
|
-
asset={script}
|
|
256
|
-
baseURL={baseURL}
|
|
257
|
-
/>
|
|
258
|
-
))}
|
|
259
|
-
</head>
|
|
260
|
-
<body
|
|
261
|
-
{...browserResponse.bodyAttributes.value}
|
|
262
|
-
dangerouslySetInnerHTML={{__html: '%%CONTENT%%'}}
|
|
263
|
-
></body>
|
|
264
|
-
</html>
|
|
265
|
-
</BrowserEffectsAreActiveContext.Provider>,
|
|
266
|
-
);
|
|
267
|
-
|
|
268
|
-
const [firstChunk, secondChunk] = htmlContent.split('%%CONTENT%%');
|
|
269
|
-
writer.write(firstChunk);
|
|
270
|
-
if (element != null) writer.write(`<div id="app">`);
|
|
271
|
-
|
|
272
|
-
const reader = content.getReader();
|
|
273
|
-
|
|
274
|
-
while (true) {
|
|
275
|
-
const {done, value} = await reader.read();
|
|
276
|
-
|
|
277
|
-
if (done) {
|
|
278
|
-
break;
|
|
279
|
-
}
|
|
280
|
-
|
|
281
|
-
writer.write(value);
|
|
282
|
-
}
|
|
283
|
-
|
|
284
|
-
if (element != null) writer.write(`</div>`);
|
|
285
|
-
|
|
286
|
-
const newSynchronousAssets = assets?.entry({
|
|
287
|
-
request,
|
|
288
|
-
modules: browserResponse.assets.get({timing: 'load'}),
|
|
289
|
-
});
|
|
290
|
-
|
|
291
|
-
const newPreloadAssets = assets?.modules(
|
|
292
|
-
browserResponse.assets.get({timing: 'preload'}),
|
|
293
|
-
{
|
|
294
|
-
request,
|
|
295
|
-
},
|
|
296
|
-
);
|
|
297
|
-
|
|
298
|
-
if (newSynchronousAssets) {
|
|
299
|
-
const diffedSynchronousAssets = diffBrowserAssetsEntries(
|
|
300
|
-
newSynchronousAssets,
|
|
301
|
-
synchronousAssets!,
|
|
302
|
-
);
|
|
303
|
-
|
|
304
|
-
const diffedPreloadAssets = diffBrowserAssetsEntries(
|
|
305
|
-
newPreloadAssets!,
|
|
306
|
-
preloadAssets!,
|
|
307
|
-
);
|
|
308
|
-
|
|
309
|
-
const additionalAssetsContent = renderToStaticMarkup(
|
|
310
|
-
<>
|
|
311
|
-
{diffedSynchronousAssets.scripts.map((script) => (
|
|
312
|
-
<ScriptAsset
|
|
313
|
-
key={script.source}
|
|
314
|
-
asset={script}
|
|
315
|
-
baseURL={baseURL}
|
|
316
|
-
/>
|
|
317
|
-
))}
|
|
318
|
-
{diffedSynchronousAssets.styles.map((style) => (
|
|
319
|
-
<StyleAsset key={style.source} asset={style} baseURL={baseURL} />
|
|
320
|
-
))}
|
|
321
|
-
{diffedPreloadAssets.styles.map((style) => (
|
|
322
|
-
<StyleAssetPreload
|
|
323
|
-
key={style.source}
|
|
324
|
-
asset={style}
|
|
325
|
-
baseURL={baseURL}
|
|
326
|
-
/>
|
|
327
|
-
))}
|
|
328
|
-
{diffedPreloadAssets.scripts.map((script) => (
|
|
329
|
-
<ScriptAssetPreload
|
|
330
|
-
key={script.source}
|
|
331
|
-
asset={script}
|
|
332
|
-
baseURL={baseURL}
|
|
333
|
-
/>
|
|
334
|
-
))}
|
|
335
|
-
</>,
|
|
336
|
-
);
|
|
337
|
-
|
|
338
|
-
writer.write(additionalAssetsContent);
|
|
339
|
-
}
|
|
340
|
-
|
|
341
|
-
writer.write(secondChunk);
|
|
342
|
-
writer.close();
|
|
343
|
-
};
|
|
344
|
-
|
|
345
|
-
waitUntil(renderFullHTML());
|
|
346
|
-
|
|
347
|
-
return body;
|
|
348
|
-
}
|
|
349
|
-
}
|
|
350
|
-
|
|
351
|
-
function preloadHeader(attributes: Partial<HTMLLinkElement>) {
|
|
352
|
-
const {
|
|
353
|
-
as,
|
|
354
|
-
rel = 'preload',
|
|
355
|
-
href,
|
|
356
|
-
crossOrigin,
|
|
357
|
-
crossorigin,
|
|
358
|
-
} = attributes as any;
|
|
359
|
-
|
|
360
|
-
// Support both property and attribute versions of the casing
|
|
361
|
-
const finalCrossOrigin = crossOrigin ?? crossorigin;
|
|
362
|
-
|
|
363
|
-
let header = `<${href}>; rel="${rel}"; as="${as}"`;
|
|
364
|
-
|
|
365
|
-
if (finalCrossOrigin === '' || finalCrossOrigin === true) {
|
|
366
|
-
header += `; crossorigin`;
|
|
367
|
-
} else if (typeof finalCrossOrigin === 'string') {
|
|
368
|
-
header += `; crossorigin="${finalCrossOrigin}"`;
|
|
369
|
-
}
|
|
370
|
-
|
|
371
|
-
return header;
|
|
372
|
-
}
|
|
373
|
-
|
|
374
|
-
function diffBrowserAssetsEntries(
|
|
375
|
-
newList: BrowserAssetsEntry,
|
|
376
|
-
oldList: BrowserAssetsEntry,
|
|
377
|
-
): BrowserAssetsEntry {
|
|
378
|
-
const oldStyles = new Set(oldList.styles.map((style) => style.source));
|
|
379
|
-
const oldScripts = new Set(oldList.scripts.map((script) => script.source));
|
|
380
|
-
|
|
381
|
-
return {
|
|
382
|
-
styles: newList.styles.filter((style) => !oldStyles.has(style.source)),
|
|
383
|
-
scripts: newList.scripts.filter((script) => !oldScripts.has(script.source)),
|
|
384
|
-
};
|
|
385
|
-
}
|
|
386
|
-
|
|
387
|
-
function noop(..._args: any) {
|
|
388
|
-
// noop
|
|
389
|
-
}
|