chore: address pr feedback

maraisr · maraisr · commit cfb19fb30920 · 2022-05-05T07:27:20.000+10:00
diff --git a/documentation/docs/14-configuration.md b/documentation/docs/14-configuration.md
@@ -29,7 +29,6 @@ const config = {
 				// ...
 			}
 		},
-		link_header: false,
 		endpointExtensions: ['.js', '.ts'],
 		files: {
 			assets: 'static',
@@ -139,12 +138,6 @@ When pages are prerendered, the CSP header is added via a `<meta http-equiv>` ta
 
 > When `mode` is `'auto'`, SvelteKit will use nonces for dynamically rendered pages and hashes for prerendered pages. Using nonces with prerendered pages is insecure and therefore forbidden.
 
-# link_header
-
-When `true` the server will inject a `Link: </my-files.js>; rel=preload` header defined by [MDN Link](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Link). This can be used to let the browser know about modulepreloads before the html is parsed.
-
-> Cloudflare with [Early Hits](https://developers.cloudflare.com/cache/about/early-hints) enabled can then further optimize this by fetching these assets as it flies through the edge.
-
 ### endpointExtensions
 
 An array of file extensions that SvelteKit will treat as endpoints. Files with extensions that match neither `config.extensions` nor `config.kit.endpointExtensions` will be ignored by the router.
diff --git a/packages/kit/src/core/dev/plugin.js b/packages/kit/src/core/dev/plugin.js
@@ -286,7 +286,6 @@ export async function create_plugin(config, cwd) {
 							{
 								amp: config.kit.amp,
 								csp: config.kit.csp,
-								link_header: false,
 								dev: true,
 								floc: config.kit.floc,
 								get_stack: (error) => {
diff --git a/packages/kit/src/runtime/server/page/render.js b/packages/kit/src/runtime/server/page/render.js
@@ -233,7 +233,9 @@ export async function render_response({
 					// don't load stylesheets that are already inlined
 					// include them in disabled state so that Vite can detect them and doesn't try to add them
 					attributes.push('disabled', 'media="(max-width: 0)"');
-				} else if (options.link_header) link_header_preload.add(path);
+				} else {
+					link_header_preload.add(`<${path}>; rel="preload"`);
+				}
 
 				return `\n\t<link ${attributes.join(' ')}>`;
 			})
@@ -243,7 +245,7 @@ export async function render_response({
 			for (const dep of modulepreloads) {
 				const path = options.prefix + dep;
 				head += `\n\t<link rel="modulepreload" href="${path}">`;
-				if (options.link_header) link_header_preload.add(path);
+				link_header_preload.add(`<${path}>; rel="modulepreload"`);
 			}
 
 			const attributes = ['type="module"', `data-hydrate="${target}"`];
@@ -310,12 +312,7 @@ export async function render_response({
 	});
 
 	if (link_header_preload.size) {
-		headers.set(
-			'link',
-			Array.from(link_header_preload)
-				.map((href) => `<${href}>; rel=preload`)
-				.join(',')
-		);
+		headers.set('link', Array.from(link_header_preload).join(','));
 	}
 
 	if (cache) {
diff --git a/packages/kit/types/internal.d.ts b/packages/kit/types/internal.d.ts
@@ -242,7 +242,6 @@ export type SSRNodeLoader = () => Promise<SSRNode>;
 export interface SSROptions {
 	amp: boolean;
 	csp: ValidatedConfig['kit']['csp'];
-	link_header: boolean;
 	dev: boolean;
 	floc: boolean;
 	get_stack: (error: Error) => string | undefined;

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,6 @@ export async function create_plugin(config, cwd) {`
`286`	`286`	`{`
`287`	`287`	`amp: config.kit.amp,`
`288`	`288`	`csp: config.kit.csp,`
`289`		`- link_header: false,`
`290`	`289`	`dev: true,`
`291`	`290`	`floc: config.kit.floc,`
`292`	`291`	`get_stack: (error) => {`