@sveltejs/kit 1.0.0-next.406 → 1.0.0-next.409

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.406",
+  "version": "1.0.0-next.409",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",

package/src/core/sync/create_manifest_data/index.js

@@ -362,7 +362,7 @@ function trace(tree, id, layout_id = DEFAULT, project_relative) {
 			layouts.unshift(layout);
 		}
 
-		const parent_layout_id = layout?.component?.split('@')[1]?.split('.')[0];
+		const parent_layout_id = layout?.component?.split('/').at(-1)?.split('@')[1]?.split('.')[0];
 
 		if (parent_layout_id) {
 			layout_id = parent_layout_id;

package/src/core/sync/write_types.js

@@ -390,18 +390,13 @@ function process_node(ts, node, outdir, params, groups) {
 			const types = [];
 			for (const method of ['POST', 'PUT', 'PATCH']) {
 				if (proxy.exports.includes(method)) {
-					if (proxy.modified) {
-						types.push(`Kit.AwaitedErrors<typeof import('./proxy${basename}').${method}>`);
-					} else {
-						// If the file wasn't tweaked, we can use the return type of the original file.
-						// The advantage is that type updates are reflected without saving.
-						types.push(
-							`Kit.AwaitedErrors<typeof import("${path_to_original(
-								outdir,
-								node.server
-							)}").${method}>`
-						);
-					}
+					// If the file wasn't tweaked, we can use the return type of the original file.
+					// The advantage is that type updates are reflected without saving.
+					const from = proxy.modified
+						? `./proxy${replace_ext_with_js(basename)}`
+						: path_to_original(outdir, node.server);
+
+					types.push(`Kit.AwaitedErrors<typeof import('${from}').${method}>`);
 				}
 			}
 			errors = types.length ? types.join(' | ') : 'null';
@@ -494,18 +489,17 @@ function process_node(ts, node, outdir, params, groups) {
  * @param {string} file_path
  */
 function path_to_original(outdir, file_path) {
+	return posixify(path.relative(outdir, path.join(cwd, replace_ext_with_js(file_path))));
+}
+
+/**
+ * @param {string} file_path
+ */
+function replace_ext_with_js(file_path) {
+	// Another extension than `.js` (or nothing, but that fails with node16 moduleResolution)
+	// will result in TS failing to lookup the file
 	const ext = path.extname(file_path);
-	return posixify(
-		path.relative(
-			outdir,
-			path.join(
-				cwd,
-				// Another extension than `.js` (or nothing, but that fails with node16 moduleResolution)
-				// will result in TS failing to lookup the file
-				file_path.slice(0, -ext.length) + '.js'
-			)
-		)
-	);
+	return file_path.slice(0, -ext.length) + '.js';
 }
 
 /**
@@ -722,10 +716,6 @@ export function find_nearest_layout(routes_dir, nodes, start_idx) {
 		}
 
 		// matching parent layout found
-		// let import_path = posixify(path.relative(path.dirname(start_file), common_path + '/$types.js'));
-		// if (!import_path.startsWith('.')) {
-		// 	import_path = './' + import_path;
-		// }
 		let folder_depth_diff =
 			posixify(path.relative(path.dirname(start_file), common_path + '/$types.js')).split('/')
 				.length - 1;

package/src/index/private.js

@@ -3,6 +3,8 @@ export class HttpError {
 	// include a stack for these sorts of errors, but we also don't want red
 	// squigglies everywhere, so this feels like a not-terribile compromise
 	name = 'HttpError';
+
+	/** @type {void} */
 	stack = undefined;
 
 	/**

package/src/packaging/utils.js

@@ -103,7 +103,12 @@ export function analyze(config, file) {
 export function generate_pkg(cwd, files) {
 	const pkg = JSON.parse(fs.readFileSync(path.join(cwd, 'package.json'), 'utf8'));
 
+	// Remove fields that are specific to the original package.json
+	// See: https://pnpm.io/package_json#publishconfigdirectory
+	delete pkg.publishConfig?.directory;
+	delete pkg.linkDirectory?.directory;
 	delete pkg.scripts;
+
 	pkg.type = 'module';
 
 	pkg.exports = {

package/src/runtime/server/page/index.js

@@ -364,21 +364,16 @@ export async function handle_json_request(event, options, mod) {
 			return json(result);
 		}
 
-		if (method === 'POST') {
+		if (result?.errors) {
 			// @ts-ignore
-			if (result.errors) {
-				// @ts-ignore
-				return json({ errors: result.errors }, { status: result.status || 400 });
-			}
-
-			return new Response(undefined, {
-				status: 201,
-				// @ts-ignore
-				headers: result.location ? { location: result.location } : undefined
-			});
+			return json({ errors: result.errors }, { status: result.status || 400 });
 		}
 
-		return new Response(undefined, { status: 204 });
+		return new Response(undefined, {
+			status: 204,
+			// @ts-ignore
+			headers: result?.location ? { location: result.location } : undefined
+		});
 	} catch (e) {
 		const error = normalize_error(e);
 

package/src/vite/build/build_server.js

@@ -214,7 +214,9 @@ export async function build_server(options, client) {
 	const { chunks } = await create_build(merged_config);
 
 	/** @type {import('vite').Manifest} */
-	const vite_manifest = JSON.parse(fs.readFileSync(`${output_dir}/server/manifest.json`, 'utf-8'));
+	const vite_manifest = JSON.parse(
+		fs.readFileSync(`${output_dir}/server/${vite_config.build.manifest}`, 'utf-8')
+	);
 
 	mkdirp(`${output_dir}/server/nodes`);
 	mkdirp(`${output_dir}/server/stylesheets`);

package/src/vite/build/utils.js

@@ -93,7 +93,8 @@ export const get_default_config = function ({ config, input, ssr, outDir }) {
 		base: assets_base(config.kit),
 		build: {
 			cssCodeSplit: true,
-			manifest: true,
+			// don't use the default name to avoid collisions with 'static/manifest.json'
+			manifest: 'vite-manifest.json',
 			outDir,
 			polyfillModulePreload: false,
 			rollupOptions: {

package/src/vite/index.js

@@ -167,7 +167,7 @@ function kit() {
 	function client_build_info(assets, chunks) {
 		/** @type {import('vite').Manifest} */
 		const vite_manifest = JSON.parse(
-			fs.readFileSync(`${paths.client_out_dir}/manifest.json`, 'utf-8')
+			fs.readFileSync(`${paths.client_out_dir}/${vite_config.build.manifest}`, 'utf-8')
 		);
 
 		const entry_id = posixify(path.relative(cwd, `${runtime_directory}/client/start.js`));
@@ -437,6 +437,10 @@ function kit() {
 					`See ${colors.bold().cyan('https://kit.svelte.dev/docs/adapters')} to learn how to configure your app to run on the platform of your choosing`
 				);
 			}
+
+			// avoid making the manifest available to users
+			fs.unlinkSync(`${paths.output_dir}/client/${vite_config.build.manifest}`);
+			fs.unlinkSync(`${paths.output_dir}/server/${vite_config.build.manifest}`);
 		},
 
 		/**