@justanarthur/payload-www 2.2.5 → 2.2.6

package/README.md

@@ -112,8 +112,18 @@ const {
 
 export default Page
 export { generateMetadata, generateStaticParams, generateSitemap }
+
+// the doc lookup blocks so unknown slugs can return a real 404
+export const instant = false
 ```
 
+The page looks up the document before it renders anything, so a missing slug returns HTTP 404
+rather than a streamed not-found body with status 200. Slugs from `generateStaticParams`
+prerender. Next renders any other slug on its first request, and blocks until the lookup is
+done. `export const instant = false` tells Next's dev-time instant validation that the route
+blocks on purpose. With `partialPrefetching: true`, Next streams the layout shell for slugs it did
+not prerender, so those slugs still get a soft 404.
+
 `slugShape` is `'single'` (default) or `'catch-all'`. Use `'catch-all'` if your route segment is
 `[[...slug]]` (Pages-style), `'single'` for `[slug]` (Posts-style — file convention).
 
@@ -141,6 +151,7 @@ const { default: PostPage, generateMetadata, generateStaticParams } = createColl
 |---|---|---|
 | `getServerSideURL` | `() => string` | host's absolute-URL helper |
 | `pagePathPrefix` | `string \| Record<locale, string>` | URL segment the collection is mounted under, used for `generateSitemap` and for canonical/hreflang URLs. Pass a record to localize the segment (`{ en: 'posts', sk: 'prispevky' }`); locales absent from it fall back to the default locale. The sitemap *index* route always uses the default locale's segment. |
+| `fallback` | `ReactNode` | rendered while the found document streams. Defaults to nothing. The lookup itself never streams, so a missing document still returns a 404. |
 
 ### What you get back
 

package/dist/cli.js

@@ -34,9 +34,9 @@ function defaultBlockPath(slug) {
 }
 async function generateAsyncImportmap(config, options) {
   const pkg = options.packageName ?? name;
-  const blocks = config.blocks ?? [] ?? [];
-  const collections = config.collections ?? [] ?? [];
-  const globals = config.globals ?? [] ?? [];
+  const blocks = config.blocks ?? [];
+  const collections = config.collections ?? [];
+  const globals = config.globals ?? [];
   const keys = new Set;
   for (const block of blocks) {
     if (!block.slug)

package/dist/collections.js

@@ -115,6 +115,7 @@ async function queryDocBySlug(args) {
     where: { [slugField]: { equals: args.slug } },
     locale: args.locale,
     draft: args.draft ?? false,
+    overrideAccess: args.draft ?? false,
     depth: args.depth
   });
   return result ?? null;
@@ -140,10 +141,10 @@ async function queryAllDocs(args) {
   cacheLife("weeks");
   const { findIds, findDocByID } = await requireCacheHelpers();
   const collection = args.collectionSlug;
-  const { ids } = await findIds(collection, { locale: args.locale });
+  const { ids } = await findIds(collection, { locale: args.locale, pagination: false, overrideAccess: false });
   if (ids.length === 0)
     return [];
-  const docs = await Promise.all(ids.map((id) => findDocByID(collection, id, { locale: args.locale })));
+  const docs = await Promise.all(ids.map((id) => findDocByID(collection, id, { locale: args.locale, overrideAccess: false })));
   return docs.filter((d) => d !== null);
 }
 async function queryDoc(args) {
@@ -156,7 +157,7 @@ async function queryAllLocaleSlugs(args) {
   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 doc = await findDocByID(args.collectionSlug, args.id, { locale: "all", select: { [slugField]: true }, overrideAccess: false });
   const localeMap = doc?.[slugField];
   if (localeMap && typeof localeMap === "object")
     return localeMap;
@@ -169,6 +170,7 @@ async function queryDocByID(args) {
   return await findDocByID(args.collectionSlug, args.id, {
     locale: args.locale,
     draft: args.draft ?? false,
+    overrideAccess: args.draft ?? false,
     depth: args.depth
   });
 }

package/dist/metadata.js

@@ -143,6 +143,7 @@ async function queryDocBySlug(args) {
     where: { [slugField]: { equals: args.slug } },
     locale: args.locale,
     draft: args.draft ?? false,
+    overrideAccess: args.draft ?? false,
     depth: args.depth
   });
   return result ?? null;
@@ -168,10 +169,10 @@ async function queryAllDocs(args) {
   cacheLife("weeks");
   const { findIds, findDocByID } = await requireCacheHelpers();
   const collection = args.collectionSlug;
-  const { ids } = await findIds(collection, { locale: args.locale });
+  const { ids } = await findIds(collection, { locale: args.locale, pagination: false, overrideAccess: false });
   if (ids.length === 0)
     return [];
-  const docs = await Promise.all(ids.map((id) => findDocByID(collection, id, { locale: args.locale })));
+  const docs = await Promise.all(ids.map((id) => findDocByID(collection, id, { locale: args.locale, overrideAccess: false })));
   return docs.filter((d) => d !== null);
 }
 async function queryDoc(args) {
@@ -184,7 +185,7 @@ async function queryAllLocaleSlugs(args) {
   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 doc = await findDocByID(args.collectionSlug, args.id, { locale: "all", select: { [slugField]: true }, overrideAccess: false });
   const localeMap = doc?.[slugField];
   if (localeMap && typeof localeMap === "object")
     return localeMap;
@@ -197,6 +198,7 @@ async function queryDocByID(args) {
   return await findDocByID(args.collectionSlug, args.id, {
     locale: args.locale,
     draft: args.draft ?? false,
+    overrideAccess: args.draft ?? false,
     depth: args.depth
   });
 }

package/dist/pages.d.ts

@@ -20,6 +20,10 @@ type NextPageProps = {
 		slug?: string | string[];
 	}>;
 };
+type RouteParams = Record<string, string | string[] | undefined>;
+type GenerateStaticParamsProps = {
+	params: RouteParams | Promise<RouteParams>;
+};
 import { RoutingConfig as GenericRoutingConfig } from "next-intl/routing";
 type RoutingConfig = GenericRoutingConfig<string[], any, any, any>;
 /**
@@ -43,9 +47,9 @@ type CreateCollectionPageExportsDeps<S extends string> = {
 	fallback?: ReactNode2;
 };
 declare function createCollectionPageExports<S extends string = "pages">({ slug: collectionSlug, _payloadConfig, importMap, routing, slugShape }: CreateCollectionPageExportsArgs<S>, { getServerSideURL, pagePathPrefix, fallback }: CreateCollectionPageExportsDeps<S>): {
-	default: (props: NextPageProps) => ReactNode2;
+	default: (props: NextPageProps) => Promise<ReactNode2>;
 	generateMetadata: (props: NextPageProps) => Promise<Metadata>;
-	generateStaticParams: (props: NextPageProps) => Promise<{
+	generateStaticParams: (props: GenerateStaticParamsProps) => Promise<{
 		locale: string;
 		slug: string | string[];
 	}[]>;

package/dist/pages.js

@@ -228,6 +228,7 @@ async function queryDocBySlug(args) {
     where: { [slugField]: { equals: args.slug } },
     locale: args.locale,
     draft: args.draft ?? false,
+    overrideAccess: args.draft ?? false,
     depth: args.depth
   });
   return result ?? null;
@@ -253,10 +254,10 @@ async function queryAllDocs(args) {
   cacheLife("weeks");
   const { findIds, findDocByID } = await requireCacheHelpers();
   const collection = args.collectionSlug;
-  const { ids } = await findIds(collection, { locale: args.locale });
+  const { ids } = await findIds(collection, { locale: args.locale, pagination: false, overrideAccess: false });
   if (ids.length === 0)
     return [];
-  const docs = await Promise.all(ids.map((id) => findDocByID(collection, id, { locale: args.locale })));
+  const docs = await Promise.all(ids.map((id) => findDocByID(collection, id, { locale: args.locale, overrideAccess: false })));
   return docs.filter((d) => d !== null);
 }
 async function queryDoc(args) {
@@ -269,7 +270,7 @@ async function queryAllLocaleSlugs(args) {
   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 doc = await findDocByID(args.collectionSlug, args.id, { locale: "all", select: { [slugField]: true }, overrideAccess: false });
   const localeMap = doc?.[slugField];
   if (localeMap && typeof localeMap === "object")
     return localeMap;
@@ -282,6 +283,7 @@ async function queryDocByID(args) {
   return await findDocByID(args.collectionSlug, args.id, {
     locale: args.locale,
     draft: args.draft ?? false,
+    overrideAccess: args.draft ?? false,
     depth: args.depth
   });
 }
@@ -352,7 +354,7 @@ async function renderWWWDataModule(data, {
 }
 
 // src/render/pages/createCollectionPageExports.tsx
-import { jsx as jsx6, Fragment as Fragment2 } from "react/jsx-runtime";
+import { jsx as jsx6 } from "react/jsx-runtime";
 function createCollectionPageExports({
   slug: collectionSlug = "pages",
   _payloadConfig,
@@ -373,13 +375,7 @@ function createCollectionPageExports({
       collectionSlug
     });
   }
-  const default_ = (props) => /* @__PURE__ */ jsx6(React.Suspense, {
-    fallback: fallback ?? null,
-    children: /* @__PURE__ */ jsx6(CollectionDocument, {
-      ...props
-    })
-  });
-  const CollectionDocument = async (props) => {
+  const default_ = async (props) => {
     const params = await props.params;
     const locale = params.locale;
     if (!routing.locales.includes(locale)) {
@@ -394,7 +390,8 @@ function createCollectionPageExports({
       notFound();
     }
     const rendered = renderWWWDataModule(doc, { collectionSlug, config: _payloadConfig, importMap }, { ...props, locale });
-    return /* @__PURE__ */ jsx6(Fragment2, {
+    return /* @__PURE__ */ jsx6(React.Suspense, {
+      fallback: fallback ?? null,
       children: rendered
     });
   };

package/dist/render-pages.d.ts

@@ -29,6 +29,10 @@ type NextLayoutProps = {
 	}>;
 	children: ReactNode;
 };
+type RouteParams = Record<string, string | string[] | undefined>;
+type GenerateStaticParamsProps = {
+	params: RouteParams | Promise<RouteParams>;
+};
 import { RoutingConfig as GenericRoutingConfig } from "next-intl/routing";
 type RoutingConfig = GenericRoutingConfig<string[], any, any, any>;
 /**
@@ -52,9 +56,9 @@ type CreateCollectionPageExportsDeps<S extends string> = {
 	fallback?: ReactNode2;
 };
 declare function createCollectionPageExports<S extends string = "pages">({ slug: collectionSlug, _payloadConfig, importMap, routing, slugShape }: CreateCollectionPageExportsArgs<S>, { getServerSideURL, pagePathPrefix, fallback }: CreateCollectionPageExportsDeps<S>): {
-	default: (props: NextPageProps) => ReactNode2;
+	default: (props: NextPageProps) => Promise<ReactNode2>;
 	generateMetadata: (props: NextPageProps) => Promise<Metadata>;
-	generateStaticParams: (props: NextPageProps) => Promise<{
+	generateStaticParams: (props: GenerateStaticParamsProps) => Promise<{
 		locale: string;
 		slug: string | string[];
 	}[]>;

package/dist/render-pages.js

@@ -258,6 +258,7 @@ async function queryDocBySlug(args) {
     where: { [slugField]: { equals: args.slug } },
     locale: args.locale,
     draft: args.draft ?? false,
+    overrideAccess: args.draft ?? false,
     depth: args.depth
   });
   return result ?? null;
@@ -283,10 +284,10 @@ async function queryAllDocs(args) {
   cacheLife("weeks");
   const { findIds, findDocByID } = await requireCacheHelpers();
   const collection = args.collectionSlug;
-  const { ids } = await findIds(collection, { locale: args.locale });
+  const { ids } = await findIds(collection, { locale: args.locale, pagination: false, overrideAccess: false });
   if (ids.length === 0)
     return [];
-  const docs = await Promise.all(ids.map((id) => findDocByID(collection, id, { locale: args.locale })));
+  const docs = await Promise.all(ids.map((id) => findDocByID(collection, id, { locale: args.locale, overrideAccess: false })));
   return docs.filter((d) => d !== null);
 }
 async function queryDoc(args) {
@@ -299,7 +300,7 @@ async function queryAllLocaleSlugs(args) {
   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 doc = await findDocByID(args.collectionSlug, args.id, { locale: "all", select: { [slugField]: true }, overrideAccess: false });
   const localeMap = doc?.[slugField];
   if (localeMap && typeof localeMap === "object")
     return localeMap;
@@ -312,6 +313,7 @@ async function queryDocByID(args) {
   return await findDocByID(args.collectionSlug, args.id, {
     locale: args.locale,
     draft: args.draft ?? false,
+    overrideAccess: args.draft ?? false,
     depth: args.depth
   });
 }
@@ -382,7 +384,7 @@ async function renderWWWDataModule(data, {
 }
 
 // src/render/pages/createCollectionPageExports.tsx
-import { jsx as jsx7, Fragment as Fragment2 } from "react/jsx-runtime";
+import { jsx as jsx7 } from "react/jsx-runtime";
 function createCollectionPageExports({
   slug: collectionSlug = "pages",
   _payloadConfig,
@@ -403,13 +405,7 @@ function createCollectionPageExports({
       collectionSlug
     });
   }
-  const default_ = (props) => /* @__PURE__ */ jsx7(React.Suspense, {
-    fallback: fallback ?? null,
-    children: /* @__PURE__ */ jsx7(CollectionDocument, {
-      ...props
-    })
-  });
-  const CollectionDocument = async (props) => {
+  const default_ = async (props) => {
     const params = await props.params;
     const locale = params.locale;
     if (!routing.locales.includes(locale)) {
@@ -424,7 +420,8 @@ function createCollectionPageExports({
       notFound();
     }
     const rendered = renderWWWDataModule(doc, { collectionSlug, config: _payloadConfig, importMap }, { ...props, locale });
-    return /* @__PURE__ */ jsx7(Fragment2, {
+    return /* @__PURE__ */ jsx7(React.Suspense, {
+      fallback: fallback ?? null,
       children: rendered
     });
   };

package/dist/sitemap.js

@@ -53,6 +53,7 @@ async function queryDocBySlug(args) {
     where: { [slugField]: { equals: args.slug } },
     locale: args.locale,
     draft: args.draft ?? false,
+    overrideAccess: args.draft ?? false,
     depth: args.depth
   });
   return result ?? null;
@@ -78,10 +79,10 @@ async function queryAllDocs(args) {
   cacheLife("weeks");
   const { findIds, findDocByID } = await requireCacheHelpers();
   const collection = args.collectionSlug;
-  const { ids } = await findIds(collection, { locale: args.locale });
+  const { ids } = await findIds(collection, { locale: args.locale, pagination: false, overrideAccess: false });
   if (ids.length === 0)
     return [];
-  const docs = await Promise.all(ids.map((id) => findDocByID(collection, id, { locale: args.locale })));
+  const docs = await Promise.all(ids.map((id) => findDocByID(collection, id, { locale: args.locale, overrideAccess: false })));
   return docs.filter((d) => d !== null);
 }
 async function queryDoc(args) {
@@ -94,7 +95,7 @@ async function queryAllLocaleSlugs(args) {
   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 doc = await findDocByID(args.collectionSlug, args.id, { locale: "all", select: { [slugField]: true }, overrideAccess: false });
   const localeMap = doc?.[slugField];
   if (localeMap && typeof localeMap === "object")
     return localeMap;
@@ -107,6 +108,7 @@ async function queryDocByID(args) {
   return await findDocByID(args.collectionSlug, args.id, {
     locale: args.locale,
     draft: args.draft ?? false,
+    overrideAccess: args.draft ?? false,
     depth: args.depth
   });
 }
@@ -198,7 +200,7 @@ async function renderWWWDataModule(data, {
 }
 
 // src/render/pages/createCollectionPageExports.tsx
-import { jsx as jsx2, Fragment } from "react/jsx-runtime";
+import { jsx as jsx2 } from "react/jsx-runtime";
 function createCollectionPageExports({
   slug: collectionSlug = "pages",
   _payloadConfig,
@@ -219,13 +221,7 @@ function createCollectionPageExports({
       collectionSlug
     });
   }
-  const default_ = (props) => /* @__PURE__ */ jsx2(React.Suspense, {
-    fallback: fallback ?? null,
-    children: /* @__PURE__ */ jsx2(CollectionDocument, {
-      ...props
-    })
-  });
-  const CollectionDocument = async (props) => {
+  const default_ = async (props) => {
     const params = await props.params;
     const locale = params.locale;
     if (!routing.locales.includes(locale)) {
@@ -240,7 +236,8 @@ function createCollectionPageExports({
       notFound();
     }
     const rendered = renderWWWDataModule(doc, { collectionSlug, config: _payloadConfig, importMap }, { ...props, locale });
-    return /* @__PURE__ */ jsx2(Fragment, {
+    return /* @__PURE__ */ jsx2(React.Suspense, {
+      fallback: fallback ?? null,
       children: rendered
     });
   };

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": "2.2.5",
+  "version": "2.2.6",
   "type": "module",
   "private": false,
   "files": [