@makeswift/runtime 0.25.0-canary.13 → 0.25.0-canary.14

package/dist/cjs/next/api-handler/config/pages-router.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/next/api-handler/config/pages-router.ts"],"sourcesContent":["import { P } from 'ts-pattern'\nimport { NextApiRequest, NextApiResponse } from 'next'\n\nimport { type ApiResponse } from '../../../api-handler/request-response'\n\nimport { redirectPreviewHandler } from '../handlers/redirect-preview'\nimport { PRERENDER_BYPASS_COOKIE, PREVIEW_DATA_COOKIE } from '../draft'\n\nimport { validateApiRoute, type ApiHandlerConfig } from './base'\n\nexport type ApiHandlerArgs = [NextApiRequest, NextApiResponse]\nexport const argsPattern = [P.any, P.any] as const\n\nexport async function config({\n  req,\n  res,\n  apiKey,\n}: {\n  req: NextApiRequest\n  res: NextApiResponse\n  apiKey: string\n}): Promise<ApiHandlerConfig> {\n  return {\n    req: {\n      headers: requestHeaders(req.headers),\n      method: req.method ?? 'GET',\n      url: req.url ?? '',\n      json() {\n        return req.body\n      },\n    },\n    route: validateApiRoute(await apiRequestParams(req)),\n    manifest: {\n      previewMode: true,\n    },\n    draftCookieNames: [PRERENDER_BYPASS_COOKIE, PREVIEW_DATA_COOKIE],\n    sendResponse: async (apiResponse: ApiResponse): Promise<Response | void> => {\n      const headers = responseHeaders(apiResponse.headers)\n      Object.entries(headers).forEach(([key, value]) => {\n        res.setHeader(key, value)\n      })\n\n      res.status(apiResponse.status)\n\n      if (apiResponse.body) {\n        await pipeTo(apiResponse.body, res)\n      }\n\n      res.end()\n    },\n    revalidationHandler: async (path?: string): Promise<void> => {\n      if (path != null) {\n        res.revalidate(path)\n      } else {\n        // No-op, Pages Router does not support tag-based revalidation\n      }\n    },\n    customRoutes: async (route: string) => {\n      if (route === '/preview') {\n        return { res: await redirectPreviewHandler(req, res, { apiKey }) }\n      }\n\n      return null\n    },\n  }\n}\n\nfunction apiRequestParams(request: NextApiRequest): Promise<NextApiRequest['query']> {\n  // `NextApiRequest.query` prop became async in Next.js 15, but it's not reflected in the type definition;\n  // force-casting it to a `Promise` manually\n  return Promise.resolve(request.query)\n}\n\nfunction requestHeaders(headers: NextApiRequest['headers']): Headers {\n  const result = new Headers()\n  for (const [key, value] of Object.entries(headers)) {\n    if (value != null) {\n      if (Array.isArray(value)) {\n        value.forEach(v => result.append(key, v))\n      } else {\n        result.append(key, value)\n      }\n    }\n  }\n\n  return result\n}\n\nfunction responseHeaders(headers: Headers): Record<string, string | string[]> {\n  return [...headers.entries()].reduce<Record<string, string | string[]>>((acc, [key, value]) => {\n    if (key in acc) {\n      const existingValue = acc[key]\n      if (Array.isArray(existingValue)) {\n        existingValue.push(value)\n      } else {\n        acc[key] = [existingValue, value]\n      }\n    } else {\n      acc[key] = value\n    }\n    return acc\n  }, {})\n}\n\nasync function pipeTo(stream: ReadableStream<Uint8Array>, res: NextApiResponse): Promise<void> {\n  try {\n    const reader = stream.getReader()\n    while (true) {\n      const { done, value } = await reader.read()\n      if (done) break\n      res.write(value)\n    }\n  } catch (error) {\n    res.destroy(error instanceof Error ? error : new Error(`${error}`))\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,wBAAkB;AAKlB,8BAAuC;AACvC,mBAA6D;AAE7D,kBAAwD;AAGjD,MAAM,cAAc,CAAC,oBAAE,KAAK,oBAAE,GAAG;AAExC,eAAsB,OAAO;AAAA,EAC3B;AAAA,EACA;AAAA,EACA;AACF,GAI8B;AAC5B,SAAO;AAAA,IACL,KAAK;AAAA,MACH,SAAS,eAAe,IAAI,OAAO;AAAA,MACnC,QAAQ,IAAI,UAAU;AAAA,MACtB,KAAK,IAAI,OAAO;AAAA,MAChB,OAAO;AACL,eAAO,IAAI;AAAA,MACb;AAAA,IACF;AAAA,IACA,WAAO,8BAAiB,MAAM,iBAAiB,GAAG,CAAC;AAAA,IACnD,UAAU;AAAA,MACR,aAAa;AAAA,IACf;AAAA,IACA,kBAAkB,CAAC,sCAAyB,gCAAmB;AAAA,IAC/D,cAAc,OAAO,gBAAuD;AAC1E,YAAM,UAAU,gBAAgB,YAAY,OAAO;AACnD,aAAO,QAAQ,OAAO,EAAE,QAAQ,CAAC,CAAC,KAAK,KAAK,MAAM;AAChD,YAAI,UAAU,KAAK,KAAK;AAAA,MAC1B,CAAC;AAED,UAAI,OAAO,YAAY,MAAM;AAE7B,UAAI,YAAY,MAAM;AACpB,cAAM,OAAO,YAAY,MAAM,GAAG;AAAA,MACpC;AAEA,UAAI,IAAI;AAAA,IACV;AAAA,IACA,qBAAqB,OAAO,SAAiC;AAC3D,UAAI,QAAQ,MAAM;AAChB,YAAI,WAAW,IAAI;AAAA,MACrB,OAAO;AAAA,MAEP;AAAA,IACF;AAAA,IACA,cAAc,OAAO,UAAkB;AACrC,UAAI,UAAU,YAAY;AACxB,eAAO,EAAE,KAAK,UAAM,gDAAuB,KAAK,KAAK,EAAE,OAAO,CAAC,EAAE;AAAA,MACnE;AAEA,aAAO;AAAA,IACT;AAAA,EACF;AACF;AAEA,SAAS,iBAAiB,SAA2D;AAGnF,SAAO,QAAQ,QAAQ,QAAQ,KAAK;AACtC;AAEA,SAAS,eAAe,SAA6C;AACnE,QAAM,SAAS,IAAI,QAAQ;AAC3B,aAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,OAAO,GAAG;AAClD,QAAI,SAAS,MAAM;AACjB,UAAI,MAAM,QAAQ,KAAK,GAAG;AACxB,cAAM,QAAQ,OAAK,OAAO,OAAO,KAAK,CAAC,CAAC;AAAA,MAC1C,OAAO;AACL,eAAO,OAAO,KAAK,KAAK;AAAA,MAC1B;AAAA,IACF;AAAA,EACF;AAEA,SAAO;AACT;AAEA,SAAS,gBAAgB,SAAqD;AAC5E,SAAO,CAAC,GAAG,QAAQ,QAAQ,CAAC,EAAE,OAA0C,CAAC,KAAK,CAAC,KAAK,KAAK,MAAM;AAC7F,QAAI,OAAO,KAAK;AACd,YAAM,gBAAgB,IAAI,GAAG;AAC7B,UAAI,MAAM,QAAQ,aAAa,GAAG;AAChC,sBAAc,KAAK,KAAK;AAAA,MAC1B,OAAO;AACL,YAAI,GAAG,IAAI,CAAC,eAAe,KAAK;AAAA,MAClC;AAAA,IACF,OAAO;AACL,UAAI,GAAG,IAAI;AAAA,IACb;AACA,WAAO;AAAA,EACT,GAAG,CAAC,CAAC;AACP;AAEA,eAAe,OAAO,QAAoC,KAAqC;AAC7F,MAAI;AACF,UAAM,SAAS,OAAO,UAAU;AAChC,WAAO,MAAM;AACX,YAAM,EAAE,MAAM,MAAM,IAAI,MAAM,OAAO,KAAK;AAC1C,UAAI;AAAM;AACV,UAAI,MAAM,KAAK;AAAA,IACjB;AAAA,EACF,SAAS,OAAO;AACd,QAAI,QAAQ,iBAAiB,QAAQ,QAAQ,IAAI,MAAM,GAAG,KAAK,EAAE,CAAC;AAAA,EACpE;AACF;","names":[]}
+{"version":3,"sources":["../../../../../src/next/api-handler/config/pages-router.ts"],"sourcesContent":["import { P } from 'ts-pattern'\nimport { NextApiRequest, NextApiResponse } from 'next'\n\nimport { type ApiResponse } from '../../../api-handler/request-response'\n\nimport { pagesRouterRedirectPreviewHandler } from '../handlers/pages-router-redirect-preview'\nimport { PRERENDER_BYPASS_COOKIE, PREVIEW_DATA_COOKIE } from '../preview'\n\nimport { validateApiRoute, type ApiHandlerConfig } from './base'\nimport { MakeswiftClient } from '../../../client'\n\nexport type ApiHandlerArgs = [NextApiRequest, NextApiResponse]\nexport const argsPattern = [P.any, P.any] as const\n\nexport async function config({\n  req,\n  res,\n  client,\n}: {\n  req: NextApiRequest\n  res: NextApiResponse\n  client: MakeswiftClient\n}): Promise<ApiHandlerConfig> {\n  return {\n    req: {\n      headers: requestHeaders(req.headers),\n      method: req.method ?? 'GET',\n      url: req.url ?? '',\n      json() {\n        return req.body\n      },\n    },\n    route: validateApiRoute(await apiRequestParams(req)),\n    manifest: {},\n    previewCookieNames: [PRERENDER_BYPASS_COOKIE, PREVIEW_DATA_COOKIE],\n    sendResponse: async (apiResponse: ApiResponse): Promise<Response | void> => {\n      const headers = responseHeaders(apiResponse.headers)\n      Object.entries(headers).forEach(([key, value]) => {\n        res.setHeader(key, value)\n      })\n\n      res.status(apiResponse.status)\n\n      if (apiResponse.body) {\n        await pipeTo(apiResponse.body, res)\n      }\n\n      res.end()\n    },\n    revalidationHandler: async (path?: string): Promise<void> => {\n      if (path != null) {\n        res.revalidate(path)\n      } else {\n        // No-op, Pages Router does not support tag-based revalidation\n      }\n    },\n    customRoutes: async (route: string) => {\n      if (route === '/redirect-preview') {\n        return { res: await pagesRouterRedirectPreviewHandler(req, res, client) }\n      }\n\n      return null\n    },\n  }\n}\n\nfunction apiRequestParams(request: NextApiRequest): Promise<NextApiRequest['query']> {\n  // `NextApiRequest.query` prop became async in Next.js 15, but it's not reflected in the type definition;\n  // force-casting it to a `Promise` manually\n  return Promise.resolve(request.query)\n}\n\nfunction requestHeaders(headers: NextApiRequest['headers']): Headers {\n  const result = new Headers()\n  for (const [key, value] of Object.entries(headers)) {\n    if (value != null) {\n      if (Array.isArray(value)) {\n        value.forEach(v => result.append(key, v))\n      } else {\n        result.append(key, value)\n      }\n    }\n  }\n\n  return result\n}\n\nfunction responseHeaders(headers: Headers): Record<string, string | string[]> {\n  return [...headers.entries()].reduce<Record<string, string | string[]>>((acc, [key, value]) => {\n    if (key in acc) {\n      const existingValue = acc[key]\n      if (Array.isArray(existingValue)) {\n        existingValue.push(value)\n      } else {\n        acc[key] = [existingValue, value]\n      }\n    } else {\n      acc[key] = value\n    }\n    return acc\n  }, {})\n}\n\nasync function pipeTo(stream: ReadableStream<Uint8Array>, res: NextApiResponse): Promise<void> {\n  try {\n    const reader = stream.getReader()\n    while (true) {\n      const { done, value } = await reader.read()\n      if (done) break\n      res.write(value)\n    }\n  } catch (error) {\n    res.destroy(error instanceof Error ? error : new Error(`${error}`))\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,wBAAkB;AAKlB,2CAAkD;AAClD,qBAA6D;AAE7D,kBAAwD;AAIjD,MAAM,cAAc,CAAC,oBAAE,KAAK,oBAAE,GAAG;AAExC,eAAsB,OAAO;AAAA,EAC3B;AAAA,EACA;AAAA,EACA;AACF,GAI8B;AAC5B,SAAO;AAAA,IACL,KAAK;AAAA,MACH,SAAS,eAAe,IAAI,OAAO;AAAA,MACnC,QAAQ,IAAI,UAAU;AAAA,MACtB,KAAK,IAAI,OAAO;AAAA,MAChB,OAAO;AACL,eAAO,IAAI;AAAA,MACb;AAAA,IACF;AAAA,IACA,WAAO,8BAAiB,MAAM,iBAAiB,GAAG,CAAC;AAAA,IACnD,UAAU,CAAC;AAAA,IACX,oBAAoB,CAAC,wCAAyB,kCAAmB;AAAA,IACjE,cAAc,OAAO,gBAAuD;AAC1E,YAAM,UAAU,gBAAgB,YAAY,OAAO;AACnD,aAAO,QAAQ,OAAO,EAAE,QAAQ,CAAC,CAAC,KAAK,KAAK,MAAM;AAChD,YAAI,UAAU,KAAK,KAAK;AAAA,MAC1B,CAAC;AAED,UAAI,OAAO,YAAY,MAAM;AAE7B,UAAI,YAAY,MAAM;AACpB,cAAM,OAAO,YAAY,MAAM,GAAG;AAAA,MACpC;AAEA,UAAI,IAAI;AAAA,IACV;AAAA,IACA,qBAAqB,OAAO,SAAiC;AAC3D,UAAI,QAAQ,MAAM;AAChB,YAAI,WAAW,IAAI;AAAA,MACrB,OAAO;AAAA,MAEP;AAAA,IACF;AAAA,IACA,cAAc,OAAO,UAAkB;AACrC,UAAI,UAAU,qBAAqB;AACjC,eAAO,EAAE,KAAK,UAAM,wEAAkC,KAAK,KAAK,MAAM,EAAE;AAAA,MAC1E;AAEA,aAAO;AAAA,IACT;AAAA,EACF;AACF;AAEA,SAAS,iBAAiB,SAA2D;AAGnF,SAAO,QAAQ,QAAQ,QAAQ,KAAK;AACtC;AAEA,SAAS,eAAe,SAA6C;AACnE,QAAM,SAAS,IAAI,QAAQ;AAC3B,aAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,OAAO,GAAG;AAClD,QAAI,SAAS,MAAM;AACjB,UAAI,MAAM,QAAQ,KAAK,GAAG;AACxB,cAAM,QAAQ,OAAK,OAAO,OAAO,KAAK,CAAC,CAAC;AAAA,MAC1C,OAAO;AACL,eAAO,OAAO,KAAK,KAAK;AAAA,MAC1B;AAAA,IACF;AAAA,EACF;AAEA,SAAO;AACT;AAEA,SAAS,gBAAgB,SAAqD;AAC5E,SAAO,CAAC,GAAG,QAAQ,QAAQ,CAAC,EAAE,OAA0C,CAAC,KAAK,CAAC,KAAK,KAAK,MAAM;AAC7F,QAAI,OAAO,KAAK;AACd,YAAM,gBAAgB,IAAI,GAAG;AAC7B,UAAI,MAAM,QAAQ,aAAa,GAAG;AAChC,sBAAc,KAAK,KAAK;AAAA,MAC1B,OAAO;AACL,YAAI,GAAG,IAAI,CAAC,eAAe,KAAK;AAAA,MAClC;AAAA,IACF,OAAO;AACL,UAAI,GAAG,IAAI;AAAA,IACb;AACA,WAAO;AAAA,EACT,GAAG,CAAC,CAAC;AACP;AAEA,eAAe,OAAO,QAAoC,KAAqC;AAC7F,MAAI;AACF,UAAM,SAAS,OAAO,UAAU;AAChC,WAAO,MAAM;AACX,YAAM,EAAE,MAAM,MAAM,IAAI,MAAM,OAAO,KAAK;AAC1C,UAAI;AAAM;AACV,UAAI,MAAM,KAAK;AAAA,IACjB;AAAA,EACF,SAAS,OAAO;AACd,QAAI,QAAQ,iBAAiB,QAAQ,QAAQ,IAAI,MAAM,GAAG,KAAK,EAAE,CAAC;AAAA,EACpE;AACF;","names":[]}

package/dist/cjs/next/api-handler/handlers/{redirect-draft.js → app-router-redirect-preview.js}

@@ -16,62 +16,66 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var redirect_draft_exports = {};
-__export(redirect_draft_exports, {
-  originalRequestProtocol: () => originalRequestProtocol,
-  redirectDraftHandler: () => redirectDraftHandler
+var app_router_redirect_preview_exports = {};
+__export(app_router_redirect_preview_exports, {
+  appRouterRedirectPreviewHandler: () => appRouterRedirectPreviewHandler,
+  originalRequestProtocol: () => originalRequestProtocol
 });
-module.exports = __toCommonJS(redirect_draft_exports);
+module.exports = __toCommonJS(app_router_redirect_preview_exports);
 var import_server = require("next/server");
 var import_headers = require("next/headers");
 var import_cookie = require("cookie");
-var import_site_version = require("../../../api/site-version");
 var import_cookies = require("../../../api-handler/cookies");
-var import_draft = require("../draft");
+var import_site_version = require("../../../api/site-version");
+var import_preview = require("../preview");
 function originalRequestProtocol(request) {
   const forwardedProto = request.headers.get("x-forwarded-proto");
   return forwardedProto != null ? forwardedProto.split(",")[0].trim() : null;
 }
-async function redirectDraftHandler(request, _context, { apiKey }) {
-  const secret = request.nextUrl.searchParams.get(import_draft.SearchParams.DraftMode);
-  if (secret == null) {
-    return new import_server.NextResponse("Unauthorized to enable draft mode: no secret provided", {
-      status: 401
-    });
+async function appRouterRedirectPreviewHandler(request, _context, client) {
+  const previewToken = request.nextUrl.searchParams.get(import_preview.SearchParams.PreviewToken);
+  if (previewToken == null) {
+    return new import_server.NextResponse("Bad request: no preview token provided", { status: 400 });
   }
-  if (secret !== apiKey) {
-    return new import_server.NextResponse("Unauthorized to enable draft mode: incorrect secret", { status: 401 });
+  const verificationResult = await client.readPreviewToken(previewToken);
+  if (verificationResult == null) {
+    return new import_server.NextResponse("Failed to verify preview token", { status: 401 });
   }
+  const { payload } = verificationResult;
   const draft = await (0, import_headers.draftMode)();
   const cookieStore = await (0, import_headers.cookies)();
   draft.enable();
-  const prerenderBypassCookie = cookieStore.get(import_draft.PRERENDER_BYPASS_COOKIE);
+  const prerenderBypassCookie = cookieStore.get(import_preview.PRERENDER_BYPASS_COOKIE);
   if (prerenderBypassCookie?.value == null) {
     return new import_server.NextResponse("Could not retrieve draft mode bypass cookie", { status: 500 });
   }
+  const siteVersion = { version: payload.version, token: previewToken };
+  const serializedSiteVersion = (0, import_site_version.serializeSiteVersion)(siteVersion);
+  const secondsUntilExpiration = (0, import_site_version.secondsUntilSiteVersionExpiration)(siteVersion);
   const draftCookies = [
     prerenderBypassCookie,
-    {
-      name: import_draft.MAKESWIFT_DRAFT_DATA_COOKIE,
-      // Eventually, we can make this value dynamic using the request
-      value: JSON.stringify({ makeswift: true, siteVersion: import_site_version.MakeswiftSiteVersion.Working })
-    }
+    { name: import_preview.MAKESWIFT_SITE_VERSION_COOKIE, value: serializedSiteVersion }
   ];
   const redirectProtocol = originalRequestProtocol(request) ?? request.nextUrl.protocol.replace(":", "");
   const redirectHost = request.headers.get("x-forwarded-host") ?? request.headers.get("host") ?? request.nextUrl.host;
   const redirectUrl = new URL(
     `${redirectProtocol}://${redirectHost}${request.nextUrl.pathname}${request.nextUrl.search}`
   );
-  redirectUrl.searchParams.delete(import_draft.SearchParams.DraftMode);
+  redirectUrl.searchParams.delete(import_preview.SearchParams.PreviewToken);
+  redirectUrl.searchParams.delete(import_preview.RewriteRuleMatches.PreviewToken);
+  redirectUrl.searchParams.delete(import_preview.RewriteRuleMatches.OriginalPath);
   const headers = new Headers();
   draftCookies.forEach(({ name, value }) => {
-    headers.append(import_cookies.SET_COOKIE_HEADER, (0, import_cookie.serialize)(name, value, { ...import_cookies.cookieSettingOptions }));
+    headers.append(
+      import_cookies.SET_COOKIE_HEADER,
+      (0, import_cookie.serialize)(name, value, { ...import_cookies.cookieSettingOptions, maxAge: secondsUntilExpiration })
+    );
   });
   return import_server.NextResponse.redirect(redirectUrl, { headers });
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  originalRequestProtocol,
-  redirectDraftHandler
+  appRouterRedirectPreviewHandler,
+  originalRequestProtocol
 });
-//# sourceMappingURL=redirect-draft.js.map
+//# sourceMappingURL=app-router-redirect-preview.js.map

package/dist/cjs/next/api-handler/handlers/app-router-redirect-preview.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/next/api-handler/handlers/app-router-redirect-preview.ts"],"sourcesContent":["import { NextRequest, NextResponse } from 'next/server'\nimport { cookies, draftMode } from 'next/headers'\n\nimport { serialize as serializeCookie } from 'cookie'\n\nimport { cookieSettingOptions, SET_COOKIE_HEADER } from '../../../api-handler/cookies'\nimport {\n  secondsUntilSiteVersionExpiration,\n  serializeSiteVersion,\n  type SiteVersion,\n} from '../../../api/site-version'\n\nimport {\n  MAKESWIFT_SITE_VERSION_COOKIE,\n  PRERENDER_BYPASS_COOKIE,\n  RewriteRuleMatches,\n  SearchParams,\n} from '../preview'\nimport { MakeswiftClient } from '../../../client'\n\nexport function originalRequestProtocol(request: NextRequest): string | null {\n  // The `x-forwarded-proto` header is not formally standardized, but many proxies\n  // *append* the protocol used for the request to the existing value. As a result,\n  // if the request passes through multiple proxies, the header may contain a\n  // comma-separated list of protocols: https://code.djangoproject.com/ticket/33569\n  const forwardedProto = request.headers.get('x-forwarded-proto')\n  return forwardedProto != null ? forwardedProto.split(',')[0].trim() : null\n}\n\nexport async function appRouterRedirectPreviewHandler(\n  request: NextRequest,\n  _context: any,\n  client: MakeswiftClient,\n): Promise<NextResponse> {\n  const previewToken = request.nextUrl.searchParams.get(SearchParams.PreviewToken)\n\n  if (previewToken == null) {\n    return new NextResponse('Bad request: no preview token provided', { status: 400 })\n  }\n\n  const verificationResult = await client.readPreviewToken(previewToken)\n\n  if (verificationResult == null) {\n    return new NextResponse('Failed to verify preview token', { status: 401 })\n  }\n\n  const { payload } = verificationResult\n\n  const draft = await draftMode()\n  const cookieStore = await cookies()\n\n  draft.enable()\n\n  const prerenderBypassCookie = cookieStore.get(PRERENDER_BYPASS_COOKIE)\n\n  if (prerenderBypassCookie?.value == null) {\n    return new NextResponse('Could not retrieve draft mode bypass cookie', { status: 500 })\n  }\n\n  const siteVersion: SiteVersion = { version: payload.version, token: previewToken }\n  const serializedSiteVersion = serializeSiteVersion(siteVersion)\n  const secondsUntilExpiration = secondsUntilSiteVersionExpiration(siteVersion)\n\n  const draftCookies: { name: string; value: string }[] = [\n    prerenderBypassCookie,\n    { name: MAKESWIFT_SITE_VERSION_COOKIE, value: serializedSiteVersion },\n  ]\n\n  const redirectProtocol =\n    originalRequestProtocol(request) ?? request.nextUrl.protocol.replace(':', '')\n\n  const redirectHost =\n    request.headers.get('x-forwarded-host') ?? request.headers.get('host') ?? request.nextUrl.host\n\n  const redirectUrl = new URL(\n    `${redirectProtocol}://${redirectHost}${request.nextUrl.pathname}${request.nextUrl.search}`,\n  )\n\n  redirectUrl.searchParams.delete(SearchParams.PreviewToken)\n  redirectUrl.searchParams.delete(RewriteRuleMatches.PreviewToken)\n  redirectUrl.searchParams.delete(RewriteRuleMatches.OriginalPath)\n\n  const headers = new Headers()\n  draftCookies.forEach(({ name, value }) => {\n    headers.append(\n      SET_COOKIE_HEADER,\n      serializeCookie(name, value, { ...cookieSettingOptions, maxAge: secondsUntilExpiration }),\n    )\n  })\n\n  return NextResponse.redirect(redirectUrl, { headers })\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAA0C;AAC1C,qBAAmC;AAEnC,oBAA6C;AAE7C,qBAAwD;AACxD,0BAIO;AAEP,qBAKO;AAGA,SAAS,wBAAwB,SAAqC;AAK3E,QAAM,iBAAiB,QAAQ,QAAQ,IAAI,mBAAmB;AAC9D,SAAO,kBAAkB,OAAO,eAAe,MAAM,GAAG,EAAE,CAAC,EAAE,KAAK,IAAI;AACxE;AAEA,eAAsB,gCACpB,SACA,UACA,QACuB;AACvB,QAAM,eAAe,QAAQ,QAAQ,aAAa,IAAI,4BAAa,YAAY;AAE/E,MAAI,gBAAgB,MAAM;AACxB,WAAO,IAAI,2BAAa,0CAA0C,EAAE,QAAQ,IAAI,CAAC;AAAA,EACnF;AAEA,QAAM,qBAAqB,MAAM,OAAO,iBAAiB,YAAY;AAErE,MAAI,sBAAsB,MAAM;AAC9B,WAAO,IAAI,2BAAa,kCAAkC,EAAE,QAAQ,IAAI,CAAC;AAAA,EAC3E;AAEA,QAAM,EAAE,QAAQ,IAAI;AAEpB,QAAM,QAAQ,UAAM,0BAAU;AAC9B,QAAM,cAAc,UAAM,wBAAQ;AAElC,QAAM,OAAO;AAEb,QAAM,wBAAwB,YAAY,IAAI,sCAAuB;AAErE,MAAI,uBAAuB,SAAS,MAAM;AACxC,WAAO,IAAI,2BAAa,+CAA+C,EAAE,QAAQ,IAAI,CAAC;AAAA,EACxF;AAEA,QAAM,cAA2B,EAAE,SAAS,QAAQ,SAAS,OAAO,aAAa;AACjF,QAAM,4BAAwB,0CAAqB,WAAW;AAC9D,QAAM,6BAAyB,uDAAkC,WAAW;AAE5E,QAAM,eAAkD;AAAA,IACtD;AAAA,IACA,EAAE,MAAM,8CAA+B,OAAO,sBAAsB;AAAA,EACtE;AAEA,QAAM,mBACJ,wBAAwB,OAAO,KAAK,QAAQ,QAAQ,SAAS,QAAQ,KAAK,EAAE;AAE9E,QAAM,eACJ,QAAQ,QAAQ,IAAI,kBAAkB,KAAK,QAAQ,QAAQ,IAAI,MAAM,KAAK,QAAQ,QAAQ;AAE5F,QAAM,cAAc,IAAI;AAAA,IACtB,GAAG,gBAAgB,MAAM,YAAY,GAAG,QAAQ,QAAQ,QAAQ,GAAG,QAAQ,QAAQ,MAAM;AAAA,EAC3F;AAEA,cAAY,aAAa,OAAO,4BAAa,YAAY;AACzD,cAAY,aAAa,OAAO,kCAAmB,YAAY;AAC/D,cAAY,aAAa,OAAO,kCAAmB,YAAY;AAE/D,QAAM,UAAU,IAAI,QAAQ;AAC5B,eAAa,QAAQ,CAAC,EAAE,MAAM,MAAM,MAAM;AACxC,YAAQ;AAAA,MACN;AAAA,UACA,cAAAA,WAAgB,MAAM,OAAO,EAAE,GAAG,qCAAsB,QAAQ,uBAAuB,CAAC;AAAA,IAC1F;AAAA,EACF,CAAC;AAED,SAAO,2BAAa,SAAS,aAAa,EAAE,QAAQ,CAAC;AACvD;","names":["serializeCookie"]}

package/dist/cjs/next/api-handler/handlers/{redirect-preview.js → pages-router-redirect-preview.js}

@@ -16,46 +16,53 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var redirect_preview_exports = {};
-__export(redirect_preview_exports, {
-  redirectPreviewHandler: () => redirectPreviewHandler
+var pages_router_redirect_preview_exports = {};
+__export(pages_router_redirect_preview_exports, {
+  pagesRouterRedirectPreviewHandler: () => pagesRouterRedirectPreviewHandler
 });
-module.exports = __toCommonJS(redirect_preview_exports);
+module.exports = __toCommonJS(pages_router_redirect_preview_exports);
 var import_set_cookie_parser = require("set-cookie-parser");
 var import_cookie = require("cookie");
-var import_site_version = require("../../../api/site-version");
 var import_cookies = require("../../../api-handler/cookies");
-var import_draft = require("../draft");
-async function redirectPreviewHandler(req, res, { apiKey }) {
-  const secret = req.query[import_draft.SearchParams.PreviewMode];
-  const pathname = req.query.path;
-  if (secret == null) {
-    return res.status(401).send("Unauthorized to enable preview mode: no secret provided");
-  }
-  if (secret !== apiKey) {
-    return res.status(401).send("Unauthorized to enable preview mode: secret is incorrect");
-  }
+var import_preview = require("../preview");
+var import_site_version = require("../../../api/site-version");
+async function pagesRouterRedirectPreviewHandler(req, res, client) {
+  const pathname = req.query[import_preview.RewriteRuleMatches.OriginalPath];
   if (pathname == null) {
     return res.status(400).send("Bad request: incoming request does not have an associated pathname");
   }
-  const setCookie = res.setPreviewData({ makeswift: true, siteVersion: import_site_version.MakeswiftSiteVersion.Working }).getHeader(import_cookies.SET_COOKIE_HEADER);
+  const previewToken = req.query[import_preview.SearchParams.PreviewToken];
+  if (previewToken == null) {
+    return res.status(400).send("Bad request: no preview token provided");
+  }
+  const verificationResult = await client.readPreviewToken(previewToken);
+  if (verificationResult == null) {
+    return res.status(401).send("Failed to verify preview token");
+  }
+  const { payload } = verificationResult;
+  const siteVersion = { version: payload.version, token: previewToken };
+  const secondsUntilExpiration = (0, import_site_version.secondsUntilSiteVersionExpiration)(siteVersion);
+  const serializedSiteVersion = (0, import_site_version.serializeSiteVersion)(siteVersion);
+  const setCookie = res.setPreviewData({ siteVersion: serializedSiteVersion }).getHeader(import_cookies.SET_COOKIE_HEADER);
   res.removeHeader(import_cookies.SET_COOKIE_HEADER);
   const parsedCookies = (0, import_set_cookie_parser.parse)(Array.isArray(setCookie) ? setCookie : "");
-  const prerenderBypassCookie = parsedCookies.find((c) => c.name === import_draft.PRERENDER_BYPASS_COOKIE);
-  const previewDataCookie = parsedCookies.find((c) => c.name === import_draft.PREVIEW_DATA_COOKIE);
+  const prerenderBypassCookie = parsedCookies.find((c) => c.name === import_preview.PRERENDER_BYPASS_COOKIE);
+  const previewDataCookie = parsedCookies.find((c) => c.name === import_preview.PREVIEW_DATA_COOKIE);
   if (prerenderBypassCookie?.value == null || previewDataCookie?.value == null) {
     return res.status(500).send("Could not retrieve preview mode cookies");
   }
   const patchedCookies = [prerenderBypassCookie, previewDataCookie].map(({ name, value }) => {
-    return (0, import_cookie.serialize)(name, value, { ...import_cookies.cookieSettingOptions });
+    return (0, import_cookie.serialize)(name, value, { ...import_cookies.cookieSettingOptions, maxAge: secondsUntilExpiration });
   });
   res.setHeader(import_cookies.SET_COOKIE_HEADER, patchedCookies);
   const destinationUrl = new URL(pathname, "http://test.com");
-  destinationUrl.searchParams.delete(import_draft.SearchParams.PreviewMode);
+  destinationUrl.searchParams.delete(import_preview.SearchParams.PreviewToken);
+  destinationUrl.searchParams.delete(import_preview.RewriteRuleMatches.PreviewToken);
+  destinationUrl.searchParams.delete(import_preview.RewriteRuleMatches.OriginalPath);
   res.redirect(`${destinationUrl.pathname}?${destinationUrl.searchParams.toString()}`);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  redirectPreviewHandler
+  pagesRouterRedirectPreviewHandler
 });
-//# sourceMappingURL=redirect-preview.js.map
+//# sourceMappingURL=pages-router-redirect-preview.js.map

package/dist/cjs/next/api-handler/handlers/pages-router-redirect-preview.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/next/api-handler/handlers/pages-router-redirect-preview.ts"],"sourcesContent":["import { NextApiRequest, NextApiResponse } from 'next'\n\nimport { parse as parseSetCookie } from 'set-cookie-parser'\nimport { serialize as serializeCookie } from 'cookie'\n\nimport { cookieSettingOptions, SET_COOKIE_HEADER } from '../../../api-handler/cookies'\n\nimport {\n  PRERENDER_BYPASS_COOKIE,\n  PREVIEW_DATA_COOKIE,\n  RewriteRuleMatches,\n  SearchParams,\n} from '../preview'\nimport { MakeswiftClient } from '../../../client'\nimport {\n  secondsUntilSiteVersionExpiration,\n  serializeSiteVersion,\n  type SiteVersion,\n} from '../../../api/site-version'\n\nexport async function pagesRouterRedirectPreviewHandler(\n  req: NextApiRequest,\n  res: NextApiResponse,\n  client: MakeswiftClient,\n): Promise<void> {\n  // Next.js automatically strips the locale prefix from rewritten request's URL, even when the\n  // rewrite's `locale` option is set to `false`: https://github.com/vercel/next.js/discussions/21798.\n  // At the same time, it also maps rewrite's URL segments (e.g. `:path`) to query parameters\n  // on the rewritten request, so we use the `query` to recover the original request path.\n  const pathname = req.query[RewriteRuleMatches.OriginalPath] as string | undefined\n\n  if (pathname == null) {\n    return res\n      .status(400)\n      .send('Bad request: incoming request does not have an associated pathname')\n  }\n\n  const previewToken = req.query[SearchParams.PreviewToken] as string | undefined\n\n  if (previewToken == null) {\n    return res.status(400).send('Bad request: no preview token provided')\n  }\n\n  const verificationResult = await client.readPreviewToken(previewToken)\n\n  if (verificationResult == null) {\n    return res.status(401).send('Failed to verify preview token')\n  }\n\n  const { payload } = verificationResult\n\n  const siteVersion: SiteVersion = { version: payload.version, token: previewToken }\n  const secondsUntilExpiration = secondsUntilSiteVersionExpiration(siteVersion)\n  const serializedSiteVersion = serializeSiteVersion(siteVersion)\n\n  const setCookie = res\n    .setPreviewData({ siteVersion: serializedSiteVersion })\n    .getHeader(SET_COOKIE_HEADER)\n\n  res.removeHeader(SET_COOKIE_HEADER)\n\n  const parsedCookies = parseSetCookie(Array.isArray(setCookie) ? setCookie : '')\n\n  const prerenderBypassCookie = parsedCookies.find(c => c.name === PRERENDER_BYPASS_COOKIE)\n  const previewDataCookie = parsedCookies.find(c => c.name === PREVIEW_DATA_COOKIE)\n\n  if (prerenderBypassCookie?.value == null || previewDataCookie?.value == null) {\n    return res.status(500).send('Could not retrieve preview mode cookies')\n  }\n\n  const patchedCookies = [prerenderBypassCookie, previewDataCookie].map(({ name, value }) => {\n    return serializeCookie(name, value, { ...cookieSettingOptions, maxAge: secondsUntilExpiration })\n  })\n  res.setHeader(SET_COOKIE_HEADER, patchedCookies)\n\n  const destinationUrl = new URL(pathname, 'http://test.com')\n  destinationUrl.searchParams.delete(SearchParams.PreviewToken)\n  destinationUrl.searchParams.delete(RewriteRuleMatches.PreviewToken)\n  destinationUrl.searchParams.delete(RewriteRuleMatches.OriginalPath)\n\n  res.redirect(`${destinationUrl.pathname}?${destinationUrl.searchParams.toString()}`)\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,+BAAwC;AACxC,oBAA6C;AAE7C,qBAAwD;AAExD,qBAKO;AAEP,0BAIO;AAEP,eAAsB,kCACpB,KACA,KACA,QACe;AAKf,QAAM,WAAW,IAAI,MAAM,kCAAmB,YAAY;AAE1D,MAAI,YAAY,MAAM;AACpB,WAAO,IACJ,OAAO,GAAG,EACV,KAAK,oEAAoE;AAAA,EAC9E;AAEA,QAAM,eAAe,IAAI,MAAM,4BAAa,YAAY;AAExD,MAAI,gBAAgB,MAAM;AACxB,WAAO,IAAI,OAAO,GAAG,EAAE,KAAK,wCAAwC;AAAA,EACtE;AAEA,QAAM,qBAAqB,MAAM,OAAO,iBAAiB,YAAY;AAErE,MAAI,sBAAsB,MAAM;AAC9B,WAAO,IAAI,OAAO,GAAG,EAAE,KAAK,gCAAgC;AAAA,EAC9D;AAEA,QAAM,EAAE,QAAQ,IAAI;AAEpB,QAAM,cAA2B,EAAE,SAAS,QAAQ,SAAS,OAAO,aAAa;AACjF,QAAM,6BAAyB,uDAAkC,WAAW;AAC5E,QAAM,4BAAwB,0CAAqB,WAAW;AAE9D,QAAM,YAAY,IACf,eAAe,EAAE,aAAa,sBAAsB,CAAC,EACrD,UAAU,gCAAiB;AAE9B,MAAI,aAAa,gCAAiB;AAElC,QAAM,oBAAgB,yBAAAA,OAAe,MAAM,QAAQ,SAAS,IAAI,YAAY,EAAE;AAE9E,QAAM,wBAAwB,cAAc,KAAK,OAAK,EAAE,SAAS,sCAAuB;AACxF,QAAM,oBAAoB,cAAc,KAAK,OAAK,EAAE,SAAS,kCAAmB;AAEhF,MAAI,uBAAuB,SAAS,QAAQ,mBAAmB,SAAS,MAAM;AAC5E,WAAO,IAAI,OAAO,GAAG,EAAE,KAAK,yCAAyC;AAAA,EACvE;AAEA,QAAM,iBAAiB,CAAC,uBAAuB,iBAAiB,EAAE,IAAI,CAAC,EAAE,MAAM,MAAM,MAAM;AACzF,eAAO,cAAAC,WAAgB,MAAM,OAAO,EAAE,GAAG,qCAAsB,QAAQ,uBAAuB,CAAC;AAAA,EACjG,CAAC;AACD,MAAI,UAAU,kCAAmB,cAAc;AAE/C,QAAM,iBAAiB,IAAI,IAAI,UAAU,iBAAiB;AAC1D,iBAAe,aAAa,OAAO,4BAAa,YAAY;AAC5D,iBAAe,aAAa,OAAO,kCAAmB,YAAY;AAClE,iBAAe,aAAa,OAAO,kCAAmB,YAAY;AAElE,MAAI,SAAS,GAAG,eAAe,QAAQ,IAAI,eAAe,aAAa,SAAS,CAAC,EAAE;AACrF;","names":["parseSetCookie","serializeCookie"]}

package/dist/cjs/next/api-handler/index.js

@@ -39,7 +39,7 @@ var PagesRouter = __toESM(require("./config/pages-router"));
 function MakeswiftApiHandler(apiKey, { apiOrigin, runtime, ...userConfig }) {
   const client = new import_client.Makeswift(apiKey, { apiOrigin, runtime });
   return async function handler(...args) {
-    const { req, route, sendResponse, customRoutes, ...handlerConfig } = await (0, import_ts_pattern.match)(args).with(AppRouter.argsPattern, ([req2, context]) => AppRouter.config({ req: req2, context, apiKey })).with(PagesRouter.argsPattern, ([req2, res]) => PagesRouter.config({ req: req2, res, apiKey })).exhaustive();
+    const { req, route, sendResponse, customRoutes, ...handlerConfig } = await (0, import_ts_pattern.match)(args).with(AppRouter.argsPattern, ([req2, context]) => AppRouter.config({ req: req2, context, client })).with(PagesRouter.argsPattern, ([req2, res]) => PagesRouter.config({ req: req2, res, client })).exhaustive();
     const apiHandler = (0, import_api_handler.createApiHandler)(apiKey, {
       ...userConfig,
       ...handlerConfig,

package/dist/cjs/next/api-handler/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/next/api-handler/index.ts"],"sourcesContent":["import { match } from 'ts-pattern'\n\nimport { Makeswift as MakeswiftClient } from '../client'\n\nimport { type ApiHandlerUserConfig, createApiHandler } from '../../api-handler'\n\nimport * as AppRouter from './config/app-router'\nimport * as PagesRouter from './config/pages-router'\n\n/**\n * @deprecated This type is deprecated and will be removed in a future release.\n */\nexport type MakeswiftApiHandlerResponse = any\n\ntype ApiHandlerArgs = AppRouter.ApiHandlerArgs | PagesRouter.ApiHandlerArgs\n\nexport function MakeswiftApiHandler(\n  apiKey: string,\n  { apiOrigin, runtime, ...userConfig }: ApiHandlerUserConfig,\n): (...args: ApiHandlerArgs) => Promise<Response | void> {\n  const client = new MakeswiftClient(apiKey, { apiOrigin, runtime })\n\n  return async function handler(...args: ApiHandlerArgs): Promise<Response | void> {\n    const { req, route, sendResponse, customRoutes, ...handlerConfig } = await match(args)\n      .with(AppRouter.argsPattern, ([req, context]) => AppRouter.config({ req, context, apiKey }))\n      .with(PagesRouter.argsPattern, ([req, res]) => PagesRouter.config({ req, res, apiKey }))\n      .exhaustive()\n\n    const apiHandler = createApiHandler(apiKey, {\n      ...userConfig,\n      ...handlerConfig,\n      runtime,\n      client,\n    })\n\n    const customRouteResponse = await customRoutes(route)\n    if (customRouteResponse) {\n      return customRouteResponse.res\n    }\n\n    return sendResponse(await apiHandler(req, route))\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,wBAAsB;AAEtB,oBAA6C;AAE7C,yBAA4D;AAE5D,gBAA2B;AAC3B,kBAA6B;AAStB,SAAS,oBACd,QACA,EAAE,WAAW,SAAS,GAAG,WAAW,GACmB;AACvD,QAAM,SAAS,IAAI,cAAAA,UAAgB,QAAQ,EAAE,WAAW,QAAQ,CAAC;AAEjE,SAAO,eAAe,WAAW,MAAgD;AAC/E,UAAM,EAAE,KAAK,OAAO,cAAc,cAAc,GAAG,cAAc,IAAI,UAAM,yBAAM,IAAI,EAClF,KAAK,UAAU,aAAa,CAAC,CAACC,MAAK,OAAO,MAAM,UAAU,OAAO,EAAE,KAAAA,MAAK,SAAS,OAAO,CAAC,CAAC,EAC1F,KAAK,YAAY,aAAa,CAAC,CAACA,MAAK,GAAG,MAAM,YAAY,OAAO,EAAE,KAAAA,MAAK,KAAK,OAAO,CAAC,CAAC,EACtF,WAAW;AAEd,UAAM,iBAAa,qCAAiB,QAAQ;AAAA,MAC1C,GAAG;AAAA,MACH,GAAG;AAAA,MACH;AAAA,MACA;AAAA,IACF,CAAC;AAED,UAAM,sBAAsB,MAAM,aAAa,KAAK;AACpD,QAAI,qBAAqB;AACvB,aAAO,oBAAoB;AAAA,IAC7B;AAEA,WAAO,aAAa,MAAM,WAAW,KAAK,KAAK,CAAC;AAAA,EAClD;AACF;","names":["MakeswiftClient","req"]}
+{"version":3,"sources":["../../../../src/next/api-handler/index.ts"],"sourcesContent":["import { match } from 'ts-pattern'\n\nimport { Makeswift as MakeswiftClient } from '../client'\n\nimport { type ApiHandlerUserConfig, createApiHandler } from '../../api-handler'\n\nimport * as AppRouter from './config/app-router'\nimport * as PagesRouter from './config/pages-router'\n\n/**\n * @deprecated This type is deprecated and will be removed in a future release.\n */\nexport type MakeswiftApiHandlerResponse = any\n\ntype ApiHandlerArgs = AppRouter.ApiHandlerArgs | PagesRouter.ApiHandlerArgs\n\nexport function MakeswiftApiHandler(\n  apiKey: string,\n  { apiOrigin, runtime, ...userConfig }: ApiHandlerUserConfig,\n): (...args: ApiHandlerArgs) => Promise<Response | void> {\n  const client = new MakeswiftClient(apiKey, { apiOrigin, runtime })\n\n  return async function handler(...args: ApiHandlerArgs): Promise<Response | void> {\n    const { req, route, sendResponse, customRoutes, ...handlerConfig } = await match(args)\n      .with(AppRouter.argsPattern, ([req, context]) => AppRouter.config({ req, context, client }))\n      .with(PagesRouter.argsPattern, ([req, res]) => PagesRouter.config({ req, res, client }))\n      .exhaustive()\n\n    const apiHandler = createApiHandler(apiKey, {\n      ...userConfig,\n      ...handlerConfig,\n      runtime,\n      client,\n    })\n\n    const customRouteResponse = await customRoutes(route)\n    if (customRouteResponse) {\n      return customRouteResponse.res\n    }\n\n    return sendResponse(await apiHandler(req, route))\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,wBAAsB;AAEtB,oBAA6C;AAE7C,yBAA4D;AAE5D,gBAA2B;AAC3B,kBAA6B;AAStB,SAAS,oBACd,QACA,EAAE,WAAW,SAAS,GAAG,WAAW,GACmB;AACvD,QAAM,SAAS,IAAI,cAAAA,UAAgB,QAAQ,EAAE,WAAW,QAAQ,CAAC;AAEjE,SAAO,eAAe,WAAW,MAAgD;AAC/E,UAAM,EAAE,KAAK,OAAO,cAAc,cAAc,GAAG,cAAc,IAAI,UAAM,yBAAM,IAAI,EAClF,KAAK,UAAU,aAAa,CAAC,CAACC,MAAK,OAAO,MAAM,UAAU,OAAO,EAAE,KAAAA,MAAK,SAAS,OAAO,CAAC,CAAC,EAC1F,KAAK,YAAY,aAAa,CAAC,CAACA,MAAK,GAAG,MAAM,YAAY,OAAO,EAAE,KAAAA,MAAK,KAAK,OAAO,CAAC,CAAC,EACtF,WAAW;AAEd,UAAM,iBAAa,qCAAiB,QAAQ;AAAA,MAC1C,GAAG;AAAA,MACH,GAAG;AAAA,MACH;AAAA,MACA;AAAA,IACF,CAAC;AAED,UAAM,sBAAsB,MAAM,aAAa,KAAK;AACpD,QAAI,qBAAqB;AACvB,aAAO,oBAAoB;AAAA,IAC7B;AAEA,WAAO,aAAa,MAAM,WAAW,KAAK,KAAK,CAAC;AAAA,EAClD;AACF;","names":["MakeswiftClient","req"]}

package/dist/cjs/next/api-handler/{draft.js → preview.js}

@@ -16,26 +16,31 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var draft_exports = {};
-__export(draft_exports, {
-  MAKESWIFT_DRAFT_DATA_COOKIE: () => MAKESWIFT_DRAFT_DATA_COOKIE,
+var preview_exports = {};
+__export(preview_exports, {
+  MAKESWIFT_SITE_VERSION_COOKIE: () => MAKESWIFT_SITE_VERSION_COOKIE,
   PRERENDER_BYPASS_COOKIE: () => PRERENDER_BYPASS_COOKIE,
   PREVIEW_DATA_COOKIE: () => PREVIEW_DATA_COOKIE,
+  RewriteRuleMatches: () => RewriteRuleMatches,
   SearchParams: () => SearchParams
 });
-module.exports = __toCommonJS(draft_exports);
+module.exports = __toCommonJS(preview_exports);
 const PRERENDER_BYPASS_COOKIE = "__prerender_bypass";
 const PREVIEW_DATA_COOKIE = "__next_preview_data";
-const MAKESWIFT_DRAFT_DATA_COOKIE = "x-makeswift-draft-data";
+const MAKESWIFT_SITE_VERSION_COOKIE = "makeswift-site-version";
 const SearchParams = {
-  DraftMode: "x-makeswift-draft-mode",
-  PreviewMode: "x-makeswift-preview-mode"
+  PreviewToken: "makeswift-preview-token"
+};
+const RewriteRuleMatches = {
+  PreviewToken: "makeswiftRewritePreviewToken",
+  OriginalPath: "makeswiftRewriteOriginalPath"
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  MAKESWIFT_DRAFT_DATA_COOKIE,
+  MAKESWIFT_SITE_VERSION_COOKIE,
   PRERENDER_BYPASS_COOKIE,
   PREVIEW_DATA_COOKIE,
+  RewriteRuleMatches,
   SearchParams
 });
-//# sourceMappingURL=draft.js.map
+//# sourceMappingURL=preview.js.map

package/dist/cjs/next/api-handler/preview.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/next/api-handler/preview.ts"],"sourcesContent":["export const PRERENDER_BYPASS_COOKIE = '__prerender_bypass'\nexport const PREVIEW_DATA_COOKIE = '__next_preview_data'\n\nexport const MAKESWIFT_SITE_VERSION_COOKIE = 'makeswift-site-version'\n\nexport const SearchParams = {\n  PreviewToken: 'makeswift-preview-token',\n} as const\n\n// When there's a rewrite rule match, the matching values are included as query\n// parameters in the request URL, where the parameter name is the expression\n// used to match the value in the next.config. This behavior is typically\n// observed on projects deployed to Vercel. We keep track of these param names\n// so we can remove them in any subsequent redirects. Ideally, we can remove\n// this behavior altogether when we no longer rely on rewrites, or use something\n// like middleware.\n//\n// See:\n// https://nextjs.org/docs/app/api-reference/config/next-config-js/rewrites#rewrite-parameters\nexport const RewriteRuleMatches = {\n  PreviewToken: 'makeswiftRewritePreviewToken',\n  OriginalPath: 'makeswiftRewriteOriginalPath',\n} as const\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,MAAM,0BAA0B;AAChC,MAAM,sBAAsB;AAE5B,MAAM,gCAAgC;AAEtC,MAAM,eAAe;AAAA,EAC1B,cAAc;AAChB;AAYO,MAAM,qBAAqB;AAAA,EAChC,cAAc;AAAA,EACd,cAAc;AAChB;","names":[]}

package/dist/cjs/next/{draft-mode/index.js → app-router-site-version.js}

@@ -16,41 +16,25 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var draft_mode_exports = {};
-__export(draft_mode_exports, {
-  MAKESWIFT_DRAFT_MODE_DATA_COOKIE: () => MAKESWIFT_DRAFT_MODE_DATA_COOKIE,
-  getSiteVersion: () => getSiteVersion,
-  makeswiftDraftDataSchema: () => makeswiftDraftDataSchema
+var app_router_site_version_exports = {};
+__export(app_router_site_version_exports, {
+  getSiteVersion: () => getSiteVersion
 });
-module.exports = __toCommonJS(draft_mode_exports);
-var import_zod = require("zod");
+module.exports = __toCommonJS(app_router_site_version_exports);
 var import_headers = require("next/headers");
-var import_site_version = require("../../api/site-version");
-const MAKESWIFT_DRAFT_MODE_DATA_COOKIE = "x-makeswift-draft-data";
-const makeswiftDraftDataSchema = import_zod.z.object({
-  makeswift: import_zod.z.literal(true),
-  siteVersion: import_site_version.makeswiftSiteVersionSchema
-});
-async function getDraftData() {
+var import_site_version = require("../api/site-version");
+var import_preview = require("./api-handler/preview");
+async function getSiteVersion() {
   const { isEnabled: isDraftModeEnabled } = await (0, import_headers.draftMode)();
   if (!isDraftModeEnabled)
     return null;
-  const cookie = (await (0, import_headers.cookies)()).get(MAKESWIFT_DRAFT_MODE_DATA_COOKIE);
+  const cookie = (await (0, import_headers.cookies)()).get(import_preview.MAKESWIFT_SITE_VERSION_COOKIE);
   if (cookie == null)
     return null;
-  const draftData = JSON.parse(cookie.value);
-  const result = makeswiftDraftDataSchema.safeParse(draftData);
-  if (result.success)
-    return result.data;
-  return null;
-}
-async function getSiteVersion() {
-  return (await getDraftData())?.siteVersion ?? import_site_version.MakeswiftSiteVersion.Live;
+  return (0, import_site_version.deserializeSiteVersion)(cookie.value);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  MAKESWIFT_DRAFT_MODE_DATA_COOKIE,
-  getSiteVersion,
-  makeswiftDraftDataSchema
+  getSiteVersion
 });
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=app-router-site-version.js.map

package/dist/cjs/next/app-router-site-version.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/next/app-router-site-version.tsx"],"sourcesContent":["import { cookies, draftMode } from 'next/headers'\nimport { deserializeSiteVersion, SiteVersion } from '../api/site-version'\nimport { MAKESWIFT_SITE_VERSION_COOKIE } from './api-handler/preview'\n\nexport async function getSiteVersion(): Promise<SiteVersion | null> {\n  const { isEnabled: isDraftModeEnabled } = await draftMode()\n  if (!isDraftModeEnabled) return null\n\n  const cookie = (await cookies()).get(MAKESWIFT_SITE_VERSION_COOKIE)\n  if (cookie == null) return null\n\n  return deserializeSiteVersion(cookie.value)\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAAmC;AACnC,0BAAoD;AACpD,qBAA8C;AAE9C,eAAsB,iBAA8C;AAClE,QAAM,EAAE,WAAW,mBAAmB,IAAI,UAAM,0BAAU;AAC1D,MAAI,CAAC;AAAoB,WAAO;AAEhC,QAAM,UAAU,UAAM,wBAAQ,GAAG,IAAI,4CAA6B;AAClE,MAAI,UAAU;AAAM,WAAO;AAE3B,aAAO,4CAAuB,OAAO,KAAK;AAC5C;","names":[]}

package/dist/cjs/next/client.js

@@ -21,16 +21,22 @@ __export(client_exports, {
   Makeswift: () => Makeswift
 });
 module.exports = __toCommonJS(client_exports);
+var import_zod = require("zod");
 var import_site_version = require("../api/site-version");
-var import_preview_mode = require("./preview-mode");
 var import_client = require("../client");
 var import_cache = require("./cache");
+const previewDataSchema = import_zod.z.object({
+  siteVersion: import_zod.z.string()
+});
 class Makeswift extends import_client.MakeswiftClient {
   static getSiteVersion(previewData) {
-    return (0, import_preview_mode.getMakeswiftSiteVersion)(previewData) ?? import_site_version.MakeswiftSiteVersion.Live;
+    const parsedSiteVersion = previewDataSchema.safeParse(previewData);
+    if (!parsedSiteVersion.success)
+      return null;
+    return (0, import_site_version.deserializeSiteVersion)(parsedSiteVersion.data.siteVersion);
   }
   static getPreviewMode(previewData) {
-    return (0, import_preview_mode.getMakeswiftSiteVersion)(previewData) === import_site_version.MakeswiftSiteVersion.Working;
+    return this.getSiteVersion(previewData) != null;
   }
   fetchOptions(_siteVersion) {
     return {

package/dist/cjs/next/client.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/next/client.ts"],"sourcesContent":["import { PreviewData } from 'next'\n\nimport { MakeswiftSiteVersion } from '../api/site-version'\nimport { getMakeswiftSiteVersion } from './preview-mode'\n\nimport { MakeswiftClient } from '../client'\nimport { MAKESWIFT_CACHE_TAG } from './cache'\n\nexport class Makeswift extends MakeswiftClient {\n  static getSiteVersion(previewData: PreviewData): MakeswiftSiteVersion {\n    return getMakeswiftSiteVersion(previewData) ?? MakeswiftSiteVersion.Live\n  }\n\n  static getPreviewMode(previewData: PreviewData): boolean {\n    return getMakeswiftSiteVersion(previewData) === MakeswiftSiteVersion.Working\n  }\n\n  fetchOptions(_siteVersion: MakeswiftSiteVersion): Record<string, unknown> {\n    return {\n      next: {\n        tags: [MAKESWIFT_CACHE_TAG],\n      },\n    }\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,0BAAqC;AACrC,0BAAwC;AAExC,oBAAgC;AAChC,mBAAoC;AAE7B,MAAM,kBAAkB,8BAAgB;AAAA,EAC7C,OAAO,eAAe,aAAgD;AACpE,eAAO,6CAAwB,WAAW,KAAK,yCAAqB;AAAA,EACtE;AAAA,EAEA,OAAO,eAAe,aAAmC;AACvD,eAAO,6CAAwB,WAAW,MAAM,yCAAqB;AAAA,EACvE;AAAA,EAEA,aAAa,cAA6D;AACxE,WAAO;AAAA,MACL,MAAM;AAAA,QACJ,MAAM,CAAC,gCAAmB;AAAA,MAC5B;AAAA,IACF;AAAA,EACF;AACF;","names":[]}
+{"version":3,"sources":["../../../src/next/client.ts"],"sourcesContent":["import { PreviewData } from 'next'\nimport { z } from 'zod'\n\nimport { deserializeSiteVersion, type SiteVersion } from '../api/site-version'\n\nimport { MakeswiftClient } from '../client'\nimport { MAKESWIFT_CACHE_TAG } from './cache'\n\nconst previewDataSchema = z.object({\n  siteVersion: z.string(),\n})\n\nexport class Makeswift extends MakeswiftClient {\n  static getSiteVersion(previewData: PreviewData): SiteVersion | null {\n    const parsedSiteVersion = previewDataSchema.safeParse(previewData)\n    if (!parsedSiteVersion.success) return null\n\n    return deserializeSiteVersion(parsedSiteVersion.data.siteVersion)\n  }\n\n  static getPreviewMode(previewData: PreviewData): boolean {\n    return this.getSiteVersion(previewData) != null\n  }\n\n  fetchOptions(_siteVersion: SiteVersion): Record<string, unknown> {\n    return {\n      next: {\n        tags: [MAKESWIFT_CACHE_TAG],\n      },\n    }\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,iBAAkB;AAElB,0BAAyD;AAEzD,oBAAgC;AAChC,mBAAoC;AAEpC,MAAM,oBAAoB,aAAE,OAAO;AAAA,EACjC,aAAa,aAAE,OAAO;AACxB,CAAC;AAEM,MAAM,kBAAkB,8BAAgB;AAAA,EAC7C,OAAO,eAAe,aAA8C;AAClE,UAAM,oBAAoB,kBAAkB,UAAU,WAAW;AACjE,QAAI,CAAC,kBAAkB;AAAS,aAAO;AAEvC,eAAO,4CAAuB,kBAAkB,KAAK,WAAW;AAAA,EAClE;AAAA,EAEA,OAAO,eAAe,aAAmC;AACvD,WAAO,KAAK,eAAe,WAAW,KAAK;AAAA,EAC7C;AAAA,EAEA,aAAa,cAAoD;AAC/D,WAAO;AAAA,MACL,MAAM;AAAA,QACJ,MAAM,CAAC,gCAAmB;AAAA,MAC5B;AAAA,IACF;AAAA,EACF;AACF;","names":[]}

package/dist/cjs/next/components/framework-provider/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/next/components/framework-provider/index.tsx"],"sourcesContent":["'use client'\n\nimport { type PropsWithChildren, useMemo } from 'react'\nimport NextImage from 'next/image'\n\nimport { useIsPagesRouter } from '../../hooks/use-is-pages-router'\nimport {\n  FrameworkContext,\n  versionedFetch,\n} from '../../../runtimes/react/components/framework-context'\n\nimport { MakeswiftSiteVersion } from '../../../api/site-version'\nimport { MAKESWIFT_CACHE_TAG } from '../../cache'\n\nimport { context as appRouterContext } from './app-router'\nimport { context as pagesRouterContext } from './pages-router'\nimport { Link } from './link'\n\nexport function FrameworkProvider({\n  children,\n  forcePagesRouter,\n}: PropsWithChildren<{ forcePagesRouter?: boolean }>) {\n  const isPagesRouter = useIsPagesRouter() || forcePagesRouter\n  const context = useMemo<FrameworkContext>(\n    () => ({\n      ...(isPagesRouter ? pagesRouterContext : appRouterContext),\n      Image: NextImage,\n      Link,\n      versionedFetch: (siteVersion: MakeswiftSiteVersion) => (url, init) =>\n        versionedFetch(siteVersion)(url, { ...init, next: { tags: [MAKESWIFT_CACHE_TAG] } }),\n    }),\n    [isPagesRouter],\n  )\n\n  return <FrameworkContext.Provider value={context}>{children}</FrameworkContext.Provider>\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAkCS;AAhCT,mBAAgD;AAChD,mBAAsB;AAEtB,iCAAiC;AACjC,+BAGO;AAGP,mBAAoC;AAEpC,wBAA4C;AAC5C,0BAA8C;AAC9C,kBAAqB;AAEd,SAAS,kBAAkB;AAAA,EAChC;AAAA,EACA;AACF,GAAsD;AACpD,QAAM,oBAAgB,6CAAiB,KAAK;AAC5C,QAAM,cAAU;AAAA,IACd,OAAO;AAAA,MACL,GAAI,gBAAgB,oBAAAA,UAAqB,kBAAAC;AAAA,MACzC,OAAO,aAAAC;AAAA,MACP;AAAA,MACA,gBAAgB,CAAC,gBAAsC,CAAC,KAAK,aAC3D,yCAAe,WAAW,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,EAAE,MAAM,CAAC,gCAAmB,EAAE,EAAE,CAAC;AAAA,IACvF;AAAA,IACA,CAAC,aAAa;AAAA,EAChB;AAEA,SAAO,4CAAC,0CAAiB,UAAjB,EAA0B,OAAO,SAAU,UAAS;AAC9D;","names":["pagesRouterContext","appRouterContext","NextImage"]}
+{"version":3,"sources":["../../../../../src/next/components/framework-provider/index.tsx"],"sourcesContent":["'use client'\n\nimport { type PropsWithChildren, useMemo } from 'react'\nimport NextImage from 'next/image'\n\nimport { useIsPagesRouter } from '../../hooks/use-is-pages-router'\nimport {\n  FrameworkContext,\n  versionedFetch,\n} from '../../../runtimes/react/components/framework-context'\n\nimport { type SiteVersion } from '../../../api/site-version'\nimport { MAKESWIFT_CACHE_TAG } from '../../cache'\n\nimport { context as appRouterContext } from './app-router'\nimport { context as pagesRouterContext } from './pages-router'\nimport { Link } from './link'\n\nexport function FrameworkProvider({\n  children,\n  forcePagesRouter,\n}: PropsWithChildren<{ forcePagesRouter?: boolean }>) {\n  const isPagesRouter = useIsPagesRouter() || forcePagesRouter\n  const context = useMemo<FrameworkContext>(\n    () => ({\n      ...(isPagesRouter ? pagesRouterContext : appRouterContext),\n      Image: NextImage,\n      Link,\n      versionedFetch: (siteVersion: SiteVersion | null) => (url, init) =>\n        versionedFetch(siteVersion)(url, { ...init, next: { tags: [MAKESWIFT_CACHE_TAG] } }),\n    }),\n    [isPagesRouter],\n  )\n\n  return <FrameworkContext.Provider value={context}>{children}</FrameworkContext.Provider>\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAkCS;AAhCT,mBAAgD;AAChD,mBAAsB;AAEtB,iCAAiC;AACjC,+BAGO;AAGP,mBAAoC;AAEpC,wBAA4C;AAC5C,0BAA8C;AAC9C,kBAAqB;AAEd,SAAS,kBAAkB;AAAA,EAChC;AAAA,EACA;AACF,GAAsD;AACpD,QAAM,oBAAgB,6CAAiB,KAAK;AAC5C,QAAM,cAAU;AAAA,IACd,OAAO;AAAA,MACL,GAAI,gBAAgB,oBAAAA,UAAqB,kBAAAC;AAAA,MACzC,OAAO,aAAAC;AAAA,MACP;AAAA,MACA,gBAAgB,CAAC,gBAAoC,CAAC,KAAK,aACzD,yCAAe,WAAW,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,EAAE,MAAM,CAAC,gCAAmB,EAAE,EAAE,CAAC;AAAA,IACvF;AAAA,IACA,CAAC,aAAa;AAAA,EAChB;AAEA,SAAO,4CAAC,0CAAiB,UAAjB,EAA0B,OAAO,SAAU,UAAS;AAC9D;","names":["pagesRouterContext","appRouterContext","NextImage"]}

package/dist/cjs/next/components/page.js

@@ -26,7 +26,7 @@ var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = require("react");
 var import_page = require("../../runtimes/react/components/page");
 var import_use_router_locale_sync = require("../hooks/use-router-locale-sync");
-const Page = (0, import_react.memo)(({ snapshot, metadata = true, ...extras }) => {
+const Page = (0, import_react.memo)(({ snapshot, metadata, ...extras }) => {
   if ("runtime" in extras) {
     throw new Error(
       `The \`runtime\` prop is no longer supported in the \`@makeswift/runtime\` \`Page\` component as of \`0.15.0\`.

package/dist/cjs/next/components/page.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/next/components/page.tsx"],"sourcesContent":["'use client'\n\nimport { memo } from 'react'\n\nimport { type MakeswiftPageSnapshot } from '../../client'\n\nimport {\n  type PageMetadataSettings,\n  Page as BuiltinPage,\n} from '../../runtimes/react/components/page'\n\nimport { useRouterLocaleSync } from '../hooks/use-router-locale-sync'\n\nexport type PageProps = {\n  snapshot: MakeswiftPageSnapshot\n  metadata?: boolean | PageMetadataSettings\n}\n\n/**\n * @param snapshot - The snapshot of the page to render, from\n * `client.getPageSnapshot()`.\n * @param metadata - Allows control over whether to use data from Makeswift for\n * rendering metadata tags in the `<head>` of the page. Pass `true` (default if\n * not provided) to render all metadata tags, or `false` to not render any. For\n * more granular control, pass an object with boolean values for specific\n * metadata fields. Valid fields include:\n *  - `title`\n *  - `description`\n *  - `keywords`\n *  - `socialImage`\n *  - `canonicalUrl`\n *  - `indexingBlocked`\n *  - `favicon`\n *\n * If a field is not provided, it will default to `false`.\n */\nexport const Page = memo(({ snapshot, metadata = true, ...extras }: PageProps) => {\n  if ('runtime' in extras) {\n    throw new Error(\n      `The \\`runtime\\` prop is no longer supported in the \\`@makeswift/runtime\\` \\`Page\\` component as of \\`0.15.0\\`.\nSee our docs for more information on what's changed and instructions to migrate: https://docs.makeswift.com/migrations/0.15.0`,\n    )\n  }\n\n  useRouterLocaleSync()\n\n  return <BuiltinPage snapshot={snapshot} metadata={metadata} />\n})\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AA8CS;AA5CT,mBAAqB;AAIrB,kBAGO;AAEP,oCAAoC;AAyB7B,MAAM,WAAO,mBAAK,CAAC,EAAE,UAAU,WAAW,MAAM,GAAG,OAAO,MAAiB;AAChF,MAAI,aAAa,QAAQ;AACvB,UAAM,IAAI;AAAA,MACR;AAAA;AAAA,IAEF;AAAA,EACF;AAEA,yDAAoB;AAEpB,SAAO,4CAAC,YAAAA,MAAA,EAAY,UAAoB,UAAoB;AAC9D,CAAC;","names":["BuiltinPage"]}
+{"version":3,"sources":["../../../../src/next/components/page.tsx"],"sourcesContent":["'use client'\n\nimport { memo } from 'react'\n\nimport { Page as BuiltinPage, type PageProps } from '../../runtimes/react/components/page'\n\nimport { useRouterLocaleSync } from '../hooks/use-router-locale-sync'\n\nexport { type PageProps } from '../../runtimes/react/components/page'\n\n/**\n * @param snapshot - The snapshot of the page to render, from\n * `client.getPageSnapshot()`.\n * @param metadata - Allows control over whether to use data from Makeswift for\n * rendering metadata tags in the `<head>` of the page. Pass `true` (default if\n * not provided) to render all metadata tags, or `false` to not render any. For\n * more granular control, pass an object with boolean values for specific\n * metadata fields. Valid fields include:\n *  - `title`\n *  - `description`\n *  - `keywords`\n *  - `socialImage`\n *  - `canonicalUrl`\n *  - `indexingBlocked`\n *  - `favicon`\n *\n * If a field is not provided, it will default to `false`.\n */\nexport const Page = memo(({ snapshot, metadata, ...extras }: PageProps) => {\n  if ('runtime' in extras) {\n    throw new Error(\n      `The \\`runtime\\` prop is no longer supported in the \\`@makeswift/runtime\\` \\`Page\\` component as of \\`0.15.0\\`.\nSee our docs for more information on what's changed and instructions to migrate: https://docs.makeswift.com/migrations/0.15.0`,\n    )\n  }\n\n  useRouterLocaleSync()\n\n  return <BuiltinPage snapshot={snapshot} metadata={metadata} />\n})\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAsCS;AApCT,mBAAqB;AAErB,kBAAoD;AAEpD,oCAAoC;AAsB7B,MAAM,WAAO,mBAAK,CAAC,EAAE,UAAU,UAAU,GAAG,OAAO,MAAiB;AACzE,MAAI,aAAa,QAAQ;AACvB,UAAM,IAAI;AAAA,MACR;AAAA;AAAA,IAEF;AAAA,EACF;AAEA,yDAAoB;AAEpB,SAAO,4CAAC,YAAAA,MAAA,EAAY,UAAoB,UAAoB;AAC9D,CAAC;","names":["BuiltinPage"]}

package/dist/cjs/next/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/next/index.tsx"],"sourcesContent":["export type { PageProps } from './components/page'\nexport { Page } from './components/page'\nexport { MakeswiftComponent } from '../runtimes/react/components/MakeswiftComponent'\nexport { Slot } from '../runtimes/react/components/Slot'\nexport type {\n  MakeswiftPage,\n  MakeswiftPageDocument,\n  MakeswiftPageSnapshot,\n  Sitemap,\n} from '../client'\nexport { Makeswift } from './client'\nexport type { MakeswiftPreviewData } from './preview-mode'\nexport { NextRootStyleRegistry as RootStyleRegistry } from './root-style-registry'\nexport { NextRuntimeProvider as ReactRuntimeProvider } from './runtime-provider'\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,kBAAqB;AACrB,gCAAmC;AACnC,kBAAqB;AAOrB,oBAA0B;AAE1B,iCAA2D;AAC3D,8BAA4D;","names":[]}
+{"version":3,"sources":["../../../src/next/index.tsx"],"sourcesContent":["export type { PageProps } from './components/page'\nexport { Page } from './components/page'\nexport { MakeswiftComponent } from '../runtimes/react/components/MakeswiftComponent'\nexport { Slot } from '../runtimes/react/components/Slot'\nexport type {\n  MakeswiftPage,\n  MakeswiftPageDocument,\n  MakeswiftPageSnapshot,\n  Sitemap,\n} from '../client'\nexport { Makeswift } from './client'\nexport { type SiteVersion } from '../api/site-version'\nexport { NextRootStyleRegistry as RootStyleRegistry } from './root-style-registry'\nexport { NextRuntimeProvider as ReactRuntimeProvider } from './runtime-provider'\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,kBAAqB;AACrB,gCAAmC;AACnC,kBAAqB;AAOrB,oBAA0B;AAE1B,iCAA2D;AAC3D,8BAA4D;","names":[]}

package/dist/cjs/next/middleware/request-utils.js

@@ -18,32 +18,26 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var request_utils_exports = {};
 __export(request_utils_exports, {
+  hasDraftModeCookies: () => hasDraftModeCookies,
   isDraftModeRequest: () => isDraftModeRequest
 });
 module.exports = __toCommonJS(request_utils_exports);
-var import_draft = require("../api-handler/draft");
-const HeaderNames = {
-  DraftMode: "X-Makeswift-Draft-Mode",
-  PreviewMode: "X-Makeswift-Preview-Mode"
-};
-const SearchParams = {
-  DraftMode: "x-makeswift-draft-mode",
-  PreviewMode: "x-makeswift-preview-mode"
-};
-function getDraftModeSecret(request) {
-  return request.nextUrl.searchParams.get(SearchParams.DraftMode) ?? request.headers.get(HeaderNames.DraftMode) ?? null;
+var import_preview = require("../api-handler/preview");
+function getPreviewTokenParam(request) {
+  return request.nextUrl.searchParams.get(import_preview.SearchParams.PreviewToken) ?? null;
+}
+function hasDraftModeCookies(request) {
+  return request.cookies.has(import_preview.PRERENDER_BYPASS_COOKIE) && request.cookies.has(import_preview.MAKESWIFT_SITE_VERSION_COOKIE);
 }
 function isDraftModeRequest(request) {
-  const hasSecret = getDraftModeSecret(request) != null;
-  if (hasSecret)
-    return true;
-  const hasDraftCookies = request.cookies.has(import_draft.PRERENDER_BYPASS_COOKIE) && request.cookies.has(import_draft.MAKESWIFT_DRAFT_DATA_COOKIE);
-  if (hasDraftCookies)
+  const hasToken = getPreviewTokenParam(request) != null;
+  if (hasToken)
     return true;
-  return false;
+  return hasDraftModeCookies(request);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  hasDraftModeCookies,
   isDraftModeRequest
 });
 //# sourceMappingURL=request-utils.js.map

package/dist/cjs/next/middleware/request-utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/next/middleware/request-utils.ts"],"sourcesContent":["import { NextRequest } from 'next/server'\nimport { MAKESWIFT_DRAFT_DATA_COOKIE, PRERENDER_BYPASS_COOKIE } from '../api-handler/draft'\n\nconst HeaderNames = {\n  DraftMode: 'X-Makeswift-Draft-Mode',\n  PreviewMode: 'X-Makeswift-Preview-Mode',\n} as const\n\nconst SearchParams = {\n  DraftMode: 'x-makeswift-draft-mode',\n  PreviewMode: 'x-makeswift-preview-mode',\n} as const\n\nfunction getDraftModeSecret(request: NextRequest): string | null {\n  return (\n    request.nextUrl.searchParams.get(SearchParams.DraftMode) ??\n    request.headers.get(HeaderNames.DraftMode) ??\n    null\n  )\n}\n\nexport function isDraftModeRequest(request: NextRequest): boolean {\n  const hasSecret = getDraftModeSecret(request) != null\n  if (hasSecret) return true\n\n  const hasDraftCookies =\n    request.cookies.has(PRERENDER_BYPASS_COOKIE) && request.cookies.has(MAKESWIFT_DRAFT_DATA_COOKIE)\n\n  if (hasDraftCookies) return true\n\n  return false\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,mBAAqE;AAErE,MAAM,cAAc;AAAA,EAClB,WAAW;AAAA,EACX,aAAa;AACf;AAEA,MAAM,eAAe;AAAA,EACnB,WAAW;AAAA,EACX,aAAa;AACf;AAEA,SAAS,mBAAmB,SAAqC;AAC/D,SACE,QAAQ,QAAQ,aAAa,IAAI,aAAa,SAAS,KACvD,QAAQ,QAAQ,IAAI,YAAY,SAAS,KACzC;AAEJ;AAEO,SAAS,mBAAmB,SAA+B;AAChE,QAAM,YAAY,mBAAmB,OAAO,KAAK;AACjD,MAAI;AAAW,WAAO;AAEtB,QAAM,kBACJ,QAAQ,QAAQ,IAAI,oCAAuB,KAAK,QAAQ,QAAQ,IAAI,wCAA2B;AAEjG,MAAI;AAAiB,WAAO;AAE5B,SAAO;AACT;","names":[]}
+{"version":3,"sources":["../../../../src/next/middleware/request-utils.ts"],"sourcesContent":["import { NextRequest } from 'next/server'\nimport {\n  MAKESWIFT_SITE_VERSION_COOKIE,\n  PRERENDER_BYPASS_COOKIE,\n  SearchParams,\n} from '../api-handler/preview'\n\nfunction getPreviewTokenParam(request: NextRequest): string | null {\n  return request.nextUrl.searchParams.get(SearchParams.PreviewToken) ?? null\n}\n\nexport function hasDraftModeCookies(request: NextRequest): boolean {\n  return (\n    request.cookies.has(PRERENDER_BYPASS_COOKIE) &&\n    request.cookies.has(MAKESWIFT_SITE_VERSION_COOKIE)\n  )\n}\n\nexport function isDraftModeRequest(request: NextRequest): boolean {\n  const hasToken = getPreviewTokenParam(request) != null\n  if (hasToken) return true\n\n  return hasDraftModeCookies(request)\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,qBAIO;AAEP,SAAS,qBAAqB,SAAqC;AACjE,SAAO,QAAQ,QAAQ,aAAa,IAAI,4BAAa,YAAY,KAAK;AACxE;AAEO,SAAS,oBAAoB,SAA+B;AACjE,SACE,QAAQ,QAAQ,IAAI,sCAAuB,KAC3C,QAAQ,QAAQ,IAAI,4CAA6B;AAErD;AAEO,SAAS,mBAAmB,SAA+B;AAChE,QAAM,WAAW,qBAAqB,OAAO,KAAK;AAClD,MAAI;AAAU,WAAO;AAErB,SAAO,oBAAoB,OAAO;AACpC;","names":[]}

package/dist/cjs/next/root-style-registry.js

@@ -19,42 +19,35 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var root_style_registry_exports = {};
 __export(root_style_registry_exports, {
-  NextRootStyleRegistry: () => NextRootStyleRegistry,
-  useCSSResetEnabled: () => import_root_style_registry2.useCSSResetEnabled,
-  useCache: () => import_root_style_registry2.useCache
+  NextRootStyleRegistry: () => NextRootStyleRegistry
 });
 module.exports = __toCommonJS(root_style_registry_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = require("react");
 var import_navigation = require("next/navigation");
 var import_root_style_registry = require("../runtimes/react/root-style-registry");
-var import_root_style_registry2 = require("../runtimes/react/root-style-registry");
-function NextRootStyleRegistry({ children, cacheKey, enableCssReset }) {
-  const [{ cache, flush }] = (0, import_react.useState)(() => (0, import_root_style_registry.createRootStyleCache)({ key: cacheKey }));
+function NextRootStyleRegistry({
+  children,
+  cacheKey,
+  enableCssReset
+}) {
+  const [cache] = (0, import_react.useState)(() => (0, import_root_style_registry.createRootStyleCache)({ key: cacheKey }));
   (0, import_navigation.useServerInsertedHTML)(() => {
-    const names = flush();
-    if (names.length === 0)
-      return null;
-    let styles = "";
-    for (const name of names) {
-      styles += cache.inserted[name];
-    }
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+    const { classNames, css } = cache.flush();
+    return classNames.length > 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
       "style",
       {
-        "data-emotion": `${cache.key} ${names.join(" ")}`,
+        "data-emotion": `${cache.key} ${classNames.join(" ")}`,
         dangerouslySetInnerHTML: {
-          __html: styles
+          __html: css
         }
       }
-    );
+    ) : null;
   });
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_root_style_registry.RootStyleRegistry, { cache, enableCssReset, children });
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  NextRootStyleRegistry,
-  useCSSResetEnabled,
-  useCache
+  NextRootStyleRegistry
 });
 //# sourceMappingURL=root-style-registry.js.map

package/dist/cjs/next/root-style-registry.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/next/root-style-registry.tsx"],"sourcesContent":["'use client'\n\nimport { type ReactNode, useState } from 'react'\nimport { useServerInsertedHTML } from 'next/navigation'\n\nimport {\n  createRootStyleCache,\n  RootStyleRegistry as ReactRootStyleRegistry,\n} from '../runtimes/react/root-style-registry'\n\nexport { useCache, useCSSResetEnabled } from '../runtimes/react/root-style-registry'\n\ntype Props = {\n  children: ReactNode\n  cacheKey?: string\n  /**\n   * Toggle the built-in CSS reset.\n   * Set to `false` when using `@layer`-based CSS frameworks like Tailwind.\n   */\n  enableCssReset?: boolean\n}\n\nexport function NextRootStyleRegistry({ children, cacheKey, enableCssReset }: Props) {\n  const [{ cache, flush }] = useState(() => createRootStyleCache({ key: cacheKey }))\n\n  useServerInsertedHTML(() => {\n    const names = flush()\n    if (names.length === 0) return null\n    let styles = ''\n    for (const name of names) {\n      styles += cache.inserted[name]\n    }\n\n    return (\n      <style\n        data-emotion={`${cache.key} ${names.join(' ')}`}\n        dangerouslySetInnerHTML={{\n          __html: styles,\n        }}\n      />\n    )\n  })\n\n  return (\n    <ReactRootStyleRegistry cache={cache} enableCssReset={enableCssReset}>\n      {children}\n    </ReactRootStyleRegistry>\n  )\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAkCM;AAhCN,mBAAyC;AACzC,wBAAsC;AAEtC,iCAGO;AAEP,IAAAA,8BAA6C;AAYtC,SAAS,sBAAsB,EAAE,UAAU,UAAU,eAAe,GAAU;AACnF,QAAM,CAAC,EAAE,OAAO,MAAM,CAAC,QAAI,uBAAS,UAAM,iDAAqB,EAAE,KAAK,SAAS,CAAC,CAAC;AAEjF,+CAAsB,MAAM;AAC1B,UAAM,QAAQ,MAAM;AACpB,QAAI,MAAM,WAAW;AAAG,aAAO;AAC/B,QAAI,SAAS;AACb,eAAW,QAAQ,OAAO;AACxB,gBAAU,MAAM,SAAS,IAAI;AAAA,IAC/B;AAEA,WACE;AAAA,MAAC;AAAA;AAAA,QACC,gBAAc,GAAG,MAAM,GAAG,IAAI,MAAM,KAAK,GAAG,CAAC;AAAA,QAC7C,yBAAyB;AAAA,UACvB,QAAQ;AAAA,QACV;AAAA;AAAA,IACF;AAAA,EAEJ,CAAC;AAED,SACE,4CAAC,2BAAAC,mBAAA,EAAuB,OAAc,gBACnC,UACH;AAEJ;","names":["import_root_style_registry","ReactRootStyleRegistry"]}
+{"version":3,"sources":["../../../src/next/root-style-registry.tsx"],"sourcesContent":["'use client'\n\nimport { type PropsWithChildren, useState } from 'react'\nimport { useServerInsertedHTML } from 'next/navigation'\n\nimport {\n  createRootStyleCache,\n  RootStyleRegistry as ReactRootStyleRegistry,\n  type RootStyleProps,\n} from '../runtimes/react/root-style-registry'\n\nexport function NextRootStyleRegistry({\n  children,\n  cacheKey,\n  enableCssReset,\n}: PropsWithChildren<RootStyleProps>) {\n  const [cache] = useState(() => createRootStyleCache({ key: cacheKey }))\n\n  useServerInsertedHTML(() => {\n    const { classNames, css } = cache.flush()\n\n    return classNames.length > 0 ? (\n      <style\n        data-emotion={`${cache.key} ${classNames.join(' ')}`}\n        dangerouslySetInnerHTML={{\n          __html: css,\n        }}\n      />\n    ) : null\n  })\n\n  return (\n    <ReactRootStyleRegistry cache={cache} enableCssReset={enableCssReset}>\n      {children}\n    </ReactRootStyleRegistry>\n  )\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAsBM;AApBN,mBAAiD;AACjD,wBAAsC;AAEtC,iCAIO;AAEA,SAAS,sBAAsB;AAAA,EACpC;AAAA,EACA;AAAA,EACA;AACF,GAAsC;AACpC,QAAM,CAAC,KAAK,QAAI,uBAAS,UAAM,iDAAqB,EAAE,KAAK,SAAS,CAAC,CAAC;AAEtE,+CAAsB,MAAM;AAC1B,UAAM,EAAE,YAAY,IAAI,IAAI,MAAM,MAAM;AAExC,WAAO,WAAW,SAAS,IACzB;AAAA,MAAC;AAAA;AAAA,QACC,gBAAc,GAAG,MAAM,GAAG,IAAI,WAAW,KAAK,GAAG,CAAC;AAAA,QAClD,yBAAyB;AAAA,UACvB,QAAQ;AAAA,QACV;AAAA;AAAA,IACF,IACE;AAAA,EACN,CAAC;AAED,SACE,4CAAC,2BAAAA,mBAAA,EAAuB,OAAc,gBACnC,UACH;AAEJ;","names":["ReactRootStyleRegistry"]}

package/dist/cjs/next/server.js

@@ -19,11 +19,11 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var server_exports = {};
 __export(server_exports, {
   MakeswiftApiHandler: () => import_api_handler.MakeswiftApiHandler,
-  getSiteVersion: () => import_draft_mode.getSiteVersion
+  getSiteVersion: () => import_app_router_site_version.getSiteVersion
 });
 module.exports = __toCommonJS(server_exports);
 var import_api_handler = require("./api-handler");
-var import_draft_mode = require("./draft-mode");
+var import_app_router_site_version = require("./app-router-site-version");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   MakeswiftApiHandler,

package/dist/cjs/next/server.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/next/server.ts"],"sourcesContent":["export { MakeswiftApiHandler } from './api-handler'\nexport type { Manifest, Font } from '../api-handler'\nexport type { MakeswiftApiHandlerResponse } from './api-handler'\nexport { getSiteVersion } from './draft-mode'\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,yBAAoC;AAGpC,wBAA+B;","names":[]}
+{"version":3,"sources":["../../../src/next/server.ts"],"sourcesContent":["export { MakeswiftApiHandler } from './api-handler'\nexport type { Manifest, Font } from '../api-handler'\nexport type { MakeswiftApiHandlerResponse } from './api-handler'\nexport { getSiteVersion } from './app-router-site-version'\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,yBAAoC;AAGpC,qCAA+B;","names":[]}