@sveltejs/kit 1.0.0-next.288 → 1.0.0-next.289
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/assets/client/start.js +10 -11
- package/assets/server/index.js +0 -1
- package/dist/chunks/amp_hook.js +1 -1
- package/dist/chunks/index.js +4 -3
- package/dist/chunks/index2.js +543 -728
- package/dist/chunks/index3.js +99 -622
- package/dist/chunks/index4.js +871 -96
- package/dist/chunks/index5.js +117 -842
- package/dist/chunks/index6.js +15546 -132
- package/dist/chunks/index7.js +3746 -15123
- package/dist/chunks/tsconfig.js +1032 -0
- package/dist/cli.js +6 -6
- package/package.json +10 -2
- package/types/index.d.ts +13 -5
- package/types/internal.d.ts +7 -3
- package/types/private.d.ts +10 -12
- package/dist/chunks/index8.js +0 -4207
package/dist/chunks/index5.js
CHANGED
|
@@ -1,895 +1,170 @@
|
|
|
1
|
-
import
|
|
2
|
-
import
|
|
3
|
-
import
|
|
4
|
-
import {
|
|
1
|
+
import fs__default from 'fs';
|
|
2
|
+
import http from 'http';
|
|
3
|
+
import https from 'https';
|
|
4
|
+
import { resolve, join } from 'path';
|
|
5
|
+
import { s as sirv } from './build.js';
|
|
6
|
+
import { pathToFileURL } from 'url';
|
|
7
|
+
import { getRequest, setResponse } from '../node.js';
|
|
5
8
|
import { installFetch } from '../install-fetch.js';
|
|
6
|
-
import {
|
|
7
|
-
import '
|
|
8
|
-
import '
|
|
9
|
-
import 'net';
|
|
10
|
-
import 'os';
|
|
9
|
+
import { b as SVELTE_KIT, S as SVELTE_KIT_ASSETS } from '../cli.js';
|
|
10
|
+
import 'querystring';
|
|
11
|
+
import 'stream';
|
|
11
12
|
import 'node:http';
|
|
12
13
|
import 'node:https';
|
|
13
14
|
import 'node:zlib';
|
|
14
15
|
import 'node:stream';
|
|
15
16
|
import 'node:util';
|
|
16
17
|
import 'node:url';
|
|
17
|
-
import '
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
/**
|
|
23
|
-
* @param {string} base
|
|
24
|
-
* @param {string} path
|
|
25
|
-
*/
|
|
26
|
-
function resolve(base, path) {
|
|
27
|
-
if (scheme.test(path)) return path;
|
|
28
|
-
|
|
29
|
-
const base_match = absolute.exec(base);
|
|
30
|
-
const path_match = absolute.exec(path);
|
|
31
|
-
|
|
32
|
-
if (!base_match) {
|
|
33
|
-
throw new Error(`bad base path: "${base}"`);
|
|
34
|
-
}
|
|
35
|
-
|
|
36
|
-
const baseparts = path_match ? [] : base.slice(base_match[0].length).split('/');
|
|
37
|
-
const pathparts = path_match ? path.slice(path_match[0].length).split('/') : path.split('/');
|
|
38
|
-
|
|
39
|
-
baseparts.pop();
|
|
40
|
-
|
|
41
|
-
for (let i = 0; i < pathparts.length; i += 1) {
|
|
42
|
-
const part = pathparts[i];
|
|
43
|
-
if (part === '.') continue;
|
|
44
|
-
else if (part === '..') baseparts.pop();
|
|
45
|
-
else baseparts.push(part);
|
|
46
|
-
}
|
|
47
|
-
|
|
48
|
-
const prefix = (path_match && path_match[0]) || (base_match && base_match[0]) || '';
|
|
49
|
-
|
|
50
|
-
return `${prefix}${baseparts.join('/')}`;
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
/** @param {string} path */
|
|
54
|
-
function is_root_relative(path) {
|
|
55
|
-
return path[0] === '/' && path[1] !== '/';
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
/**
|
|
59
|
-
* @param {string} path
|
|
60
|
-
* @param {import('types').TrailingSlash} trailing_slash
|
|
61
|
-
*/
|
|
62
|
-
function normalize_path(path, trailing_slash) {
|
|
63
|
-
if (path === '/' || trailing_slash === 'ignore') return path;
|
|
64
|
-
|
|
65
|
-
if (trailing_slash === 'never') {
|
|
66
|
-
return path.endsWith('/') ? path.slice(0, -1) : path;
|
|
67
|
-
} else if (trailing_slash === 'always' && /\/[^./]+$/.test(path)) {
|
|
68
|
-
return path + '/';
|
|
69
|
-
}
|
|
70
|
-
|
|
71
|
-
return path;
|
|
72
|
-
}
|
|
73
|
-
|
|
74
|
-
/** @typedef {{
|
|
75
|
-
* fn: () => Promise<any>,
|
|
76
|
-
* fulfil: (value: any) => void,
|
|
77
|
-
* reject: (error: Error) => void
|
|
78
|
-
* }} Task */
|
|
79
|
-
|
|
80
|
-
/** @param {number} concurrency */
|
|
81
|
-
function queue(concurrency) {
|
|
82
|
-
/** @type {Task[]} */
|
|
83
|
-
const tasks = [];
|
|
84
|
-
|
|
85
|
-
let current = 0;
|
|
86
|
-
|
|
87
|
-
/** @type {(value?: any) => void} */
|
|
88
|
-
let fulfil;
|
|
89
|
-
|
|
90
|
-
/** @type {(error: Error) => void} */
|
|
91
|
-
let reject;
|
|
92
|
-
|
|
93
|
-
let closed = false;
|
|
94
|
-
|
|
95
|
-
const done = new Promise((f, r) => {
|
|
96
|
-
fulfil = f;
|
|
97
|
-
reject = r;
|
|
98
|
-
});
|
|
99
|
-
|
|
100
|
-
done.catch(() => {
|
|
101
|
-
// this is necessary in case a catch handler is never added
|
|
102
|
-
// to the done promise by the user
|
|
103
|
-
});
|
|
104
|
-
|
|
105
|
-
function dequeue() {
|
|
106
|
-
if (current < concurrency) {
|
|
107
|
-
const task = tasks.shift();
|
|
108
|
-
|
|
109
|
-
if (task) {
|
|
110
|
-
current += 1;
|
|
111
|
-
const promise = Promise.resolve(task.fn());
|
|
112
|
-
|
|
113
|
-
promise
|
|
114
|
-
.then(task.fulfil, (err) => {
|
|
115
|
-
task.reject(err);
|
|
116
|
-
reject(err);
|
|
117
|
-
})
|
|
118
|
-
.then(() => {
|
|
119
|
-
current -= 1;
|
|
120
|
-
dequeue();
|
|
121
|
-
});
|
|
122
|
-
} else if (current === 0) {
|
|
123
|
-
closed = true;
|
|
124
|
-
fulfil();
|
|
125
|
-
}
|
|
126
|
-
}
|
|
127
|
-
}
|
|
128
|
-
|
|
129
|
-
return {
|
|
130
|
-
/** @param {() => any} fn */
|
|
131
|
-
add: (fn) => {
|
|
132
|
-
if (closed) throw new Error('Cannot add tasks to a queue that has ended');
|
|
133
|
-
|
|
134
|
-
const promise = new Promise((fulfil, reject) => {
|
|
135
|
-
tasks.push({ fn, fulfil, reject });
|
|
136
|
-
});
|
|
137
|
-
|
|
138
|
-
dequeue();
|
|
139
|
-
return promise;
|
|
140
|
-
},
|
|
141
|
-
|
|
142
|
-
done: () => {
|
|
143
|
-
if (current === 0) {
|
|
144
|
-
closed = true;
|
|
145
|
-
fulfil();
|
|
146
|
-
}
|
|
147
|
-
|
|
148
|
-
return done;
|
|
149
|
-
}
|
|
150
|
-
};
|
|
151
|
-
}
|
|
152
|
-
|
|
153
|
-
const DOCTYPE = 'DOCTYPE';
|
|
154
|
-
const CDATA_OPEN = '[CDATA[';
|
|
155
|
-
const CDATA_CLOSE = ']]>';
|
|
156
|
-
const COMMENT_OPEN = '--';
|
|
157
|
-
const COMMENT_CLOSE = '-->';
|
|
158
|
-
|
|
159
|
-
const TAG_OPEN = /[a-zA-Z]/;
|
|
160
|
-
const TAG_CHAR = /[a-zA-Z0-9]/;
|
|
161
|
-
const ATTRIBUTE_NAME = /[^\t\n\f />"'=]/;
|
|
162
|
-
|
|
163
|
-
const WHITESPACE = /[\s\n\r]/;
|
|
164
|
-
|
|
165
|
-
/** @param {string} html */
|
|
166
|
-
function crawl(html) {
|
|
167
|
-
/** @type {string[]} */
|
|
168
|
-
const hrefs = [];
|
|
169
|
-
|
|
170
|
-
let i = 0;
|
|
171
|
-
main: while (i < html.length) {
|
|
172
|
-
const char = html[i];
|
|
173
|
-
|
|
174
|
-
if (char === '<') {
|
|
175
|
-
if (html[i + 1] === '!') {
|
|
176
|
-
i += 2;
|
|
177
|
-
|
|
178
|
-
if (html.substr(i, DOCTYPE.length).toUpperCase() === DOCTYPE) {
|
|
179
|
-
i += DOCTYPE.length;
|
|
180
|
-
while (i < html.length) {
|
|
181
|
-
if (html[i++] === '>') {
|
|
182
|
-
continue main;
|
|
183
|
-
}
|
|
184
|
-
}
|
|
185
|
-
}
|
|
186
|
-
|
|
187
|
-
// skip cdata
|
|
188
|
-
if (html.substr(i, CDATA_OPEN.length) === CDATA_OPEN) {
|
|
189
|
-
i += CDATA_OPEN.length;
|
|
190
|
-
while (i < html.length) {
|
|
191
|
-
if (html.substr(i, CDATA_CLOSE.length) === CDATA_CLOSE) {
|
|
192
|
-
i += CDATA_CLOSE.length;
|
|
193
|
-
continue main;
|
|
194
|
-
}
|
|
195
|
-
|
|
196
|
-
i += 1;
|
|
197
|
-
}
|
|
198
|
-
}
|
|
199
|
-
|
|
200
|
-
// skip comments
|
|
201
|
-
if (html.substr(i, COMMENT_OPEN.length) === COMMENT_OPEN) {
|
|
202
|
-
i += COMMENT_OPEN.length;
|
|
203
|
-
while (i < html.length) {
|
|
204
|
-
if (html.substr(i, COMMENT_CLOSE.length) === COMMENT_CLOSE) {
|
|
205
|
-
i += COMMENT_CLOSE.length;
|
|
206
|
-
continue main;
|
|
207
|
-
}
|
|
208
|
-
|
|
209
|
-
i += 1;
|
|
210
|
-
}
|
|
211
|
-
}
|
|
212
|
-
}
|
|
213
|
-
|
|
214
|
-
// parse opening tags
|
|
215
|
-
const start = ++i;
|
|
216
|
-
if (TAG_OPEN.test(html[start])) {
|
|
217
|
-
while (i < html.length) {
|
|
218
|
-
if (!TAG_CHAR.test(html[i])) {
|
|
219
|
-
break;
|
|
220
|
-
}
|
|
221
|
-
|
|
222
|
-
i += 1;
|
|
223
|
-
}
|
|
224
|
-
|
|
225
|
-
const tag = html.slice(start, i).toUpperCase();
|
|
226
|
-
|
|
227
|
-
if (tag === 'SCRIPT' || tag === 'STYLE') {
|
|
228
|
-
while (i < html.length) {
|
|
229
|
-
if (
|
|
230
|
-
html[i] === '<' &&
|
|
231
|
-
html[i + 1] === '/' &&
|
|
232
|
-
html.substr(i + 2, tag.length).toUpperCase() === tag
|
|
233
|
-
) {
|
|
234
|
-
continue main;
|
|
235
|
-
}
|
|
236
|
-
|
|
237
|
-
i += 1;
|
|
238
|
-
}
|
|
239
|
-
}
|
|
240
|
-
|
|
241
|
-
let href = '';
|
|
242
|
-
|
|
243
|
-
while (i < html.length) {
|
|
244
|
-
const start = i;
|
|
245
|
-
|
|
246
|
-
const char = html[start];
|
|
247
|
-
if (char === '>') break;
|
|
248
|
-
|
|
249
|
-
if (ATTRIBUTE_NAME.test(char)) {
|
|
250
|
-
i += 1;
|
|
251
|
-
|
|
252
|
-
while (i < html.length) {
|
|
253
|
-
if (!ATTRIBUTE_NAME.test(html[i])) {
|
|
254
|
-
break;
|
|
255
|
-
}
|
|
256
|
-
|
|
257
|
-
i += 1;
|
|
258
|
-
}
|
|
259
|
-
|
|
260
|
-
const name = html.slice(start, i).toLowerCase();
|
|
261
|
-
|
|
262
|
-
while (WHITESPACE.test(html[i])) i += 1;
|
|
263
|
-
|
|
264
|
-
if (html[i] === '=') {
|
|
265
|
-
i += 1;
|
|
266
|
-
while (WHITESPACE.test(html[i])) i += 1;
|
|
267
|
-
|
|
268
|
-
let value;
|
|
269
|
-
|
|
270
|
-
if (html[i] === "'" || html[i] === '"') {
|
|
271
|
-
const quote = html[i++];
|
|
272
|
-
|
|
273
|
-
const start = i;
|
|
274
|
-
let escaped = false;
|
|
275
|
-
|
|
276
|
-
while (i < html.length) {
|
|
277
|
-
if (!escaped) {
|
|
278
|
-
const char = html[i];
|
|
279
|
-
|
|
280
|
-
if (html[i] === quote) {
|
|
281
|
-
break;
|
|
282
|
-
}
|
|
283
|
-
|
|
284
|
-
if (char === '\\') {
|
|
285
|
-
escaped = true;
|
|
286
|
-
}
|
|
287
|
-
}
|
|
288
|
-
|
|
289
|
-
i += 1;
|
|
290
|
-
}
|
|
291
|
-
|
|
292
|
-
value = html.slice(start, i);
|
|
293
|
-
} else {
|
|
294
|
-
const start = i;
|
|
295
|
-
while (html[i] !== '>' && !WHITESPACE.test(html[i])) i += 1;
|
|
296
|
-
value = html.slice(start, i);
|
|
297
|
-
|
|
298
|
-
i -= 1;
|
|
299
|
-
}
|
|
300
|
-
|
|
301
|
-
if (name === 'href') {
|
|
302
|
-
href = value;
|
|
303
|
-
} else if (name === 'src') {
|
|
304
|
-
hrefs.push(value);
|
|
305
|
-
} else if (name === 'srcset') {
|
|
306
|
-
const candidates = [];
|
|
307
|
-
let insideURL = true;
|
|
308
|
-
value = value.trim();
|
|
309
|
-
for (let i = 0; i < value.length; i++) {
|
|
310
|
-
if (value[i] === ',' && (!insideURL || (insideURL && value[i + 1] === ' '))) {
|
|
311
|
-
candidates.push(value.slice(0, i));
|
|
312
|
-
value = value.substring(i + 1).trim();
|
|
313
|
-
i = 0;
|
|
314
|
-
insideURL = true;
|
|
315
|
-
} else if (value[i] === ' ') {
|
|
316
|
-
insideURL = false;
|
|
317
|
-
}
|
|
318
|
-
}
|
|
319
|
-
candidates.push(value);
|
|
320
|
-
for (const candidate of candidates) {
|
|
321
|
-
const src = candidate.split(WHITESPACE)[0];
|
|
322
|
-
hrefs.push(src);
|
|
323
|
-
}
|
|
324
|
-
}
|
|
325
|
-
} else {
|
|
326
|
-
i -= 1;
|
|
327
|
-
}
|
|
328
|
-
}
|
|
329
|
-
|
|
330
|
-
i += 1;
|
|
331
|
-
}
|
|
332
|
-
|
|
333
|
-
if (href) {
|
|
334
|
-
hrefs.push(href);
|
|
335
|
-
}
|
|
336
|
-
}
|
|
337
|
-
}
|
|
338
|
-
|
|
339
|
-
i += 1;
|
|
340
|
-
}
|
|
341
|
-
|
|
342
|
-
return hrefs;
|
|
343
|
-
}
|
|
344
|
-
|
|
345
|
-
/**
|
|
346
|
-
* Inside a script element, only `</script` and `<!--` hold special meaning to the HTML parser.
|
|
347
|
-
*
|
|
348
|
-
* The first closes the script element, so everything after is treated as raw HTML.
|
|
349
|
-
* The second disables further parsing until `-->`, so the script element might be unexpectedly
|
|
350
|
-
* kept open until until an unrelated HTML comment in the page.
|
|
351
|
-
*
|
|
352
|
-
* U+2028 LINE SEPARATOR and U+2029 PARAGRAPH SEPARATOR are escaped for the sake of pre-2018
|
|
353
|
-
* browsers.
|
|
354
|
-
*
|
|
355
|
-
* @see tests for unsafe parsing examples.
|
|
356
|
-
* @see https://html.spec.whatwg.org/multipage/scripting.html#restrictions-for-contents-of-script-elements
|
|
357
|
-
* @see https://html.spec.whatwg.org/multipage/syntax.html#cdata-rcdata-restrictions
|
|
358
|
-
* @see https://html.spec.whatwg.org/multipage/parsing.html#script-data-state
|
|
359
|
-
* @see https://html.spec.whatwg.org/multipage/parsing.html#script-data-double-escaped-state
|
|
360
|
-
* @see https://github.com/tc39/proposal-json-superset
|
|
361
|
-
* @type {Record<string, string>}
|
|
362
|
-
*/
|
|
363
|
-
const render_json_payload_script_dict = {
|
|
364
|
-
'<': '\\u003C',
|
|
365
|
-
'\u2028': '\\u2028',
|
|
366
|
-
'\u2029': '\\u2029'
|
|
367
|
-
};
|
|
368
|
-
|
|
369
|
-
new RegExp(
|
|
370
|
-
`[${Object.keys(render_json_payload_script_dict).join('')}]`,
|
|
371
|
-
'g'
|
|
372
|
-
);
|
|
373
|
-
|
|
374
|
-
/**
|
|
375
|
-
* When inside a double-quoted attribute value, only `&` and `"` hold special meaning.
|
|
376
|
-
* @see https://html.spec.whatwg.org/multipage/parsing.html#attribute-value-(double-quoted)-state
|
|
377
|
-
* @type {Record<string, string>}
|
|
378
|
-
*/
|
|
379
|
-
const escape_html_attr_dict = {
|
|
380
|
-
'&': '&',
|
|
381
|
-
'"': '"'
|
|
382
|
-
};
|
|
383
|
-
|
|
384
|
-
const escape_html_attr_regex = new RegExp(
|
|
385
|
-
// special characters
|
|
386
|
-
`[${Object.keys(escape_html_attr_dict).join('')}]|` +
|
|
387
|
-
// high surrogate without paired low surrogate
|
|
388
|
-
'[\\ud800-\\udbff](?![\\udc00-\\udfff])|' +
|
|
389
|
-
// a valid surrogate pair, the only match with 2 code units
|
|
390
|
-
// we match it so that we can match unpaired low surrogates in the same pass
|
|
391
|
-
// TODO: use lookbehind assertions once they are widely supported: (?<![\ud800-udbff])[\udc00-\udfff]
|
|
392
|
-
'[\\ud800-\\udbff][\\udc00-\\udfff]|' +
|
|
393
|
-
// unpaired low surrogate (see previous match)
|
|
394
|
-
'[\\udc00-\\udfff]',
|
|
395
|
-
'g'
|
|
396
|
-
);
|
|
397
|
-
|
|
398
|
-
/**
|
|
399
|
-
* Formats a string to be used as an attribute's value in raw HTML.
|
|
400
|
-
*
|
|
401
|
-
* It escapes unpaired surrogates (which are allowed in js strings but invalid in HTML), escapes
|
|
402
|
-
* characters that are special in attributes, and surrounds the whole string in double-quotes.
|
|
403
|
-
*
|
|
404
|
-
* @param {string} str
|
|
405
|
-
* @returns {string} Escaped string surrounded by double-quotes.
|
|
406
|
-
* @example const html = `<tag data-value=${escape_html_attr('value')}>...</tag>`;
|
|
407
|
-
*/
|
|
408
|
-
function escape_html_attr(str) {
|
|
409
|
-
const escaped_str = str.replace(escape_html_attr_regex, (match) => {
|
|
410
|
-
if (match.length === 2) {
|
|
411
|
-
// valid surrogate pair
|
|
412
|
-
return match;
|
|
413
|
-
}
|
|
18
|
+
import 'net';
|
|
19
|
+
import 'sade';
|
|
20
|
+
import 'child_process';
|
|
21
|
+
import 'os';
|
|
414
22
|
|
|
415
|
-
|
|
23
|
+
/** @param {string} dir */
|
|
24
|
+
const mutable = (dir) =>
|
|
25
|
+
sirv(dir, {
|
|
26
|
+
etag: true,
|
|
27
|
+
maxAge: 0
|
|
416
28
|
});
|
|
417
29
|
|
|
418
|
-
return `"${escaped_str}"`;
|
|
419
|
-
}
|
|
420
|
-
|
|
421
|
-
/**
|
|
422
|
-
* @typedef {import('types').PrerenderErrorHandler} PrerenderErrorHandler
|
|
423
|
-
* @typedef {import('types').PrerenderOnErrorValue} OnError
|
|
424
|
-
* @typedef {import('types').Logger} Logger
|
|
425
|
-
*/
|
|
426
|
-
|
|
427
|
-
/** @type {(details: Parameters<PrerenderErrorHandler>[0] ) => string} */
|
|
428
|
-
function format_error({ status, path, referrer, referenceType }) {
|
|
429
|
-
return `${status} ${path}${referrer ? ` (${referenceType} from ${referrer})` : ''}`;
|
|
430
|
-
}
|
|
431
|
-
|
|
432
|
-
/** @type {(log: Logger, onError: OnError) => PrerenderErrorHandler} */
|
|
433
|
-
function normalise_error_handler(log, onError) {
|
|
434
|
-
switch (onError) {
|
|
435
|
-
case 'continue':
|
|
436
|
-
return (details) => {
|
|
437
|
-
log.error(format_error(details));
|
|
438
|
-
};
|
|
439
|
-
case 'fail':
|
|
440
|
-
return (details) => {
|
|
441
|
-
throw new Error(format_error(details));
|
|
442
|
-
};
|
|
443
|
-
default:
|
|
444
|
-
return onError;
|
|
445
|
-
}
|
|
446
|
-
}
|
|
447
|
-
|
|
448
|
-
const OK = 2;
|
|
449
|
-
const REDIRECT = 3;
|
|
450
|
-
|
|
451
30
|
/**
|
|
452
31
|
* @param {{
|
|
453
|
-
*
|
|
454
|
-
*
|
|
455
|
-
* log: Logger;
|
|
32
|
+
* port: number;
|
|
33
|
+
* host?: string;
|
|
456
34
|
* config: import('types').ValidatedConfig;
|
|
457
|
-
*
|
|
458
|
-
*
|
|
459
|
-
* all: boolean; // disregard `export const prerender = true`
|
|
35
|
+
* https?: boolean;
|
|
36
|
+
* cwd?: string;
|
|
460
37
|
* }} opts
|
|
461
38
|
*/
|
|
462
|
-
async function
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
};
|
|
470
|
-
|
|
471
|
-
if (!config.kit.prerender.enabled && !fallback) {
|
|
472
|
-
return prerendered;
|
|
473
|
-
}
|
|
474
|
-
|
|
39
|
+
async function preview({
|
|
40
|
+
port,
|
|
41
|
+
host,
|
|
42
|
+
config,
|
|
43
|
+
https: use_https = false,
|
|
44
|
+
cwd = process.cwd()
|
|
45
|
+
}) {
|
|
475
46
|
installFetch();
|
|
476
47
|
|
|
477
|
-
const
|
|
48
|
+
const index_file = resolve(cwd, `${SVELTE_KIT}/output/server/index.js`);
|
|
49
|
+
const manifest_file = resolve(cwd, `${SVELTE_KIT}/output/server/manifest.js`);
|
|
478
50
|
|
|
479
51
|
/** @type {import('types').ServerModule} */
|
|
480
|
-
const { Server, override } = await import(pathToFileURL(
|
|
481
|
-
const { manifest } = await import(pathToFileURL(`${server_root}/server/manifest.js`).href);
|
|
482
|
-
|
|
483
|
-
override({
|
|
484
|
-
paths: config.kit.paths,
|
|
485
|
-
prerendering: true,
|
|
486
|
-
read: (file) => readFileSync(join(config.kit.files.assets, file))
|
|
487
|
-
});
|
|
488
|
-
|
|
489
|
-
const server = new Server(manifest);
|
|
52
|
+
const { Server, override } = await import(pathToFileURL(index_file).href);
|
|
490
53
|
|
|
491
|
-
const
|
|
54
|
+
const { manifest } = await import(pathToFileURL(manifest_file).href);
|
|
492
55
|
|
|
493
|
-
|
|
494
|
-
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
|
|
56
|
+
/** @type {import('sirv').RequestHandler} */
|
|
57
|
+
const static_handler = fs__default.existsSync(config.kit.files.assets)
|
|
58
|
+
? mutable(config.kit.files.assets)
|
|
59
|
+
: (_req, _res, next) => {
|
|
60
|
+
if (!next) throw new Error('No next() handler is available');
|
|
61
|
+
return next();
|
|
62
|
+
};
|
|
498
63
|
|
|
499
|
-
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
}
|
|
64
|
+
const assets_handler = sirv(resolve(cwd, `${SVELTE_KIT}/output/client`), {
|
|
65
|
+
maxAge: 31536000,
|
|
66
|
+
immutable: true
|
|
503
67
|
});
|
|
504
68
|
|
|
505
|
-
const
|
|
506
|
-
|
|
507
|
-
/**
|
|
508
|
-
* @param {string} path
|
|
509
|
-
* @param {boolean} is_html
|
|
510
|
-
*/
|
|
511
|
-
function output_filename(path, is_html) {
|
|
512
|
-
const file = path.slice(config.kit.paths.base.length + 1);
|
|
513
|
-
|
|
514
|
-
if (file === '') {
|
|
515
|
-
return 'index.html';
|
|
516
|
-
}
|
|
517
|
-
|
|
518
|
-
if (is_html && !file.endsWith('.html')) {
|
|
519
|
-
return file + (config.kit.trailingSlash === 'always' ? 'index.html' : '.html');
|
|
520
|
-
}
|
|
521
|
-
|
|
522
|
-
return file;
|
|
523
|
-
}
|
|
524
|
-
|
|
525
|
-
const seen = new Set();
|
|
526
|
-
const written = new Set();
|
|
527
|
-
|
|
528
|
-
/**
|
|
529
|
-
* @param {string | null} referrer
|
|
530
|
-
* @param {string} decoded
|
|
531
|
-
* @param {string} [encoded]
|
|
532
|
-
*/
|
|
533
|
-
function enqueue(referrer, decoded, encoded) {
|
|
534
|
-
if (seen.has(decoded)) return;
|
|
535
|
-
seen.add(decoded);
|
|
536
|
-
|
|
537
|
-
const file = decoded.slice(config.kit.paths.base.length + 1);
|
|
538
|
-
if (files.has(file)) return;
|
|
539
|
-
|
|
540
|
-
return q.add(() => visit(decoded, encoded || encodeURI(decoded), referrer));
|
|
541
|
-
}
|
|
542
|
-
|
|
543
|
-
/**
|
|
544
|
-
* @param {string} decoded
|
|
545
|
-
* @param {string} encoded
|
|
546
|
-
* @param {string?} referrer
|
|
547
|
-
*/
|
|
548
|
-
async function visit(decoded, encoded, referrer) {
|
|
549
|
-
if (!decoded.startsWith(config.kit.paths.base)) {
|
|
550
|
-
error({ status: 404, path: decoded, referrer, referenceType: 'linked' });
|
|
551
|
-
return;
|
|
552
|
-
}
|
|
553
|
-
|
|
554
|
-
/** @type {Map<string, import('types').PrerenderDependency>} */
|
|
555
|
-
const dependencies = new Map();
|
|
556
|
-
|
|
557
|
-
const response = await server.respond(new Request(`http://sveltekit-prerender${encoded}`), {
|
|
558
|
-
prerender: {
|
|
559
|
-
all,
|
|
560
|
-
dependencies
|
|
561
|
-
}
|
|
562
|
-
});
|
|
563
|
-
|
|
564
|
-
const text = await response.text();
|
|
565
|
-
|
|
566
|
-
save(response, text, decoded, encoded, referrer, 'linked');
|
|
567
|
-
|
|
568
|
-
for (const [dependency_path, result] of dependencies) {
|
|
569
|
-
// this seems circuitous, but using new URL allows us to not care
|
|
570
|
-
// whether dependency_path is encoded or not
|
|
571
|
-
const encoded_dependency_path = new URL(dependency_path, 'http://localhost').pathname;
|
|
572
|
-
const decoded_dependency_path = decodeURI(encoded_dependency_path);
|
|
69
|
+
const has_asset_path = !!config.kit.paths.assets;
|
|
573
70
|
|
|
574
|
-
|
|
575
|
-
|
|
576
|
-
|
|
577
|
-
|
|
578
|
-
|
|
579
|
-
|
|
580
|
-
|
|
581
|
-
|
|
582
|
-
|
|
583
|
-
}
|
|
584
|
-
|
|
585
|
-
if (config.kit.prerender.crawl && response.headers.get('content-type') === 'text/html') {
|
|
586
|
-
for (const href of crawl(text)) {
|
|
587
|
-
if (href.startsWith('data:') || href.startsWith('#')) continue;
|
|
588
|
-
|
|
589
|
-
const resolved = resolve(encoded, href);
|
|
590
|
-
if (!is_root_relative(resolved)) continue;
|
|
71
|
+
override({
|
|
72
|
+
paths: {
|
|
73
|
+
base: config.kit.paths.base,
|
|
74
|
+
assets: has_asset_path ? SVELTE_KIT_ASSETS : config.kit.paths.base
|
|
75
|
+
},
|
|
76
|
+
prerendering: false,
|
|
77
|
+
protocol: use_https ? 'https' : 'http',
|
|
78
|
+
read: (file) => fs__default.readFileSync(join(config.kit.files.assets, file))
|
|
79
|
+
});
|
|
591
80
|
|
|
592
|
-
|
|
81
|
+
const server = new Server(manifest);
|
|
593
82
|
|
|
594
|
-
|
|
83
|
+
/** @type {import('vite').UserConfig} */
|
|
84
|
+
const vite_config = (config.kit.vite && (await config.kit.vite())) || {};
|
|
595
85
|
|
|
596
|
-
|
|
597
|
-
|
|
598
|
-
|
|
86
|
+
const http_server = await get_server(use_https, vite_config, (req, res) => {
|
|
87
|
+
if (req.url == null) {
|
|
88
|
+
throw new Error('Invalid request url');
|
|
599
89
|
}
|
|
600
|
-
}
|
|
601
|
-
|
|
602
|
-
/**
|
|
603
|
-
* @param {Response} response
|
|
604
|
-
* @param {string | Uint8Array} body
|
|
605
|
-
* @param {string} decoded
|
|
606
|
-
* @param {string} encoded
|
|
607
|
-
* @param {string | null} referrer
|
|
608
|
-
* @param {'linked' | 'fetched'} referenceType
|
|
609
|
-
*/
|
|
610
|
-
function save(response, body, decoded, encoded, referrer, referenceType) {
|
|
611
|
-
const response_type = Math.floor(response.status / 100);
|
|
612
|
-
const type = /** @type {string} */ (response.headers.get('content-type'));
|
|
613
|
-
const is_html = response_type === REDIRECT || type === 'text/html';
|
|
614
|
-
|
|
615
|
-
const file = output_filename(decoded, is_html);
|
|
616
|
-
const dest = `${out}/${file}`;
|
|
617
|
-
|
|
618
|
-
if (written.has(file)) return;
|
|
619
|
-
written.add(file);
|
|
620
90
|
|
|
621
|
-
|
|
622
|
-
const location = response.headers.get('location');
|
|
91
|
+
const initial_url = req.url;
|
|
623
92
|
|
|
624
|
-
|
|
625
|
-
|
|
93
|
+
const render_handler = async () => {
|
|
94
|
+
if (initial_url.startsWith(config.kit.paths.base)) {
|
|
95
|
+
const protocol = use_https ? 'https' : 'http';
|
|
96
|
+
const host = req.headers['host'];
|
|
626
97
|
|
|
627
|
-
|
|
98
|
+
let request;
|
|
628
99
|
|
|
629
|
-
|
|
630
|
-
|
|
631
|
-
|
|
632
|
-
)
|
|
633
|
-
|
|
634
|
-
|
|
635
|
-
if (is_root_relative(resolved)) {
|
|
636
|
-
resolved = normalize_path(resolved, config.kit.trailingSlash);
|
|
637
|
-
enqueue(decoded, decodeURI(resolved), resolved);
|
|
100
|
+
try {
|
|
101
|
+
req.url = initial_url;
|
|
102
|
+
request = await getRequest(`${protocol}://${host}`, req);
|
|
103
|
+
} catch (/** @type {any} */ err) {
|
|
104
|
+
res.statusCode = err.status || 400;
|
|
105
|
+
return res.end(err.reason || 'Invalid request body');
|
|
638
106
|
}
|
|
639
107
|
|
|
640
|
-
|
|
641
|
-
prerendered.redirects.set(decoded, {
|
|
642
|
-
status: response.status,
|
|
643
|
-
location: resolved
|
|
644
|
-
});
|
|
645
|
-
|
|
646
|
-
prerendered.paths.push(normalize_path(decoded, 'never'));
|
|
647
|
-
}
|
|
108
|
+
setResponse(res, await server.respond(request));
|
|
648
109
|
} else {
|
|
649
|
-
|
|
110
|
+
res.statusCode = 404;
|
|
111
|
+
res.end('Not found');
|
|
650
112
|
}
|
|
651
|
-
|
|
652
|
-
|
|
653
|
-
|
|
654
|
-
|
|
655
|
-
|
|
656
|
-
|
|
657
|
-
|
|
658
|
-
|
|
659
|
-
writeFileSync(dest, body);
|
|
660
|
-
|
|
661
|
-
if (is_html) {
|
|
662
|
-
prerendered.pages.set(decoded, {
|
|
663
|
-
file
|
|
113
|
+
};
|
|
114
|
+
|
|
115
|
+
if (has_asset_path) {
|
|
116
|
+
if (initial_url.startsWith(SVELTE_KIT_ASSETS)) {
|
|
117
|
+
// custom assets path
|
|
118
|
+
req.url = initial_url.slice(SVELTE_KIT_ASSETS.length);
|
|
119
|
+
assets_handler(req, res, () => {
|
|
120
|
+
static_handler(req, res, render_handler);
|
|
664
121
|
});
|
|
665
122
|
} else {
|
|
666
|
-
|
|
667
|
-
type
|
|
668
|
-
});
|
|
123
|
+
render_handler();
|
|
669
124
|
}
|
|
670
|
-
|
|
671
|
-
|
|
672
|
-
|
|
673
|
-
error({ status: response.status, path: decoded, referrer, referenceType });
|
|
674
|
-
}
|
|
675
|
-
}
|
|
676
|
-
|
|
677
|
-
if (config.kit.prerender.enabled) {
|
|
678
|
-
for (const entry of config.kit.prerender.entries) {
|
|
679
|
-
if (entry === '*') {
|
|
680
|
-
for (const entry of build_data.entries) {
|
|
681
|
-
enqueue(null, normalize_path(config.kit.paths.base + entry, config.kit.trailingSlash)); // TODO can we pre-normalize these?
|
|
682
|
-
}
|
|
683
|
-
} else {
|
|
684
|
-
enqueue(null, normalize_path(config.kit.paths.base + entry, config.kit.trailingSlash));
|
|
125
|
+
} else {
|
|
126
|
+
if (initial_url.startsWith(config.kit.paths.base)) {
|
|
127
|
+
req.url = initial_url.slice(config.kit.paths.base.length);
|
|
685
128
|
}
|
|
129
|
+
assets_handler(req, res, () => {
|
|
130
|
+
static_handler(req, res, render_handler);
|
|
131
|
+
});
|
|
686
132
|
}
|
|
133
|
+
});
|
|
687
134
|
|
|
688
|
-
|
|
689
|
-
}
|
|
690
|
-
|
|
691
|
-
if (fallback) {
|
|
692
|
-
const rendered = await server.respond(new Request('http://sveltekit-prerender/[fallback]'), {
|
|
693
|
-
prerender: {
|
|
694
|
-
fallback,
|
|
695
|
-
all: false,
|
|
696
|
-
dependencies: new Map()
|
|
697
|
-
}
|
|
698
|
-
});
|
|
699
|
-
|
|
700
|
-
const file = join(out, fallback);
|
|
701
|
-
mkdirp(dirname(file));
|
|
702
|
-
writeFileSync(file, await rendered.text());
|
|
703
|
-
}
|
|
135
|
+
await http_server.listen(port, host || '0.0.0.0');
|
|
704
136
|
|
|
705
|
-
return
|
|
137
|
+
return Promise.resolve(http_server);
|
|
706
138
|
}
|
|
707
139
|
|
|
708
140
|
/**
|
|
709
|
-
* @param {
|
|
710
|
-
*
|
|
711
|
-
*
|
|
712
|
-
*
|
|
713
|
-
* log: import('types').Logger;
|
|
714
|
-
* }} opts
|
|
715
|
-
* @returns {import('types').Builder}
|
|
141
|
+
* @param {boolean} use_https
|
|
142
|
+
* @param {import('vite').UserConfig} user_config
|
|
143
|
+
* @param {(req: http.IncomingMessage, res: http.ServerResponse) => void} handler
|
|
144
|
+
* @returns {Promise<import('net').Server>}
|
|
716
145
|
*/
|
|
717
|
-
function
|
|
718
|
-
/** @type {
|
|
719
|
-
|
|
720
|
-
|
|
721
|
-
|
|
722
|
-
|
|
723
|
-
|
|
724
|
-
|
|
725
|
-
|
|
726
|
-
|
|
727
|
-
|
|
728
|
-
|
|
146
|
+
async function get_server(use_https, user_config, handler) {
|
|
147
|
+
/** @type {https.ServerOptions} */
|
|
148
|
+
const https_options = {};
|
|
149
|
+
|
|
150
|
+
if (use_https) {
|
|
151
|
+
const secure_opts = user_config.server
|
|
152
|
+
? /** @type {import('tls').SecureContextOptions} */ (user_config.server.https)
|
|
153
|
+
: {};
|
|
154
|
+
|
|
155
|
+
if (secure_opts.key && secure_opts.cert) {
|
|
156
|
+
https_options.key = secure_opts.key.toString();
|
|
157
|
+
https_options.cert = secure_opts.cert.toString();
|
|
158
|
+
} else {
|
|
159
|
+
https_options.key = https_options.cert = (await import('./cert.js')).createCertificate();
|
|
729
160
|
}
|
|
730
|
-
|
|
731
|
-
return true;
|
|
732
161
|
}
|
|
733
162
|
|
|
734
|
-
return
|
|
735
|
-
|
|
736
|
-
|
|
737
|
-
|
|
738
|
-
|
|
739
|
-
|
|
740
|
-
appDir: config.kit.appDir,
|
|
741
|
-
trailingSlash: config.kit.trailingSlash,
|
|
742
|
-
|
|
743
|
-
createEntries(fn) {
|
|
744
|
-
generated_manifest = true;
|
|
745
|
-
|
|
746
|
-
const { routes } = build_data.manifest_data;
|
|
747
|
-
|
|
748
|
-
/** @type {import('types').RouteDefinition[]} */
|
|
749
|
-
const facades = routes.map((route) => ({
|
|
750
|
-
type: route.type,
|
|
751
|
-
segments: route.segments,
|
|
752
|
-
pattern: route.pattern,
|
|
753
|
-
methods: route.type === 'page' ? ['get'] : build_data.server.methods[route.file]
|
|
754
|
-
}));
|
|
755
|
-
|
|
756
|
-
const seen = new Set();
|
|
757
|
-
|
|
758
|
-
for (let i = 0; i < routes.length; i += 1) {
|
|
759
|
-
const route = routes[i];
|
|
760
|
-
const { id, filter, complete } = fn(facades[i]);
|
|
761
|
-
|
|
762
|
-
if (seen.has(id)) continue;
|
|
763
|
-
seen.add(id);
|
|
764
|
-
|
|
765
|
-
const group = [route];
|
|
766
|
-
|
|
767
|
-
// figure out which lower priority routes should be considered fallbacks
|
|
768
|
-
for (let j = i + 1; j < routes.length; j += 1) {
|
|
769
|
-
if (filter(facades[j])) {
|
|
770
|
-
group.push(routes[j]);
|
|
771
|
-
}
|
|
772
|
-
}
|
|
773
|
-
|
|
774
|
-
const filtered = new Set(group.filter(not_prerendered));
|
|
775
|
-
|
|
776
|
-
// heuristic: if /foo/[bar] is included, /foo/[bar].json should
|
|
777
|
-
// also be included, since the page likely needs the endpoint
|
|
778
|
-
filtered.forEach((route) => {
|
|
779
|
-
if (route.type === 'page') {
|
|
780
|
-
const length = route.segments.length;
|
|
781
|
-
|
|
782
|
-
const endpoint = routes.find((candidate) => {
|
|
783
|
-
if (candidate.segments.length !== length) return false;
|
|
784
|
-
|
|
785
|
-
for (let i = 0; i < length; i += 1) {
|
|
786
|
-
const a = route.segments[i];
|
|
787
|
-
const b = candidate.segments[i];
|
|
788
|
-
|
|
789
|
-
if (i === length - 1) {
|
|
790
|
-
return b.content === `${a.content}.json`;
|
|
791
|
-
}
|
|
792
|
-
|
|
793
|
-
if (a.content !== b.content) return false;
|
|
794
|
-
}
|
|
795
|
-
});
|
|
796
|
-
|
|
797
|
-
if (endpoint) {
|
|
798
|
-
filtered.add(endpoint);
|
|
799
|
-
}
|
|
800
|
-
}
|
|
801
|
-
});
|
|
802
|
-
|
|
803
|
-
if (filtered.size > 0) {
|
|
804
|
-
complete({
|
|
805
|
-
generateManifest: ({ relativePath, format }) =>
|
|
806
|
-
generate_manifest(build_data, relativePath, Array.from(filtered), format)
|
|
807
|
-
});
|
|
808
|
-
}
|
|
809
|
-
}
|
|
810
|
-
},
|
|
811
|
-
|
|
812
|
-
generateManifest: ({ relativePath, format }) => {
|
|
813
|
-
generated_manifest = true;
|
|
814
|
-
return generate_manifest(
|
|
815
|
-
build_data,
|
|
816
|
-
relativePath,
|
|
817
|
-
build_data.manifest_data.routes.filter(not_prerendered),
|
|
818
|
-
format
|
|
819
|
-
);
|
|
820
|
-
},
|
|
821
|
-
|
|
822
|
-
getBuildDirectory(name) {
|
|
823
|
-
return `${cwd}/${SVELTE_KIT}/${name}`;
|
|
824
|
-
},
|
|
825
|
-
|
|
826
|
-
getClientDirectory() {
|
|
827
|
-
return `${cwd}/${SVELTE_KIT}/output/client`;
|
|
828
|
-
},
|
|
829
|
-
|
|
830
|
-
getServerDirectory() {
|
|
831
|
-
return `${cwd}/${SVELTE_KIT}/output/server`;
|
|
832
|
-
},
|
|
833
|
-
|
|
834
|
-
getStaticDirectory() {
|
|
835
|
-
return config.kit.files.assets;
|
|
836
|
-
},
|
|
837
|
-
|
|
838
|
-
writeClient(dest) {
|
|
839
|
-
return copy(`${cwd}/${SVELTE_KIT}/output/client`, dest, {
|
|
840
|
-
filter: (file) => file[0] !== '.'
|
|
841
|
-
});
|
|
842
|
-
},
|
|
843
|
-
|
|
844
|
-
writeServer(dest) {
|
|
845
|
-
return copy(`${cwd}/${SVELTE_KIT}/output/server`, dest, {
|
|
846
|
-
filter: (file) => file[0] !== '.'
|
|
847
|
-
});
|
|
848
|
-
},
|
|
849
|
-
|
|
850
|
-
writeStatic(dest) {
|
|
851
|
-
return copy(config.kit.files.assets, dest);
|
|
852
|
-
},
|
|
853
|
-
|
|
854
|
-
async prerender({ all = false, dest, fallback }) {
|
|
855
|
-
if (generated_manifest) {
|
|
856
|
-
throw new Error(
|
|
857
|
-
'Adapters must call prerender(...) before createEntries(...) or generateManifest(...)'
|
|
858
|
-
);
|
|
859
|
-
}
|
|
860
|
-
|
|
861
|
-
const prerendered = await prerender({
|
|
862
|
-
out: dest,
|
|
863
|
-
all,
|
|
864
|
-
cwd,
|
|
865
|
-
config,
|
|
866
|
-
build_data,
|
|
867
|
-
fallback,
|
|
868
|
-
log
|
|
869
|
-
});
|
|
870
|
-
|
|
871
|
-
prerendered_paths = new Set(prerendered.paths);
|
|
872
|
-
|
|
873
|
-
return prerendered;
|
|
874
|
-
}
|
|
875
|
-
};
|
|
876
|
-
}
|
|
877
|
-
|
|
878
|
-
/**
|
|
879
|
-
* @param {import('types').ValidatedConfig} config
|
|
880
|
-
* @param {import('types').BuildData} build_data
|
|
881
|
-
* @param {{ cwd?: string, verbose: boolean }} opts
|
|
882
|
-
*/
|
|
883
|
-
async function adapt(config, build_data, { cwd = process.cwd(), verbose }) {
|
|
884
|
-
const { name, adapt } = config.kit.adapter;
|
|
885
|
-
|
|
886
|
-
console.log($.bold().cyan(`\n> Using ${name}`));
|
|
887
|
-
|
|
888
|
-
const log = logger({ verbose });
|
|
889
|
-
const builder = create_builder({ cwd, config, build_data, log });
|
|
890
|
-
await adapt(builder);
|
|
891
|
-
|
|
892
|
-
log.success('done');
|
|
163
|
+
return Promise.resolve(
|
|
164
|
+
use_https
|
|
165
|
+
? https.createServer(/** @type {https.ServerOptions} */ (https_options), handler)
|
|
166
|
+
: http.createServer(handler)
|
|
167
|
+
);
|
|
893
168
|
}
|
|
894
169
|
|
|
895
|
-
export {
|
|
170
|
+
export { preview };
|