Merge pull request #1 from timlrx/update

Update packages, dependencies and name

.changeset/blue-pandas-brush.md

@@ -0,0 +1,5 @@
+---
+'next-contentlayer': minor
+---
+
+Support next 14

.changeset/config.json

@@ -2,12 +2,22 @@
   "$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
   "changelog": "@changesets/cli/changelog",
   "commit": false,
-  "fixed": [["@contentlayer/*", "contentlayer", "next-contentlayer"]],
+  "fixed": [
+    [
+      "@contentlayer/*",
+      "contentlayer",
+      "next-contentlayer"
+    ]
+  ],
   "access": "public",
   "baseBranch": "main",
   "updateInternalDependencies": "patch",
-  "ignore": ["examples-*"],
+  "ignore": [
+    "*-example",
+    "next-rsc-dynamic",
+    "next-images"
+  ],
   "___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
     "useCalculatedVersionForSnapshots": true
   }
-}
+}

.changeset/fresh-buckets-cheer.md

@@ -0,0 +1,5 @@
+---
+'@contentlayer/core': minor
+---
+
+Update unified ecosystem dependencies

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ jobs:
   build-example-next-contentlayer-example:
     strategy:
       matrix:
-        node-version: [17, 18, 19, 20] # `app` dir requires 17+
+        node-version: [18, 19, 20]
         os: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -43,7 +43,7 @@ jobs:
   build-example-next-rsc-dynamic-example:
     strategy:
       matrix:
-        node-version: [17, 18, 19, 20] # `app` dir requires 17+
+        node-version: [18, 19, 20]
         os: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -55,7 +55,7 @@ jobs:
   build-example-next-images-example:
     strategy:
       matrix:
-        node-version: [17, 18, 19, 20] # `app` dir requires 17+
+        node-version: [18, 19, 20]
         # TODO re-enable windows
         # os: [ubuntu-latest, windows-latest]
         os: [ubuntu-latest]

.gitignore

@@ -26,3 +26,4 @@ out
 !tap-snapshots/dist/*
 
 .contentlayer
+.DS_Store

.vscode/settings.json

@@ -8,22 +8,21 @@
     "examples/gatsby-docs/gatsby": true
   },
   "files.exclude": {
+    "**/.direnv": true,
+    "**/.DS_Store": true,
     "**/.git": true,
-    "**/.svn": true,
     "**/.hg": true,
+    "**/.svn": true,
+    "**/.yarn": true,
     "**/CVS": true,
-    "**/.DS_Store": true,
     "**/Thumbs.db": true,
-    "**/dist": true,
-    "**/vercel.json": true,
-    "**/.yarn": true,
-    "**/.direnv": true
+    "**/vercel.json": true
   },
   "editor.formatOnSave": true,
   "editor.codeActionsOnSave": {
-    "source.organizeImports": false,
-    "source.fixAll": true,
-    "source.addMissingImports": true
+    "source.organizeImports": "never",
+    "source.fixAll": "explicit",
+    "source.addMissingImports": "explicit"
   },
   "typescript.enablePromptUseWorkspaceTsdk": true,
   "prettier.singleQuote": true,

examples/next-images/app/page.tsx

@@ -1,35 +1,30 @@
-import Link from "next/link";
-import { compareDesc, format, parseISO } from "date-fns";
-import { allPosts, Post } from "contentlayer/generated";
-import { getMDXComponent } from "next-contentlayer/hooks";
+import Link from 'next/link'
+import { compareDesc, format, parseISO } from 'date-fns'
+import { allPosts, Post } from 'contentlayer/generated'
+import { getMDXComponent } from 'next-contentlayer2/hooks'
 
 function PostCard(post: Post) {
-  const Content = getMDXComponent(post.body.code);
+  const Content = getMDXComponent(post.body.code)
 
   return (
     <div className="mb-8">
       <h2 className="text-xl">
-        <Link
-          href={post.url}
-          className="text-blue-700 hover:text-blue-900"
-          legacyBehavior>
+        <Link href={post.url} className="text-blue-700 hover:text-blue-900" legacyBehavior>
           {post.title}
         </Link>
       </h2>
       <time dateTime={post.date} className="block mb-2 text-xs text-gray-600">
-        {format(parseISO(post.date), "LLLL d, yyyy")}
+        {format(parseISO(post.date), 'LLLL d, yyyy')}
       </time>
       <div className="text-sm">
         <Content />
       </div>
     </div>
-  );
+  )
 }
 
 export default function Home() {
-  const posts = allPosts.sort((a, b) =>
-    compareDesc(new Date(a.date), new Date(b.date))
-  );
+  const posts = allPosts.sort((a, b) => compareDesc(new Date(a.date), new Date(b.date)))
 
   return (
     <div className="max-w-xl py-8 mx-auto">
@@ -39,5 +34,5 @@ export default function Home() {
         <PostCard key={idx} {...post} />
       ))}
     </div>
-  );
+  )
 }

examples/next-images/app/posts/[slug]/page.tsx

@@ -1,6 +1,6 @@
 import { format, parseISO } from 'date-fns'
 import { allPosts } from 'contentlayer/generated'
-import { getMDXComponent } from 'next-contentlayer/hooks'
+import { getMDXComponent } from 'next-contentlayer2/hooks'
 import Image from 'next/image'
 
 export const generateStaticParams = async () => allPosts.map((post) => ({ slug: post._raw.flattenedPath }))

examples/next-images/contentlayer.config.ts

@@ -1,4 +1,4 @@
-import { defineDocumentType, makeSource } from 'contentlayer/source-files'
+import { defineDocumentType, makeSource } from 'contentlayer2/source-files'
 
 const Post = defineDocumentType(() => ({
   name: 'Post',

examples/next-images/next.config.js

@@ -1,10 +1,6 @@
-const { withContentlayer } = require("next-contentlayer");
+const { withContentlayer } = require("next-contentlayer2");
 
 /** @type {import('next').NextConfig} */
-const nextConfig = {
-  experimental: {
-    appDir: true,
-  },
-};
+const nextConfig = {}
 
 module.exports = withContentlayer(nextConfig);

examples/next-images/package.json

@@ -8,10 +8,10 @@
     "start": "next start"
   },
   "dependencies": {
-    "contentlayer": "latest",
+    "contentlayer2": "latest",
     "date-fns": "2.30.0",
-    "next": "13.4.7",
-    "next-contentlayer": "latest",
+    "next": "14.1.0",
+    "next-contentlayer2": "latest",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },

examples/next-rsc-dynamic/contentlayer.config.ts

@@ -1,6 +1,6 @@
-import { defineDocumentType } from 'contentlayer/source-files'
+import { defineDocumentType } from 'contentlayer2/source-files'
 import { spawn } from 'node:child_process'
-import { makeSource } from 'contentlayer/source-remote-files'
+import { makeSource } from 'contentlayer2/source-remote-files'
 
 const Post = defineDocumentType(() => ({
   name: 'Post',

examples/next-rsc-dynamic/next.config.js

@@ -1,5 +1,3 @@
-const { withContentlayer } = require('next-contentlayer')
+const { withContentlayer } = require('next-contentlayer2')
 
-module.exports = withContentlayer({
-  experimental: { appDir: true, },
-})
+module.exports = withContentlayer({})

examples/next-rsc-dynamic/package.json

@@ -8,10 +8,10 @@
     "start": "next start"
   },
   "dependencies": {
-    "contentlayer": "latest",
+    "contentlayer2": "latest",
     "date-fns": "2.30.0",
-    "next": "13.4.7",
-    "next-contentlayer": "latest",
+    "next": "14.1.0",
+    "next-contentlayer2": "latest",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },

examples/node-script-mdx/contentlayer.config.ts

@@ -1,4 +1,4 @@
-import { defineDocumentType, makeSource } from 'contentlayer/source-files'
+import { defineDocumentType, makeSource } from 'contentlayer2/source-files'
 import { bundleMDX } from 'mdx-bundler'
 import * as ReactDOMServer from 'react-dom/server'
 import { getMDXComponent } from 'mdx-bundler/client/index.js'

examples/node-script-mdx/package.json

@@ -2,9 +2,9 @@
   "name": "node-script-mdx-example",
   "private": true,
   "scripts": {
-    "start": "contentlayer build && node --experimental-json-modules my-script.mjs"
+    "start": "contentlayer2 build && node --experimental-json-modules my-script.mjs"
   },
   "dependencies": {
-    "contentlayer": "latest"
+    "contentlayer2": "latest"
   }
 }

examples/node-script-remote-content/contentlayer.config.ts

@@ -1,6 +1,6 @@
-import { defineDocumentType } from 'contentlayer/source-files'
+import { defineDocumentType } from 'contentlayer2/source-files'
 import { spawn } from 'node:child_process'
-import { makeSource } from 'contentlayer/source-remote-files'
+import { makeSource } from 'contentlayer2/source-remote-files'
 
 const Post = defineDocumentType(() => ({
   name: 'Post',

examples/node-script-remote-content/package.json

@@ -2,9 +2,9 @@
   "name": "node-script-remote-content-example",
   "private": true,
   "scripts": {
-    "start": "contentlayer build && node --experimental-json-modules my-script.mjs"
+    "start": "contentlayer2 build && node --experimental-json-modules my-script.mjs"
   },
   "dependencies": {
-    "contentlayer": "latest"
+    "contentlayer2": "latest"
   }
 }

examples/node-script/contentlayer.config.ts

@@ -1,4 +1,4 @@
-import { defineDocumentType, makeSource } from 'contentlayer/source-files'
+import { defineDocumentType, makeSource } from 'contentlayer2/source-files'
 
 const Post = defineDocumentType(() => ({
   name: 'Post',

examples/node-script/package.json

@@ -2,9 +2,9 @@
   "name": "node-script-example",
   "private": true,
   "scripts": {
-    "start": "contentlayer build && node --experimental-json-modules my-script.mjs"
+    "start": "contentlayer2 build && node --experimental-json-modules my-script.mjs"
   },
   "dependencies": {
-    "contentlayer": "latest"
+    "contentlayer2": "latest"
   }
 }

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "contentlayer-monorepo",
+  "name": "contentlayer2-monorepo",
   "private": true,
   "workspaces": [
     "./packages/@contentlayer/*",
@@ -10,11 +10,11 @@
     "postinstall": "ts-patch install",
     "prepare": "ts-patch install -s",
     "test": "CI=true VITEST_SEGFAULT_RETRY=3 yarn workspaces foreach --parallel run test",
-    "build": "run build:clean && run build:ts && yarn workspace next-contentlayer run prepack",
+    "build": "run build:clean && run build:ts && yarn workspace next-contentlayer2 run prepack",
     "build:ts": "tsc --build tsconfig.all.json",
     "dev:ts": "run build:ts --watch",
     "build:clean": "bash -c 'rm -rf packages/*/dist packages/@contentlayer/*/dist'",
-    "examples:postinstall": "yarn workspaces foreach --verbose --include \"examples-*\" exec yarn contentlayer postinstall",
+    "examples:postinstall": "yarn workspaces foreach --verbose --include \"examples-*\" exec yarn contentlayer2 postinstall",
     "release:prerelease": "yarn build && yarn workspaces foreach --verbose --topological-dev --parallel --no-private npm publish --tolerate-republish --tag=dev",
     "release:patch": "yarn build && yarn workspaces foreach --verbose --topological-dev --parallel --no-private npm publish --tolerate-republish",
     "release:minor": "yarn build && yarn workspaces foreach --verbose --topological-dev --parallel --no-private npm publish --tolerate-republish",
@@ -42,11 +42,11 @@
   },
   "resolutions": {
     "esbuild": "0.18.0",
-    "contentlayer": "workspace:*",
-    "@contentlayer/*": "workspace:*",
-    "contentlayer-stackbit-yaml-generator": "workspace:*",
-    "next-contentlayer": "workspace:*",
+    "contentlayer2": "workspace:*",
+    "@contentlayer2/*": "workspace:*",
+    "contentlayer-stackbit-yaml-generator2": "workspace:*",
+    "next-contentlayer2": "workspace:*",
     "rxjs": "^7.1.0"
   },
   "packageManager": "[email protected]"
-}
+}

packages/@contentlayer/cli/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@contentlayer/cli",
-  "version": "0.3.4",
+  "name": "@contentlayer2/cli",
+  "version": "0.4.1",
   "type": "module",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -13,8 +13,8 @@
     "test": "echo No tests yet"
   },
   "dependencies": {
-    "@contentlayer/core": "workspace:*",
-    "@contentlayer/utils": "workspace:*",
+    "@contentlayer2/core": "workspace:*",
+    "@contentlayer2/utils": "workspace:*",
     "clipanion": "^3.2.1",
     "typanion": "^3.12.1"
   },

packages/@contentlayer/cli/src/commands/BuildCommand.ts

@@ -1,5 +1,5 @@
-import * as core from '@contentlayer/core'
-import { OT, pipe, T } from '@contentlayer/utils/effect'
+import * as core from '@contentlayer2/core'
+import { OT, pipe, T } from '@contentlayer2/utils/effect'
 import type { Usage } from 'clipanion'
 
 import { BaseCommand } from './_BaseCommand.js'
@@ -25,6 +25,6 @@ export class BuildCommand extends BaseCommand {
       T.tap((config) => (config.source.options.disableImportAliasWarning ? T.unit : T.fork(core.validateTsconfig))),
       T.chain((config) => core.generateDotpkg({ config, verbose: this.verbose })),
       T.tap(core.logGenerateInfo),
-      OT.withSpan('@contentlayer/cli/commands/BuildCommand:executeSafe'),
+      OT.withSpan('@contentlayer2/cli/commands/BuildCommand:executeSafe'),
     )
 }

packages/@contentlayer/cli/src/commands/DefaultCommand.ts

@@ -1,4 +1,4 @@
-import { OT, pipe, T } from '@contentlayer/utils/effect'
+import { OT, pipe, T } from '@contentlayer2/utils/effect'
 import { Command } from 'clipanion'
 
 import { BaseCommand } from './_BaseCommand.js'
@@ -9,6 +9,6 @@ export class DefaultCommand extends BaseCommand {
   executeSafe = () =>
     pipe(
       T.succeedWith(() => console.log(this.cli.usage())),
-      OT.withSpan('@contentlayer/cli/commands/DefaultCommand:executeSafe', { attributes: { cwd: process.cwd() } }),
+      OT.withSpan('@contentlayer2/cli/commands/DefaultCommand:executeSafe', { attributes: { cwd: process.cwd() } }),
     )
 }

packages/@contentlayer/cli/src/commands/DevCommand.ts

@@ -1,6 +1,6 @@
-import * as core from '@contentlayer/core'
-import { errorToString } from '@contentlayer/utils'
-import { E, OT, pipe, S, T } from '@contentlayer/utils/effect'
+import * as core from '@contentlayer2/core'
+import { errorToString } from '@contentlayer2/utils'
+import { E, OT, pipe, S, T } from '@contentlayer2/utils/effect'
 import type { Usage } from 'clipanion'
 
 import { BaseCommand } from './_BaseCommand.js'
@@ -31,8 +31,8 @@ export class DevCommand extends BaseCommand {
         core.generateDotpkgStream({ config, verbose: this.verbose, isDev: true }),
       ),
       S.tap(E.fold((error) => T.log(errorToString(error)), core.logGenerateInfo)),
-      OT.withStreamSpan('@contentlayer/cli/commands/DevCommand:stream'),
+      OT.withStreamSpan('@contentlayer2/cli/commands/DevCommand:stream'),
       S.runDrain,
-      OT.withSpan('@contentlayer/cli/commands/DevCommand:executeSafe'),
+      OT.withSpan('@contentlayer2/cli/commands/DevCommand:executeSafe'),
     )
 }