svelte 3.43.1 → 3.44.2

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Svelte changelog
 
+## 3.44.2
+
+* Fix overly restrictive preprocessor types ([#6904](https://github.com/sveltejs/svelte/pull/6904))
+* More specific typing for crossfade function - returns a tuple, not an array ([#6926](https://github.com/sveltejs/svelte/issues/6926))
+* Add `URLSearchParams` as a known global ([#6938](https://github.com/sveltejs/svelte/pull/6938))
+* Add `types` field to `exports` map ([#6939](https://github.com/sveltejs/svelte/issues/6939))
+
+## 3.44.1
+
+* Fix code generation when a multi-line `return` statement contains comments ([code-red#36](https://github.com/Rich-Harris/code-red/issues/36))
+* Fix code generation when `for`/`if`/`while` statements have empty bodies ([#6884](https://github.com/sveltejs/svelte/issues/6884))
+
+## 3.44.0
+
+* Add `enableSourcemap` compiler option ([#6835](https://github.com/sveltejs/svelte/pull/6835))
+
+## 3.43.2
+
+* Fix regression where user-specified `import`s were not rewritten according to the `sveltePath` option ([#6834](https://github.com/sveltejs/svelte/issues/6834))
+
 ## 3.43.1
 
 * Prevent a rejecting promise used in `{#await}` during SSR from appearing as an unhandled rejection ([#6789](https://github.com/sveltejs/svelte/issues/6789))

package/README.md

@@ -64,7 +64,7 @@ npm run test -- -g transition
 
 ## svelte.dev
 
-The source code for https://svelte.dev, including all the documentation, lives in the [site](site) directory. The site is built with [Sapper](https://sapper.svelte.dev).
+The source code for https://svelte.dev, including all the documentation, lives in the [site](site) directory. The site is built with [SvelteKit](https://kit.svelte.dev).
 
 ### Is svelte.dev down?
 

package/compiler.js

@@ -6498,7 +6498,7 @@
 		}),
 
 		EmptyStatement(node, state) {
-			return [];
+			return [c(';')];
 		},
 
 		ParenthesizedExpression(node, state) {
@@ -6604,10 +6604,11 @@
 
 		ReturnStatement(node, state) {
 			if (node.argument) {
+				const contains_comment = node.argument.leadingComments && node.argument.leadingComments.some((/** @type import('../utils/comments.js').CommentWithLocation */ comment) => comment.has_trailing_newline);
 				return [
-					c('return '),
+					c(contains_comment ? 'return (' : 'return '),
 					...handle(node.argument, state),
-					c(';')
+					c(contains_comment ? ');' : ';')
 				];
 			} else {
 				return [c('return;')];
@@ -7961,7 +7962,7 @@
 
 		const { enter, leave } = get_comment_handlers(comments, raw);
 
-		walk(node, {
+		return walk(node, {
 			enter,
 
 			/** @param {any} node */
@@ -8063,7 +8064,6 @@
 					node.update = node.update === EMPTY ? null : node.update;
 				}
 
-				// @ts-ignore
 				leave(node);
 			}
 		});
@@ -8082,11 +8082,11 @@
 		const comments = [];
 
 		try {
-			const ast = /** @type {any} */ (
+			let ast = /** @type {any} */ (
 				parse(str, acorn_opts(comments, str))
 			);
 
-			inject(str, ast, values, comments);
+			ast = inject(str, ast, values, comments);
 
 			return ast.body;
 		} catch (err) {
@@ -8107,7 +8107,7 @@
 		const comments = [];
 
 		try {
-			const expression =
+			let expression =
 				/** @type {Expression & { start: Number, end: number }} */ (
 					parseExpressionAt(str, 0, acorn_opts(comments, str))
 				);
@@ -8116,7 +8116,9 @@
 				throw new Error(`Unexpected token '${match[0]}'`);
 			}
 
-			inject(str, expression, values, comments);
+			expression = /** @type {Expression & { start: Number, end: number }} */ (
+				inject(str, expression, values, comments)
+			);
 
 			return expression;
 		} catch (err) {
@@ -8137,11 +8139,11 @@
 		const comments = [];
 
 		try {
-			const expression = /** @type {any} */ (
+			let expression = /** @type {any} */ (
 				parseExpressionAt(str, 0, acorn_opts(comments, str))
 			);
 
-			inject(str, expression, values, comments);
+			expression = inject(str, expression, values, comments);
 
 			return expression.properties[0];
 		} catch (err) {
@@ -8210,6 +8212,8 @@
 	});
 
 	const whitespace = /[ \t\r\n]/;
+	const start_whitespace = /^[ \t\r\n]*/;
+	const end_whitespace = /[ \t\r\n]*$/;
 	const dimensions = /^(?:offset|client)(?:Width|Height)$/;
 
 	function list(items, conjunction = 'or') {
@@ -16396,6 +16400,7 @@
 	    'undefined',
 	    'URIError',
 	    'URL',
+	    'URLSearchParams',
 	    'window'
 	]);
 	const reserved = new Set([
@@ -17224,16 +17229,10 @@
 	}
 
 	function trim_start(str) {
-	    let i = 0;
-	    while (whitespace.test(str[i]))
-	        i += 1;
-	    return str.slice(i);
+	    return str.replace(start_whitespace, '');
 	}
 	function trim_end(str) {
-	    let i = str.length;
-	    while (whitespace.test(str[i - 1]))
-	        i -= 1;
-	    return str.slice(0, i);
+	    return str.replace(end_whitespace, '');
 	}
 
 	function to_string(node) {
@@ -24930,6 +24929,12 @@
 	    });
 	}
 
+	function check_enable_sourcemap(enable_sourcemap, namespace) {
+	    return typeof enable_sourcemap === 'boolean'
+	        ? enable_sourcemap
+	        : enable_sourcemap[namespace];
+	}
+
 	function dom(component, options) {
 	    const { name } = component;
 	    const renderer = new Renderer(component, options);
@@ -24944,8 +24949,14 @@
 	        body.push(b `const ${renderer.file_var} = ${file};`);
 	    }
 	    const css = component.stylesheet.render(options.filename, !options.customElement);
-	    css.map = apply_preprocessor_sourcemap(options.filename, css.map, options.sourcemap);
-	    const styles = component.stylesheet.has_styles && options.dev
+	    const css_sourcemap_enabled = check_enable_sourcemap(options.enableSourcemap, 'css');
+	    if (css_sourcemap_enabled) {
+	        css.map = apply_preprocessor_sourcemap(options.filename, css.map, options.sourcemap);
+	    }
+	    else {
+	        css.map = null;
+	    }
+	    const styles = css_sourcemap_enabled && component.stylesheet.has_styles && options.dev
 	        ? `${css.code}\n/*# sourceMappingURL=${css.map.toUrl()} */`
 	        : css.code;
 	    const add_css = component.get_unique_name('add_css');
@@ -25351,7 +25362,7 @@
 				constructor(options) {
 					super();
 
-					${css.code && b `this.shadowRoot.innerHTML = \`<style>${css.code.replace(/\\/g, '\\\\')}${options.dev ? `\n/*# sourceMappingURL=${css.map.toUrl()} */` : ''}</style>\`;`}
+					${css.code && b `this.shadowRoot.innerHTML = \`<style>${css.code.replace(/\\/g, '\\\\')}${css_sourcemap_enabled && options.dev ? `\n/*# sourceMappingURL=${css.map.toUrl()} */` : ''}</style>\`;`}
 
 					@init(this, { target: this.shadowRoot, props: ${init_props}, customElement: true }, ${definition}, ${has_create_fragment ? 'create_fragment' : 'null'}, ${not_equal}, ${prop_indexes}, null, ${dirty});
 
@@ -27753,11 +27764,12 @@
 	        css.code && b `$$result.css.add(#css);`,
 	        main
 	    ].filter(Boolean);
+	    const css_sourcemap_enabled = check_enable_sourcemap(options.enableSourcemap, 'css');
 	    const js = b `
 		${css.code ? b `
 		const #css = {
 			code: "${css.code}",
-			map: ${css.map ? string_literal(css.map.toString()) : 'null'}
+			map: ${css_sourcemap_enabled && css.map ? string_literal(css.map.toString()) : 'null'}
 		};` : null}
 
 		${component.extract_javascript(component.ast.module)}
@@ -27842,12 +27854,15 @@
 	    };
 	    const internal_globals = get_internal_globals(globals, helpers);
 	    // edit user imports
-	    imports.forEach(node => {
-	        node.source.value = edit_source(node.source.value, sveltePath);
-	    });
-	    exports_from.forEach(node => {
-	        node.source.value = edit_source(node.source.value, sveltePath);
-	    });
+	    function rewrite_import(node) {
+	        const value = edit_source(node.source.value, sveltePath);
+	        if (node.source.value !== value) {
+	            node.source.value = value;
+	            node.source.raw = null;
+	        }
+	    }
+	    imports.forEach(rewrite_import);
+	    exports_from.forEach(rewrite_import);
 	    const exports = module_exports.length > 0 && {
 	        type: 'ExportNamedDeclaration',
 	        specifiers: module_exports.map(x => ({
@@ -30126,7 +30141,7 @@
 	        if (result) {
 	            const { compile_options, name } = this;
 	            const { format = 'esm' } = compile_options;
-	            const banner = `${this.file ? `${this.file} ` : ''}generated by Svelte v${'3.43.1'}`;
+	            const banner = `${this.file ? `${this.file} ` : ''}generated by Svelte v${'3.44.2'}`;
 	            const program = { type: 'Program', body: result.js };
 	            walk(program, {
 	                enter: (node, parent, key) => {
@@ -30190,17 +30205,24 @@
 	            css = compile_options.customElement
 	                ? { code: null, map: null }
 	                : result.css;
-	            const sourcemap_source_filename = get_sourcemap_source_filename(compile_options);
-	            js = print(program, {
-	                sourceMapSource: sourcemap_source_filename
-	            });
-	            js.map.sources = [
-	                sourcemap_source_filename
-	            ];
-	            js.map.sourcesContent = [
-	                this.source
-	            ];
-	            js.map = apply_preprocessor_sourcemap(sourcemap_source_filename, js.map, compile_options.sourcemap);
+	            const js_sourcemap_enabled = check_enable_sourcemap(compile_options.enableSourcemap, 'js');
+	            if (!js_sourcemap_enabled) {
+	                js = print(program);
+	                js.map = null;
+	            }
+	            else {
+	                const sourcemap_source_filename = get_sourcemap_source_filename(compile_options);
+	                js = print(program, {
+	                    sourceMapSource: sourcemap_source_filename
+	                });
+	                js.map.sources = [
+	                    sourcemap_source_filename
+	                ];
+	                js.map.sourcesContent = [
+	                    this.source
+	                ];
+	                js.map = apply_preprocessor_sourcemap(sourcemap_source_filename, js.map, compile_options.sourcemap);
+	            }
 	        }
 	        return {
 	            js,
@@ -31248,6 +31270,7 @@
 	    'name',
 	    'filename',
 	    'sourcemap',
+	    'enableSourcemap',
 	    'generate',
 	    'errorMode',
 	    'varsReport',
@@ -31311,7 +31334,7 @@
 	    }
 	}
 	function compile(source, options = {}) {
-	    options = Object.assign({ generate: 'dom', dev: false }, options);
+	    options = Object.assign({ generate: 'dom', dev: false, enableSourcemap: true }, options);
 	    const stats = new Stats();
 	    const warnings = [];
 	    validate_options(options, warnings);
@@ -31565,10 +31588,10 @@
 	    const { string, map } = await replace_in_code(tag_regex, process_single_tag, source);
 	    return { string, map, dependencies };
 	}
-	async function process_markup(filename, process, source) {
+	async function process_markup(process, source) {
 	    const processed = await process({
 	        content: source.source,
-	        filename
+	        filename: source.filename
 	    });
 	    if (processed) {
 	        return {
@@ -31587,7 +31610,6 @@
 	    }
 	}
 	async function preprocess(source, preprocessor, options) {
-	    // @ts-ignore todo: doublecheck
 	    const filename = (options && options.filename) || preprocessor.filename; // legacy
 	    const preprocessors = preprocessor ? (Array.isArray(preprocessor) ? preprocessor : [preprocessor]) : [];
 	    const markup = preprocessors.map(p => p.markup).filter(Boolean);
@@ -31597,7 +31619,7 @@
 	    // TODO keep track: what preprocessor generated what sourcemap?
 	    // to make debugging easier = detect low-resolution sourcemaps in fn combine_mappings
 	    for (const process of markup) {
-	        result.update_source(await process_markup(filename, process, result));
+	        result.update_source(await process_markup(process, result));
 	    }
 	    for (const process of script) {
 	        result.update_source(await process_tag('script', process, result));
@@ -31608,7 +31630,7 @@
 	    return result.to_processed();
 	}
 
-	const VERSION = '3.43.1';
+	const VERSION = '3.44.2';
 
 	exports.VERSION = VERSION;
 	exports.compile = compile;