.changeset/famous-boxes-tap.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+prevent duplicate module ids by disabling optimizeDeps for @sveltejs/kit

.changeset/ninety-snakes-melt.md

@@ -0,0 +1,5 @@
+---
+'svelte-migrate': patch
+---
+
+Suggest props destructuring if possible

.changeset/ninety-vans-talk.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+Generate types when Svelte file missing, fix layout params

.changeset/old-berries-develop.md

@@ -0,0 +1,5 @@
+---
+'svelte-migrate': patch
+---
+
+Fix typo in migration task

.changeset/pre.json

@@ -240,6 +240,7 @@
     "fair-pets-bake",
     "famous-birds-boil",
     "famous-birds-cheer",
+    "famous-boxes-tap",
     "famous-cameras-cheer",
     "famous-crabs-run",
     "famous-donuts-whisper",
@@ -627,7 +628,9 @@
     "ninety-games-flow",
     "ninety-glasses-exercise",
     "ninety-singers-invite",
+    "ninety-snakes-melt",
     "ninety-suns-relax",
+    "ninety-vans-talk",
     "odd-bottles-drop",
     "odd-coats-shake",
     "odd-coins-lie",
@@ -641,6 +644,7 @@
     "odd-pumas-grow",
     "odd-trees-visit",
     "old-beers-push",
+    "old-berries-develop",
     "old-cars-switch",
     "old-comics-happen",
     "old-ears-wait",
@@ -1056,6 +1060,7 @@
     "tiny-humans-yawn",
     "tiny-kids-sort",
     "tiny-moles-joke",
+    "tiny-pears-check",
     "tiny-shrimps-call",
     "tiny-singers-allow",
     "tiny-socks-sparkle",

.changeset/tiny-pears-check.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+Silence unknown prop warnings coming from SvelteKit

packages/kit/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @sveltejs/kit
 
+## 1.0.0-next.424
+
+### Patch Changes
+
+- prevent duplicate module ids by disabling optimizeDeps for @sveltejs/kit ([#6057](https://github.com/sveltejs/kit/pull/6057))
+
+* Generate types when Svelte file missing, fix layout params ([#6066](https://github.com/sveltejs/kit/pull/6066))
+
+- Silence unknown prop warnings coming from SvelteKit ([#6071](https://github.com/sveltejs/kit/pull/6071))
+
 ## 1.0.0-next.423
 
 ### Patch Changes

packages/kit/package.json

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

packages/kit/src/core/sync/write_types.js

@@ -162,10 +162,11 @@ function get_groups(manifest_data, routes_dir) {
 		/** @type {Node} */
 		const node = { ...nodes[i] }; // shallow copy so we don't mutate the original when setting parent
 
+		const file_path = /** @type {string} */ (node.component ?? node.shared ?? node.server);
 		// skip default layout/error
-		if (!node?.component?.startsWith(routes_dir)) continue;
+		if (!file_path.startsWith(routes_dir)) continue;
 
-		const parts = /** @type {string} */ (node.component ?? node.shared ?? node.server).split('/');
+		const parts = file_path.split('/');
 
 		const file = /** @type {string} */ (parts.pop());
 		const dir = parts.join('/').slice(routes_dir.length + 1);
@@ -284,7 +285,7 @@ function write_types_for_dir(config, manifest_data, routes_dir, dir, groups, ts)
 		manifest_data.routes.forEach((route) => {
 			if (route.type === 'page' && route.id.startsWith(dir + '/')) {
 				// TODO this is O(n^2), see if we need to speed it up
-				for (const name of parse_route_id(route.id).names) {
+				for (const name of parse_route_id(route.id.slice(dir.length + 1)).names) {
 					layout_params.add(name);
 				}
 			}

packages/kit/src/runtime/client/client.js

@@ -268,7 +268,22 @@ export function create_client({ target, base, trailing_slash }) {
 				navigation_result.props.page.url = url;
 			}
 
-			root.$set(navigation_result.props);
+			if (import.meta.env.DEV) {
+				// Nasty hack to silence harmless warnings the user can do nothing about
+				const warn = console.warn;
+				console.warn = (...args) => {
+					if (
+						args.length !== 1 ||
+						!/<(Layout|Page)> was created with unknown prop '(data|errors)'/.test(args[0])
+					) {
+						warn(...args);
+					}
+				};
+				root.$set(navigation_result.props);
+				tick().then(() => (console.warn = warn));
+			} else {
+				root.$set(navigation_result.props);
+			}
 		} else {
 			initialize(navigation_result);
 		}
@@ -347,11 +362,30 @@ export function create_client({ target, base, trailing_slash }) {
 
 		page = result.props.page;
 
-		root = new Root({
-			target,
-			props: { ...result.props, stores },
-			hydrate: true
-		});
+		if (import.meta.env.DEV) {
+			// Nasty hack to silence harmless warnings the user can do nothing about
+			const warn = console.warn;
+			console.warn = (...args) => {
+				if (
+					args.length !== 1 ||
+					!/<(Layout|Page)> was created with unknown prop '(data|errors)'/.test(args[0])
+				) {
+					warn(...args);
+				}
+			};
+			root = new Root({
+				target,
+				props: { ...result.props, stores },
+				hydrate: true
+			});
+			console.warn = warn;
+		} else {
+			root = new Root({
+				target,
+				props: { ...result.props, stores },
+				hydrate: true
+			});
+		}
 
 		if (router_enabled) {
 			const navigation = { from: null, to: new URL(location.href) };

packages/kit/src/vite/build/utils.js

@@ -123,6 +123,9 @@ export function get_default_build_config({ config, input, ssr, outDir }) {
 		resolve: {
 			alias: get_aliases(config.kit)
 		},
+		optimizeDeps: {
+			exclude: ['@sveltejs/kit']
+		},
 		ssr: {
 			noExternal: ['@sveltejs/kit']
 		},

packages/kit/src/vite/index.js

@@ -273,6 +273,9 @@ function kit() {
 					// under different IDs, which breaks a bunch of stuff
 					// https://github.com/vitejs/vite/pull/9296
 					external: ['@sveltejs/kit']
+				},
+				optimizeDeps: {
+					exclude: ['@sveltejs/kit']
 				}
 			};
 

packages/migrate/CHANGELOG.md

@@ -1,5 +1,13 @@
 # svelte-migrate
 
+## 1.0.0-next.8
+
+### Patch Changes
+
+- Suggest props destructuring if possible ([#6069](https://github.com/sveltejs/kit/pull/6069))
+
+* Fix typo in migration task ([#6070](https://github.com/sveltejs/kit/pull/6070))
+
 ## 1.0.0-next.7
 
 ### Patch Changes

packages/migrate/migrations/routes/index.js

@@ -148,7 +148,12 @@ export async function migrate() {
 
 			renamed += svelte_ext;
 
-			const { module, main, ext } = migrate_scripts(content, is_error_page, move_to_directory);
+			const { module, main, ext } = migrate_scripts(
+				content,
+				bare,
+				is_error_page,
+				move_to_directory
+			);
 
 			if (move_to_directory) {
 				const dir = path.dirname(renamed);

packages/migrate/migrations/routes/migrate_scripts/index.js

@@ -9,16 +9,21 @@ import {
 	except_str
 } from '../utils.js';
 import * as TASKS from '../tasks.js';
+import MagicString from 'magic-string';
 
 /**
  * @param {string} content
+ * @param {string} filename
  * @param {boolean} is_error
  * @param {boolean} moved
  */
-export function migrate_scripts(content, is_error, moved) {
+export function migrate_scripts(content, filename, is_error, moved) {
 	/** @type {string | null} */
 	let module = null;
 
+	const match = /__layout(?:-([^.@]+))?/.exec(filename);
+	const data_name = match?.[1] ? `LayoutData.${match[1]}` : match ? `LayoutData` : 'PageData';
+
 	let ext = '.js';
 
 	// instance script
@@ -31,6 +36,10 @@ export function migrate_scripts(content, is_error, moved) {
 				contents = adjust_imports(contents);
 			}
 
+			if (/lang(?:uage)?=(['"])(ts|typescript)\1/.test(attrs)) {
+				ext = '.ts';
+			}
+
 			if (/context=(['"])module\1/.test(attrs)) {
 				// special case — load is no longer supported in error
 				if (is_error) {
@@ -42,10 +51,6 @@ export function migrate_scripts(content, is_error, moved) {
 					return `<script${attrs}>${body}</script>${whitespace}`;
 				}
 
-				if (/lang(?:uage)?=(['"])(ts|typescript)\1/.test(attrs)) {
-					ext = '.ts';
-				}
-
 				module = dedent(contents.replace(/^\n/, ''));
 
 				const declared = find_declarations(contents);
@@ -88,8 +93,22 @@ export function migrate_scripts(content, is_error, moved) {
 			}
 
 			if (!is_error && /export/.test(contents)) {
-				contents = `\n${indent}${error('Add data prop', TASKS.PAGE_DATA_PROP)}\n${contents}`;
-				// Possible TODO: migrate props to data.prop, or suggest $: ({propX, propY, ...} = data);
+				let prefix = `\n${indent}${error('Add data prop', TASKS.PAGE_DATA_PROP)}`;
+				const props = get_props(contents);
+				if (props) {
+					prefix += `\n${comment(
+						`${indent}Suggestion (check code before using, and possibly convert to data.X access later):\n` +
+							`${indent}${
+								ext === '.ts'
+									? `import type { ${data_name} } from './$types';`
+									: `/** @type {import('./$types').${data_name}} */`
+							}\n` +
+							`${indent}export let data${ext === '.ts' ? `: ${data_name}` : ''};\n` +
+							`${indent}$: ({ ${props.join(', ')} } = data);`,
+						indent
+					)}`;
+				}
+				contents = `${prefix}\n${contents}`;
 			}
 
 			return `<script${attrs}>${contents}</script>${whitespace}`;
@@ -155,3 +174,74 @@ function find_declarations(content) {
 
 	return declared;
 }
+
+/**
+ * @param {string} content
+ */
+function get_props(content) {
+	try {
+		const ast = ts.createSourceFile(
+			'filename.ts',
+			content,
+			ts.ScriptTarget.Latest,
+			true,
+			ts.ScriptKind.TS
+		);
+
+		const code = new MagicString(content);
+		let give_up = false;
+		/** @type {string[] } */
+		let exports = [];
+
+		/** @param {ts.Node} node */
+		function walk(node) {
+			if (
+				ts.isExportDeclaration(node) ||
+				((ts.isFunctionDeclaration(node) || ts.isClassDeclaration(node)) && hasExportKeyword(node))
+			) {
+				give_up = true;
+				return;
+			}
+
+			if (ts.isVariableStatement(node)) {
+				if (hasExportKeyword(node)) {
+					const isLet = node.declarationList.flags === ts.NodeFlags.Let;
+					if (isLet) {
+						ts.forEachChild(node.declarationList, (node) => {
+							if (ts.isVariableDeclaration(node)) {
+								if (ts.isIdentifier(node.name)) {
+									const name = node.name.getText();
+									if (name === 'data') {
+										give_up = true;
+										return;
+									} else {
+										exports.push(name);
+									}
+								} else {
+									give_up = true;
+									return;
+								}
+							}
+						});
+					} else {
+						give_up = true;
+						return;
+					}
+				}
+			}
+		}
+
+		ts.forEachChild(ast, walk);
+		if (give_up) return;
+		return exports;
+	} catch (e) {
+		return;
+	}
+}
+
+/**
+ * @param {ts.Node} node
+ */
+export function hasExportKeyword(node) {
+	return node.modifiers?.find((x) => x.kind == ts.SyntaxKind.ExportKeyword);
+}

packages/migrate/migrations/routes/migrate_scripts/index.spec.js

@@ -7,6 +7,7 @@ for (const sample of read_samples(import.meta.url)) {
 	test(sample.description, () => {
 		const actual = migrate_scripts(
 			sample.before,
+			sample.filename ?? 'some-page.svelte',
 			sample.description.includes('error'),
 			sample.description.includes('moved')
 		);