@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/index4.js
CHANGED
|
@@ -1,120 +1,895 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { b as SVELTE_KIT, m as mkdirp, h as rimraf, i as copy, $, j as logger } from '../cli.js';
|
|
2
|
+
import { readFileSync, writeFileSync } from 'fs';
|
|
3
|
+
import { resolve as resolve$1, join, dirname } from 'path';
|
|
4
|
+
import { pathToFileURL, URL } from 'url';
|
|
5
|
+
import { installFetch } from '../install-fetch.js';
|
|
6
|
+
import { g as generate_manifest } from './index3.js';
|
|
7
|
+
import 'sade';
|
|
8
|
+
import 'child_process';
|
|
9
|
+
import 'net';
|
|
10
|
+
import 'os';
|
|
11
|
+
import 'node:http';
|
|
12
|
+
import 'node:https';
|
|
13
|
+
import 'node:zlib';
|
|
14
|
+
import 'node:stream';
|
|
15
|
+
import 'node:util';
|
|
16
|
+
import 'node:url';
|
|
17
|
+
import './misc.js';
|
|
18
|
+
|
|
19
|
+
const absolute = /^([a-z]+:)?\/?\//;
|
|
20
|
+
const scheme = /^[a-z]+:/;
|
|
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
|
+
}
|
|
3
57
|
|
|
4
58
|
/**
|
|
5
|
-
* @param {
|
|
6
|
-
* @param {
|
|
7
|
-
* @param {import('types').RouteData[]} routes;
|
|
8
|
-
* @param {'esm' | 'cjs'} format
|
|
59
|
+
* @param {string} path
|
|
60
|
+
* @param {import('types').TrailingSlash} trailing_slash
|
|
9
61
|
*/
|
|
10
|
-
function
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
) {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
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;
|
|
24
98
|
});
|
|
25
99
|
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
100
|
+
done.catch(() => {
|
|
101
|
+
// this is necessary in case a catch handler is never added
|
|
102
|
+
// to the done promise by the user
|
|
29
103
|
});
|
|
30
104
|
|
|
31
|
-
|
|
32
|
-
if (
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
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());
|
|
36
112
|
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
113
|
+
promise
|
|
114
|
+
.then(task.fulfil, (err) => {
|
|
115
|
+
task.reject(err);
|
|
116
|
+
reject(err);
|
|
117
|
+
})
|
|
118
|
+
.then(() => {
|
|
119
|
+
current -= 1;
|
|
120
|
+
dequeue();
|
|
40
121
|
});
|
|
41
|
-
|
|
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 });
|
|
42
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
|
+
}
|
|
414
|
+
|
|
415
|
+
return escape_html_attr_dict[match] ?? `&#${match.charCodeAt(0)};`;
|
|
416
|
+
});
|
|
417
|
+
|
|
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
|
+
/**
|
|
452
|
+
* @param {{
|
|
453
|
+
* cwd: string;
|
|
454
|
+
* out: string;
|
|
455
|
+
* log: Logger;
|
|
456
|
+
* config: import('types').ValidatedConfig;
|
|
457
|
+
* build_data: import('types').BuildData;
|
|
458
|
+
* fallback?: string;
|
|
459
|
+
* all: boolean; // disregard `export const prerender = true`
|
|
460
|
+
* }} opts
|
|
461
|
+
*/
|
|
462
|
+
async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
|
|
463
|
+
/** @type {import('types').Prerendered} */
|
|
464
|
+
const prerendered = {
|
|
465
|
+
pages: new Map(),
|
|
466
|
+
assets: new Map(),
|
|
467
|
+
redirects: new Map(),
|
|
468
|
+
paths: []
|
|
469
|
+
};
|
|
470
|
+
|
|
471
|
+
if (!config.kit.prerender.enabled && !fallback) {
|
|
472
|
+
return prerendered;
|
|
473
|
+
}
|
|
474
|
+
|
|
475
|
+
installFetch();
|
|
476
|
+
|
|
477
|
+
const server_root = resolve$1(cwd, `${SVELTE_KIT}/output`);
|
|
478
|
+
|
|
479
|
+
/** @type {import('types').ServerModule} */
|
|
480
|
+
const { Server, override } = await import(pathToFileURL(`${server_root}/server/index.js`).href);
|
|
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);
|
|
490
|
+
|
|
491
|
+
const error = normalise_error_handler(log, config.kit.prerender.onError);
|
|
492
|
+
|
|
493
|
+
const files = new Set([
|
|
494
|
+
...build_data.static,
|
|
495
|
+
...build_data.client.chunks.map((chunk) => `${config.kit.appDir}/${chunk.fileName}`),
|
|
496
|
+
...build_data.client.assets.map((chunk) => `${config.kit.appDir}/${chunk.fileName}`)
|
|
497
|
+
]);
|
|
498
|
+
|
|
499
|
+
build_data.static.forEach((file) => {
|
|
500
|
+
if (file.endsWith('/index.html')) {
|
|
501
|
+
files.add(file.slice(0, -11));
|
|
43
502
|
}
|
|
44
503
|
});
|
|
45
504
|
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
505
|
+
const q = queue(config.kit.prerender.concurrency);
|
|
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);
|
|
573
|
+
|
|
574
|
+
const body = result.body ?? new Uint8Array(await result.response.arrayBuffer());
|
|
575
|
+
save(
|
|
576
|
+
result.response,
|
|
577
|
+
body,
|
|
578
|
+
decoded_dependency_path,
|
|
579
|
+
encoded_dependency_path,
|
|
580
|
+
decoded,
|
|
581
|
+
'fetched'
|
|
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;
|
|
591
|
+
|
|
592
|
+
const parsed = new URL(resolved, 'http://localhost');
|
|
593
|
+
|
|
594
|
+
if (parsed.search) ;
|
|
595
|
+
|
|
596
|
+
const pathname = normalize_path(parsed.pathname, config.kit.trailingSlash);
|
|
597
|
+
enqueue(decoded, decodeURI(pathname), pathname);
|
|
598
|
+
}
|
|
599
|
+
}
|
|
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
|
+
|
|
621
|
+
if (response_type === REDIRECT) {
|
|
622
|
+
const location = response.headers.get('location');
|
|
623
|
+
|
|
624
|
+
if (location) {
|
|
625
|
+
mkdirp(dirname(dest));
|
|
626
|
+
|
|
627
|
+
log.warn(`${response.status} ${decoded} -> ${location}`);
|
|
628
|
+
|
|
629
|
+
writeFileSync(
|
|
630
|
+
dest,
|
|
631
|
+
`<meta http-equiv="refresh" content=${escape_html_attr(`0;url=${location}`)}>`
|
|
632
|
+
);
|
|
633
|
+
|
|
634
|
+
let resolved = resolve(encoded, location);
|
|
635
|
+
if (is_root_relative(resolved)) {
|
|
636
|
+
resolved = normalize_path(resolved, config.kit.trailingSlash);
|
|
637
|
+
enqueue(decoded, decodeURI(resolved), resolved);
|
|
638
|
+
}
|
|
639
|
+
|
|
640
|
+
if (!prerendered.redirects.has(decoded)) {
|
|
641
|
+
prerendered.redirects.set(decoded, {
|
|
642
|
+
status: response.status,
|
|
643
|
+
location: resolved
|
|
644
|
+
});
|
|
645
|
+
|
|
646
|
+
prerendered.paths.push(normalize_path(decoded, 'never'));
|
|
647
|
+
}
|
|
648
|
+
} else {
|
|
649
|
+
log.warn(`location header missing on redirect received from ${decoded}`);
|
|
650
|
+
}
|
|
651
|
+
|
|
652
|
+
return;
|
|
653
|
+
}
|
|
654
|
+
|
|
655
|
+
if (response.status === 200) {
|
|
656
|
+
mkdirp(dirname(dest));
|
|
657
|
+
|
|
658
|
+
log.info(`${response.status} ${decoded}`);
|
|
659
|
+
writeFileSync(dest, body);
|
|
660
|
+
|
|
661
|
+
if (is_html) {
|
|
662
|
+
prerendered.pages.set(decoded, {
|
|
663
|
+
file
|
|
664
|
+
});
|
|
665
|
+
} else {
|
|
666
|
+
prerendered.assets.set(decoded, {
|
|
667
|
+
type
|
|
668
|
+
});
|
|
669
|
+
}
|
|
670
|
+
|
|
671
|
+
prerendered.paths.push(normalize_path(decoded, 'never'));
|
|
672
|
+
} else if (response_type !== OK) {
|
|
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));
|
|
685
|
+
}
|
|
686
|
+
}
|
|
687
|
+
|
|
688
|
+
await q.done();
|
|
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
|
+
});
|
|
51
699
|
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
700
|
+
const file = join(out, fallback);
|
|
701
|
+
mkdirp(dirname(file));
|
|
702
|
+
writeFileSync(file, await rendered.text());
|
|
55
703
|
}
|
|
56
704
|
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
705
|
+
return prerendered;
|
|
706
|
+
}
|
|
707
|
+
|
|
708
|
+
/**
|
|
709
|
+
* @param {{
|
|
710
|
+
* cwd: string;
|
|
711
|
+
* config: import('types').ValidatedConfig;
|
|
712
|
+
* build_data: import('types').BuildData;
|
|
713
|
+
* log: import('types').Logger;
|
|
714
|
+
* }} opts
|
|
715
|
+
* @returns {import('types').Builder}
|
|
716
|
+
*/
|
|
717
|
+
function create_builder({ cwd, config, build_data, log }) {
|
|
718
|
+
/** @type {Set<string>} */
|
|
719
|
+
let prerendered_paths;
|
|
720
|
+
|
|
721
|
+
let generated_manifest = false;
|
|
722
|
+
|
|
723
|
+
/** @param {import('types').RouteData} route */
|
|
724
|
+
function not_prerendered(route) {
|
|
725
|
+
if (!prerendered_paths) return true;
|
|
726
|
+
|
|
727
|
+
if (route.type === 'page' && route.path) {
|
|
728
|
+
return !prerendered_paths.has(route.path);
|
|
729
|
+
}
|
|
730
|
+
|
|
731
|
+
return true;
|
|
732
|
+
}
|
|
733
|
+
|
|
734
|
+
return {
|
|
735
|
+
log,
|
|
736
|
+
rimraf,
|
|
737
|
+
mkdirp,
|
|
738
|
+
copy,
|
|
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) => {
|
|
72
779
|
if (route.type === 'page') {
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
}`.replace(/^\t\t/gm, '');
|
|
82
|
-
} else {
|
|
83
|
-
if (!build_data.server.vite_manifest[route.file]) {
|
|
84
|
-
// this is necessary in cases where a .css file snuck in —
|
|
85
|
-
// perhaps it would be better to disallow these (and others?)
|
|
86
|
-
return null;
|
|
87
|
-
}
|
|
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];
|
|
88
788
|
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
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
|
+
}
|
|
95
800
|
}
|
|
96
|
-
})
|
|
97
|
-
|
|
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;
|
|
98
874
|
}
|
|
99
|
-
}
|
|
875
|
+
};
|
|
100
876
|
}
|
|
101
877
|
|
|
102
|
-
/**
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
: 'null';
|
|
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');
|
|
118
893
|
}
|
|
119
894
|
|
|
120
|
-
export {
|
|
895
|
+
export { adapt };
|