Upgrade Gatsby to v5

slab · Nov 26, 2023 · c855b78 · c855b78
1 parent 65dae3c
commit c855b78
Show file tree

Hide file tree

Showing 8 changed files with 3,219 additions and 2,337 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,5 +1,6 @@
 {
   "name": "quill-monorepo",
+  "private": true,
   "version": "2.0.0-dev.4",
   "description": "Your powerful, rich text editor",
   "author": "Jason Chen <jhchen7@gmail.com>",

diff --git a/packages/quill/package.json b/packages/quill/package.json
@@ -77,7 +77,7 @@
     "defaults"
   ],
   "scripts": {
-    "build:dev": "./scripts/build development",
+    "build": "./scripts/build development",
     "build:prod": "./scripts/build production",
     "build:webpack": "webpack",
     "build:release": "./_develop/scripts/release.sh",

diff --git a/packages/website/gatsby-config.js b/packages/website/gatsby-config.js
@@ -79,27 +79,25 @@ module.exports = {
                 });
               });
             },
-            query: `
-              {
-                allMdx(
-                  sort: { fields: frontmatter___date, order: DESC }
-                  filter: { fields: { pageType: { eq: "blog" } } }
-                ) {
-                  nodes {
-                    frontmatter {
-                      date(formatString: "DD MMM yyyy")
-                      title
-                    }
-                    fields {
-                      permalink
-                    }
-                    id
-                    body
-                    excerpt
-                  }
-                }
-              }
-            `,
+            query: `{
+  allMdx(
+    sort: {frontmatter: {date: DESC}}
+    filter: {fields: {pageType: {eq: "blog"}}}
+  ) {
+    nodes {
+      frontmatter {
+        date(formatString: "DD MMM yyyy")
+        title
+      }
+      fields {
+        permalink
+      }
+      id
+      body
+      excerpt
+    }
+  }
+}`,
             output: '/feed.xml',
             title: siteMetadata.title,
             match: '^/blog/',

diff --git a/packages/website/gatsby-node.js b/packages/website/gatsby-node.js
@@ -38,6 +38,7 @@ exports.onCreateNode = async ({ node, actions, getNode, reporter, cache }) => {
     name: `pageType`,
     value: pageType,
   });
+  console.log(filePath)
   createNodeField({
     node,
     name: `slug`,
@@ -72,6 +73,7 @@ exports.onCreateNode = async ({ node, actions, getNode, reporter, cache }) => {
       };
       const { default: Content } = await run(result.processedMDX, args);
       const value = renderToStaticMarkup(Content(args));
+      console.log(value)
       createNodeField({
         node,
         name: `excerpt`,

diff --git a/packages/website/package.json b/packages/website/package.json
@@ -1,36 +1,43 @@
 {
   "name": "website",
+  "private": true,
   "version": "1.0.0",
   "description": "",
   "main": "gatsby-browser.js",
   "keywords": [],
   "author": "",
   "license": "BSD-3-Clause",
+  "overrides": {
+    "graphql": {
+      "version": "16.8.1"
+    }
+  },
   "scripts": {
     "build": "gatsby build",
     "serve": "gatsby serve",
     "develop": "gatsby develop"
   },
   "dependencies": {
-    "@mdx-js/react": "^2.1.5",
-    "babel-preset-gatsby": "^2.24.0",
+    "@mdx-js/react": "^3.0.0",
     "classnames": "^2.3.2",
-    "gatsby-plugin-google-analytics": "^4.24.0",
+    "quill": "*",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-helmet": "^6.1.0",
     "slugify": "^1.6.5"
   },
   "devDependencies": {
-    "gatsby": "^4.24.5",
-    "gatsby-plugin-feed": "^4.24.0",
-    "gatsby-plugin-mdx": "^4.3.0",
+    "babel-preset-gatsby": "^3.12.1",
+    "gatsby": "^5.12.11",
+    "gatsby-plugin-feed": "^5.12.3",
+    "gatsby-plugin-google-analytics": "^5.12.0",
+    "gatsby-plugin-mdx": "^5.12.3",
     "gatsby-plugin-react-svg": "^3.1.0",
-    "gatsby-plugin-sass": "^5.24.0",
+    "gatsby-plugin-sass": "^6.12.3",
     "gatsby-remark-find-replace": "^0.3.0",
-    "gatsby-remark-prismjs": "^6.24.0",
-    "gatsby-source-filesystem": "^4.24.0",
-    "prism-react-renderer": "^1.3.5",
+    "gatsby-remark-prismjs": "^7.12.0",
+    "gatsby-source-filesystem": "^5.12.1",
+    "prism-react-renderer": "^2.3.0",
     "prismjs": "^1.29.0",
     "sass": "^1.55.0"
   }

diff --git a/packages/website/root-wrapper.js b/packages/website/root-wrapper.js
@@ -1,5 +1,5 @@
 import { MDXProvider } from '@mdx-js/react';
-import Highlight, { defaultProps } from 'prism-react-renderer';
+import { Highlight } from 'prism-react-renderer';
 import CodePen from './src/components/CodePen';
 import Editor from './src/components/Editor';
 import {
@@ -26,7 +26,6 @@ const components = {
     const matches = className.match(/language-(?<lang>.*)/);
     return (
       <Highlight
-        {...defaultProps}
         code={children.props.children}
         language={
           matches && matches.groups && matches.groups.lang

diff --git a/packages/website/src/pages/blog/index.jsx b/packages/website/src/pages/blog/index.jsx
@@ -44,29 +44,27 @@ const Blog = ({ data }) => (
   </Default>
 );
 
-export const query = graphql`
-  query {
-    allMdx(
-      sort: { fields: frontmatter___date, order: DESC }
-      filter: { fields: { pageType: { eq: "blog" } } }
-    ) {
-      nodes {
-        fields {
-          slug
-          permalink
-          excerpt
-        }
-        frontmatter {
-          date(formatString: "DD MMM yyyy")
-          title
-        }
-        id
-        body
+export const query = graphql`{
+  allMdx(
+    sort: {frontmatter: {date: DESC}}
+    filter: {fields: {pageType: {eq: "blog"}}}
+  ) {
+    nodes {
+      fields {
+        slug
+        permalink
         excerpt
       }
+      frontmatter {
+        date(formatString: "DD MMM yyyy")
+        title
+      }
+      id
+      body
+      excerpt
     }
   }
-`;
+}`;
 
 export const Head = () => (
   <>