Merge branch 'main' into better-ssr-hydration-error

Author: Rich-Harris

.changeset/eight-pianos-raise.md

@@ -0,0 +1,5 @@
+---
+"svelte": patch
+---
+
+fix: add backwards-compat for old warning codes in legacy mode

.changeset/eighty-lizards-notice.md

@@ -0,0 +1,5 @@
+---
+"svelte": patch
+---
+
+chore: improve runtime overhead of creating comment templates

.changeset/empty-flowers-change.md

@@ -0,0 +1,5 @@
+---
+"svelte": patch
+---
+
+fix: replicate Svelte 4 props update detection in legacy mode

.changeset/good-roses-argue.md

@@ -0,0 +1,5 @@
+---
+"svelte": patch
+---
+
+fix: correctly handle falsy values of style directives in SSR mode

.changeset/plenty-zoos-fix.md

@@ -0,0 +1,5 @@
+---
+"svelte": patch
+---
+
+fix: improve handling of lazy image elements

.changeset/popular-apes-bathe.md

@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: skip deriveds for props with known safe calls

.changeset/pre.json

@@ -98,15 +98,18 @@
     "early-ads-tie",
     "early-months-whisper",
     "eight-hornets-punch",
+    "eight-pianos-raise",
     "eight-steaks-shout",
     "eighty-bikes-camp",
     "eighty-days-cheat",
+    "eighty-lizards-notice",
     "eleven-beers-yell",
     "eleven-cycles-applaud",
     "empty-bags-heal",
     "empty-bulldogs-exercise",
     "empty-coins-build",
     "empty-crabs-think",
+    "empty-flowers-change",
     "empty-geckos-pretend",
     "empty-tools-share",
     "fair-bags-smoke",
@@ -152,6 +155,7 @@
     "gentle-sheep-hug",
     "gentle-spies-happen",
     "gentle-toys-chew",
+    "gentle-trees-exercise",
     "giant-bananas-turn",
     "giant-moons-own",
     "giant-planets-shake",
@@ -163,6 +167,7 @@
     "good-pianos-jump",
     "good-plums-type",
     "good-rivers-yawn",
+    "good-roses-argue",
     "gorgeous-monkeys-carry",
     "gorgeous-singers-rest",
     "great-fans-unite",
@@ -302,12 +307,14 @@
     "pink-goats-promise",
     "pink-mayflies-tie",
     "plenty-starfishes-dress",
+    "plenty-zoos-fix",
     "polite-dolphins-care",
     "polite-pumpkins-guess",
     "polite-ravens-study",
     "poor-eggs-enjoy",
     "poor-hats-design",
     "poor-seahorses-flash",
+    "popular-apes-bathe",
     "popular-ligers-perform",
     "popular-mangos-rest",
     "popular-walls-hunt",

eslint.config.js

@@ -43,9 +43,10 @@ export default [
 			'documentation',
 			// contains a fork of the REPL which doesn't adhere to eslint rules
 			'sites/svelte-5-preview/**',
+			'playgrounds/demo/src/**',
+			'tmp/**',
 			// wasn't checked previously, reenable at some point
-			'sites/svelte.dev/**',
-			'tmp/**'
+			'sites/svelte.dev/**'
 		]
 	}
 ];

packages/svelte/CHANGELOG.md

@@ -1,5 +1,27 @@
 # svelte
 
+## 5.0.0-next.133
+
+### Patch Changes
+
+- fix: add backwards-compat for old warning codes in legacy mode ([#11607](https://github.com/sveltejs/svelte/pull/11607))
+
+## 5.0.0-next.132
+
+### Patch Changes
+
+- chore: improve runtime overhead of creating comment templates ([#11591](https://github.com/sveltejs/svelte/pull/11591))
+
+- fix: replicate Svelte 4 props update detection in legacy mode ([#11577](https://github.com/sveltejs/svelte/pull/11577))
+
+- fix: allow for non optional chain call expression in render ([#11578](https://github.com/sveltejs/svelte/pull/11578))
+
+- fix: correctly handle falsy values of style directives in SSR mode ([#11583](https://github.com/sveltejs/svelte/pull/11583))
+
+- fix: improve handling of lazy image elements ([#11593](https://github.com/sveltejs/svelte/pull/11593))
+
+- fix: skip deriveds for props with known safe calls ([#11595](https://github.com/sveltejs/svelte/pull/11595))
+
 ## 5.0.0-next.131
 
 ### Patch Changes

packages/svelte/messages/compile-warnings/misc.md

@@ -0,0 +1,9 @@
+## legacy_code
+
+> `%code%` is no longer valid — please use `%suggestion%` instead
+
+## unknown_code
+
+> `%code%` is not a recognised code
+
+> `%code%` is not a recognised code (did you mean `%suggestion%`?)

packages/svelte/package.json

@@ -2,7 +2,7 @@
   "name": "svelte",
   "description": "Cybernetically enhanced web apps",
   "license": "MIT",
-  "version": "5.0.0-next.131",
+  "version": "5.0.0-next.133",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {

packages/svelte/scripts/process-messages/index.js

@@ -61,7 +61,7 @@ function transform(name, dest) {
 
 	const comments = [];
 
-	const ast = acorn.parse(source, {
+	let ast = acorn.parse(source, {
 		ecmaVersion: 'latest',
 		sourceType: 'module',
 		onComment: (block, value, start, end) => {
@@ -80,7 +80,7 @@ function transform(name, dest) {
 		}
 	});
 
-	walk(ast, null, {
+	ast = walk(ast, null, {
 		_(node, { next }) {
 			let comment;
 
@@ -100,6 +100,18 @@ function transform(name, dest) {
 					node.trailingComments = [comments.shift()];
 				}
 			}
+		},
+		// @ts-expect-error
+		Identifier(node, context) {
+			if (node.name === 'CODES') {
+				return {
+					type: 'ArrayExpression',
+					elements: Object.keys(messages[name]).map((code) => ({
+						type: 'Literal',
+						value: code
+					}))
+				};
+			}
 		}
 	});
 

packages/svelte/scripts/process-messages/templates/compile-warnings.js

@@ -1,37 +1,14 @@
-import { getLocator } from 'locate-character';
+import { filename, locator, warnings, ignore_stack } from './state.js';
 
 /** @typedef {{ start?: number, end?: number }} NodeLike */
 
-/** @type {import('#compiler').Warning[]} */
-let warnings = [];
-
-/** @type {string | undefined} */
-let filename;
-
-let locator = getLocator('', { offsetLine: 1 });
-
-/**
- * @param {{
- *   source: string;
- *   filename: string | undefined;
- * }} options
- * @returns {import('#compiler').Warning[]}
- */
-export function reset_warnings(options) {
-	filename = options.filename;
-	locator = getLocator(options.source, { offsetLine: 1 });
-
-	return (warnings = []);
-}
-
 /**
  * @param {null | NodeLike} node
  * @param {string} code
  * @param {string} message
  */
 function w(node, code, message) {
-	// @ts-expect-error
-	if (node?.ignores?.has(code)) return;
+	if (ignore_stack.at(-1)?.has(code)) return;
 
 	warnings.push({
 		code,
@@ -42,6 +19,8 @@ function w(node, code, message) {
 	});
 }
 
+export const codes = CODES;
+
 /**
  * MESSAGE
  * @param {null | NodeLike} node

packages/svelte/src/compiler/index.js

@@ -1,4 +1,3 @@
-import { getLocator } from 'locate-character';
 import { walk as zimmerframe_walk } from 'zimmerframe';
 import { CompileError } from './errors.js';
 import { convert } from './legacy.js';
@@ -8,7 +7,7 @@ import { remove_typescript_nodes } from './phases/1-parse/remove_typescript_node
 import { analyze_component, analyze_module } from './phases/2-analyze/index.js';
 import { transform_component, transform_module } from './phases/3-transform/index.js';
 import { validate_component_options, validate_module_options } from './validate-options.js';
-import { reset_warnings } from './warnings.js';
+import * as state from './state.js';
 export { default as preprocess } from './preprocess/index.js';
 
 /**
@@ -21,7 +20,8 @@ export { default as preprocess } from './preprocess/index.js';
  */
 export function compile(source, options) {
 	try {
-		const warnings = reset_warnings({ source, filename: options.filename });
+		state.reset({ source, filename: options.filename });
+
 		const validated = validate_component_options(options, '');
 		let parsed = _parse(source);
 
@@ -44,9 +44,7 @@ export function compile(source, options) {
 		}
 
 		const analysis = analyze_component(parsed, source, combined_options);
-
 		const result = transform_component(analysis, source, combined_options);
-		result.warnings = warnings;
 		result.ast = to_public_ast(source, parsed, options.modernAst);
 		return result;
 	} catch (e) {
@@ -68,11 +66,11 @@ export function compile(source, options) {
  */
 export function compileModule(source, options) {
 	try {
-		const warnings = reset_warnings({ source, filename: options.filename });
+		state.reset({ source, filename: options.filename });
+
 		const validated = validate_module_options(options, '');
 		const analysis = analyze_module(parse_acorn(source, false), validated);
 		const result = transform_module(analysis, source, validated);
-		result.warnings = warnings;
 		return result;
 	} catch (e) {
 		if (e instanceof CompileError) {
@@ -92,10 +90,8 @@ function handle_compile_error(error, filename, source) {
 	error.filename = filename;
 
 	if (error.position) {
-		// TODO this is reused with warnings — DRY out
-		const locator = getLocator(source, { offsetLine: 1 });
-		const start = locator(error.position[0]);
-		const end = locator(error.position[1]);
+		const start = state.locator(error.position[0]);
+		const end = state.locator(error.position[1]);
 
 		error.start = start;
 		error.end = end;
@@ -142,6 +138,8 @@ function handle_compile_error(error, filename, source) {
  * @returns {import('#compiler').Root | import('./types/legacy-nodes.js').LegacyRoot}
  */
 export function parse(source, options = {}) {
+	state.reset({ source, filename: options.filename });
+
 	/** @type {import('#compiler').Root} */
 	let ast;
 	try {

packages/svelte/src/compiler/legacy.js

@@ -201,7 +201,7 @@ export function convert(source, ast) {
 			Comment(node) {
 				return {
 					...node,
-					ignores: extract_svelte_ignore(node.data)
+					ignores: extract_svelte_ignore(node.start, node.data, false)
 				};
 			},
 			ComplexSelector(node) {

packages/svelte/src/compiler/migrate/index.js

@@ -4,9 +4,10 @@ import { parse } from '../phases/1-parse/index.js';
 import { analyze_component } from '../phases/2-analyze/index.js';
 import { validate_component_options } from '../validate-options.js';
 import { get_rune } from '../phases/scope.js';
-import { reset_warnings } from '../warnings.js';
+import { reset } from '../state.js';
 import { extract_identifiers } from '../utils/ast.js';
 import { regex_is_valid_identifier } from '../phases/patterns.js';
+import { migrate_svelte_ignore } from '../utils/extract_svelte_ignore.js';
 
 /**
  * Does a best-effort migration of Svelte code towards using runes, event attributes and render tags.
@@ -17,7 +18,7 @@ import { regex_is_valid_identifier } from '../phases/patterns.js';
  */
 export function migrate(source) {
 	try {
-		reset_warnings({ source, filename: 'migrate.svelte' });
+		reset({ source, filename: 'migrate.svelte' });
 
 		let parsed = parse(source);
 
@@ -174,6 +175,21 @@ export function migrate(source) {
 
 /** @type {import('zimmerframe').Visitors<import('../types/template.js').SvelteNode, State>} */
 const instance_script = {
+	_(node, { state, next }) {
+		// @ts-expect-error
+		const comments = node.leadingComments;
+		if (comments) {
+			for (const comment of comments) {
+				if (comment.type === 'Line') {
+					const migrated = migrate_svelte_ignore(comment.value);
+					if (migrated !== comment.value) {
+						state.str.overwrite(comment.start + '//'.length, comment.end, migrated);
+					}
+				}
+			}
+		}
+		next();
+	},
 	Identifier(node, { state }) {
 		handle_identifier(node, state);
 	},
@@ -474,6 +490,12 @@ const template = {
 		} else {
 			state.str.update(node.start, node.end, `{@render ${name}?.(${slot_props})}`);
 		}
+	},
+	Comment(node, { state }) {
+		const migrated = migrate_svelte_ignore(node.data);
+		if (migrated !== node.data) {
+			state.str.overwrite(node.start + '<!--'.length, node.end - '-->'.length, migrated);
+		}
 	}
 };