@prismicio/svelte 3.0.0-pr.71.0f237fd → 3.0.0-pr.71.249fd8d

package/dist/kit/redirectToPreviewURL.js

@@ -1,4 +1,6 @@
+import { resolve } from "$app/paths";
 import * as prismic from "@prismicio/client";
+import { getSafePath } from "../lib/getSafePath";
 /**
  * Redirects a visitor to the URL of a previewed Prismic document from within a SvelteKit `+server`
  * file.
@@ -21,11 +23,14 @@ export const redirectToPreviewURL = async (config) => {
     const previewToken = new URL(config.request.url).searchParams.get("token") ?? undefined;
     const documentID = new URL(config.request.url).searchParams.get("documentId") ?? undefined;
     const routePrefix = config.routePrefix ?? "preview";
-    const previewURL = await config.client.resolvePreviewURL({
-        previewToken,
-        documentID,
-        defaultURL: config.defaultURL || "/",
-    });
+    const location = getSharedPath(config.request.url, routePrefix) ??
+        "/" +
+            routePrefix +
+            (await config.client.resolvePreviewURL({
+                previewToken,
+                documentID,
+                defaultURL: config.defaultURL || "/",
+            }));
     // Prevent a flash of non-preview content by setting the preview token
     // on the initial page load.
     if (previewToken) {
@@ -45,7 +50,23 @@ export const redirectToPreviewURL = async (config) => {
     return new Response(undefined, {
         status: 307,
         headers: {
-            Location: "/" + routePrefix + previewURL,
+            Location: location,
         },
     });
 };
+/**
+ * Returns the `path` param of toolbar share links inside the preview route prefix, or `undefined`
+ * if it is missing or not a path on this website.
+ */
+const getSharedPath = (requestURL, routePrefix) => {
+    const path = getSafePath(new URL(requestURL).searchParams.get("path"));
+    // `path` comes from the browser, so it already includes `paths.base`. `resolve()` returns `base`
+    // either absolute or relative to the request.
+    const base = new URL(resolve("/", {}), requestURL).pathname.slice(0, -1);
+    const rest = path?.startsWith(base) ? path.slice(base.length) : undefined;
+    // `/docs` and `/docs?q=1` are under the `/docs` base, but `/docs-old` isn't.
+    if (rest === undefined || !/^([/?#]|$)/.test(rest)) {
+        return;
+    }
+    return /^\/([^/?#]*)/.exec(rest)?.[1] === routePrefix ? path : `${base}/${routePrefix}${rest}`;
+};

package/dist/lib/getSafePath.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Returns `path` if it stays on the current origin, like `/blog?page=2#top`. It comes from
+ * `location`, so it already includes `paths.base`.
+ */
+export declare function getSafePath(path: string | null | undefined): string | undefined;

package/dist/lib/getSafePath.js

@@ -0,0 +1,22 @@
+/**
+ * Returns `path` if it stays on the current origin, like `/blog?page=2#top`. It comes from
+ * `location`, so it already includes `paths.base`.
+ */
+export function getSafePath(path) {
+    if (!path?.startsWith("/") || path.startsWith("//") || path.startsWith("/\\")) {
+        return;
+    }
+    const origin = "https://placeholder.invalid";
+    let url;
+    try {
+        url = new URL(path, origin);
+    }
+    catch {
+        return;
+    }
+    const safePath = url.href.slice(origin.length);
+    // Normalizing can create `//`, like with `/.//example.com`.
+    if (url.origin === origin && !safePath.startsWith("//")) {
+        return safePath;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@prismicio/svelte",
-	"version": "3.0.0-pr.71.0f237fd",
+	"version": "3.0.0-pr.71.249fd8d",
 	"description": "Svelte components to present Prismic content.",
 	"keywords": [
 		"prismic",
@@ -62,7 +62,7 @@
 		"esm-env": "^1.2.2"
 	},
 	"devDependencies": {
-		"@prismicio/client": "7.22.3-pr.477.9eb2102",
+		"@prismicio/client": "^7.23.0",
 		"@prismicio/mock": "^0.7.2",
 		"@sveltejs/kit": "^3.0.1",
 		"@sveltejs/package": "^3.0.1",
@@ -71,9 +71,9 @@
 		"@types/node": "^26.6.5",
 		"@vitest/coverage-v8": "^5.0.5",
 		"globals": "^17.13.0",
-		"happy-dom": "^21.0.3",
-		"oxfmt": "^0.73.0",
-		"oxlint": "^1.88.0",
+		"happy-dom": "^21.0.4",
+		"oxfmt": "^0.74.0",
+		"oxlint": "^1.89.0",
 		"standard-version": "^9.5.0",
 		"svelte": "^5.57.2",
 		"typescript": "^6.0.3",
@@ -89,9 +89,6 @@
 			"optional": true
 		}
 	},
-	"overrides": {
-		"@prismicio/client": "$@prismicio/client"
-	},
 	"engines": {
 		"node": ">=22"
 	}

package/src/kit/redirectToPreviewURL.ts

@@ -1,6 +1,9 @@
+import { resolve } from "$app/paths"
 import * as prismic from "@prismicio/client"
 import type { Cookies } from "@sveltejs/kit"
 
+import { getSafePath } from "../lib/getSafePath"
+
 export type RedirectToPreviewURLConfig = {
 	/** The Prismic client configured for the preview session's repository. */
 	// `Pick` is used to use the smallest possible subset of
@@ -54,11 +57,15 @@ export const redirectToPreviewURL = async (
 	const documentID = new URL(config.request.url).searchParams.get("documentId") ?? undefined
 	const routePrefix = config.routePrefix ?? "preview"
 
-	const previewURL = await config.client.resolvePreviewURL({
-		previewToken,
-		documentID,
-		defaultURL: config.defaultURL || "/",
-	})
+	const location =
+		getSharedPath(config.request.url, routePrefix) ??
+		"/" +
+			routePrefix +
+			(await config.client.resolvePreviewURL({
+				previewToken,
+				documentID,
+				defaultURL: config.defaultURL || "/",
+			}))
 
 	// Prevent a flash of non-preview content by setting the preview token
 	// on the initial page load.
@@ -81,7 +88,25 @@ export const redirectToPreviewURL = async (
 	return new Response(undefined, {
 		status: 307,
 		headers: {
-			Location: "/" + routePrefix + previewURL,
+			Location: location,
 		},
 	})
 }
+
+/**
+ * Returns the `path` param of toolbar share links inside the preview route prefix, or `undefined`
+ * if it is missing or not a path on this website.
+ */
+const getSharedPath = (requestURL: string, routePrefix: string): string | undefined => {
+	const path = getSafePath(new URL(requestURL).searchParams.get("path"))
+	// `path` comes from the browser, so it already includes `paths.base`. `resolve()` returns `base`
+	// either absolute or relative to the request.
+	const base = new URL(resolve("/", {}), requestURL).pathname.slice(0, -1)
+	const rest = path?.startsWith(base) ? path.slice(base.length) : undefined
+	// `/docs` and `/docs?q=1` are under the `/docs` base, but `/docs-old` isn't.
+	if (rest === undefined || !/^([/?#]|$)/.test(rest)) {
+		return
+	}
+
+	return /^\/([^/?#]*)/.exec(rest)?.[1] === routePrefix ? path : `${base}/${routePrefix}${rest}`
+}

package/src/lib/getSafePath.ts

@@ -0,0 +1,22 @@
+/**
+ * Returns `path` if it stays on the current origin, like `/blog?page=2#top`. It comes from
+ * `location`, so it already includes `paths.base`.
+ */
+export function getSafePath(path: string | null | undefined): string | undefined {
+	if (!path?.startsWith("/") || path.startsWith("//") || path.startsWith("/\\")) {
+		return
+	}
+
+	const origin = "https://placeholder.invalid"
+	let url: URL
+	try {
+		url = new URL(path, origin)
+	} catch {
+		return
+	}
+	const safePath = url.href.slice(origin.length)
+	// Normalizing can create `//`, like with `/.//example.com`.
+	if (url.origin === origin && !safePath.startsWith("//")) {
+		return safePath
+	}
+}