From 17245d3bcdbec3c6f4794978a1365fc543929e99 Mon Sep 17 00:00:00 2001 From: Dylan Slack Date: Wed, 12 Mar 2025 20:07:29 -0700 Subject: [PATCH 1/5] feat(examples): add blog example --- examples/blog/README.md | 36 +++++ examples/blog/next.config.ts | 7 + examples/blog/package.json | 28 ++++ examples/blog/postcss.config.mjs | 5 + examples/blog/src/app/blog/[slug]/page.tsx | 17 ++ examples/blog/src/app/blog/page.tsx | 17 ++ examples/blog/src/app/favicon.ico | Bin 0 -> 25931 bytes examples/blog/src/app/globals.css | 26 +++ examples/blog/src/app/layout.tsx | 42 +++++ examples/blog/src/app/page.tsx | 25 +++ examples/blog/src/cms.tsx | 174 +++++++++++++++++++++ examples/blog/src/components/navbar.tsx | 17 ++ examples/blog/src/middleware.ts | 36 +++++ examples/blog/src/utils.ts | 7 + examples/blog/tsconfig.json | 27 ++++ package.json | 1 + packages/ui/src/deepdish.tsx | 6 +- packages/ui/src/types.ts | 2 +- pnpm-lock.yaml | 67 +++++++- pnpm-workspace.yaml | 3 +- 20 files changed, 539 insertions(+), 4 deletions(-) create mode 100644 examples/blog/README.md create mode 100644 examples/blog/next.config.ts create mode 100644 examples/blog/package.json create mode 100644 examples/blog/postcss.config.mjs create mode 100644 examples/blog/src/app/blog/[slug]/page.tsx create mode 100644 examples/blog/src/app/blog/page.tsx create mode 100644 examples/blog/src/app/favicon.ico create mode 100644 examples/blog/src/app/globals.css create mode 100644 examples/blog/src/app/layout.tsx create mode 100644 examples/blog/src/app/page.tsx create mode 100644 examples/blog/src/cms.tsx create mode 100644 examples/blog/src/components/navbar.tsx create mode 100644 examples/blog/src/middleware.ts create mode 100644 examples/blog/src/utils.ts create mode 100644 examples/blog/tsconfig.json diff --git a/examples/blog/README.md b/examples/blog/README.md new file mode 100644 index 00000000..e215bc4c --- /dev/null +++ b/examples/blog/README.md @@ -0,0 +1,36 @@ +This is a [Next.js](https://nextjs.org) project bootstrapped with [`create-next-app`](https://nextjs.org/docs/app/api-reference/cli/create-next-app). + +## Getting Started + +First, run the development server: + +```bash +npm run dev +# or +yarn dev +# or +pnpm dev +# or +bun dev +``` + +Open [http://localhost:3000](http://localhost:3000) with your browser to see the result. + +You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file. + +This project uses [`next/font`](https://nextjs.org/docs/app/building-your-application/optimizing/fonts) to automatically optimize and load [Geist](https://vercel.com/font), a new font family for Vercel. + +## Learn More + +To learn more about Next.js, take a look at the following resources: + +- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API. +- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial. + +You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js) - your feedback and contributions are welcome! + +## Deploy on Vercel + +The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js. + +Check out our [Next.js deployment documentation](https://nextjs.org/docs/app/building-your-application/deploying) for more details. diff --git a/examples/blog/next.config.ts b/examples/blog/next.config.ts new file mode 100644 index 00000000..73290639 --- /dev/null +++ b/examples/blog/next.config.ts @@ -0,0 +1,7 @@ +import type { NextConfig } from 'next' + +const nextConfig: NextConfig = { + /* config options here */ +} + +export default nextConfig diff --git a/examples/blog/package.json b/examples/blog/package.json new file mode 100644 index 00000000..a302ff33 --- /dev/null +++ b/examples/blog/package.json @@ -0,0 +1,28 @@ +{ + "name": "@deepdish/blog", + "version": "0.0.1", + "private": true, + "scripts": { + "dev": "next dev --turbopack", + "build": "next build", + "start": "next start" + }, + "dependencies": { + "@deepdish/cms": "workspace:0.8.0", + "@deepdish/nextjs": "workspace:0.8.0", + "@deepdish/resolvers": "workspace:0.13.0", + "@deepdish/ui": "workspace:0.15.0", + "next": "15.1.4", + "react": "catalog:react", + "react-dom": "catalog:react", + "valibot": "1.0.0-rc.0" + }, + "devDependencies": { + "@tailwindcss/postcss": "catalog:tailwind", + "@types/node": "catalog:repo", + "@types/react": "catalog:react", + "@types/react-dom": "catalog:react", + "tailwindcss": "catalog:tailwind", + "typescript": "catalog:repo" + } +} diff --git a/examples/blog/postcss.config.mjs b/examples/blog/postcss.config.mjs new file mode 100644 index 00000000..86e8e3c4 --- /dev/null +++ b/examples/blog/postcss.config.mjs @@ -0,0 +1,5 @@ +const config = { + plugins: ['@tailwindcss/postcss'], +} + +export default config diff --git a/examples/blog/src/app/blog/[slug]/page.tsx b/examples/blog/src/app/blog/[slug]/page.tsx new file mode 100644 index 00000000..551abdc7 --- /dev/null +++ b/examples/blog/src/app/blog/[slug]/page.tsx @@ -0,0 +1,17 @@ +import { BlogPost } from '@/cms' + +export default async function BlogArticle({ + params, +}: { + params: Promise<{ slug: string }> +}) { + const { slug } = await params + + return ( +
+
+ +
+
+ ) +} diff --git a/examples/blog/src/app/blog/page.tsx b/examples/blog/src/app/blog/page.tsx new file mode 100644 index 00000000..4da16ce0 --- /dev/null +++ b/examples/blog/src/app/blog/page.tsx @@ -0,0 +1,17 @@ +import { BlogCard } from '@/cms' + +export default function Blog() { + return ( +
+
+

Johnny Pizza Blog

+

+ Check out our cool blog articles and learn more about our pizza! +

+
+ +
+
+
+ ) +} diff --git a/examples/blog/src/app/favicon.ico b/examples/blog/src/app/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..718d6fea4835ec2d246af9800eddb7ffb276240c GIT binary patch literal 25931 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 LrJugUA?W`A8`#=m literal 0 HcmV?d00001 diff --git a/examples/blog/src/app/globals.css b/examples/blog/src/app/globals.css new file mode 100644 index 00000000..a2dc41ec --- /dev/null +++ b/examples/blog/src/app/globals.css @@ -0,0 +1,26 @@ +@import "tailwindcss"; + +:root { + --background: #ffffff; + --foreground: #171717; +} + +@theme inline { + --color-background: var(--background); + --color-foreground: var(--foreground); + --font-sans: var(--font-geist-sans); + --font-mono: var(--font-geist-mono); +} + +@media (prefers-color-scheme: dark) { + :root { + --background: #0a0a0a; + --foreground: #ededed; + } +} + +body { + background: var(--background); + color: var(--foreground); + font-family: Arial, Helvetica, sans-serif; +} diff --git a/examples/blog/src/app/layout.tsx b/examples/blog/src/app/layout.tsx new file mode 100644 index 00000000..173a86da --- /dev/null +++ b/examples/blog/src/app/layout.tsx @@ -0,0 +1,42 @@ +import { DeepDishProvider } from '@deepdish/cms' +import type { Metadata } from 'next' +import { Geist, Geist_Mono } from 'next/font/google' +import './globals.css' +import { Navbar } from '@/components/navbar' + +// initialize the DeepDish CMS +import '@/cms' + +const geistSans = Geist({ + variable: '--font-geist-sans', + subsets: ['latin'], +}) + +const geistMono = Geist_Mono({ + variable: '--font-geist-mono', + subsets: ['latin'], +}) + +export const metadata: Metadata = { + title: 'Create Next App', + description: 'Generated by create next app', +} + +export default function RootLayout({ + children, +}: Readonly<{ + children: React.ReactNode +}>) { + return ( + + + + +
{children}
+ + + + ) +} diff --git a/examples/blog/src/app/page.tsx b/examples/blog/src/app/page.tsx new file mode 100644 index 00000000..9438f8bd --- /dev/null +++ b/examples/blog/src/app/page.tsx @@ -0,0 +1,25 @@ +import { Paragraph } from '@/cms' +import Link from 'next/link' + +export default function Home() { + return ( +
+
+ + Welcome to Johnny Pizza + + + We pride ourselves on our pizza. We use only the freshest ingredients + and our team of expert chefs to create the best pizza in town. + + Check out our blog! +
+
+ ) +} diff --git a/examples/blog/src/cms.tsx b/examples/blog/src/cms.tsx new file mode 100644 index 00000000..c5ff41d2 --- /dev/null +++ b/examples/blog/src/cms.tsx @@ -0,0 +1,174 @@ +import fs from 'node:fs/promises' +import { getBaseUrl } from '@deepdish/cms/vercel' +import { createJsonResolver } from '@deepdish/resolvers/json' +import { createComponents } from '@deepdish/ui/components' +import { configure } from '@deepdish/ui/config' +import type { IntrinsicElement, SetChildren } from '@deepdish/ui/deepdish' +import * as v from 'valibot' +import Link from 'next/link' +import { truncate } from '@/utils' + +// TODO: get local data dir to work +export const contentPaths = { + blog: '/tmp/deepdish_blog_blog.json', + text: '/tmp/deepdish_blog_text.json', +} as const + +async function initContent() { + for (const path of Object.values(contentPaths)) { + const exists = await fs + .stat(path) + .then(() => true) + .catch(() => false) + + if (!exists) { + await fs.writeFile(path, JSON.stringify({})) + } + } +} + +const blogSchema = v.object({ + title: v.string(), + author: v.object({ + name: v.string(), + email: v.string(), + }), + body: v.string(), + slug: v.string(), +}) + +const textSchema = v.string() + +const contracts = { + blog: { + resolver: createJsonResolver(contentPaths.blog, blogSchema, { + maxBatchSize: 10, + }), + schema: blogSchema, + }, + text: { + resolver: createJsonResolver(contentPaths.text, textSchema, { + maxBatchSize: 10, + }), + schema: textSchema, + }, +} + +async function cms() { + await initContent() + + await configure({ + contracts, + logging: { + enabled: process.env.NODE_ENV === 'development', + }, + settings: { + baseUrl: getBaseUrl({}), + draft: true, + }, + }) + + return createComponents(contracts) +} + +const components = await cms() + +const Blog = components.blog +const Text = components.text + +type DeepDishWithoutContract = + | { + key: string + collection?: never + } + | { + collection: string + } + +type ElementProps = SetChildren< + JSX.IntrinsicElements[E], + C +> & { + deepdish: DeepDishWithoutContract +} + +type ParagraphProps = ElementProps + +export function Paragraph(props: ParagraphProps<'p'>) { + return ( + { + return

{content}

+ }} + /> + ) +} + +export function BlogCard(props: { + deepdish: DeepDishWithoutContract +}) { + return ( + { + if (!content) { + return
Blog Card Placeholder
+ } + + return ( +
+

{content.title}

+

+ Written by {content.author.name} +

+

{truncate(content.body, 100)}

+ + Read article + +
+ ) + }} + /> + ) +} + +export function BlogPost(props: { + deepdish: DeepDishWithoutContract +}) { + return ( + { + if (!content) { + return
Blog Article Placeholder
+ } + + return ( +
+

+ {content.title} +

+

+ Written by {content.author.name} +

+

{content.body}

+
+ ) + }} + /> + ) +} diff --git a/examples/blog/src/components/navbar.tsx b/examples/blog/src/components/navbar.tsx new file mode 100644 index 00000000..907e958d --- /dev/null +++ b/examples/blog/src/components/navbar.tsx @@ -0,0 +1,17 @@ +import Link from 'next/link' + +export function Navbar() { + return ( +
+
+
+ Johnny Pizza +
+
+ Home + Blog +
+
+
+ ) +} diff --git a/examples/blog/src/middleware.ts b/examples/blog/src/middleware.ts new file mode 100644 index 00000000..2c91df3f --- /dev/null +++ b/examples/blog/src/middleware.ts @@ -0,0 +1,36 @@ +import { deepdishMiddleware } from '@deepdish/nextjs' +import { type NextRequest, NextResponse } from 'next/server' +import { getBaseUrl } from '@deepdish/cms/vercel' + +let signedIn = false + +async function signIn() { + await new Promise((resolve) => setTimeout(resolve, 1000)) + signedIn = true + + return NextResponse.redirect(getBaseUrl({})) +} + +async function signOut() { + await new Promise((resolve) => setTimeout(resolve, 1000)) + signedIn = false + + return NextResponse.redirect(getBaseUrl({})) +} + +async function verify() { + await new Promise((resolve) => setTimeout(resolve, 1000)) + return signedIn +} + +export default (request: NextRequest) => { + return deepdishMiddleware( + { + draft: true, + verify, + signIn, + signOut, + }, + request, + ) +} diff --git a/examples/blog/src/utils.ts b/examples/blog/src/utils.ts new file mode 100644 index 00000000..ea474def --- /dev/null +++ b/examples/blog/src/utils.ts @@ -0,0 +1,7 @@ +export function truncate(str: string, maxLength: number) { + if (str.length <= maxLength) { + return str + } + + return `${str.slice(0, maxLength)}...` +} diff --git a/examples/blog/tsconfig.json b/examples/blog/tsconfig.json new file mode 100644 index 00000000..c1334095 --- /dev/null +++ b/examples/blog/tsconfig.json @@ -0,0 +1,27 @@ +{ + "compilerOptions": { + "target": "ES2017", + "lib": ["dom", "dom.iterable", "esnext"], + "allowJs": true, + "skipLibCheck": true, + "strict": true, + "noEmit": true, + "esModuleInterop": true, + "module": "esnext", + "moduleResolution": "bundler", + "resolveJsonModule": true, + "isolatedModules": true, + "jsx": "preserve", + "incremental": true, + "plugins": [ + { + "name": "next" + } + ], + "paths": { + "@/*": ["./src/*"] + } + }, + "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"], + "exclude": ["node_modules"] +} diff --git a/package.json b/package.json index cef81f26..1fa39966 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "private": true, "workspaces": [ "apps/*", + "examples/*", "packages/*" ], "scripts": { diff --git a/packages/ui/src/deepdish.tsx b/packages/ui/src/deepdish.tsx index 6b39c0b9..c082ad6c 100644 --- a/packages/ui/src/deepdish.tsx +++ b/packages/ui/src/deepdish.tsx @@ -1,3 +1,4 @@ +/// import 'server-only' import { withResult } from '@byteslice/result' @@ -10,6 +11,9 @@ import type { DeepDishCollectionProps, DeepDishElementProps, DeepDishProps, + ElementProps, + IntrinsicElement, + SetChildren, } from './types' const logger = getLogger(['deepdish', 'ui']) @@ -250,4 +254,4 @@ export async function DeepDish(props: { ) } -export type { DeepDishProps } +export type { DeepDishProps, ElementProps, IntrinsicElement, SetChildren } diff --git a/packages/ui/src/types.ts b/packages/ui/src/types.ts index 0c217760..d096c2d8 100644 --- a/packages/ui/src/types.ts +++ b/packages/ui/src/types.ts @@ -28,4 +28,4 @@ export type ElementProps< export type IntrinsicElement = keyof JSX.IntrinsicElements -type SetChildren = Omit & { children?: C } +export type SetChildren = Omit & { children?: C } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 64514145..ff619b41 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -17,6 +17,12 @@ catalogs: specifier: ^19.0.0 || ^19.0.0-0 version: 19.0.0 react: + '@types/react': + specifier: 19.0.0 + version: 19.0.0 + '@types/react-dom': + specifier: 19.0.0 + version: 19.0.0 react: specifier: 19.0.0 version: 19.0.0 @@ -248,6 +254,52 @@ importers: specifier: 5.5.4 version: 5.5.4 + examples/blog: + dependencies: + '@deepdish/cms': + specifier: workspace:0.8.0 + version: link:../../packages/cms + '@deepdish/nextjs': + specifier: workspace:0.8.0 + version: link:../../packages/nextjs + '@deepdish/resolvers': + specifier: workspace:0.13.0 + version: link:../../packages/resolvers + '@deepdish/ui': + specifier: workspace:0.15.0 + version: link:../../packages/ui + next: + specifier: 15.1.4 + version: 15.1.4(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + react: + specifier: catalog:react + version: 19.0.0 + react-dom: + specifier: catalog:react + version: 19.0.0(react@19.0.0) + valibot: + specifier: 1.0.0-rc.0 + version: 1.0.0-rc.0(typescript@5.7.2) + devDependencies: + '@tailwindcss/postcss': + specifier: catalog:tailwind + version: 4.0.3 + '@types/node': + specifier: catalog:repo + version: 20.9.0 + '@types/react': + specifier: catalog:react + version: 19.0.0 + '@types/react-dom': + specifier: catalog:react + version: 19.0.0 + tailwindcss: + specifier: catalog:tailwind + version: 4.0.3 + typescript: + specifier: catalog:repo + version: 5.7.2 + packages/cms: dependencies: '@deepdish-cloud/resolvers': @@ -3302,6 +3354,9 @@ packages: '@types/react-dom@18.3.0': resolution: {integrity: sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==} + '@types/react-dom@19.0.0': + resolution: {integrity: sha512-1KfiQKsH1o00p9m5ag12axHQSb3FOU9H20UTrujVSkNhuCrRHiQWFqgEnTNK5ZNfnzZv8UWrnXVqCmCF9fgY3w==} + '@types/react-dom@19.0.4': resolution: {integrity: sha512-4fSQ8vWFkg+TGhePfUzVmat3eC14TXYSsiiDSLI0dVLsrm9gZFABjPy/Qu6TKgl1tq1Bu1yDsuQgY3A3DOjCcg==} peerDependencies: @@ -3313,6 +3368,9 @@ packages: '@types/react@18.3.3': resolution: {integrity: sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==} + '@types/react@19.0.0': + resolution: {integrity: sha512-MY3oPudxvMYyesqs/kW1Bh8y9VqSmf+tzqw3ae8a9DZW68pUe3zAdHeI1jc6iAysuRdACnVknHP8AhwD4/dxtg==} + '@types/statuses@2.0.5': resolution: {integrity: sha512-jmIUGWrAiwu3dZpxntxieC+1n/5c3mjrImkmOSQ2NC5uP6cYO4aAZDdSmRcI5C1oiTmqlZGHC+/NmJrKogbP5A==} @@ -3445,7 +3503,6 @@ packages: bun@1.2.4: resolution: {integrity: sha512-ZY0EZ/UKqheaLeAtMsfJA6jWoWvV9HAtfFaOJSmS3LrNpFKs1Sg5fZLSsczN1h3a+Dtheo4O3p3ZYWrf40kRGw==} - cpu: [arm64, x64, aarch64] os: [darwin, linux, win32] hasBin: true @@ -8087,6 +8144,10 @@ snapshots: dependencies: '@types/react': 18.3.3 + '@types/react-dom@19.0.0': + dependencies: + '@types/react': 18.3.3 + '@types/react-dom@19.0.4(@types/react@18.3.3)': dependencies: '@types/react': 18.3.3 @@ -8101,6 +8162,10 @@ snapshots: '@types/prop-types': 15.7.14 csstype: 3.1.3 + '@types/react@19.0.0': + dependencies: + csstype: 3.1.3 + '@types/statuses@2.0.5': {} '@types/tough-cookie@4.0.5': {} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 9979b851..5ff84a27 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,6 +1,7 @@ packages: - - "packages/*" - "apps/*" + - "examples/*" + - "packages/*" catalogs: react: From e694020d924b9ce88bc82037e7ae99778ad3a793 Mon Sep 17 00:00:00 2001 From: Dylan Slack Date: Wed, 12 Mar 2025 20:12:02 -0700 Subject: [PATCH 2/5] chore: lint --- examples/blog/src/cms.tsx | 4 ++-- examples/blog/src/middleware.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/blog/src/cms.tsx b/examples/blog/src/cms.tsx index c5ff41d2..9284e4f3 100644 --- a/examples/blog/src/cms.tsx +++ b/examples/blog/src/cms.tsx @@ -1,12 +1,12 @@ import fs from 'node:fs/promises' +import { truncate } from '@/utils' import { getBaseUrl } from '@deepdish/cms/vercel' import { createJsonResolver } from '@deepdish/resolvers/json' import { createComponents } from '@deepdish/ui/components' import { configure } from '@deepdish/ui/config' import type { IntrinsicElement, SetChildren } from '@deepdish/ui/deepdish' -import * as v from 'valibot' import Link from 'next/link' -import { truncate } from '@/utils' +import * as v from 'valibot' // TODO: get local data dir to work export const contentPaths = { diff --git a/examples/blog/src/middleware.ts b/examples/blog/src/middleware.ts index 2c91df3f..148a1317 100644 --- a/examples/blog/src/middleware.ts +++ b/examples/blog/src/middleware.ts @@ -1,6 +1,6 @@ +import { getBaseUrl } from '@deepdish/cms/vercel' import { deepdishMiddleware } from '@deepdish/nextjs' import { type NextRequest, NextResponse } from 'next/server' -import { getBaseUrl } from '@deepdish/cms/vercel' let signedIn = false From b79d74c830c8accf424088151c3d6e9a189158fe Mon Sep 17 00:00:00 2001 From: Dylan Slack Date: Fri, 14 Mar 2025 07:43:49 -0700 Subject: [PATCH 3/5] chore: remove dark mode --- examples/blog/src/app/globals.css | 7 ------- 1 file changed, 7 deletions(-) diff --git a/examples/blog/src/app/globals.css b/examples/blog/src/app/globals.css index a2dc41ec..2a89a481 100644 --- a/examples/blog/src/app/globals.css +++ b/examples/blog/src/app/globals.css @@ -12,13 +12,6 @@ --font-mono: var(--font-geist-mono); } -@media (prefers-color-scheme: dark) { - :root { - --background: #0a0a0a; - --foreground: #ededed; - } -} - body { background: var(--background); color: var(--foreground); From 0fa11808d3501d4e8cb183dcd9b8335ebb46e63b Mon Sep 17 00:00:00 2001 From: Dylan Slack Date: Fri, 14 Mar 2025 07:50:06 -0700 Subject: [PATCH 4/5] refactor: move provider export to cms --- examples/blog/src/app/layout.tsx | 4 +--- examples/blog/src/cms.tsx | 7 +++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/examples/blog/src/app/layout.tsx b/examples/blog/src/app/layout.tsx index 173a86da..6ddd45f5 100644 --- a/examples/blog/src/app/layout.tsx +++ b/examples/blog/src/app/layout.tsx @@ -1,11 +1,9 @@ -import { DeepDishProvider } from '@deepdish/cms' import type { Metadata } from 'next' import { Geist, Geist_Mono } from 'next/font/google' import './globals.css' import { Navbar } from '@/components/navbar' -// initialize the DeepDish CMS -import '@/cms' +import { DeepDishProvider } from '@/cms' const geistSans = Geist({ variable: '--font-geist-sans', diff --git a/examples/blog/src/cms.tsx b/examples/blog/src/cms.tsx index 9284e4f3..ed2cbcde 100644 --- a/examples/blog/src/cms.tsx +++ b/examples/blog/src/cms.tsx @@ -1,5 +1,6 @@ import fs from 'node:fs/promises' import { truncate } from '@/utils' +import { DeepDishProvider as InternalDeepDishProvider } from '@deepdish/cms' import { getBaseUrl } from '@deepdish/cms/vercel' import { createJsonResolver } from '@deepdish/resolvers/json' import { createComponents } from '@deepdish/ui/components' @@ -172,3 +173,9 @@ export function BlogPost(props: { /> ) } + +export function DeepDishProvider(props: { + children: React.ReactNode +}) { + return +} From ff1b396df4e6a2f821c564d97d44e6e889bb3163 Mon Sep 17 00:00:00 2001 From: Dylan Slack Date: Fri, 14 Mar 2025 07:51:23 -0700 Subject: [PATCH 5/5] feat: add metadata --- examples/blog/src/app/layout.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/blog/src/app/layout.tsx b/examples/blog/src/app/layout.tsx index 6ddd45f5..b86befea 100644 --- a/examples/blog/src/app/layout.tsx +++ b/examples/blog/src/app/layout.tsx @@ -16,8 +16,8 @@ const geistMono = Geist_Mono({ }) export const metadata: Metadata = { - title: 'Create Next App', - description: 'Generated by create next app', + title: 'DeepDish Blog Example', + description: 'Blog example showcasing the DeepDish CMS', } export default function RootLayout({