@byline/cli 3.20.4 → 3.21.0

package/dist/templates/byline-examples/collections/docs/hooks.ts

@@ -17,11 +17,11 @@
  * config from it. Anything the schema *statically imports* therefore ships to
  * the client. Hook *bodies*, however, only ever run server-side.
  *
- * Search indexing is the canonical reason this matters: it imports
- * `getSystemBylineClient` from `@byline/host-tanstack-start`, a server-only
- * module. Importing that from the schema would drag server code into the
- * browser bundle (fatal in dev). The schema avoids it by referencing these
- * hooks through a **dynamic import** instead of an inline object:
+ * Search indexing is the canonical reason this matters: it imports the
+ * server-only app client boundary from `byline/client.server.ts`. Importing
+ * that from the schema would drag server code into the browser bundle (fatal
+ * in dev). The schema avoids it by referencing these hooks through a
+ * **dynamic import** instead of an inline object:
  *
  *     // schema.ts
  *     hooks: () => import('./hooks.js')
@@ -52,7 +52,7 @@
  */
 
 import { defineHooks } from '@byline/core'
-import { getSystemBylineClient } from '@byline/host-tanstack-start/integrations/byline-client'
+import { getSystemBylineClient } from '../../client.server.js'
 
 export default defineHooks({
   beforeCreate: async ({ data, collectionPath }) => {
@@ -62,7 +62,7 @@ export default defineHooks({
     console.log(
       `afterCreate: document ${documentId} (version ${documentVersionId}) created in '${collectionPath}'`
     )
-    await getSystemBylineClient().collection(collectionPath).indexDocument(documentId)
+    await getSystemBylineClient().collection('docs').indexDocument(documentId)
   },
   beforeUpdate: async ({ data, collectionPath }) => {
     console.log(`beforeUpdate: updating a document in '${collectionPath}'`, data)
@@ -71,7 +71,7 @@ export default defineHooks({
     console.log(
       `afterUpdate: document ${documentId} (version ${documentVersionId}) in '${collectionPath}' updated`
     )
-    await getSystemBylineClient().collection(collectionPath).indexDocument(documentId)
+    await getSystemBylineClient().collection('docs').indexDocument(documentId)
   },
   beforeStatusChange: async ({ documentId, collectionPath, previousStatus, nextStatus }) => {
     console.log(
@@ -85,21 +85,21 @@ export default defineHooks({
     console.log(
       `afterStatusChange: ${documentId} in '${collectionPath}' ${previousStatus} → ${nextStatus}`
     )
-    await getSystemBylineClient().collection(collectionPath).indexDocument(documentId)
+    await getSystemBylineClient().collection('docs').indexDocument(documentId)
   },
   beforeUnpublish: async ({ documentId, collectionPath }) => {
     console.log(`beforeUnpublish: unpublishing ${documentId} in '${collectionPath}'`)
   },
   afterUnpublish: async ({ documentId, collectionPath }) => {
     console.log(`afterUnpublish: ${documentId} in '${collectionPath}' unpublished`)
-    await getSystemBylineClient().collection(collectionPath).indexDocument(documentId)
+    await getSystemBylineClient().collection('docs').indexDocument(documentId)
   },
   beforeDelete: async ({ documentId, collectionPath }) => {
     console.log(`beforeDelete: deleting ${documentId} in '${collectionPath}'`)
   },
   afterDelete: async ({ documentId, collectionPath }) => {
     console.log(`afterDelete: ${documentId} in '${collectionPath}' deleted`)
-    await getSystemBylineClient().collection(collectionPath).removeFromIndex(documentId)
+    await getSystemBylineClient().collection('docs').removeFromIndex(documentId)
   },
   // Fires on any structural tree change (place / reorder / re-parent /
   // promote-on-delete) for a `tree: true` collection. The payload carries the

package/dist/templates/byline-examples/collections/docs/schema.ts

@@ -41,13 +41,22 @@ export const Docs = defineCollection({
   // placement from the source directory layout (see
   // byline/scripts/import-docs.ts --tree).
   tree: true,
-  // Collection search config (docs/05-reading-and-delivery/07-search.md).
-  // Each key names the part a field plays in the index: `body` fields feed
-  // the full-text search vector (`title` is display-only unless listed here,
-  // so we include it and boost it into the heaviest weight class); `facets`,
-  // `filters`, and `zones` round out the surface. Opting in here is what
-  // makes the lifecycle hooks in ./hooks.ts index this collection — and it
-  // requires a `search` provider registered in byline/server.config.ts.
+  // Admin list-view quick-search. The collection list route's search box
+  // matches these top-level text-store fields with substring queries (ILIKE, in
+  // the Postgres adapter) against `store_text` — a lightweight "find the row I
+  // mean" affordance that needs no indexing and no lifecycle hooks. Falls back
+  // to `useAsTitle` when omitted; declared explicitly here for guidance.
+  listSearch: ['title'],
+  // Search-*provider* config (docs/05-reading-and-delivery/07-search.md) —
+  // distinct from `listSearch` above. Each key names the part a field plays in
+  // the index: `body` fields feed the full-text search vector (`title` is
+  // display-only unless listed here, so we include it and boost it into the
+  // heaviest weight class); `facets`, `filters`, and `zones` round out the
+  // surface. This drives the pluggable SearchProvider (full-text search in
+  // @byline/search-postgres) and requires a `search` provider registered in
+  // byline/server.config.ts. Unlike `listSearch`, `search` is inert on its own
+  // — opting in here is what makes the index / reindex / deindex lifecycle
+  // hooks in ./hooks.ts keep this collection's provider index in sync.
   // `content` is a container (blocks) field: naming it walks every text-bearing
   // child (richtext body, image alt + caption) into the searchable body —
   // omit it and document bodies are silently absent from the index.
@@ -60,11 +69,11 @@ export const Docs = defineCollection({
   // a collection *schema* is isomorphic — Byline bundles it into the browser
   // admin too (the admin reads field config from it), so anything the schema
   // *statically imports* ships to the client. Search indexing needs a
-  // server-only import (`getSystemBylineClient` from
-  // `@byline/host-tanstack-start`), which would crash the browser bundle if
-  // imported here. The **loader form** — a thunk that dynamically imports a
-  // sibling module — keeps `./hooks.ts` and its entire import graph out of
-  // the client bundle while running exactly like inline hooks on the server.
+  // server-only import from the app's `client.server.ts` boundary, which would
+  // crash the browser bundle if imported here. The **loader form** — a thunk
+  // that dynamically imports a sibling module — keeps `./hooks.ts` and its
+  // entire import graph out of the client bundle while running exactly like
+  // inline hooks on the server.
   // See ./hooks.ts for the worked example and the full explanation.
   hooks: () => import('./hooks.js'),
   fields: [

package/dist/templates/byline-examples/collections/index.ts

@@ -0,0 +1,22 @@
+/**
+ * This Source Code is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) Infonomic Company Limited
+ */
+
+import type { InferCollectionRegistry } from '@byline/core'
+
+import type { CollectionFieldsByPath } from '../generated/collection-types.js'
+
+import { Docs } from './docs/schema.js'
+import { Media } from './media/schema.js'
+import { News } from './news/schema.js'
+import { NewsCategories } from './news-categories/schema.js'
+import { Pages } from './pages/schema.js'
+
+export const collections = [Docs, News, Pages, Media, NewsCategories] as const
+
+export type InferredBylineCollections = InferCollectionRegistry<typeof collections>
+export type BylineCollections = CollectionFieldsByPath

package/dist/templates/byline-examples/collections/media/schema.ts

@@ -50,6 +50,19 @@ export const Media = defineCollection({
     archived: { label: 'Archived', verb: 'Archive' },
   }),
   showStats: true,
+  // Admin list-view quick-search. The collection list route's search box
+  // matches these top-level text-store fields with substring queries (ILIKE, in
+  // the Postgres adapter) against `store_text` — a lightweight "find the row I
+  // mean" affordance that needs no indexing and no lifecycle hooks. Falls back
+  // to `useAsTitle` when omitted; declared explicitly here for guidance.
+  listSearch: ['title'],
+  // Search-*provider* config (docs/05-reading-and-delivery/07-search.md) —
+  // distinct from `listSearch` above. This drives the pluggable SearchProvider
+  // (full-text search in @byline/search-postgres) and offers richer options:
+  // per-field weighting/`boost`, `facets`, `filters`, and `zones`. Unlike
+  // `listSearch`, `search` is inert on its own — it MUST be paired with index /
+  // reindex / deindex document-lifecycle hooks that keep the provider index in
+  // sync on create / update / publish / delete (see this collection's hooks).
   search: { body: ['title', 'caption'] },
   fields: [
     {

package/dist/templates/byline-examples/collections/news/schema.ts

@@ -30,6 +30,19 @@ export const News = defineCollection({
     archived: { label: 'Archived', verb: 'Archive' },
   }),
   showStats: true,
+  // Admin list-view quick-search. The collection list route's search box
+  // matches these top-level text-store fields with substring queries (ILIKE, in
+  // the Postgres adapter) against `store_text` — a lightweight "find the row I
+  // mean" affordance that needs no indexing and no lifecycle hooks. Falls back
+  // to `useAsTitle` when omitted; declared explicitly here for guidance.
+  listSearch: ['title'],
+  // Search-*provider* config (docs/05-reading-and-delivery/07-search.md) —
+  // distinct from `listSearch` above. This drives the pluggable SearchProvider
+  // (full-text search in @byline/search-postgres) and offers richer options:
+  // per-field weighting/`boost`, `facets`, `filters`, and `zones`. Unlike
+  // `listSearch`, `search` is inert on its own — it MUST be paired with index /
+  // reindex / deindex document-lifecycle hooks that keep the provider index in
+  // sync on create / update / publish / delete (see this collection's hooks).
   search: { body: ['title'] },
   useAsTitle: 'title',
   useAsPath: 'title',

package/dist/templates/byline-examples/collections/news-categories/schema.ts

@@ -21,6 +21,19 @@ export const NewsCategories = defineCollection({
   // `published` and the form shows only Save / Close.
   workflow: SINGLE_STATUS_WORKFLOW,
   showStats: true,
+  // Admin list-view quick-search. The collection list route's search box
+  // matches these top-level text-store fields with substring queries (ILIKE, in
+  // the Postgres adapter) against `store_text` — a lightweight "find the row I
+  // mean" affordance that needs no indexing and no lifecycle hooks. Falls back
+  // to `useAsTitle` when omitted; declared explicitly here for guidance.
+  listSearch: ['name'],
+  // Search-*provider* config (docs/05-reading-and-delivery/07-search.md) —
+  // distinct from `listSearch` above. This drives the pluggable SearchProvider
+  // (full-text search in @byline/search-postgres) and offers richer options:
+  // per-field weighting/`boost`, `facets`, `filters`, and `zones`. Unlike
+  // `listSearch`, `search` is inert on its own — it MUST be paired with index /
+  // reindex / deindex document-lifecycle hooks that keep the provider index in
+  // sync on create / update / publish / delete (see this collection's hooks).
   search: { body: ['name'] },
   useAsTitle: 'name',
   useAsPath: 'name',

package/dist/templates/byline-examples/collections/pages/schema.ts

@@ -32,6 +32,19 @@ export const Pages = defineCollection({
     archived: { label: 'Archived', verb: 'Archive' },
   }),
   showStats: true,
+  // Admin list-view quick-search. The collection list route's search box
+  // matches these top-level text-store fields with substring queries (ILIKE, in
+  // the Postgres adapter) against `store_text` — a lightweight "find the row I
+  // mean" affordance that needs no indexing and no lifecycle hooks. Falls back
+  // to `useAsTitle` when omitted; declared explicitly here for guidance.
+  listSearch: ['title'],
+  // Search-*provider* config (docs/05-reading-and-delivery/07-search.md) —
+  // distinct from `listSearch` above. This drives the pluggable SearchProvider
+  // (full-text search in @byline/search-postgres) and offers richer options:
+  // per-field weighting/`boost`, `facets`, `filters`, and `zones`. Unlike
+  // `listSearch`, `search` is inert on its own — it MUST be paired with index /
+  // reindex / deindex document-lifecycle hooks that keep the provider index in
+  // sync on create / update / publish / delete (see this collection's hooks).
   search: { body: ['title'] },
   useAsTitle: 'title',
   useAsPath: 'title',

package/dist/templates/byline-examples/generated/collection-types.ts

@@ -0,0 +1,139 @@
+// Generated by @byline/core/codegen
+// Format version: 1
+// Hash: a32bba417302b4e2c90703e47a1f326d4db64cabd11194f8eed816e78442178e
+
+import type {
+  JsonValue,
+  RelatedDocumentValue,
+  StoredFileValue,
+} from '@byline/core'
+
+export type PhotoBlockData = {
+  _id: string
+  _type: 'photoBlock'
+  display?: 'default' | 'wide' | 'full_width' | undefined
+  photo?: RelatedDocumentValue | undefined
+  alt: string
+  caption?: JsonValue | undefined
+}
+
+export type PhotoBlockDataAllLocales = {
+  _id: string
+  _type: 'photoBlock'
+  display?: 'default' | 'wide' | 'full_width' | undefined
+  photo?: RelatedDocumentValue | undefined
+  alt: string
+  caption?: { [locale: string]: JsonValue } | undefined
+}
+
+export type RichTextBlockData = {
+  _id: string
+  _type: 'richTextBlock'
+  richText: JsonValue
+  constrainedWidth?: boolean | undefined
+}
+
+export type RichTextBlockDataAllLocales = {
+  _id: string
+  _type: 'richTextBlock'
+  richText: { [locale: string]: JsonValue }
+  constrainedWidth?: boolean | undefined
+}
+
+export type DocsFields = {
+  title: string
+  summary: string
+  featureImage?: RelatedDocumentValue | undefined
+  publishedOn: Date
+  content?: Array<RichTextBlockData | PhotoBlockData> | undefined
+}
+
+export type DocsFieldsAllLocales = {
+  title: { [locale: string]: string }
+  summary: { [locale: string]: string }
+  featureImage?: RelatedDocumentValue | undefined
+  publishedOn: Date
+  content?: Array<RichTextBlockDataAllLocales | PhotoBlockDataAllLocales> | undefined
+}
+
+export type MediaFields = {
+  image: StoredFileValue
+  title: string
+  altText: string
+  caption?: string | undefined
+  credit?: string | undefined
+}
+
+export type MediaFieldsAllLocales = {
+  image: StoredFileValue
+  title: string
+  altText: string
+  caption?: string | undefined
+  credit?: string | undefined
+}
+
+export type NewsCategoriesFields = {
+  name: string
+  description: string
+}
+
+export type NewsCategoriesFieldsAllLocales = {
+  name: { [locale: string]: string }
+  description: { [locale: string]: string }
+}
+
+export type NewsFields = {
+  title: string
+  summary: string
+  category: RelatedDocumentValue
+  featureImage?: RelatedDocumentValue | undefined
+  featured?: boolean | undefined
+  content: JsonValue
+  publishedOn: Date
+}
+
+export type NewsFieldsAllLocales = {
+  title: { [locale: string]: string }
+  summary: { [locale: string]: string }
+  category: RelatedDocumentValue
+  featureImage?: RelatedDocumentValue | undefined
+  featured?: boolean | undefined
+  content: { [locale: string]: JsonValue }
+  publishedOn: Date
+}
+
+export type PagesFields = {
+  title: string
+  summary: string
+  featureImage?: RelatedDocumentValue | undefined
+  area: 'root' | 'about' | 'legal'
+  content?: Array<RichTextBlockData | PhotoBlockData> | undefined
+  publishedOn: Date
+}
+
+export type PagesFieldsAllLocales = {
+  title: { [locale: string]: string }
+  summary: { [locale: string]: string }
+  featureImage?: RelatedDocumentValue | undefined
+  area: 'root' | 'about' | 'legal'
+  content?: Array<RichTextBlockDataAllLocales | PhotoBlockDataAllLocales> | undefined
+  publishedOn: Date
+}
+
+export type CollectionFieldsByPath = {
+  docs: DocsFields
+  media: MediaFields
+  news: NewsFields
+  'news-categories': NewsCategoriesFields
+  pages: PagesFields
+}
+
+export type CollectionFieldsAllLocalesByPath = {
+  docs: DocsFieldsAllLocales
+  media: MediaFieldsAllLocales
+  news: NewsFieldsAllLocales
+  'news-categories': NewsCategoriesFieldsAllLocales
+  pages: PagesFieldsAllLocales
+}
+
+export type CollectionPath = keyof CollectionFieldsByPath

package/dist/templates/byline-examples/i18n.ts

@@ -12,9 +12,9 @@
  * translation bundle.
  *
  * The locale arrays themselves live in `./locales.ts`, a dependency-free leaf
- * module, so the public frontend can import them without pulling in the admin
- * translation graph this file depends on. Re-exported here for back-compat
- * with existing `~/i18n` importers.
+ * module exposed to public frontend code by `./public.ts`, without pulling in
+ * the admin translation graph this file depends on. Re-exported here for
+ * back-compat with existing `~/i18n` importers.
  *
  * `interface` locales govern the CMS admin UI language.
  * `content` locales govern the languages a document can be published in.

package/dist/templates/byline-examples/locales.ts

@@ -12,12 +12,12 @@
  * registry). `byline/i18n.ts` consumes these to assemble the
  * `defineServerConfig` / `defineClientConfig` payload.
  *
- * Kept separate from `byline/i18n.ts` so a public frontend (or a collection
- * schema file loaded outside Vite — e.g. when running seeds via tsx) can
- * import the locale arrays without dragging in the admin translation graph
- * (`@byline/i18n/admin`) that `i18n.ts` depends on. Importing `byline/i18n.ts`
- * would; importing this won't — which keeps the lazy admin/public bundle split
- * (`src/routes/_byline/route.lazy.tsx`) intact.
+ * Kept separate from `byline/i18n.ts` so `byline/public.ts` can expose the
+ * locale arrays to a public frontend (or a collection schema file loaded
+ * outside Vite — e.g. when running seeds via tsx) without dragging in the
+ * admin translation graph (`@byline/i18n/admin`) that `i18n.ts` depends on.
+ * Importing `byline/i18n.ts` would; importing this won't — which keeps the lazy
+ * admin/public bundle split (`src/routes/_byline/route.lazy.tsx`) intact.
  *
  * `interface` locales govern the CMS admin UI language; `content` locales
  * govern the languages a document can be published in.
@@ -33,10 +33,10 @@ export interface LocaleDefinition {
 // (or a third-party plugin merged in via `mergeTranslations(...)`).
 // `adminTranslations({ locales })` in `byline/i18n.ts` throws at boot if a
 // requested code is not bundled — `@byline/i18n/admin` ships English and French.
-export const interfaceLocales: LocaleDefinition[] = [
+export const interfaceLocales = [
   { code: 'en', label: 'English' },
   { code: 'fr', label: 'Français' },
-]
+] as const satisfies readonly LocaleDefinition[]
 
 /** Locales a document can be published in. */
 export const contentLocales = [
@@ -44,4 +44,4 @@ export const contentLocales = [
   { code: 'fr', label: 'Français' },
   { code: 'es', label: 'Español' },
   { code: 'de', label: 'Deutsch' },
-] as const
+] as const satisfies readonly LocaleDefinition[]

package/dist/templates/byline-examples/public.ts

@@ -0,0 +1,12 @@
+/**
+ * This Source Code is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) Infonomic Company Limited
+ */
+
+/** Client-safe public configuration. Keep this barrel free of admin and server imports. */
+export { contentLocales, interfaceLocales } from './locales.js'
+export { routes } from './routes.js'
+export type { LocaleDefinition } from './locales.js'

package/dist/templates/byline-examples/scripts/generate-types.ts

@@ -0,0 +1,81 @@
+import { randomUUID } from 'node:crypto'
+import { existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from 'node:fs'
+import { dirname, resolve } from 'node:path'
+import { fileURLToPath, pathToFileURL } from 'node:url'
+
+import { emitCollectionTypes } from '@byline/core/codegen'
+
+import { collections } from '../collections/index.js'
+
+const defaultOutputPath = fileURLToPath(
+  new URL('../generated/collection-types.ts', import.meta.url)
+)
+
+export type GenerationStatus = 'current' | 'unchanged' | 'written'
+
+export function writeCollectionTypes(
+  outputPath: string,
+  source: string,
+  check: boolean
+): GenerationStatus {
+  const existing = existsSync(outputPath) ? readFileSync(outputPath, 'utf8') : undefined
+
+  if (check) {
+    if (existing === undefined) {
+      throw new Error(
+        `generated collection types are missing: ${outputPath}. Run pnpm byline:generate`
+      )
+    }
+    if (existing !== source) {
+      throw new Error(
+        `generated collection types are stale: ${outputPath}. Run pnpm byline:generate`
+      )
+    }
+    return 'current'
+  }
+
+  if (existing === source) return 'unchanged'
+
+  mkdirSync(dirname(outputPath), { recursive: true })
+  const temporaryPath = `${outputPath}.${process.pid}.${randomUUID()}.tmp`
+  try {
+    writeFileSync(temporaryPath, source, 'utf8')
+    renameSync(temporaryPath, outputPath)
+  } finally {
+    rmSync(temporaryPath, { force: true })
+  }
+  return 'written'
+}
+
+function parseArgs(args: readonly string[]): { check: boolean } {
+  const unknown = args.filter((arg) => arg !== '--check')
+  if (unknown.length > 0) throw new Error(`unknown argument: ${unknown.join(', ')}`)
+  if (args.filter((arg) => arg === '--check').length > 1) {
+    throw new Error('duplicate argument: --check')
+  }
+  return { check: args.includes('--check') }
+}
+
+export function generateCollectionTypes(
+  outputPath = defaultOutputPath,
+  check = false
+): { hash: string; status: GenerationStatus } {
+  const { source, hash } = emitCollectionTypes(collections)
+  return { hash, status: writeCollectionTypes(outputPath, source, check) }
+}
+
+function main(): void {
+  const { check } = parseArgs(process.argv.slice(2))
+  const { hash, status } = generateCollectionTypes(defaultOutputPath, check)
+  console.log(`collection types: ${collections.length} collections ${hash.slice(0, 12)} ${status}`)
+}
+
+const entryPath = process.argv[1]
+if (entryPath !== undefined && pathToFileURL(resolve(entryPath)).href === import.meta.url) {
+  try {
+    main()
+  } catch (error) {
+    console.error(`collection type generation failed: ${(error as Error).message}`)
+    process.exitCode = 1
+  }
+}

package/dist/templates/byline-examples/server.config.ts

@@ -19,7 +19,6 @@ import { JwtSessionProvider } from '@byline/admin/auth'
 import { type BylineCore, initBylineCore } from '@byline/core'
 import { pgAdapter } from '@byline/db-postgres'
 import { createAdminStore } from '@byline/db-postgres/admin'
-import { getAdminBylineClient } from '@byline/host-tanstack-start/integrations/byline-client'
 import {
   lexicalEditorEmbedServer,
   lexicalEditorPopulateServer,
@@ -29,22 +28,13 @@ import {
 import { migrate, postgresSearch } from '@byline/search-postgres'
 import { localStorageProvider } from '@byline/storage-local'
 
-// Import collection definitions directly from schema files — NOT the full
-// admin config or index barrels. The admin config / index files pull in
-// admin UI configs (React components, CSS modules) that are not loadable
-// outside Vite (e.g. when running seeds via tsx).
-import { Docs } from './collections/docs/schema.js'
-import { Media } from './collections/media/schema.js'
-import { News } from './collections/news/schema.js'
-import { NewsCategories } from './collections/news-categories/schema.js'
-import { Pages } from './collections/pages/schema.js'
+import { getAdminBylineClient } from './client.server.js'
+import { collections } from './collections/index.js'
 import { i18n } from './i18n.js'
 import { DEFAULT_SERVER_URL, routes } from './routes.js'
 
 const serverURL = process.env.VITE_SERVER_URL || DEFAULT_SERVER_URL
 
-const collections = [Docs, News, Pages, Media, NewsCategories]
-
 // HMR-safe singleton. Vite's program reload re-evaluates this module
 // without disposing the previous module's resources — every reload
 // would otherwise allocate a fresh pg `Pool` (max: 20) inside

package/dist/templates/routes/_byline/admin/collections/$collection/$id/api.tsx

@@ -8,9 +8,4 @@
 
 import { createCollectionApiRoute } from '@byline/host-tanstack-start/routes'
 
-import { contentLocales, i18n } from '~/i18n'
-
-export const Route = createCollectionApiRoute('/_byline/admin/collections/$collection/$id/api', {
-  contentLocales,
-  defaultContentLocale: i18n.content.defaultLocale,
-})
+export const Route = createCollectionApiRoute('/_byline/admin/collections/$collection/$id/api')

package/dist/templates/routes/_byline/admin/collections/$collection/$id/history.tsx

@@ -8,12 +8,6 @@
 
 import { createCollectionHistoryRoute } from '@byline/host-tanstack-start/routes'
 
-import { contentLocales, i18n } from '~/i18n'
-
 export const Route = createCollectionHistoryRoute(
-  '/_byline/admin/collections/$collection/$id/history',
-  {
-    contentLocales,
-    defaultContentLocale: i18n.content.defaultLocale,
-  }
+  '/_byline/admin/collections/$collection/$id/history'
 )

package/dist/templates/routes/_byline/admin/collections/$collection/$id/index.tsx

@@ -8,9 +8,4 @@
 
 import { createCollectionEditRoute } from '@byline/host-tanstack-start/routes'
 
-import { contentLocales, i18n } from '~/i18n'
-
-export const Route = createCollectionEditRoute('/_byline/admin/collections/$collection/$id/', {
-  contentLocales,
-  defaultContentLocale: i18n.content.defaultLocale,
-})
+export const Route = createCollectionEditRoute('/_byline/admin/collections/$collection/$id/')

package/dist/templates/ui-byline/blocks/photo-block/index.tsx

@@ -5,8 +5,7 @@ import type React from 'react'
 import { Container, FadeInLift } from '@byline/ui/react'
 import cx from 'classnames'
 
-import type { PhotoBlockData } from '~/blocks/photo-block'
-import type { MediaFields } from '~/collections/media/schema'
+import type { MediaFields, PhotoBlockData } from '~/generated/collection-types.js'
 
 import { ResponsiveImage } from '@/ui/byline/components/responsive-image'
 import { LexicalRichText } from '@/ui/byline/components/richtext-lexical'

package/dist/templates/ui-byline/blocks/richtext-block/index.tsx

@@ -3,7 +3,7 @@
 import { Container } from '@byline/ui/react'
 import cx from 'classnames'
 
-import type { RichTextBlockData } from '~/blocks/richtext-block'
+import type { RichTextBlockData } from '~/generated/collection-types.js'
 
 import { LexicalRichText } from '@/ui/byline/components/richtext-lexical'
 import type { Locale } from '@/ui/byline/types/i18n'

package/dist/templates/ui-byline/render-blocks.tsx

@@ -1,20 +1,16 @@
-import type { BlocksUnion } from '@byline/core'
 import { Section } from '@byline/ui/react'
 
-import { PhotoBlock as PhotoBlockDef } from '~/blocks/photo-block'
-import { RichTextBlock as RichTextBlockDef } from '~/blocks/richtext-block'
+import type { PhotoBlockData, RichTextBlockData } from '~/generated/collection-types.js'
 
 import { PhotoBlock } from '@/ui/byline/blocks/photo-block'
 import { RichTextBlock } from '@/ui/byline/blocks/richtext-block'
 import { toKebabCase } from '@/ui/utils/to-kebab-case'
 import type { Locale } from '@/i18n/i18n-config'
 
-const Blocks = [PhotoBlockDef, RichTextBlockDef] as const
-
-export type AnyBlock = BlocksUnion<typeof Blocks>
+export type AnyBlock = PhotoBlockData | RichTextBlockData
 
 // Mapped type ensures every AnyBlock['_type'] has a registered component.
-// TypeScript errors here if Blocks gains a new type without a matching entry.
+// TypeScript errors here if AnyBlock gains a new type without a matching entry.
 type BlockRegistry = {
   [K in AnyBlock['_type']]: React.ComponentType<{
     id: string

package/package.json

@@ -2,7 +2,7 @@
   "name": "@byline/cli",
   "private": false,
   "license": "MPL-2.0",
-  "version": "3.20.4",
+  "version": "3.21.0",
   "engines": {
     "node": ">=20.9.0"
   },