Merge pull request #119 from contentlayerdev/contentlayer-next

[WIP] Contentlayer 0.1.0

.vscode/settings.json

@@ -4,7 +4,8 @@
     "**/.next": true,
     "**/*.tsbuildinfo": true,
     "**/dist": true,
-    "**/.pnp.*": true
+    "**/.pnp.*": true,
+    "examples/gatsby-docs/gatsby": true
   },
   "editor.formatOnSave": true,
   "editor.codeActionsOnSave": {

.yarnrc.yml

@@ -12,7 +12,7 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-version.cjs
     spec: '@yarnpkg/plugin-version'
 
-yarnPath: .yarn/releases/yarn-3.0.2.cjs
+yarnPath: .yarn/releases/yarn-3.1.1.cjs
 
 changesetBaseRefs:
   - main

examples/gatsby-docs/contentlayer.config.ts

@@ -66,7 +66,7 @@ export default makeSource(async () => {
   return {
     contentDirPath: 'gatsby/docs',
     documentTypes: [Reference, HowTo, Conceptual, Tutorial],
-    onUnknownDocuments: 'skip-ignore',
+    onUnknownDocuments: 'skip-warn',
     markdown: {
       rehypePlugins: [[rehypeShiki, { highlighter }]],
     },

examples/gatsby-docs/next-env.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

examples/gatsby-docs/pages/[...id].tsx

@@ -1,8 +1,8 @@
 import Head from 'next/head'
 import type { FC } from 'react'
 
-import { allDocuments } from '.contentlayer/data'
-import type { DocumentTypes } from '.contentlayer/types'
+import { allDocuments } from 'contentlayer/generated'
+import type { DocumentTypes } from 'contentlayer/generated'
 
 export const getStaticPaths = () => {
   const paths = allDocuments.map((_) => `/${_._raw.flattenedPath}`)

examples/gatsby-docs/pages/index.tsx

@@ -1,7 +1,7 @@
 import type { InferGetStaticPropsType } from 'next'
 import type { FC } from 'react'
 
-import { allDocuments } from '.contentlayer/data'
+import { allDocuments } from 'contentlayer/generated'
 
 export const getStaticProps = () => {
   const docs = allDocuments.map((_) => ({ path: _._raw.flattenedPath, title: _.title }))

examples/gatsby-docs/tsconfig.json

@@ -16,8 +16,12 @@
     "strict": false,
     "module": "esnext",
     "moduleResolution": "node",
-    "isolatedModules": true
+    "isolatedModules": true,
+    "baseUrl": ".",
+    "paths": {
+      "contentlayer/generated": ["./.contentlayer/generated"]
+    }
   },
-  "include": ["next-env.d.ts", "**/*.tsx", "**/*.ts", "./node_modules/.contentlayer/*", "./node_modules/@types"],
+  "include": ["next-env.d.ts", "**/*.tsx", "**/*.ts", ".contentlayer/generated"],
   "exclude": ["node_modules", "gatsby"]
 }

examples/playground-azimuth-colocated/src/components/Action.tsx

@@ -4,7 +4,7 @@ import React from 'react'
 
 import { classNames, Link, withPrefix } from '../utils'
 import { Icon } from './Icon'
-import type * as types from '.contentlayer/types'
+import type * as types from 'contentlayer/generated'
 
 export const Action: FC<{ action: types.Action }> = ({ action }) => (
   <Link

examples/playground-azimuth-colocated/src/components/ActionLink.tsx

@@ -2,7 +2,7 @@ import type { FC } from 'react'
 import React from 'react'
 
 import { Link, withPrefix } from '../utils'
-import type * as types from '.contentlayer/types'
+import type * as types from 'contentlayer/generated'
 
 export const ActionLink: FC<{ action: types.Action }> = ({ action }) => (
   <Link

examples/playground-azimuth-colocated/src/components/BlogPostFooter.tsx

@@ -3,8 +3,8 @@
 import type { FC } from 'react'
 import React, { useMemo } from 'react'
 
-import { allPeople } from '.contentlayer/data'
-import type * as types from '.contentlayer/types'
+import { allPeople } from 'contentlayer/generated'
+import type * as types from 'contentlayer/generated'
 
 export const BlogPostFooter: FC<{ post: types.Post; dateType: 'long' | 'short' }> = ({ post, dateType }) => {
   const author = useMemo(() => allPeople.find((_) => post.author === _._id), [post])

examples/playground-azimuth-colocated/src/components/FormField.tsx

@@ -3,7 +3,7 @@ import type { FC } from 'react'
 import React from 'react'
 
 import { classNames } from '../utils'
-import type * as types from '.contentlayer/types'
+import type * as types from 'contentlayer/generated'
 
 export const FormField: FC<{ section: types.FooterForm | types.SectionContact; field: types.FormField }> = ({
   field,

examples/playground-azimuth-colocated/src/components/Header.tsx

@@ -3,8 +3,8 @@ import React from 'react'
 
 import { classNames, Link, withPrefix } from '../utils'
 import { Action } from './Action'
-import type * as types from '.contentlayer/types'
-import { isType } from '.contentlayer/types'
+import type * as types from 'contentlayer/generated'
+import { isType } from 'contentlayer/generated'
 
 export const Header: FC<{
   config: types.Config

examples/playground-azimuth-colocated/src/components/Layout.tsx

@@ -6,7 +6,7 @@ import { Helmet } from 'react-helmet'
 import { withPrefix } from '../utils'
 import { Footer } from './footer/Footer'
 import { Header } from './Header'
-import type * as types from '.contentlayer/types'
+import type * as types from 'contentlayer/generated'
 
 export const Layout: FC<{
   doc: types.Blog | types.Page | types.Landing | types.Post

examples/playground-azimuth-colocated/src/components/footer/Footer.tsx

@@ -6,7 +6,7 @@ import { ActionLink } from '../ActionLink'
 import { FooterForm } from './FooterForm'
 import { FooterNav } from './FooterNav'
 import { FooterText } from './FooterText'
-import type * as types from '.contentlayer/types'
+import type * as types from 'contentlayer/generated'
 
 export const Footer: FC<{ config: types.Config }> = ({ config }) => (
   <footer id="colophon" className="site-footer">

examples/playground-azimuth-colocated/src/components/footer/FooterForm.tsx

@@ -3,7 +3,7 @@ import React from 'react'
 
 import { markdownify } from '../../utils'
 import { FormField } from '../FormField'
-import type * as types from '.contentlayer/types'
+import type * as types from 'contentlayer/generated'
 
 export const FooterForm: FC<{ section: types.FooterForm }> = ({ section }) => (
   <section className="cell widget widget-form">

examples/playground-azimuth-colocated/src/components/footer/FooterNav.tsx

@@ -2,7 +2,7 @@ import type { FC } from 'react'
 import React from 'react'
 
 import { Action } from '../Action'
-import type * as types from '.contentlayer/types'
+import type * as types from 'contentlayer/generated'
 
 export const FooterNav: FC<{ section: types.FooterNav }> = ({ section }) => (
   <section className="cell widget widget-nav">

examples/playground-azimuth-colocated/src/components/footer/FooterText.tsx

@@ -2,7 +2,7 @@ import type { FC } from 'react'
 import React from 'react'
 
 import { Link, markdownify, withPrefix } from '../../utils'
-import type * as types from '.contentlayer/types'
+import type * as types from 'contentlayer/generated'
 
 export const FooterText: FC<{ section: types.FooterText }> = ({ section }) => (
   <section className="cell widget widget-text">

examples/playground-azimuth-colocated/src/components/landing-sections/CtaButtons.tsx

@@ -2,7 +2,7 @@ import type { FC } from 'react'
 import React from 'react'
 
 import { Action } from '../Action'
-import type * as types from '.contentlayer/types'
+import type * as types from 'contentlayer/generated'
 
 export const CtaButtons: FC<{ actions: types.Action[] }> = ({ actions }) => (
   <>

examples/playground-azimuth-colocated/src/components/landing-sections/SectionContact.tsx

@@ -6,7 +6,7 @@ import React from 'react'
 import { htmlToReact, markdownify } from '../../utils'
 import { FormField, FormFieldModel } from '../FormField'
 import { sectionBaseFields } from './model'
-import type * as types from '.contentlayer/types'
+import type * as types from 'contentlayer/generated'
 
 export const SectionContact: FC<{ section: types.SectionContact }> = ({ section }) => (
   <section id={section.section_id} className={'block contact-block bg-' + section.background + ' outer'}>

examples/playground-azimuth-colocated/src/components/landing-sections/SectionContent.tsx

@@ -6,7 +6,7 @@ import { markdownify, withPrefix } from '../../utils'
 import { ActionModel } from '../Action'
 import { CtaButtons } from './CtaButtons'
 import { sectionBaseFields } from './model'
-import type * as types from '.contentlayer/types'
+import type * as types from 'contentlayer/generated'
 
 export const SectionContent: FC<{ section: types.SectionContent }> = ({ section }) => (
   <section id={section.section_id} className={'block text-block bg-' + section.background + ' outer'}>

examples/playground-azimuth-colocated/src/components/landing-sections/SectionCta.tsx

@@ -6,7 +6,7 @@ import { htmlToReact } from '../../utils'
 import { ActionModel } from '../Action'
 import { CtaButtons } from './CtaButtons'
 import { sectionBaseFields } from './model'
-import type * as types from '.contentlayer/types'
+import type * as types from 'contentlayer/generated'
 
 export const SectionCta: FC<{ section: types.SectionCta }> = ({ section }) => (
   <section id={section.section_id} className="block cta-block bg-accent outer">

examples/playground-azimuth-colocated/src/components/landing-sections/SectionFaq.tsx

@@ -4,7 +4,7 @@ import React from 'react'
 
 import { htmlToReact, markdownify } from '../../utils'
 import { sectionBaseFields } from './model'
-import type * as types from '.contentlayer/types'
+import type * as types from 'contentlayer/generated'
 
 export const SectionFaq: FC<{ section: types.SectionFaq }> = ({ section }) => (
   <section id={section.section_id} className={'block faq-block bg-' + section.background + ' outer'}>

examples/playground-azimuth-colocated/src/components/landing-sections/SectionFeatures.tsx

@@ -6,7 +6,7 @@ import { htmlToReact, markdownify, withPrefix } from '../../utils'
 import { ActionModel } from '../Action'
 import { CtaButtons } from './CtaButtons'
 import { sectionBaseFields } from './model'
-import type * as types from '.contentlayer/types'
+import type * as types from 'contentlayer/generated'
 
 export const SectionFeatures: FC<{ section: types.SectionFeatures }> = ({ section, ...props }) => {
   return (

examples/playground-azimuth-colocated/src/components/landing-sections/SectionHero.tsx

@@ -6,7 +6,7 @@ import { markdownify, withPrefix } from '../../utils'
 import { ActionModel } from '../Action'
 import { CtaButtons } from './CtaButtons'
 import { sectionBaseFields } from './model'
-import type * as types from '.contentlayer/types'
+import type * as types from 'contentlayer/generated'
 
 export const SectionHero: FC<{ section: types.SectionHero }> = ({ section }) => {
   return (

examples/playground-azimuth-colocated/src/components/landing-sections/SectionPosts.tsx

@@ -5,7 +5,7 @@ import React from 'react'
 import { htmlToReact, Link, withPrefix } from '../../utils'
 import { BlogPostFooter } from '../BlogPostFooter'
 import { sectionBaseFields } from './model'
-import type * as types from '.contentlayer/types'
+import type * as types from 'contentlayer/generated'
 
 export const SectionPosts: FC<{ section: types.SectionPosts; posts: types.Post[] }> = ({ section, posts }) => {
   const recentPosts = posts

examples/playground-azimuth-colocated/src/components/landing-sections/SectionPricing.tsx

@@ -6,7 +6,7 @@ import { classNames, htmlToReact, markdownify } from '../../utils'
 import { ActionModel } from '../Action'
 import { CtaButtons } from './CtaButtons'
 import { sectionBaseFields } from './model'
-import type * as types from '.contentlayer/types'
+import type * as types from 'contentlayer/generated'
 
 export const SectionPricing: FC<{ section: types.SectionPricing }> = ({ section }) => (
   <section id={section.section_id} className={'block pricing-block bg-' + section.background + ' outer'}>

examples/playground-azimuth-colocated/src/components/landing-sections/SectionReviews.tsx

@@ -4,7 +4,7 @@ import React from 'react'
 
 import { htmlToReact, withPrefix } from '../../utils'
 import { sectionBaseFields } from './model'
-import type * as types from '.contentlayer/types'
+import type * as types from 'contentlayer/generated'
 
 export const SectionReviews: FC<{ section: types.SectionReviews }> = ({ section }) => (
   <section id={section.section_id} className={'block reviews-block bg-' + section.background + ' outer'}>

examples/playground-azimuth-colocated/src/layouts/BlogLayout.tsx

@@ -7,7 +7,7 @@ import { Layout } from '../components/Layout'
 import { SEOModel } from '../contentlayer/objects/SEO'
 import { Link, withPrefix } from '../utils'
 import { urlFromFilePath } from '../utils/contentlayer'
-import type * as types from '.contentlayer/types'
+import type * as types from 'contentlayer/generated'
 
 export const BlogLayout: FC<{ blog: types.Blog; config: types.Config; posts: types.Post[] }> = ({
   blog,

examples/playground-azimuth-colocated/src/layouts/LandingLayout.tsx

@@ -14,7 +14,7 @@ import { SectionReviews, SectionReviewsModel } from '../components/landing-secti
 import { Layout } from '../components/Layout'
 import { SEOModel } from '../contentlayer/objects/SEO'
 import { urlFromFilePath } from '../utils/contentlayer'
-import type * as types from '.contentlayer/types'
+import type * as types from 'contentlayer/generated'
 
 export const LandingLayout: FC<{
   landing: types.Landing

examples/playground-azimuth-colocated/src/layouts/PageLayout.tsx

@@ -6,7 +6,7 @@ import { Layout } from '../components/Layout'
 import { SEOModel } from '../contentlayer/objects/SEO'
 import { htmlToReact, markdownify, withPrefix } from '../utils'
 import { urlFromFilePath } from '../utils/contentlayer'
-import type * as types from '.contentlayer/types'
+import type * as types from 'contentlayer/generated'
 
 export const PageLayout: FC<{
   page: types.Page

examples/playground-azimuth-colocated/src/layouts/PostLayout.tsx

@@ -8,7 +8,7 @@ import { Person } from '../contentlayer/documents/Person'
 import { SEOModel } from '../contentlayer/objects/SEO'
 import { htmlToReact, withPrefix } from '../utils'
 import { urlFromFilePath } from '../utils/contentlayer'
-import type * as types from '.contentlayer/types'
+import type * as types from 'contentlayer/generated'
 
 export const PostLayout: FC<{
   post: types.Post

examples/playground-azimuth-colocated/src/pages/[[...slug]].tsx

@@ -8,8 +8,8 @@ import { LandingLayout } from '../layouts/LandingLayout'
 import { PageLayout } from '../layouts/PageLayout'
 import { PostLayout } from '../layouts/PostLayout'
 import { defineStaticProps, toParams } from '../utils/next'
-import { allDocuments, allPosts, config } from '.contentlayer/data'
-import { isType } from '.contentlayer/types'
+import { allDocuments, allPosts, config } from 'contentlayer/generated'
+import { isType } from 'contentlayer/generated'
 
 export const getStaticPaths = async () => {
   const paths = allDocuments

examples/playground-azimuth-contentful/src/components/Action.tsx

@@ -3,7 +3,7 @@ import React from 'react'
 
 import { classNames, Link, withPrefix } from '../utils'
 import { Icon } from './Icon'
-import type { Action as Action_ } from '.contentlayer/types'
+import type { Action as Action_ } from 'contentlayer/generated'
 
 export const Action: FC<{ action: Action_ }> = ({ action }) => (
   <Link

examples/playground-azimuth-contentful/src/components/ActionLink.tsx

@@ -2,7 +2,7 @@ import type { FC } from 'react'
 import React from 'react'
 
 import { Link, withPrefix } from '../utils'
-import type { Action } from '.contentlayer/types'
+import type { Action } from 'contentlayer/generated'
 
 export const ActionLink: FC<{ action: Action }> = ({ action }) => (
   <Link

examples/playground-azimuth-contentful/src/components/BlogPostFooter.tsx

@@ -3,8 +3,8 @@
 import type { FC } from 'react'
 import React, { useMemo } from 'react'
 
-import { allPeople } from '.contentlayer/data'
-import type { Post } from '.contentlayer/types'
+import { allPeople } from 'contentlayer/generated'
+import type { Post } from 'contentlayer/generated'
 
 export const BlogPostFooter: FC<{ post: Post; dateType: 'long' | 'short' }> = ({ post, dateType }) => {
   const author = useMemo(() => allPeople.find((_) => post.author === _._id), [post])

examples/playground-azimuth-contentful/src/components/FormField.tsx

@@ -2,7 +2,7 @@ import type { FC } from 'react'
 import React from 'react'
 
 import { classNames } from '../utils'
-import type { Footer_form, Form_field, Section_contact } from '.contentlayer/types'
+import type { Footer_form, Form_field, Section_contact } from 'contentlayer/generated'
 
 export const FormField: FC<{ section: Footer_form | Section_contact; field: Form_field }> = ({ field, section }) => {
   return (

examples/playground-azimuth-contentful/src/components/Header.tsx

@@ -3,8 +3,8 @@ import React from 'react'
 
 import { classNames, Link, withPrefix } from '../utils'
 import { Action } from './Action'
-import type { Blog, Config, Landing, Page, Post } from '.contentlayer/types'
-import { isType } from '.contentlayer/types'
+import type { Blog, Config, Landing, Page, Post } from 'contentlayer/generated'
+import { isType } from 'contentlayer/generated'
 
 export const Header: FC<{
   config: Config

examples/playground-azimuth-contentful/src/components/Layout.tsx

@@ -6,7 +6,7 @@ import { Helmet } from 'react-helmet'
 import { withPrefix } from '../utils'
 import { Footer } from './footer/Footer'
 import { Header } from './Header'
-import type { Blog, Config, Landing, Page, Post } from '.contentlayer/types'
+import type { Blog, Config, Landing, Page, Post } from 'contentlayer/generated'
 
 export const Layout: FC<{
   doc: Blog | Page | Landing | Post

examples/playground-azimuth-contentful/src/components/footer/Footer.tsx

@@ -6,7 +6,7 @@ import { ActionLink } from '../ActionLink'
 import { FooterForm } from './FooterForm'
 import { FooterNav } from './FooterNav'
 import { FooterText } from './FooterText'
-import type { Config } from '.contentlayer/types'
+import type { Config } from 'contentlayer/generated'
 
 export const Footer: FC<{ config: Config }> = ({ config }) => (
   <footer id="colophon" className="site-footer">

examples/playground-azimuth-contentful/src/components/footer/FooterForm.tsx

@@ -3,7 +3,7 @@ import React from 'react'
 
 import { markdownify } from '../../utils'
 import { FormField } from '../FormField'
-import type { Footer_form } from '.contentlayer/types'
+import type { Footer_form } from 'contentlayer/generated'
 
 export const FooterForm: FC<{ section: Footer_form }> = ({ section }) => (
   <section className="cell widget widget-form">

examples/playground-azimuth-contentful/src/components/footer/FooterNav.tsx

@@ -2,7 +2,7 @@ import type { FC } from 'react'
 import React from 'react'
 
 import { Action } from '../Action'
-import type { Footer_nav } from '.contentlayer/types'
+import type { Footer_nav } from 'contentlayer/generated'
 
 export const FooterNav: FC<{ section: Footer_nav }> = ({ section }) => (
   <section className="cell widget widget-nav">

examples/playground-azimuth-contentful/src/components/footer/FooterText.tsx

@@ -2,7 +2,7 @@ import type { FC } from 'react'
 import React from 'react'
 
 import { Link, markdownify, withPrefix } from '../../utils'
-import type { Footer_text } from '.contentlayer/types'
+import type { Footer_text } from 'contentlayer/generated'
 
 export const FooterText: FC<{ section: Footer_text }> = ({ section }) => (
   <section className="cell widget widget-text">