@justanarthur/payload-www 1.4.1 → 2.0.0

package/dist/sitemap.js

@@ -1,8 +1,3 @@
-
-
-// src/render/pages/createCollectionPageExports.tsx
-import"server-only";
-
 // src/render/metadata/slug.ts
 var SLUG_NESTED_DIVIDER = "_";
 function paramsSlugToSlug(slug, _shape) {
@@ -22,142 +17,118 @@ function slugToPath(slug) {
 }
 
 // src/render/metadata/query.ts
+import { createCacheHelpers } from "@pro-laico/payload-revalidate/cache";
+import { tagsFor } from "@pro-laico/payload-revalidate";
+import { cacheLife } from "next/cache";
 import { getPayload } from "payload";
-
-// src/collections/hooks/createRevalidateCollectionGlobalHook.ts
-import { revalidateTag } from "next/cache";
-function createRevalidateCollectionGlobalHook() {
-  const afterChangeDeleteHook = async ({ doc, req, ...args }) => {
-    const previousDoc = "previousDoc" in args ? args.previousDoc : null, locale = req.locale;
-    function revalidate(args2) {
-      try {
-        revalidateTag(createCollectionCacheKey({ ...args2, locale }), "max");
-      } catch (error) {
-        const msg = error instanceof Error ? error.message : String(error);
-        if (msg.includes("static generation store missing"))
-          return;
-        console.error(error);
-      }
-    }
-    if ("collection" in args) {
-      [
-        doc && doc._status !== "draft" && doc.slug,
-        previousDoc && previousDoc._status === "published" && previousDoc.slug
-      ].filter((slug) => slug !== undefined && slug !== false).map((slug) => revalidate({ collectionSlug: args.collection.slug, slug }));
-    } else {
-      revalidate({ globalSlug: args.global.slug });
-    }
-    return doc;
-  };
-  return { afterChange: afterChangeDeleteHook, afterDelete: afterChangeDeleteHook };
-}
-function createCollectionCacheKey(args) {
-  return `${"globalSlug" in args ? args.globalSlug : args.collectionSlug + args.slug}_${args.locale}`;
+var _helpers = null;
+var _seedPromise = null;
+function seedPayloadCache({ config }) {
+  if (_helpers || _seedPromise)
+    return;
+  _seedPromise = (async () => {
+    const payload = await getPayload({ config: await config });
+    _helpers = createCacheHelpers(payload);
+  })();
 }
-
-// src/render/metadata/query.ts
-async function withUnstableCache(keyParts, tags, fn) {
-  const { unstable_cache } = await import("next/cache");
-  return unstable_cache(fn, keyParts.map(String), { tags })();
+async function requireCacheHelpers() {
+  if (_helpers)
+    return _helpers;
+  if (_seedPromise) {
+    await _seedPromise;
+    if (_helpers)
+      return _helpers;
+  }
+  throw new Error("[payload-www] seedPayloadCache({ config }) must be called before any query getter. " + "Call it from createCollectionPageExports / createRootLayoutExports factory, or in your root layout.");
 }
-async function queryDoc(args, { config: configPromise }) {
-  return withUnstableCache(Object.values(args), [createCollectionCacheKey(args)], async () => {
-    if ("globalSlug" in args)
-      return queryGlobal({ ...args, config: configPromise });
-    else
-      return queryDocBySlug({ ...args, config: configPromise });
+async function queryDocBySlug(args) {
+  "use cache";
+  cacheLife("weeks");
+  const { findDoc } = await requireCacheHelpers();
+  const slugField = args.slugField ?? "slug";
+  const result = await findDoc(args.collectionSlug, {
+    where: { [slugField]: { equals: args.slug } },
+    locale: args.locale,
+    draft: args.draft ?? false,
+    depth: args.depth
   });
+  return result ?? null;
 }
-async function queryDocBySlug({
-  collectionSlug,
-  slug,
-  slugField = "slug",
-  locale,
-  draft = false,
-  config
-}) {
-  return withUnstableCache([collectionSlug, slug, locale, draft], [createCollectionCacheKey({ collectionSlug, slug, locale })], async () => {
-    const payload = await getPayload({ config });
-    const result = await payload.find({
-      collection: collectionSlug,
-      draft,
-      limit: 1,
-      pagination: false,
-      overrideAccess: draft,
-      where: { [slugField]: { equals: slug } },
-      locale
+async function queryGlobal(args) {
+  "use cache";
+  cacheLife("weeks");
+  const { findGlobal } = await requireCacheHelpers();
+  try {
+    const result = await findGlobal(args.globalSlug, {
+      locale: args.locale,
+      draft: args.draft ?? false,
+      depth: args.depth
     });
-    return result.docs?.[0] ?? null;
-  });
+    return result ?? null;
+  } catch (error) {
+    console.warn("[WWW] queryGlobal failed", { globalSlug: args.globalSlug, locale: args.locale, error: String(error) });
+    return null;
+  }
 }
-async function queryGlobal({
-  globalSlug,
-  locale,
-  draft = false,
-  config
-}) {
-  return withUnstableCache([globalSlug, locale, draft], [createCollectionCacheKey({ globalSlug, locale })], async () => {
-    const payload = await getPayload({ config });
-    try {
-      return await payload.findGlobal({ slug: globalSlug, draft, locale });
-    } catch (error) {
-      console.warn("[WWW] queryGlobal failed", { globalSlug, locale, error: String(error) });
-      return null;
-    }
-  });
+async function queryAllDocs(args) {
+  "use cache";
+  cacheLife("weeks");
+  const { findIds, findDocByID } = await requireCacheHelpers();
+  const collection = args.collectionSlug;
+  const { ids } = await findIds(collection, { locale: args.locale });
+  if (ids.length === 0)
+    return [];
+  const docs = await Promise.all(ids.map((id) => findDocByID(collection, id, { locale: args.locale })));
+  return docs.filter((d) => d !== null);
 }
-async function queryAllDocs({
-  collectionSlug,
-  slugField = "slug",
-  locale,
-  config
-}) {
-  return withUnstableCache([collectionSlug, slugField, locale], [createCollectionCacheKey({ collectionSlug, slug: "__all__", locale })], async () => {
-    const payload = await getPayload({ config });
-    const result = await payload.find({
-      collection: collectionSlug,
-      draft: false,
-      limit: 1000,
-      pagination: false,
-      overrideAccess: false,
-      select: { [slugField]: true },
-      locale
-    });
-    return result.docs ?? [];
-  });
+async function queryDoc(args) {
+  if ("globalSlug" in args)
+    return queryGlobal(args);
+  return queryDocBySlug(args);
 }
-async function queryAllLocaleSlugs({
-  collectionSlug,
-  id,
-  slugField = "slug",
-  config
-}) {
-  const payload = await getPayload({ config });
-  const doc = await payload.findByID({
-    collection: collectionSlug,
-    id,
-    locale: "all",
-    select: { [slugField]: true }
+async function queryAllLocaleSlugs(args) {
+  "use cache";
+  cacheLife("weeks");
+  const { findDocByID } = await requireCacheHelpers();
+  const slugField = args.slugField ?? "slug";
+  const doc = await findDocByID(args.collectionSlug, args.id, { locale: "all", select: { [slugField]: true } });
+  const localeMap = doc?.[slugField];
+  if (localeMap && typeof localeMap === "object")
+    return localeMap;
+  return null;
+}
+async function queryDocByID(args) {
+  "use cache";
+  cacheLife("weeks");
+  const { findDocByID } = await requireCacheHelpers();
+  return await findDocByID(args.collectionSlug, args.id, {
+    locale: args.locale,
+    draft: args.draft ?? false,
+    depth: args.depth
   });
-  return doc?.[slugField];
 }
 
 // src/render/pages/createCollectionPageExports.tsx
 import { setRequestLocale } from "next-intl/server";
 
 // src/render/pages/utils/buildLocalizedPath.ts
+function resolvePagePathPrefix(prefix, locale, routing) {
+  if (typeof prefix !== "object")
+    return prefix;
+  return prefix[locale] ?? prefix[routing.defaultLocale];
+}
 function buildLocalizedPath(locale, prefix, slug, { routing }) {
   const path = slugToPath(slug);
+  const localePrefix = resolvePagePathPrefix(prefix, locale, routing);
   return `${routing.localePrefix === "never" ? "" : routing.localePrefix === "always" ? locale : routing.localePrefix === "as-needed" ? locale === routing.defaultLocale ? "" : "/" + locale : (() => {
     throw new Error("Unsupported locale prefix");
-  })()}${prefix ? "/" + prefix : ""}${path ? "/" + path : ""}`;
+  })()}${localePrefix ? "/" + localePrefix : ""}${path ? "/" + path : ""}`;
 }
 function buildLocalizedPaths(localesSlug, pagePathPrefix, { routing }) {
-  if (!localesSlug[routing.defaultLocale])
-    return {};
+  const blankIsHome = !localesSlug[routing.defaultLocale];
   return routing.locales.reduce((paths, locale) => {
     const slug = localesSlug[locale];
-    if (!slug)
+    if (!slug && !blankIsHome)
       return paths;
     paths[locale] = buildLocalizedPath(locale, pagePathPrefix, slug, { routing });
     return paths;
@@ -227,7 +198,7 @@ async function renderWWWDataModule(data, {
 import { jsx as jsx2, Fragment } from "react/jsx-runtime";
 function createCollectionPageExports({
   slug: collectionSlug = "pages",
-  config: configPromise,
+  _payloadConfig,
   importMap,
   routing,
   slugShape = "single"
@@ -235,14 +206,13 @@ function createCollectionPageExports({
   getServerSideURL,
   pagePathPrefix
 }) {
+  seedPayloadCache({ config: _payloadConfig });
   const siteUrl = getServerSideURL();
   async function fetchDoc(locale, slug) {
     return queryDoc({
       slug,
       locale,
       collectionSlug
-    }, {
-      config: configPromise
     });
   }
   const default_ = async (props) => {
@@ -259,22 +229,25 @@ function createCollectionPageExports({
       const { notFound } = await import("next/navigation");
       notFound();
     }
-    const rendered = renderWWWDataModule(doc, { collectionSlug, config: configPromise, importMap }, { ...props, locale });
+    const rendered = renderWWWDataModule(doc, { collectionSlug, config: _payloadConfig, importMap }, { ...props, locale });
     return /* @__PURE__ */ jsx2(Fragment, {
       children: rendered
     });
   };
   async function generateMetadata(props) {
     const params = await props.params;
-    const locale = params.locale, slug = paramsSlugToSlug(params.slug, slugShape);
+    const locale = params.locale;
+    if (!routing.locales.includes(locale)) {
+      return {};
+    }
+    const slug = paramsSlugToSlug(params.slug, slugShape);
     const doc = await fetchDoc(locale, slug);
     const [localesSlug, siteDefaults] = await Promise.all([
       doc ? queryAllLocaleSlugs({
         id: doc.id,
-        collectionSlug,
-        config: configPromise
+        collectionSlug
       }) : Promise.resolve({}),
-      createSiteDefaults({ config: configPromise, locale })
+      createSiteDefaults({ config: _payloadConfig, locale })
     ]);
     if (!doc)
       return {};
@@ -291,22 +264,23 @@ function createCollectionPageExports({
     return { ...meta, alternates };
   }
   async function generateStaticParams(props) {
-    const locale = (await props.params).locale;
-    const docs = await queryAllDocs({ locale, collectionSlug, config: configPromise });
-    return docs.filter((doc) => typeof doc.slug === "string" && doc.slug.length > 0).map((doc) => ({ slug: slugToParamsSlug(doc.slug, slugShape) }));
+    await props.params;
+    const perLocaleEntries = await Promise.all(routing.locales.map(async (locale) => {
+      const docs = await queryAllDocs({ locale, collectionSlug });
+      return docs.filter((doc) => typeof doc.slug === "string" && doc.slug.length > 0).map((doc) => ({ locale, slug: slugToParamsSlug(doc.slug, slugShape) }));
+    }));
+    return perLocaleEntries.flat();
   }
   async function generateSitemap() {
     const locale = routing.defaultLocale;
     const docs = await queryAllDocs({
       collectionSlug,
-      locale,
-      config: configPromise
+      locale: routing.defaultLocale
     });
     return await Promise.all(docs.map(async (doc) => {
       const localesSlug = await queryAllLocaleSlugs({
         id: doc.id,
-        collectionSlug,
-        config: configPromise
+        collectionSlug
       }) ?? {};
       const alternates = buildAlternates(locale, localesSlug, pagePathPrefix, { routing, siteUrl });
       return {
@@ -317,7 +291,7 @@ function createCollectionPageExports({
     }));
   }
   generateSitemap.getServerSideURL = getServerSideURL;
-  generateSitemap.pagePathPrefix = pagePathPrefix;
+  generateSitemap.pagePathPrefix = resolvePagePathPrefix(pagePathPrefix, routing.defaultLocale, routing);
   return {
     default: default_,
     generateMetadata,
@@ -341,8 +315,9 @@ ${sitemaps.map((url) => `  <sitemap><loc>${url}</loc></sitemap>`).join(`
 }
 
 // src/exports/sitemap.ts
-var sitemap_default = { createSitemapFromCollections };
+var sitemap_default = { createSitemapFromCollections, seedPayloadCache };
 export {
+  createSitemapFromCollections,
   sitemap_default as default,
-  createSitemapFromCollections
+  seedPayloadCache
 };

package/dist/translator.d.ts

@@ -1,2 +1,2 @@
 import { translator } from "@justanarthur/payload-plugin-translator";
-export { translator, translator as default };
+export { translator as default, translator };

package/dist/translator.js

@@ -1,9 +1,7 @@
-
-
 // src/exports/translator.ts
 import { translator } from "@justanarthur/payload-plugin-translator";
 var translator_default = translator;
 export {
-  translator,
-  translator_default as default
+  translator_default as default,
+  translator
 };

package/dist/utils.d.ts

@@ -11,4 +11,4 @@ declare const utils: {
 	getFromImportMap: typeof getFromImportMap;
 	generateImportName: typeof generateImportName;
 };
-export { getFromImportMap, generateImportName, utils as default };
+export { utils as default, generateImportName, getFromImportMap };

package/dist/utils.js

@@ -1,5 +1,3 @@
-
-
 // src/render/generateImportName.ts
 function generateImportName(type, slug) {
   switch (type) {
@@ -34,7 +32,7 @@ function getFromImportMap(key, importMap) {
 var utils = { getFromImportMap, generateImportName };
 var utils_default = utils;
 export {
-  getFromImportMap,
+  utils_default as default,
   generateImportName,
-  utils_default as default
+  getFromImportMap
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@justanarthur/payload-www",
   "description": "Reusable Payload CMS website template — config builder, collections, globals, blocks, fields, access, hooks, metadata (JSON-LD, hreflang), page renderers, and test helpers.",
-  "version": "1.4.1",
+  "version": "2.0.0",
   "type": "module",
   "private": false,
   "files": [
@@ -113,24 +113,24 @@
     "prepublishOnly": "bun run clean && bun run build"
   },
   "dependencies": {
-    "@payloadcms/live-preview-react": "3.85.0",
-    "@payloadcms/plugin-mcp": "3.85.0",
-    "@payloadcms/richtext-lexical": "3.85.0",
-    "@payloadcms/next": "3.85.0",
-    "next": "16.2.6",
-    "next-intl": "^4.0.0",
+    "@payloadcms/live-preview-react": "3.88.0",
+    "@payloadcms/plugin-mcp": "3.88.0",
+    "@payloadcms/richtext-lexical": "3.88.0",
+    "@payloadcms/next": "3.88.0",
+    "next": "16.3.4",
+    "next-intl": "^4.14.2",
     "server-only": "0.0.1",
     "tsx": "^4.19.2"
   },
   "devDependencies": {
     "@types/node": "22.19.9",
-    "@types/react": "19.2.14",
-    "@types/react-dom": "19.2.3",
+    "@types/react": "19.2.18",
+    "@types/react-dom": "19.2.7",
     "bunup": "^0.16.32",
-    "payload": "3.85.1",
-    "react": "19.2.6",
-    "react-dom": "19.2.6",
-    "typescript": "5.7.3",
+    "payload": "3.88.0",
+    "react": "19.2.8",
+    "react-dom": "19.2.8",
+    "typescript": "^7.0.2",
     "vitest": "4.0.18"
   },
   "peerDependencies": {
@@ -139,12 +139,14 @@
     "@payloadcms/richtext-lexical": "^3.85.0",
     "@payloadcms/translations": "^3.85.0",
     "@payloadcms/ui": "^3.85.0",
+    "@pro-laico/core": "^0.5.0",
+    "@pro-laico/payload-revalidate": "^0.8.5",
     "next": "^16.2.6",
     "next-intl": "^4.0.0",
     "payload": "^3.85.0",
     "react": "^19.2.6",
     "react-dom": "^19.2.6",
-    "@justanarthur/payload-plugin-seo": "^3.0.0",
+    "@justanarthur/payload-plugin-seo": "^4.0.0",
     "@justanarthur/payload-plugin-translator": "^3.0.0",
     "@justanarthur/payload-imagehash-plugin": "^3.3.0"
   },