+ {toolbar && (
+
+ )}
+
-
+
- {headerIds.map(hid => (
-
-
+ {headerIds.map((hid, i) => (
+
+
))}
- {rowIds.map(rid => (
-
- {headerIds.map((_, j) => {
- const cellId = `s-cell-${rid}-${j}`;
-
- return (
- |
-
- |
- );
- })}
+ {rowIds.map((rid, i) => (
+ // `h-9` is a floor, not a cap: it holds the row at the height a
+ // row of text-sm cells settles on once the data arrives.
+
+ {headerIds.map((hid, j) => (
+
+
+
+ ))}
))}
-
-
+ {/* The shape `PaginationDataTable` takes: page size, then prev / next. */}
+
);
diff --git a/packages/vitnode/src/content/server/diagnostics.ts b/packages/vitnode/src/content/server/diagnostics.ts
index 37745fbb9..91a3fbcc2 100644
--- a/packages/vitnode/src/content/server/diagnostics.ts
+++ b/packages/vitnode/src/content/server/diagnostics.ts
@@ -5,12 +5,11 @@ import { and, count, eq, inArray, sql } from "drizzle-orm";
import type { RegisteredContentModel } from "./model";
-import { contentDefinitionOf } from "./model";
-
import { core_content_schedules } from "../../database/content";
import { core_search_index } from "../../database/search";
import { normalizeContentLocale } from "../locale";
import { listContentLanguages } from "./language-resolver";
+import { contentDefinitionOf } from "./model";
import {
contentTranslationPublicationColumns,
publicationColumns,
diff --git a/packages/vitnode/src/content/server/module.ts b/packages/vitnode/src/content/server/module.ts
index 6d32f6f80..4e6807fbd 100644
--- a/packages/vitnode/src/content/server/module.ts
+++ b/packages/vitnode/src/content/server/module.ts
@@ -1,5 +1,4 @@
import type { BuildModuleReturn } from "../../api/lib/module";
-import type { AnyContentTypeDefinition } from "../types";
import type { AnyContentModel } from "./model";
import { buildModule } from "../../api/lib/module";
diff --git a/packages/vitnode/src/content/server/public-module.ts b/packages/vitnode/src/content/server/public-module.ts
index a9b729f04..2fcc81c40 100644
--- a/packages/vitnode/src/content/server/public-module.ts
+++ b/packages/vitnode/src/content/server/public-module.ts
@@ -1,5 +1,4 @@
import type { BuildModuleReturn } from "../../api/lib/module";
-import type { AnyContentTypeDefinition } from "../types";
import type { AnyContentModel } from "./model";
import { buildModule } from "../../api/lib/module";
diff --git a/packages/vitnode/src/content/server/search-sync.ts b/packages/vitnode/src/content/server/search-sync.ts
index be86d1119..6affc7c23 100644
--- a/packages/vitnode/src/content/server/search-sync.ts
+++ b/packages/vitnode/src/content/server/search-sync.ts
@@ -6,8 +6,6 @@ import { eq } from "drizzle-orm";
import type { AnyContentTypeDefinition } from "../types";
import type { AnyContentModel } from "./model";
-import { contentDefinitionOf } from "./model";
-
import { partitionContentFields } from "../localization";
import { contentColumnsToValues, contentStorageColumns } from "../paths";
import {
@@ -16,6 +14,7 @@ import {
contentSearchIndexedPaths,
} from "../search";
import { listContentLanguages } from "./language-resolver";
+import { contentDefinitionOf } from "./model";
import {
contentSearchDocument,
contentTranslationSearchDocument,
diff --git a/packages/vitnode/src/lib/api/get-middleware-api.ts b/packages/vitnode/src/lib/api/get-middleware-api.ts
index e448cf355..8460394bd 100644
--- a/packages/vitnode/src/lib/api/get-middleware-api.ts
+++ b/packages/vitnode/src/lib/api/get-middleware-api.ts
@@ -1,15 +1,53 @@
+import { cacheLife } from "next/cache";
+import { connection } from "next/server";
+
import { middlewareModule } from "@/api/modules/middleware/middleware.module";
-import { fetcher } from "@/lib/fetcher";
+import { coreFetcher } from "@/lib/fetcher/core";
-export const getMiddlewareApi = async () => {
- const res = await fetcher(middlewareModule, {
+/**
+ * Deployment configuration for the auth screens: which SSO adapters are
+ * registered, whether an email adapter exists, and the public captcha key.
+ *
+ * Every field is derived from `vitnode.api.config.ts`, so the response is the
+ * same for every visitor and only changes on deploy - hence `cacheLife("max")`.
+ *
+ * Goes through `coreFetcher` rather than `fetcher` deliberately: `fetcher`
+ * forwards the request's cookies and headers, and `use cache` cannot enclose a
+ * runtime read. Nothing on this route is per-user, so there is nothing to
+ * forward.
+ */
+const fetchMiddlewareApi = async () => {
+ "use cache";
+ cacheLife("max");
+
+ const res = await coreFetcher(middlewareModule, {
path: "/",
method: "get",
module: "middleware",
- options: {
- cache: "force-cache",
- },
});
return await res.json();
};
+
+/**
+ * `connection()` first, so the entry above is filled by the first real request
+ * instead of during `next build`.
+ *
+ * Cache Components fills a `use cache` entry while prerendering, and filling
+ * this one means an HTTP request to `NEXT_PUBLIC_API_URL` from the build itself.
+ * In the single-app deployment that origin *is* the app being built, so nothing
+ * is listening and the prerender dies with `ECONNREFUSED`; in the split
+ * deployment it is a separate service a build machine - CI, a Docker image, a
+ * first deploy - has no reason to reach. Neither is a misconfiguration that
+ * could be fixed, so the read waits for a request that can actually answer it.
+ *
+ * The cache still does its job either way: one API call per deploy, not one per
+ * visitor. What it gives up is a place in the static shell, so every caller has
+ * to sit inside a `
` boundary - or its route has to be a documented
+ * `instant = false`.
+ */
+export const getMiddlewareApi = async () => {
+ await connection();
+
+ return await fetchMiddlewareApi();
+};
diff --git a/packages/vitnode/src/lib/i18n/proxy.ts b/packages/vitnode/src/lib/i18n/proxy.ts
new file mode 100644
index 000000000..30e85c443
--- /dev/null
+++ b/packages/vitnode/src/lib/i18n/proxy.ts
@@ -0,0 +1,19 @@
+import createMiddleware from "next-intl/middleware";
+
+import type { VitNodeI18nConfig } from "./types";
+
+/**
+ * The next-intl Proxy (middleware), built from the app's i18n config alone.
+ *
+ * Deliberately takes the i18n block rather than the whole `VitNodeConfig`: the
+ * Proxy runs outside the App Directory, where `next/root-params` - reached
+ * through the request config - cannot be imported. Keeping `vitnode.config.ts`
+ * out of the Proxy's module graph is what lets the request config read root
+ * params at all.
+ */
+export const createVitNodeProxy = (i18n: VitNodeI18nConfig) =>
+ createMiddleware({
+ locales: i18n.locales.map(locale => locale.code),
+ defaultLocale: i18n.defaultLocale,
+ localePrefix: i18n.localePrefix ?? "as-needed",
+ });
diff --git a/packages/vitnode/src/lib/i18n/request-config.ts b/packages/vitnode/src/lib/i18n/request-config.ts
new file mode 100644
index 000000000..ca0f6d056
--- /dev/null
+++ b/packages/vitnode/src/lib/i18n/request-config.ts
@@ -0,0 +1,109 @@
+import type { VitNodeConfig } from "@/vitnode.config";
+
+import { CONFIG_PLUGIN } from "@/config";
+import { loadMessages } from "@/lib/i18n/load-messages";
+import { buildMessagesSources } from "@/lib/i18n/sources";
+
+/**
+ * The next-intl request config, kept in its own module rather than alongside
+ * `buildConfig` in `vitnode.config.ts`.
+ *
+ * `next/root-params` is only importable from the App Directory graph, and
+ * `vitnode.config.ts` is reached from the Proxy (middleware) and from
+ * `vitnode.api.config.ts` inside the catch-all Route Handler. Importing root
+ * params there fails the build outright, so the read lives here, behind the one
+ * entry point only a Server Component reaches.
+ */
+
+/**
+ * The root `[locale]` segment, read through `next/root-params`.
+ *
+ * Root params are known at prerender time, which is what makes a localized
+ * route statically renderable - unlike next-intl's header-derived
+ * `requestLocale`, reading them does not pull the render into request time.
+ *
+ * Returns `undefined` rather than throwing when root params are unavailable, so
+ * callers fall through to the next source. That covers Server Actions, where
+ * `next/root-params` is not supported.
+ */
+const readRootParamsLocale = async (): Promise => {
+ try {
+ const { locale } = await import("next/root-params");
+
+ return await locale();
+ } catch {
+ return undefined;
+ }
+};
+
+export const handleRequestConfig = async ({
+ params,
+ vitNodeConfig,
+}: {
+ /**
+ * next-intl's `getRequestConfig` argument, passed through whole rather than
+ * destructured by the caller.
+ *
+ * `requestLocale` is a getter that calls `headers()` the moment it is read, so
+ * destructuring it - even without awaiting - would touch request data on
+ * routes that are otherwise fully static. Taking the object lets the read stay
+ * behind the root-params check below.
+ */
+ params: {
+ /**
+ * A locale named by the caller, e.g. `getTranslations({ locale })`. Wins
+ * over everything else - it is the one unambiguously deliberate source.
+ */
+ locale?: string;
+ /**
+ * next-intl's header-derived locale. Deprecated upstream in favour of root
+ * params, and kept only as the last resort: it is still the sole source in
+ * Server Actions, where `next/root-params` is unavailable and no explicit
+ * locale is passed.
+ */
+ requestLocale?: Promise;
+ };
+ vitNodeConfig: VitNodeConfig;
+}) => {
+ const localeCodes = vitNodeConfig.i18n.locales.map(locale => locale.code);
+ const isSupported = (value: string | undefined): value is string =>
+ value !== undefined && localeCodes.includes(value);
+
+ // Ordered and short-circuiting: each source is consulted only when the ones
+ // before it miss, so a statically rendered route never reaches
+ // `requestLocale` and stays out of the request-time path.
+ const resolveLocale = async (): Promise => {
+ if (isSupported(params.locale)) return params.locale;
+
+ const fromRootParams = await readRootParamsLocale();
+ if (isSupported(fromRootParams)) return fromRootParams;
+
+ // Root params cover every App Router render, so reaching here means the
+ // Server Action path, which `next/root-params` does not support.
+ const fromRequest = await params.requestLocale;
+ if (isSupported(fromRequest)) return fromRequest;
+
+ return vitNodeConfig.i18n.defaultLocale;
+ };
+
+ const locale = await resolveLocale();
+
+ const sources = buildMessagesSources({
+ appMessages: vitNodeConfig.i18n.messages,
+ plugins: vitNodeConfig.plugins,
+ });
+
+ return {
+ locale,
+ messages: await loadMessages({
+ defaultLocale: vitNodeConfig.i18n.defaultLocale,
+ locale,
+ sources,
+ }),
+ pluginIds: [
+ CONFIG_PLUGIN.pluginId,
+ ...vitNodeConfig.plugins.map(plugin => plugin.pluginId),
+ ],
+ timeZone: vitNodeConfig.i18n.timeZone,
+ };
+};
diff --git a/packages/vitnode/src/routes/admin/content/[...slug]/page.tsx b/packages/vitnode/src/routes/admin/content/[...slug]/page.tsx
index ad75e5bab..c77ceb7e8 100644
--- a/packages/vitnode/src/routes/admin/content/[...slug]/page.tsx
+++ b/packages/vitnode/src/routes/admin/content/[...slug]/page.tsx
@@ -1,8 +1,11 @@
import type { Metadata } from "next/dist/types";
+import React from "react";
+
import {
ContentAdminView,
type ContentAdminViewProps,
+ ContentAdminViewSkeleton,
getContentLabels,
resolveContentType,
} from "@/views/admin/views/content/content-admin-view";
@@ -19,5 +22,9 @@ export const generateMetadata = async ({
};
export default function ContentAdminPage(props: ContentAdminViewProps) {
- return ;
+ return (
+ }>
+
+
+ );
}
diff --git a/packages/vitnode/src/routes/admin/core/advanced/queue/page.tsx b/packages/vitnode/src/routes/admin/core/advanced/queue/page.tsx
index 1451b8db6..a81ab2a0f 100644
--- a/packages/vitnode/src/routes/admin/core/advanced/queue/page.tsx
+++ b/packages/vitnode/src/routes/admin/core/advanced/queue/page.tsx
@@ -42,7 +42,7 @@ export default async function Page(
- }>
+ }>
diff --git a/packages/vitnode/src/routes/admin/core/system/files/page.tsx b/packages/vitnode/src/routes/admin/core/system/files/page.tsx
index 003bba1f8..459f3da9b 100644
--- a/packages/vitnode/src/routes/admin/core/system/files/page.tsx
+++ b/packages/vitnode/src/routes/admin/core/system/files/page.tsx
@@ -42,7 +42,7 @@ export default async function Page(
- }>
+ }>
diff --git a/packages/vitnode/src/routes/admin/core/users/page.tsx b/packages/vitnode/src/routes/admin/core/users/page.tsx
index 37d5801ee..6869eccf2 100644
--- a/packages/vitnode/src/routes/admin/core/users/page.tsx
+++ b/packages/vitnode/src/routes/admin/core/users/page.tsx
@@ -46,7 +46,7 @@ export default async function Page(
{canCreate && }
- }>
+ }>