Use the same option source for SSL (certs and keys) in Preview and Dev

.changeset/itchy-readers-search.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+Align Dev and Preview key/cert options

packages/kit/src/core/dev/index.js

@@ -77,18 +77,18 @@ class Watcher extends EventEmitter {
 	}
 
 	async init_server() {
-		/** @type {any} */
-		const user_config = (this.config.kit.vite && this.config.kit.vite()) || {};
+		/** @type {import('types/config').ViteConfig} ViteConfig */
+		const vite_config = (this.config.kit.vite && this.config.kit.vite()) || {};
 
 		/** @type {(req: import("http").IncomingMessage, res: import("http").ServerResponse) => void} */
 		let handler = (req, res) => {};
 
-		this.server = await get_server(this.https, user_config, (req, res) => handler(req, res));
+		this.server = await get_server(this.https, vite_config, (req, res) => handler(req, res));
 
-		const alias = user_config.resolve && user_config.resolve.alias;
+		const alias = vite_config.resolve && vite_config.resolve.alias;
 
 		/** @type {[any, string[]]} */
-		const [merged_config, conflicts] = deep_merge(user_config, {
+		const [merged_config, conflicts] = deep_merge(vite_config, {
 			configFile: false,
 			root: this.cwd,
 			resolve: {
@@ -125,7 +125,8 @@ class Watcher extends EventEmitter {
 				entries: []
 			},
 			ssr: {
-				noExternal: get_no_external(this.cwd, user_config.ssr && user_config.ssr.noExternal)
+				// @ts-ignore // ssr not defined in vite config.ts
+				noExternal: get_no_external(this.cwd, vite_config.ssr && vite_config.ssr.noExternal)
 			}
 		});
 

packages/kit/src/core/server/index.js

@@ -1,33 +1,62 @@
 import http from 'http';
 import https from 'https';
+import fs from 'fs';
+import path from 'path';
 /**
  *
  * @param {boolean} use_https
- * @param {any} user_config
+ * @param {import('types/config').ViteConfig} vite_config
  * @param {(req: http.IncomingMessage, res: http.ServerResponse) => void} handler
  * @returns {Promise<import('net').Server>}
  */
-export async function get_server(use_https, user_config, handler) {
+export async function get_server(use_https, vite_config, handler) {
 	/** @type {https.ServerOptions} */
-	const https_options = {};
+	let https_options;
 
 	if (use_https) {
-		if (
-			user_config.server &&
-			user_config.server.https &&
-			user_config.server.https.key &&
-			user_config.server.https.cert
-		) {
-			https_options.key = user_config.server.https.key.toString();
-			https_options.cert = user_config.server.https.cert.toString();
-		} else {
-			https_options.key = https_options.cert = (await import('./cert')).createCertificate();
+		https_options =
+			vite_config && vite_config.server && typeof vite_config.server.https === 'object'
+				? vite_config.server.https
+				: {};
+
+		if (https_options.ca) https_options.ca = readFileIfExists(https_options.ca);
+		if (https_options.cert) https_options.cert = readFileIfExists(https_options.cert);
+		if (https_options.key) https_options.key = readFileIfExists(https_options.key);
+		if (https_options.pfx) {
+			https_options.pfx = readFileIfExists(https_options.pfx);
+			delete https_options.cert;
+			delete https_options.key;
+		}
+
+		if (!https_options.pfx && (!https_options.key || !https_options.cert)) {
+			https_options.cert = https_options.key = (await import('./cert')).createCertificate();
+		}
+	} else {
+		if (vite_config && vite_config.server) {
+			delete vite_config.server.https;
 		}
 	}
 
 	return Promise.resolve(
 		use_https
-			? https.createServer(/** @type {https.ServerOptions} */ (https_options), handler)
+			? https.createServer(/** @type {https.ServerOptions} */(https_options), handler)
 			: http.createServer(handler)
 	);
 }
+
+/**
+ *
+ * @param {string | Buffer | any[]} value
+ * @returns {string | Buffer | Buffer[]} value
+ */
+function readFileIfExists(value) {
+	if (typeof value === 'string') {
+		try {
+			return fs.readFileSync(path.resolve(value));
+			//			return fs.readFileSync(path.resolve(value), { encoding: 'utf-8' });
+		} catch (e) {
+			return value;
+		}
+	}
+	return value;
+}

packages/kit/src/core/start/index.js

@@ -48,7 +48,11 @@ export async function start({ port, host, config, https: use_https = false, cwd
 		read: (file) => fs.readFileSync(join(config.kit.files.assets, file))
 	});
 
-	const server = await get_server(use_https, config.kit, (req, res) => {
+	const vite_config =
+		/** @type {import('types/config').ViteConfig} ViteConfig */
+		(config.kit.vite && config.kit.vite()) || {};
+
+	const server = await get_server(use_https, vite_config, (req, res) => {
 		const parsed = parse(req.url || '');
 
 		assets_handler(req, res, () => {

packages/kit/types/config.d.ts

@@ -123,3 +123,5 @@ export type ValidatedConfig = {
 	};
 	preprocess: any;
 };
+
+export type { ViteConfig };