@cmssy/remix 9.10.0 → 10.1.0

package/dist/index.cjs

@@ -1,6 +1,7 @@
 'use strict';
 
 var core = require('@cmssy/core');
+var internal = require('@cmssy/core/internal');
 
 // src/loader.ts
 function createCmssyLoader(config) {
@@ -10,14 +11,14 @@ function createCmssyLoader(config) {
     const url = new URL(request.url);
     const isEdit = await core.isVerifiedEditUrl(url, config);
     const editRequested = url.searchParams.getAll(core.CMSSY_EDIT_QUERY_PARAM).includes("1");
-    if (!isEdit && editRequested && core.isDevelopment()) {
+    if (!isEdit && editRequested && internal.isDevelopment()) {
       const { collectEditDiagnostics, renderEditDiagnostics } = await import('@cmssy/core/preflight');
       const diagnosed = await collectEditDiagnostics({
         config,
         providedSecret: url.searchParams.get(core.CMSSY_SECRET_QUERY_PARAM),
         devOrigin: url.origin
       });
-      const locales = await core.resolveSiteLocales(config);
+      const locales = await internal.resolveSiteLocales(config);
       return {
         page: null,
         layouts: [],
@@ -29,14 +30,14 @@ function createCmssyLoader(config) {
         diagnostics: renderEditDiagnostics(diagnosed)
       };
     }
-    const siteLocales = await core.resolveSiteLocales(config);
+    const siteLocales = await internal.resolveSiteLocales(config);
     const segments = url.pathname.split("/").filter(Boolean);
-    const fromPath = core.splitLocaleFromPath(segments, siteLocales);
-    const locale = request.headers.get(core.CMSSY_LOCALE_HEADER) ?? fromPath.locale;
+    const fromPath = internal.splitLocaleFromPath(segments, siteLocales);
+    const locale = request.headers.get(internal.CMSSY_LOCALE_HEADER) ?? fromPath.locale;
     const previewSecret = isEdit ? config.draftSecret : void 0;
     const [page, layouts] = await Promise.all([
-      core.fetchPage(config, fromPath.path, { previewSecret }),
-      core.fetchLayouts(config, fromPath.path, { previewSecret })
+      internal.fetchPage(config, fromPath.path, { previewSecret }),
+      internal.fetchLayouts(config, fromPath.path, { previewSecret })
     ]);
     return {
       page,
@@ -51,75 +52,7 @@ function createCmssyLoader(config) {
 }
 function createCmssyHeaders(config) {
   return function cmssyHeaders() {
-    return core.cmssyCspHeaders({ editorOrigin: config.editorOrigin });
-  };
-}
-function xmlEscape(value) {
-  return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
-}
-function baseUrlFor(config, url, request) {
-  if (config.siteUrl) return config.siteUrl.replace(/\/+$/, "");
-  const host = request.headers.get("x-forwarded-host") ?? request.headers.get("host");
-  if (!host) return url.origin.replace(/\/+$/, "");
-  const protocol = request.headers.get("x-forwarded-proto") ?? (host.startsWith("localhost") || host.startsWith("127.0.0.1") ? "http" : "https");
-  return `${protocol}://${host}`.replace(/\/+$/, "");
-}
-function createCmssySitemap(config, options = {}) {
-  return async function loader({
-    request
-  }) {
-    const baseUrl = baseUrlFor(config, new URL(request.url), request);
-    const { defaultLocale, locales } = await core.resolveSiteLocales(config);
-    const pages = await core.fetchPages(config);
-    const entries = [];
-    for (const page of pages) {
-      const slug = core.normalizeSlug(page.slug);
-      for (const locale of locales) {
-        entries.push({
-          url: `${baseUrl}${core.localizedPath(slug, locale, defaultLocale)}`,
-          lastModified: page.updatedAt ?? void 0
-        });
-      }
-    }
-    if (options.extra) {
-      entries.push(
-        ...await options.extra({
-          baseUrl,
-          defaultLocale,
-          locales
-        })
-      );
-    }
-    const body = [
-      '<?xml version="1.0" encoding="UTF-8"?>',
-      '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">',
-      ...entries.map(
-        (entry) => [
-          "  <url>",
-          `    <loc>${xmlEscape(entry.url)}</loc>`,
-          entry.lastModified ? `    <lastmod>${xmlEscape(entry.lastModified)}</lastmod>` : "",
-          "  </url>"
-        ].filter(Boolean).join("\n")
-      ),
-      "</urlset>"
-    ].join("\n");
-    return new Response(body, {
-      headers: { "content-type": "application/xml" }
-    });
-  };
-}
-function createCmssyRobots(config) {
-  return async function loader({
-    request
-  }) {
-    const baseUrl = baseUrlFor(config, new URL(request.url), request);
-    const body = [
-      "User-agent: *",
-      "Allow: /",
-      `Sitemap: ${baseUrl}/sitemap.xml`,
-      ""
-    ].join("\n");
-    return new Response(body, { headers: { "content-type": "text/plain" } });
+    return internal.cmssyCspHeaders({ editorOrigin: config.editorOrigin });
   };
 }
 
@@ -127,10 +60,6 @@ Object.defineProperty(exports, "CMSSY_LOCALE_HEADER", {
   enumerable: true,
   get: function () { return core.CMSSY_LOCALE_HEADER; }
 });
-Object.defineProperty(exports, "buildBlockContext", {
-  enumerable: true,
-  get: function () { return core.buildBlockContext; }
-});
 Object.defineProperty(exports, "createCmssyClient", {
   enumerable: true,
   get: function () { return core.createCmssyClient; }
@@ -139,30 +68,6 @@ Object.defineProperty(exports, "defineCmssyConfig", {
   enumerable: true,
   get: function () { return core.defineCmssyConfig; }
 });
-Object.defineProperty(exports, "fetchLayouts", {
-  enumerable: true,
-  get: function () { return core.fetchLayouts; }
-});
-Object.defineProperty(exports, "fetchPage", {
-  enumerable: true,
-  get: function () { return core.fetchPage; }
-});
-Object.defineProperty(exports, "fetchPageMeta", {
-  enumerable: true,
-  get: function () { return core.fetchPageMeta; }
-});
-Object.defineProperty(exports, "fetchPages", {
-  enumerable: true,
-  get: function () { return core.fetchPages; }
-});
-Object.defineProperty(exports, "fetchProduct", {
-  enumerable: true,
-  get: function () { return core.fetchProduct; }
-});
-Object.defineProperty(exports, "fetchProducts", {
-  enumerable: true,
-  get: function () { return core.fetchProducts; }
-});
 Object.defineProperty(exports, "isVerifiedEditUrl", {
   enumerable: true,
   get: function () { return core.isVerifiedEditUrl; }
@@ -171,15 +76,5 @@ Object.defineProperty(exports, "localizeHref", {
   enumerable: true,
   get: function () { return core.localizeHref; }
 });
-Object.defineProperty(exports, "localizedPath", {
-  enumerable: true,
-  get: function () { return core.localizedPath; }
-});
-Object.defineProperty(exports, "resolveSiteLocales", {
-  enumerable: true,
-  get: function () { return core.resolveSiteLocales; }
-});
 exports.createCmssyHeaders = createCmssyHeaders;
 exports.createCmssyLoader = createCmssyLoader;
-exports.createCmssyRobots = createCmssyRobots;
-exports.createCmssySitemap = createCmssySitemap;

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import { CmssyPageData, CmssyLayoutGroup, CmssyConfig } from '@cmssy/core';
-export { CMSSY_LOCALE_HEADER, CmssyBlockContext, CmssyConfig, CmssyEnvConfig, CmssyLayoutGroup, CmssyPageData, buildBlockContext, createCmssyClient, defineCmssyConfig, fetchLayouts, fetchPage, fetchPageMeta, fetchPages, fetchProduct, fetchProducts, isVerifiedEditUrl, localizeHref, localizedPath, resolveSiteLocales } from '@cmssy/core';
+export { CMSSY_LOCALE_HEADER, CmssyBlockContext, CmssyConfig, CmssyEnvConfig, CmssyLayoutGroup, CmssyPageData, createCmssyClient, defineCmssyConfig, isVerifiedEditUrl, localizeHref } from '@cmssy/core';
 
 interface CmssyRouteData {
     page: CmssyPageData | null;
@@ -30,31 +30,4 @@ declare function createCmssyLoader(config: CmssyConfig): ({ request, }: {
  */
 declare function createCmssyHeaders(config: CmssyConfig): () => Record<string, string>;
 
-interface CmssySitemapEntry {
-    url: string;
-    lastModified?: string;
-}
-interface CmssySitemapOptions {
-    /**
-     * Records are not pages, so the sitemap cannot know about your products or
-     * categories. Add them here; you get the same base URL and locales the page
-     * entries use, so the two cannot disagree.
-     */
-    extra?: (context: {
-        baseUrl: string;
-        defaultLocale: string;
-        locales: string[];
-    }) => Promise<CmssySitemapEntry[]> | CmssySitemapEntry[];
-}
-/**
- * One `<url>` per language, plus x-default - a translated page is not a
- * duplicate, and telling Google it is keeps the translation out of the index.
- */
-declare function createCmssySitemap(config: CmssyConfig, options?: CmssySitemapOptions): ({ request, }: {
-    request: Request;
-}) => Promise<Response>;
-declare function createCmssyRobots(config: CmssyConfig): ({ request, }: {
-    request: Request;
-}) => Promise<Response>;
-
-export { type CmssyRouteData, type CmssySitemapEntry, type CmssySitemapOptions, createCmssyHeaders, createCmssyLoader, createCmssyRobots, createCmssySitemap };
+export { type CmssyRouteData, createCmssyHeaders, createCmssyLoader };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { CmssyPageData, CmssyLayoutGroup, CmssyConfig } from '@cmssy/core';
-export { CMSSY_LOCALE_HEADER, CmssyBlockContext, CmssyConfig, CmssyEnvConfig, CmssyLayoutGroup, CmssyPageData, buildBlockContext, createCmssyClient, defineCmssyConfig, fetchLayouts, fetchPage, fetchPageMeta, fetchPages, fetchProduct, fetchProducts, isVerifiedEditUrl, localizeHref, localizedPath, resolveSiteLocales } from '@cmssy/core';
+export { CMSSY_LOCALE_HEADER, CmssyBlockContext, CmssyConfig, CmssyEnvConfig, CmssyLayoutGroup, CmssyPageData, createCmssyClient, defineCmssyConfig, isVerifiedEditUrl, localizeHref } from '@cmssy/core';
 
 interface CmssyRouteData {
     page: CmssyPageData | null;
@@ -30,31 +30,4 @@ declare function createCmssyLoader(config: CmssyConfig): ({ request, }: {
  */
 declare function createCmssyHeaders(config: CmssyConfig): () => Record<string, string>;
 
-interface CmssySitemapEntry {
-    url: string;
-    lastModified?: string;
-}
-interface CmssySitemapOptions {
-    /**
-     * Records are not pages, so the sitemap cannot know about your products or
-     * categories. Add them here; you get the same base URL and locales the page
-     * entries use, so the two cannot disagree.
-     */
-    extra?: (context: {
-        baseUrl: string;
-        defaultLocale: string;
-        locales: string[];
-    }) => Promise<CmssySitemapEntry[]> | CmssySitemapEntry[];
-}
-/**
- * One `<url>` per language, plus x-default - a translated page is not a
- * duplicate, and telling Google it is keeps the translation out of the index.
- */
-declare function createCmssySitemap(config: CmssyConfig, options?: CmssySitemapOptions): ({ request, }: {
-    request: Request;
-}) => Promise<Response>;
-declare function createCmssyRobots(config: CmssyConfig): ({ request, }: {
-    request: Request;
-}) => Promise<Response>;
-
-export { type CmssyRouteData, type CmssySitemapEntry, type CmssySitemapOptions, createCmssyHeaders, createCmssyLoader, createCmssyRobots, createCmssySitemap };
+export { type CmssyRouteData, createCmssyHeaders, createCmssyLoader };

package/dist/index.js

@@ -1,5 +1,6 @@
-import { isVerifiedEditUrl, CMSSY_EDIT_QUERY_PARAM, isDevelopment, CMSSY_SECRET_QUERY_PARAM, resolveSiteLocales, splitLocaleFromPath, CMSSY_LOCALE_HEADER, fetchPage, fetchLayouts, cmssyCspHeaders, fetchPages, normalizeSlug, localizedPath } from '@cmssy/core';
-export { CMSSY_LOCALE_HEADER, buildBlockContext, createCmssyClient, defineCmssyConfig, fetchLayouts, fetchPage, fetchPageMeta, fetchPages, fetchProduct, fetchProducts, isVerifiedEditUrl, localizeHref, localizedPath, resolveSiteLocales } from '@cmssy/core';
+import { isVerifiedEditUrl, CMSSY_EDIT_QUERY_PARAM, CMSSY_SECRET_QUERY_PARAM } from '@cmssy/core';
+export { CMSSY_LOCALE_HEADER, createCmssyClient, defineCmssyConfig, isVerifiedEditUrl, localizeHref } from '@cmssy/core';
+import { isDevelopment, resolveSiteLocales, splitLocaleFromPath, CMSSY_LOCALE_HEADER, fetchPage, fetchLayouts, cmssyCspHeaders } from '@cmssy/core/internal';
 
 // src/loader.ts
 function createCmssyLoader(config) {
@@ -53,73 +54,5 @@ function createCmssyHeaders(config) {
     return cmssyCspHeaders({ editorOrigin: config.editorOrigin });
   };
 }
-function xmlEscape(value) {
-  return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
-}
-function baseUrlFor(config, url, request) {
-  if (config.siteUrl) return config.siteUrl.replace(/\/+$/, "");
-  const host = request.headers.get("x-forwarded-host") ?? request.headers.get("host");
-  if (!host) return url.origin.replace(/\/+$/, "");
-  const protocol = request.headers.get("x-forwarded-proto") ?? (host.startsWith("localhost") || host.startsWith("127.0.0.1") ? "http" : "https");
-  return `${protocol}://${host}`.replace(/\/+$/, "");
-}
-function createCmssySitemap(config, options = {}) {
-  return async function loader({
-    request
-  }) {
-    const baseUrl = baseUrlFor(config, new URL(request.url), request);
-    const { defaultLocale, locales } = await resolveSiteLocales(config);
-    const pages = await fetchPages(config);
-    const entries = [];
-    for (const page of pages) {
-      const slug = normalizeSlug(page.slug);
-      for (const locale of locales) {
-        entries.push({
-          url: `${baseUrl}${localizedPath(slug, locale, defaultLocale)}`,
-          lastModified: page.updatedAt ?? void 0
-        });
-      }
-    }
-    if (options.extra) {
-      entries.push(
-        ...await options.extra({
-          baseUrl,
-          defaultLocale,
-          locales
-        })
-      );
-    }
-    const body = [
-      '<?xml version="1.0" encoding="UTF-8"?>',
-      '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">',
-      ...entries.map(
-        (entry) => [
-          "  <url>",
-          `    <loc>${xmlEscape(entry.url)}</loc>`,
-          entry.lastModified ? `    <lastmod>${xmlEscape(entry.lastModified)}</lastmod>` : "",
-          "  </url>"
-        ].filter(Boolean).join("\n")
-      ),
-      "</urlset>"
-    ].join("\n");
-    return new Response(body, {
-      headers: { "content-type": "application/xml" }
-    });
-  };
-}
-function createCmssyRobots(config) {
-  return async function loader({
-    request
-  }) {
-    const baseUrl = baseUrlFor(config, new URL(request.url), request);
-    const body = [
-      "User-agent: *",
-      "Allow: /",
-      `Sitemap: ${baseUrl}/sitemap.xml`,
-      ""
-    ].join("\n");
-    return new Response(body, { headers: { "content-type": "text/plain" } });
-  };
-}
 
-export { createCmssyHeaders, createCmssyLoader, createCmssyRobots, createCmssySitemap };
+export { createCmssyHeaders, createCmssyLoader };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/remix",
-  "version": "9.10.0",
+  "version": "10.1.0",
   "description": "React Router 7 bindings for cmssy headless sites: page loader, framing CSP, sitemap and robots.",
   "keywords": [
     "cmssy",
@@ -48,7 +48,7 @@
     "vitest": "^2.1.0"
   },
   "dependencies": {
-    "@cmssy/core": "9.10.0"
+    "@cmssy/core": "10.1.0"
   },
   "scripts": {
     "build": "tsup",