fix: switch to contentlayer2

cyf · Jul 25, 2024 · 3d5615f · 3d5615f
1 parent 75b2590
commit 3d5615f
Show file tree

Hide file tree

Showing 13 changed files with 879 additions and 71 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -65,10 +65,10 @@ jobs:
       - name: install dependencies
         run: pnpm install
 
-      - name: copy files to @contentlayer/source-files
+      - name: copy files to @contentlayer2/source-files
         if: matrix.settings.platform == 'windows-latest'
         run: |
-          copy fixed_pkg\makeCacheItemFromFilePath.js node_modules\.pnpm\node_modules\@contentlayer\source-files\dist\fetchData\makeCacheItemFromFilePath.js
+          copy fixed_pkg\makeCacheItemFromFilePath.js node_modules\.pnpm\node_modules\@contentlayer2\source-files\dist\fetchData\makeCacheItemFromFilePath.js
       
       - name: import windows certificate
         if: matrix.settings.platform == 'windows-latest'

diff --git a/.github/workflows/test-app.yml b/.github/workflows/test-app.yml
@@ -37,10 +37,10 @@ jobs:
       - name: install dependencies
         run: pnpm install
 
-      - name: copy files to @contentlayer/source-files
+      - name: copy files to @contentlayer2/source-files
         if: matrix.platforms == 'windows-latest'
         run: |
-          copy fixed_pkg\makeCacheItemFromFilePath.js node_modules\.pnpm\node_modules\@contentlayer\source-files\dist\fetchData\makeCacheItemFromFilePath.js
+          copy fixed_pkg\makeCacheItemFromFilePath.js node_modules\.pnpm\node_modules\@contentlayer2\source-files\dist\fetchData\makeCacheItemFromFilePath.js
 
       - name: build app
         run: pnpm build:app
diff --git a/.github/workflows/test-code-signing.yml b/.github/workflows/test-code-signing.yml
@@ -73,10 +73,10 @@ jobs:
       - name: install dependencies
         run: pnpm install
 
-      - name: copy files to @contentlayer/source-files
+      - name: copy files to @contentlayer2/source-files
         if: matrix.settings.platform == 'windows-latest'
         run: |
-          copy fixed_pkg\makeCacheItemFromFilePath.js node_modules\.pnpm\node_modules\@contentlayer\source-files\dist\fetchData\makeCacheItemFromFilePath.js
+          copy fixed_pkg\makeCacheItemFromFilePath.js node_modules\.pnpm\node_modules\@contentlayer2\source-files\dist\fetchData\makeCacheItemFromFilePath.js
 
       - name: import windows certificate
         if: matrix.settings.platform == 'windows-latest'

diff --git a/app/components/mdx/mdx.tsx b/app/components/mdx/mdx.tsx
@@ -1,4 +1,4 @@
-import { useMDXComponent } from "next-contentlayer/hooks";
+import { useMDXComponent } from "next-contentlayer2/hooks";
 import PostLink from "./link";
 import PostImage from "./image";
 import PostBanner from "./banner";

diff --git a/app/contentlayer.config.js b/app/contentlayer.config.js
@@ -1,4 +1,4 @@
-import { defineDocumentType, makeSource } from "contentlayer/source-files";
+import { defineDocumentType, makeSource } from "contentlayer2/source-files";
 import rehypeSlug from "rehype-slug";
 
 const Post = defineDocumentType(() => ({

diff --git a/app/next.config.js b/app/next.config.js
@@ -1,4 +1,4 @@
-const { withContentlayer } = require("next-contentlayer");
+const { withContentlayer } = require("next-contentlayer2");
 
 /** @type {import('next').NextConfig} */
 const nextConfig = {

diff --git a/app/package.json b/app/package.json
@@ -20,7 +20,7 @@
     "classnames": "^2.5.1",
     "clsx": "^2.1.1",
     "cmdk": "^1.0.0",
-    "contentlayer": "^0.3.4",
+    "contentlayer2": "^0.5.0",
     "date-fns": "^3.6.0",
     "dayjs": "^1.11.11",
     "focus-trap-react": "^10.2.3",
@@ -32,7 +32,7 @@
     "ms": "^2.1.3",
     "muse-ui": "^4.0.0-alpha.3",
     "next": "14.2.5",
-    "next-contentlayer": "^0.3.4",
+    "next-contentlayer2": "^0.5.0",
     "next-intl": "^3.17.1",
     "next-themes": "^0.3.0",
     "nextjs-toploader": "^1.6.12",
@@ -71,7 +71,7 @@
     "prettier-plugin-tailwindcss": "^0.6.5",
     "sort-package-json": "^2.10.0",
     "tailwindcss": "^3.4.6",
-    "typescript": "^5.4.5"
+    "typescript": "5.4.5"
   },
   "engines": {
     "node": "^18"

diff --git a/docs/components/mdx/mdx.tsx b/docs/components/mdx/mdx.tsx
@@ -1,4 +1,4 @@
-import { useMDXComponent } from "next-contentlayer/hooks";
+import { useMDXComponent } from "next-contentlayer2/hooks";
 import PostLink from "./link";
 import PostImage from "./image";
 import PostBanner from "./banner";

diff --git a/docs/contentlayer.config.js b/docs/contentlayer.config.js
@@ -1,4 +1,4 @@
-import { defineDocumentType, makeSource } from "contentlayer/source-files";
+import { defineDocumentType, makeSource } from "contentlayer2/source-files";
 import rehypeSlug from "rehype-slug";
 
 const Post = defineDocumentType(() => ({

diff --git a/docs/next.config.js b/docs/next.config.js
@@ -1,4 +1,4 @@
-const { withContentlayer } = require("next-contentlayer");
+const { withContentlayer } = require("next-contentlayer2");
 
 const basePath =
   process.env.NEXT_PUBLIC_VERCEL_ENV === "production" ? "/faforever" : "";

diff --git a/docs/package.json b/docs/package.json
@@ -20,7 +20,7 @@
     "classnames": "^2.5.1",
     "clsx": "^2.1.1",
     "cmdk": "^1.0.0",
-    "contentlayer": "^0.3.4",
+    "contentlayer2": "^0.5.0",
     "date-fns": "^3.6.0",
     "dayjs": "^1.11.11",
     "focus-trap-react": "^10.2.3",
@@ -34,7 +34,7 @@
     "ms": "^2.1.3",
     "muse-ui": "^4.0.0-alpha.3",
     "next": "14.2.5",
-    "next-contentlayer": "^0.3.4",
+    "next-contentlayer2": "^0.5.0",
     "next-themes": "^0.3.0",
     "nextjs-toploader": "^1.6.12",
     "react": "18.3.1",

diff --git a/fixed_pkg/makeCacheItemFromFilePath.js b/fixed_pkg/makeCacheItemFromFilePath.js