Unverified Commit 58c7265b authored by Greg Rickaby's avatar Greg Rickaby Committed by GitHub

Update DatoCMS Example (#13008)

👋🏻 This PR updates the Datocms example:

- [x] Next.js 9.4 absolute import and aliases support
- [x] Next.js 9.4 native `.env` support
- [x] Tailwind 1.4 native PurgeCSS support
- [x] Chore: bump other dependencies, like React, Remark, and DateFNS 

I've tested this PR here: 

- 💻 https://github.com/gregrickaby/datocms-next-js-blog-demo-2392
- 👀 https://datocms-next-js-blog-demo-2392.now.sh/
parent 9386ba29
import Container from './container' import Container from './container'
import cn from 'classnames' import cn from 'classnames'
import { EXAMPLE_PATH } from '../lib/constants' import { EXAMPLE_PATH } from '@/lib/constants'
export default function Alert({ preview }) { export default function Alert({ preview }) {
return ( return (
......
import Container from './container' import Container from './container'
import { EXAMPLE_PATH } from '../lib/constants' import { EXAMPLE_PATH } from '@/lib/constants'
export default function Footer() { export default function Footer() {
return ( return (
......
import Avatar from '../components/avatar' import Avatar from './avatar'
import Date from '../components/date' import Date from './date'
import CoverImage from '../components/cover-image' import CoverImage from './cover-image'
import Link from 'next/link' import Link from 'next/link'
export default function HeroPost({ export default function HeroPost({
......
import { CMS_NAME, CMS_URL } from '../lib/constants' import { CMS_NAME, CMS_URL } from '@/lib/constants'
export default function Intro() { export default function Intro() {
return ( return (
......
import Alert from '../components/alert' import Alert from './alert'
import Footer from '../components/footer' import Footer from './footer'
import Meta from '../components/meta' import Meta from './meta'
export default function Layout({ preview, children }) { export default function Layout({ preview, children }) {
return ( return (
......
import Head from 'next/head' import Head from 'next/head'
import { CMS_NAME, HOME_OG_IMAGE_URL } from '../lib/constants' import { CMS_NAME, HOME_OG_IMAGE_URL } from '@/lib/constants'
export default function Meta() { export default function Meta() {
return ( return (
......
import PostPreview from '../components/post-preview' import PostPreview from './post-preview'
export default function MoreStories({ posts }) { export default function MoreStories({ posts }) {
return ( return (
......
import Avatar from '../components/avatar' import Avatar from './avatar'
import Date from '../components/date' import Date from './date'
import CoverImage from '../components/cover-image' import CoverImage from './cover-image'
import PostTitle from '../components/post-title' import PostTitle from './post-title'
export default function PostHeader({ title, coverImage, date, author }) { export default function PostHeader({ title, coverImage, date, author }) {
return ( return (
......
import Avatar from '../components/avatar' import Avatar from './avatar'
import Date from '../components/date' import Date from './date'
import CoverImage from './cover-image' import CoverImage from './cover-image'
import Link from 'next/link' import Link from 'next/link'
......
{
"compilerOptions": {
"baseUrl": ".",
"paths": {
"@/components/*": ["components/*"],
"@/lib/*": ["lib/*"],
"@/styles/*": ["styles/*"]
}
}
}
require('dotenv').config()
module.exports = {
env: {
NEXT_EXAMPLE_CMS_DATOCMS_API_TOKEN:
process.env.NEXT_EXAMPLE_CMS_DATOCMS_API_TOKEN,
},
}
...@@ -8,18 +8,17 @@ ...@@ -8,18 +8,17 @@
}, },
"dependencies": { "dependencies": {
"classnames": "2.2.6", "classnames": "2.2.6",
"date-fns": "2.10.0", "date-fns": "2.14.0",
"next": "latest", "next": "latest",
"react": "^16.13.0", "react": "^16.13.1",
"react-datocms": "1.1.0", "react-datocms": "1.2.4",
"react-dom": "^16.13.0", "react-dom": "^16.13.1",
"remark": "11.0.2", "remark": "12.0.0",
"remark-html": "10.0.0" "remark-html": "11.0.2"
}, },
"devDependencies": { "devDependencies": {
"@fullhuman/postcss-purgecss": "^2.1.0", "postcss-flexbugs-fixes": "4.2.1",
"dotenv": "8.2.0",
"postcss-preset-env": "^6.7.0", "postcss-preset-env": "^6.7.0",
"tailwindcss": "^1.2.0" "tailwindcss": "^1.4.6"
} }
} }
import '../styles/index.css' import '@/styles/index.css'
function MyApp({ Component, pageProps }) { function MyApp({ Component, pageProps }) {
return <Component {...pageProps} /> return <Component {...pageProps} />
......
import { getPreviewPostBySlug } from '../../lib/api' import { getPreviewPostBySlug } from '@/lib/api'
export default async function preview(req, res) { export default async function preview(req, res) {
// Check the secret and next parameters // Check the secret and next parameters
......
import Container from '../components/container' import Container from '@/components/container'
import MoreStories from '../components/more-stories' import MoreStories from '@/components/more-stories'
import HeroPost from '../components/hero-post' import HeroPost from '@/components/hero-post'
import Intro from '../components/intro' import Intro from '@/components/intro'
import Layout from '../components/layout' import Layout from '@/components/layout'
import { getAllPostsForHome } from '../lib/api' import { getAllPostsForHome } from '@/lib/api'
import Head from 'next/head' import Head from 'next/head'
import { CMS_NAME } from '../lib/constants' import { CMS_NAME } from '@/lib/constants'
export default function Index({ allPosts }) { export default function Index({ allPosts }) {
const heroPost = allPosts[0] const heroPost = allPosts[0]
......
import { useRouter } from 'next/router' import { useRouter } from 'next/router'
import ErrorPage from 'next/error' import ErrorPage from 'next/error'
import Container from '../../components/container' import Container from '@/components/container'
import PostBody from '../../components/post-body' import PostBody from '@/components/post-body'
import MoreStories from '../../components/more-stories' import MoreStories from '@/components/more-stories'
import Header from '../../components/header' import Header from '@/components/header'
import PostHeader from '../../components/post-header' import PostHeader from '@/components/post-header'
import SectionSeparator from '../../components/section-separator' import SectionSeparator from '@/components/section-separator'
import Layout from '../../components/layout' import Layout from '@/components/layout'
import { getAllPostsWithSlug, getPostAndMorePosts } from '../../lib/api' import { getAllPostsWithSlug, getPostAndMorePosts } from '@/lib/api'
import PostTitle from '../../components/post-title' import PostTitle from '@/components/post-title'
import Head from 'next/head' import Head from 'next/head'
import { CMS_NAME } from '../../lib/constants' import { CMS_NAME } from '@/lib/constants'
import markdownToHtml from '../../lib/markdownToHtml' import markdownToHtml from '@/lib/markdownToHtml'
export default function Post({ post, morePosts, preview }) { export default function Post({ post, morePosts, preview }) {
const router = useRouter() const router = useRouter()
......
module.exports = { module.exports = {
plugins: [ plugins: [
'tailwindcss', 'tailwindcss',
process.env.NODE_ENV === 'production' 'postcss-flexbugs-fixes',
? [ [
'@fullhuman/postcss-purgecss', 'postcss-preset-env',
{ {
content: [ autoprefixer: {
'./pages/**/*.{js,jsx,ts,tsx}', flexbox: 'no-2009',
'./components/**/*.{js,jsx,ts,tsx}', },
], stage: 3,
defaultExtractor: (content) => features: {
content.match(/[\w-/:]+(?<!:)/g) || [], 'custom-properties': false,
}, },
] },
: undefined, ],
'postcss-preset-env',
], ],
} }
/* purgecss start ignore */
@tailwind base; @tailwind base;
@tailwind components; @tailwind components;
/* purgecss end ignore */
@tailwind utilities; @tailwind utilities;
module.exports = { module.exports = {
purge: ['./components/**/*.js', './pages/**/*.js'],
theme: { theme: {
extend: { extend: {
colors: { colors: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment