@prismicio/next 2.3.4-pr.175.5f9614e → 2.3.4-pr.175.88bf097

package/src/redirectToPreviewURL.ts

@@ -1,6 +1,6 @@
 import { cookie as prismicCookie, type Client, type LinkResolverFunction } from "@prismicio/client"
 
-import { getPreviewSessionRef, getSafePath, previewSessionCookie } from "./lib/toolbarV5"
+import { getSafePath } from "./lib/getSafePath"
 import type { NextRequestLike } from "./types"
 
 export type RedirectToPreviewURLConfig = {
@@ -8,7 +8,7 @@ export type RedirectToPreviewURLConfig = {
 	// `Pick` is used to use the smallest possible subset of
 	// `prismic.Client`. Doing this reduces the surface area for breaking
 	// type changes.
-	client: Pick<Client, "resolvePreviewURL" | "documentAPIEndpoint">
+	client: Pick<Client, "resolvePreviewURL">
 
 	/**
 	 * The `request` object from a Next.js Route Handler.
@@ -45,29 +45,33 @@ export async function redirectToPreviewURL(config: RedirectToPreviewURLConfig):
 	// tsdown.config.ts for Next.js's server alias) is not resolvable by Node.js.
 	const { redirect } = await import("next/navigation")
 
-	const { searchParams } = request.nextUrl
-	const documentID = searchParams.get("documentId") ?? undefined
-	let previewToken = searchParams.get("token") ?? undefined
-	const cookieJar = await cookies()
-
-	// The toolbar's v5 flow follows the session. Share links only carry the session.
-	const session = searchParams.get("session")
-	if (session) {
-		previewToken ??= await getPreviewSessionRef(client, session)
-		cookieJar.set(previewSessionCookie, session, { sameSite: "none", secure: true })
-	}
+	const documentID = request.nextUrl.searchParams.get("documentId") ?? undefined
 
 	// Set the initial preview cookie. Setting the cookie here is necessary
 	// to support unpublished previews. Without setting it here, the page
 	// will try to render without the preview cookie, leading to a
 	// PrismicNotFound error.
+	const cookieJar = await cookies()
+	const previewToken = request.nextUrl.searchParams.get("token") ?? undefined
 	if (previewToken) {
 		cookieJar.set(prismicCookie.preview, previewToken, { sameSite: "none", secure: true })
 	}
 
+	// The toolbar's v5 flow follows this session.
+	const session = request.nextUrl.searchParams.get("session")
+	if (session) {
+		cookieJar.set(prismicCookie.previewSession, session, { sameSite: "none", secure: true })
+	}
+
+	// Share links return to the page they were opened from.
 	const previewURL =
-		(session && getSafePath(searchParams.get("path"))) ||
-		(await client.resolvePreviewURL({ documentID, previewToken, defaultURL, linkResolver }))
+		getSafePath(request.nextUrl.searchParams.get("path")) ??
+		(await client.resolvePreviewURL({
+			documentID,
+			previewToken,
+			defaultURL,
+			linkResolver,
+		}))
 
 	;(await draftMode()).enable()
 

package/dist/lib/toolbarV5.cjs

@@ -1,37 +0,0 @@
-let _prismicio_client = require("@prismicio/client");
-//#region src/lib/toolbarV5.ts
-/** The cookie storing the preview session ID. The toolbar's v5 flow follows this session. */
-const previewSessionCookie = "io.prismic.previewSession";
-/**
-* Props for the toolbar's `<script>`, opting into its v5 flow.
-*
-* @param previewURL - The app's preview route, as passed to `fetch()`.
-*/
-function getToolbarScriptProps(repositoryName, previewURL) {
-	return {
-		src: `${(0, _prismicio_client.getToolbarSrc)(repositoryName)}&v=5`,
-		"data-preview-url": typeof window === "undefined" ? void 0 : new URL(previewURL, document.baseURI).href
-	};
-}
-/** Fetches the current ref of a preview session, for share links that only carry the session. */
-async function getPreviewSessionRef(client, session) {
-	const url = new URL(`/previews/token/${encodeURIComponent(session)}`, client.documentAPIEndpoint);
-	url.hostname = url.hostname.replace(".cdn.", ".");
-	const json = await (await fetch(url, { cache: "no-store" })).json();
-	if (!json.ref) throw new _prismicio_client.PreviewTokenExpiredError("This preview session has expired", url.href, json);
-	return json.ref;
-}
-/** Returns `path` if it is a path on the same origin, like `/blog?page=2`. */
-function getSafePath(path) {
-	if (!path?.startsWith("/") || path.startsWith("//") || path.startsWith("/\\")) return;
-	const origin = "https://placeholder.invalid";
-	const url = new URL(path, origin);
-	if (url.origin === origin) return url.href.slice(27);
-}
-//#endregion
-exports.getPreviewSessionRef = getPreviewSessionRef;
-exports.getSafePath = getSafePath;
-exports.getToolbarScriptProps = getToolbarScriptProps;
-exports.previewSessionCookie = previewSessionCookie;
-
-//# sourceMappingURL=toolbarV5.cjs.map

package/dist/lib/toolbarV5.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"toolbarV5.cjs","names":["getToolbarSrc","PreviewTokenExpiredError"],"sources":["../../src/lib/toolbarV5.ts"],"sourcesContent":["import { getToolbarSrc, PreviewTokenExpiredError, type Client } from \"@prismicio/client\"\n\n/** The cookie storing the preview session ID. The toolbar's v5 flow follows this session. */\nexport const previewSessionCookie = \"io.prismic.previewSession\"\n\n/**\n * Props for the toolbar's `<script>`, opting into its v5 flow.\n *\n * @param previewURL - The app's preview route, as passed to `fetch()`.\n */\nexport function getToolbarScriptProps(\n\trepositoryName: string,\n\tpreviewURL: string,\n): { src: string; \"data-preview-url\"?: string } {\n\treturn {\n\t\t// TODO: Use `getToolbarSrc()` once `@prismicio/client` adds `v=5`.\n\t\tsrc: `${getToolbarSrc(repositoryName)}&v=5`,\n\t\t// The toolbar builds share links with this URL. `next/script` adds `lazyOnload` scripts in\n\t\t// the browser, where the URL is known.\n\t\t\"data-preview-url\":\n\t\t\ttypeof window === \"undefined\" ? undefined : new URL(previewURL, document.baseURI).href,\n\t}\n}\n\n/** Fetches the current ref of a preview session, for share links that only carry the session. */\nexport async function getPreviewSessionRef(\n\tclient: Pick<Client, \"documentAPIEndpoint\">,\n\tsession: string,\n): Promise<string> {\n\tconst url = new URL(`/previews/token/${encodeURIComponent(session)}`, client.documentAPIEndpoint)\n\t// The endpoint is on the repository host, not on its CDN.\n\turl.hostname = url.hostname.replace(\".cdn.\", \".\")\n\tconst res = await fetch(url, { cache: \"no-store\" })\n\tconst json = await res.json()\n\tif (!json.ref) {\n\t\t// Like the Content API's response to an expired preview token.\n\t\tthrow new PreviewTokenExpiredError(\"This preview session has expired\", url.href, json)\n\t}\n\n\treturn json.ref\n}\n\n/** Returns `path` if it is a path on the same origin, like `/blog?page=2`. */\nexport function getSafePath(path: string | undefined | null): string | undefined {\n\tif (!path?.startsWith(\"/\") || path.startsWith(\"//\") || path.startsWith(\"/\\\\\")) {\n\t\treturn\n\t}\n\n\tconst origin = \"https://placeholder.invalid\"\n\tconst url = new URL(path, origin)\n\tif (url.origin === origin) {\n\t\treturn url.href.slice(origin.length)\n\t}\n}\n"],"mappings":";;;AAGA,MAAa,uBAAuB;;;;;;AAOpC,SAAgB,sBACf,gBACA,YAC+C;CAC/C,OAAO;EAEN,KAAK,IAAA,GAAGA,kBAAAA,cAAAA,CAAc,cAAc,EAAE;EAGtC,oBACC,OAAO,WAAW,cAAc,KAAA,IAAY,IAAI,IAAI,YAAY,SAAS,OAAO,CAAC,CAAC;CACpF;AACD;;AAGA,eAAsB,qBACrB,QACA,SACkB;CAClB,MAAM,MAAM,IAAI,IAAI,mBAAmB,mBAAmB,OAAO,KAAK,OAAO,mBAAmB;CAEhG,IAAI,WAAW,IAAI,SAAS,QAAQ,SAAS,GAAG;CAEhD,MAAM,OAAO,OAAM,MADD,MAAM,KAAK,EAAE,OAAO,WAAW,CAAC,EAAA,CAC3B,KAAK;CAC5B,IAAI,CAAC,KAAK,KAET,MAAM,IAAIC,kBAAAA,yBAAyB,oCAAoC,IAAI,MAAM,IAAI;CAGtF,OAAO,KAAK;AACb;;AAGA,SAAgB,YAAY,MAAqD;CAChF,IAAI,CAAC,MAAM,WAAW,GAAG,KAAK,KAAK,WAAW,IAAI,KAAK,KAAK,WAAW,KAAK,GAC3E;CAGD,MAAM,SAAS;CACf,MAAM,MAAM,IAAI,IAAI,MAAM,MAAM;CAChC,IAAI,IAAI,WAAW,QAClB,OAAO,IAAI,KAAK,MAAM,EAAa;AAErC"}

package/dist/lib/toolbarV5.js

@@ -1,34 +0,0 @@
-import { PreviewTokenExpiredError, getToolbarSrc } from "@prismicio/client";
-//#region src/lib/toolbarV5.ts
-/** The cookie storing the preview session ID. The toolbar's v5 flow follows this session. */
-const previewSessionCookie = "io.prismic.previewSession";
-/**
-* Props for the toolbar's `<script>`, opting into its v5 flow.
-*
-* @param previewURL - The app's preview route, as passed to `fetch()`.
-*/
-function getToolbarScriptProps(repositoryName, previewURL) {
-	return {
-		src: `${getToolbarSrc(repositoryName)}&v=5`,
-		"data-preview-url": typeof window === "undefined" ? void 0 : new URL(previewURL, document.baseURI).href
-	};
-}
-/** Fetches the current ref of a preview session, for share links that only carry the session. */
-async function getPreviewSessionRef(client, session) {
-	const url = new URL(`/previews/token/${encodeURIComponent(session)}`, client.documentAPIEndpoint);
-	url.hostname = url.hostname.replace(".cdn.", ".");
-	const json = await (await fetch(url, { cache: "no-store" })).json();
-	if (!json.ref) throw new PreviewTokenExpiredError("This preview session has expired", url.href, json);
-	return json.ref;
-}
-/** Returns `path` if it is a path on the same origin, like `/blog?page=2`. */
-function getSafePath(path) {
-	if (!path?.startsWith("/") || path.startsWith("//") || path.startsWith("/\\")) return;
-	const origin = "https://placeholder.invalid";
-	const url = new URL(path, origin);
-	if (url.origin === origin) return url.href.slice(27);
-}
-//#endregion
-export { getPreviewSessionRef, getSafePath, getToolbarScriptProps, previewSessionCookie };
-
-//# sourceMappingURL=toolbarV5.js.map

package/dist/lib/toolbarV5.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"toolbarV5.js","names":[],"sources":["../../src/lib/toolbarV5.ts"],"sourcesContent":["import { getToolbarSrc, PreviewTokenExpiredError, type Client } from \"@prismicio/client\"\n\n/** The cookie storing the preview session ID. The toolbar's v5 flow follows this session. */\nexport const previewSessionCookie = \"io.prismic.previewSession\"\n\n/**\n * Props for the toolbar's `<script>`, opting into its v5 flow.\n *\n * @param previewURL - The app's preview route, as passed to `fetch()`.\n */\nexport function getToolbarScriptProps(\n\trepositoryName: string,\n\tpreviewURL: string,\n): { src: string; \"data-preview-url\"?: string } {\n\treturn {\n\t\t// TODO: Use `getToolbarSrc()` once `@prismicio/client` adds `v=5`.\n\t\tsrc: `${getToolbarSrc(repositoryName)}&v=5`,\n\t\t// The toolbar builds share links with this URL. `next/script` adds `lazyOnload` scripts in\n\t\t// the browser, where the URL is known.\n\t\t\"data-preview-url\":\n\t\t\ttypeof window === \"undefined\" ? undefined : new URL(previewURL, document.baseURI).href,\n\t}\n}\n\n/** Fetches the current ref of a preview session, for share links that only carry the session. */\nexport async function getPreviewSessionRef(\n\tclient: Pick<Client, \"documentAPIEndpoint\">,\n\tsession: string,\n): Promise<string> {\n\tconst url = new URL(`/previews/token/${encodeURIComponent(session)}`, client.documentAPIEndpoint)\n\t// The endpoint is on the repository host, not on its CDN.\n\turl.hostname = url.hostname.replace(\".cdn.\", \".\")\n\tconst res = await fetch(url, { cache: \"no-store\" })\n\tconst json = await res.json()\n\tif (!json.ref) {\n\t\t// Like the Content API's response to an expired preview token.\n\t\tthrow new PreviewTokenExpiredError(\"This preview session has expired\", url.href, json)\n\t}\n\n\treturn json.ref\n}\n\n/** Returns `path` if it is a path on the same origin, like `/blog?page=2`. */\nexport function getSafePath(path: string | undefined | null): string | undefined {\n\tif (!path?.startsWith(\"/\") || path.startsWith(\"//\") || path.startsWith(\"/\\\\\")) {\n\t\treturn\n\t}\n\n\tconst origin = \"https://placeholder.invalid\"\n\tconst url = new URL(path, origin)\n\tif (url.origin === origin) {\n\t\treturn url.href.slice(origin.length)\n\t}\n}\n"],"mappings":";;;AAGA,MAAa,uBAAuB;;;;;;AAOpC,SAAgB,sBACf,gBACA,YAC+C;CAC/C,OAAO;EAEN,KAAK,GAAG,cAAc,cAAc,EAAE;EAGtC,oBACC,OAAO,WAAW,cAAc,KAAA,IAAY,IAAI,IAAI,YAAY,SAAS,OAAO,CAAC,CAAC;CACpF;AACD;;AAGA,eAAsB,qBACrB,QACA,SACkB;CAClB,MAAM,MAAM,IAAI,IAAI,mBAAmB,mBAAmB,OAAO,KAAK,OAAO,mBAAmB;CAEhG,IAAI,WAAW,IAAI,SAAS,QAAQ,SAAS,GAAG;CAEhD,MAAM,OAAO,OAAM,MADD,MAAM,KAAK,EAAE,OAAO,WAAW,CAAC,EAAA,CAC3B,KAAK;CAC5B,IAAI,CAAC,KAAK,KAET,MAAM,IAAI,yBAAyB,oCAAoC,IAAI,MAAM,IAAI;CAGtF,OAAO,KAAK;AACb;;AAGA,SAAgB,YAAY,MAAqD;CAChF,IAAI,CAAC,MAAM,WAAW,GAAG,KAAK,KAAK,WAAW,IAAI,KAAK,KAAK,WAAW,KAAK,GAC3E;CAGD,MAAM,SAAS;CACf,MAAM,MAAM,IAAI,IAAI,MAAM,MAAM;CAChC,IAAI,IAAI,WAAW,QAClB,OAAO,IAAI,KAAK,MAAM,EAAa;AAErC"}

package/src/lib/toolbarV5.ts

@@ -1,54 +0,0 @@
-import { getToolbarSrc, PreviewTokenExpiredError, type Client } from "@prismicio/client"
-
-/** The cookie storing the preview session ID. The toolbar's v5 flow follows this session. */
-export const previewSessionCookie = "io.prismic.previewSession"
-
-/**
- * Props for the toolbar's `<script>`, opting into its v5 flow.
- *
- * @param previewURL - The app's preview route, as passed to `fetch()`.
- */
-export function getToolbarScriptProps(
-	repositoryName: string,
-	previewURL: string,
-): { src: string; "data-preview-url"?: string } {
-	return {
-		// TODO: Use `getToolbarSrc()` once `@prismicio/client` adds `v=5`.
-		src: `${getToolbarSrc(repositoryName)}&v=5`,
-		// The toolbar builds share links with this URL. `next/script` adds `lazyOnload` scripts in
-		// the browser, where the URL is known.
-		"data-preview-url":
-			typeof window === "undefined" ? undefined : new URL(previewURL, document.baseURI).href,
-	}
-}
-
-/** Fetches the current ref of a preview session, for share links that only carry the session. */
-export async function getPreviewSessionRef(
-	client: Pick<Client, "documentAPIEndpoint">,
-	session: string,
-): Promise<string> {
-	const url = new URL(`/previews/token/${encodeURIComponent(session)}`, client.documentAPIEndpoint)
-	// The endpoint is on the repository host, not on its CDN.
-	url.hostname = url.hostname.replace(".cdn.", ".")
-	const res = await fetch(url, { cache: "no-store" })
-	const json = await res.json()
-	if (!json.ref) {
-		// Like the Content API's response to an expired preview token.
-		throw new PreviewTokenExpiredError("This preview session has expired", url.href, json)
-	}
-
-	return json.ref
-}
-
-/** Returns `path` if it is a path on the same origin, like `/blog?page=2`. */
-export function getSafePath(path: string | undefined | null): string | undefined {
-	if (!path?.startsWith("/") || path.startsWith("//") || path.startsWith("/\\")) {
-		return
-	}
-
-	const origin = "https://placeholder.invalid"
-	const url = new URL(path, origin)
-	if (url.origin === origin) {
-		return url.href.slice(origin.length)
-	}
-}