@sveltejs/kit 1.0.0-next.281 → 1.0.0-next.284

package/assets/client/start.js

@@ -8,7 +8,7 @@ import { init } from './singletons.js';
 
 /**
  * @param {string} path
- * @param {'always' | 'never' | 'ignore'} trailing_slash
+ * @param {import('types').TrailingSlash} trailing_slash
  */
 function normalize_path(path, trailing_slash) {
 	if (path === '/' || trailing_slash === 'ignore') return path;
@@ -37,6 +37,11 @@ try {
 	// do nothing
 }
 
+/** @param {number} index */
+function update_scroll_positions(index) {
+	scroll_positions[index] = scroll_state();
+}
+
 function scroll_state() {
 	return {
 		x: pageXOffset,
@@ -143,7 +148,7 @@ class Router {
 
 		addEventListener('visibilitychange', () => {
 			if (document.visibilityState === 'hidden') {
-				this.#update_scroll_positions();
+				update_scroll_positions(this.current_history_index);
 
 				try {
 					sessionStorage[SCROLL_KEY] = JSON.stringify(scroll_positions);
@@ -195,6 +200,7 @@ class Router {
 
 			if (!a.href) return;
 
+			const is_svg_a_element = a instanceof SVGAElement;
 			const url = get_href(a);
 			const url_string = url.toString();
 			if (url_string === location.href) {
@@ -202,6 +208,11 @@ class Router {
 				return;
 			}
 
+			// Ignore if url does not have origin (e.g. `mailto:`, `tel:`.)
+			// MEMO: Without this condition, firefox will open mailer twice.
+			// See: https://github.com/sveltejs/kit/issues/4045
+			if (!is_svg_a_element && url.origin === 'null') return;
+
 			// Ignore if tag has
 			// 1. 'download' attribute
 			// 2. 'rel' attribute includes external
@@ -212,7 +223,7 @@ class Router {
 			}
 
 			// Ignore if <a> has a target
-			if (a instanceof SVGAElement ? a.target.baseVal : a.target) return;
+			if (is_svg_a_element ? a.target.baseVal : a.target) return;
 
 			// Check if new url only differs by hash and use the browser default behavior in that case
 			// This will ensure the `hashchange` event is fired
@@ -223,7 +234,7 @@ class Router {
 				// clicking a hash link and those triggered by popstate
 				this.hash_navigating = true;
 
-				this.#update_scroll_positions();
+				update_scroll_positions(this.current_history_index);
 				this.renderer.update_page_store(new URL(url.href));
 
 				return;
@@ -282,10 +293,6 @@ class Router {
 		this.initialized = true;
 	}
 
-	#update_scroll_positions() {
-		scroll_positions[this.current_history_index] = scroll_state();
-	}
-
 	/**
 	 * Returns true if `url` has the same origin and basepath as the app
 	 * @param {URL} url
@@ -434,7 +441,7 @@ class Router {
 			});
 		}
 
-		this.#update_scroll_positions();
+		update_scroll_positions(this.current_history_index);
 
 		accepted();
 

package/assets/server/index.js

@@ -1305,7 +1305,7 @@ async function render_response({
 		}
 	}
 
-	if (state.prerender) {
+	if (state.prerender && !options.amp) {
 		const http_equiv = [];
 
 		const csp_headers = csp.get_meta();
@@ -1491,7 +1491,7 @@ function is_root_relative(path) {
 
 /**
  * @param {string} path
- * @param {'always' | 'never' | 'ignore'} trailing_slash
+ * @param {import('types').TrailingSlash} trailing_slash
  */
 function normalize_path(path, trailing_slash) {
 	if (path === '/' || trailing_slash === 'ignore') return path;
@@ -1844,7 +1844,7 @@ async function load_node({
 
 	// generate __data.json files when prerendering
 	if (shadow.body && state.prerender) {
-		const pathname = `${event.url.pathname}/__data.json`;
+		const pathname = `${event.url.pathname.replace(/\/$/, '')}/__data.json`;
 
 		const dependency = {
 			response: new Response(undefined),

package/dist/chunks/index5.js

@@ -57,7 +57,7 @@ function is_root_relative(path) {
 
 /**
  * @param {string} path
- * @param {'always' | 'never' | 'ignore'} trailing_slash
+ * @param {import('types').TrailingSlash} trailing_slash
  */
 function normalize_path(path, trailing_slash) {
 	if (path === '/' || trailing_slash === 'ignore') return path;

package/dist/cli.js

@@ -998,7 +998,7 @@ async function launch(port, https) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}`);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.281');
+const prog = sade('svelte-kit').version('1.0.0-next.284');
 
 prog
 	.command('dev')
@@ -1156,7 +1156,7 @@ async function check_port(port) {
 function welcome({ port, host, https, open, loose, allow, cwd }) {
 	if (open) launch(port, https);
 
-	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.281'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.284'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.281",
+  "version": "1.0.0-next.284",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -16,7 +16,7 @@
   },
   "devDependencies": {
     "@playwright/test": "^1.17.1",
-    "@rollup/plugin-replace": "^3.0.0",
+    "@rollup/plugin-replace": "^4.0.0",
     "@types/amphtml-validator": "^1.0.1",
     "@types/cookie": "^0.4.1",
     "@types/marked": "^4.0.1",

package/types/ambient.d.ts

@@ -1,5 +1,3 @@
-/* eslint-disable import/no-duplicates */
-
 declare namespace App {
 	interface Locals {}
 	interface Platform {}

package/types/index.d.ts

@@ -1,24 +1,25 @@
 /// <reference types="svelte" />
 /// <reference types="vite/client" />
 
+import './ambient';
+
 import { CompileOptions } from 'svelte/types/compiler/interfaces';
 import {
-	Logger,
-	PrerenderOnErrorValue,
-	SSRNodeLoader,
-	SSRRoute,
-	TrailingSlash,
+	AdapterEntry,
+	Body,
 	Either,
+	Fallthrough,
+	Logger,
 	MaybePromise,
+	PrerenderOnErrorValue,
 	RecursiveRequired,
-	RouteDefinition,
-	AdapterEntry,
-	ResponseHeaders,
-	Fallthrough,
 	RequiredResolveOptions,
-	Body
+	ResponseHeaders,
+	RouteDefinition,
+	SSRNodeLoader,
+	SSRRoute,
+	TrailingSlash
 } from './internal';
-import './ambient';
 
 export interface Adapter {
 	name: string;
@@ -31,7 +32,7 @@ export interface Builder {
 	mkdirp(dir: string): void;
 
 	appDir: string;
-	trailingSlash: 'always' | 'never' | 'ignore';
+	trailingSlash: TrailingSlash;
 
 	/**
 	 * Create entry points that map to individual functions
@@ -171,7 +172,7 @@ export namespace Csp {
 	type BaseSource = 'self' | 'unsafe-eval' | 'unsafe-hashes' | 'unsafe-inline' | 'none';
 	type CryptoSource = `${'nonce' | 'sha256' | 'sha384' | 'sha512'}-${string}`;
 	type FrameSource = HostSource | SchemeSource | 'self' | 'none';
-	type HostNameScheme = `${string}.${string}` | `localhost`;
+	type HostNameScheme = `${string}.${string}` | 'localhost';
 	type HostSource = `${HostProtocolSchemes}${HostNameScheme}${PortScheme}`;
 	type HostProtocolSchemes = `${string}://` | '';
 	type HttpDelineator = '/' | '?' | '#' | '\\';