[pull] master from nodejs:master

.eslintignore

@@ -1,2 +1 @@
-test
 public

.eslintrc.js

@@ -63,7 +63,7 @@ module.exports = {
     },
     {
       files: ['test-processor.js', 'test-setup.js', 'test/**'],
-      extends: ['plugin:testing-library/recommended'],
+      extends: ['plugin:testing-library/react'],
       env: {
         jest: true,
       },

.github/workflows/cleanup-staging.yml

@@ -8,7 +8,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.3.4
 
       - name: Setup GCloud
         uses: GoogleCloudPlatform/github-actions/setup-gcloud@master

.github/workflows/gatsby.yml

@@ -6,9 +6,9 @@ jobs:
   test-ci:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.3.4
 
-      - uses: actions/[email protected].5
+      - uses: actions/[email protected].6
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}

.github/workflows/generate-preview.yml

@@ -10,7 +10,7 @@ jobs:
     if: github.event.label.name == 'create-preview'
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.3.4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
@@ -23,7 +23,7 @@ jobs:
           export_default_credentials: true
 
       - name: Remove create-preview label
-        uses: actions/github-script@v3
+        uses: actions/github-script@v4.0.2
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
@@ -51,7 +51,7 @@ jobs:
         run: gsutil -m rsync -R public gs://staging.nodejs.dev/${{ github.event.pull_request.number }}/
 
       - name: Comment on PR
-        uses: actions/github-script@v3
+        uses: actions/github-script@v4.0.2
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |

.github/workflows/test.yml

@@ -10,11 +10,11 @@ jobs:
   test-ci:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.3.4
 
       - uses: actions/[email protected]
 
-      - uses: actions/[email protected].5
+      - uses: actions/[email protected].6
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -32,4 +32,4 @@ jobs:
         run: npm run test-ci
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v1.5.0

.github/workflows/upload-to-staging.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event.issue.pull_request != null && github.event.comment.body == '/preview'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.3.4
 
       - name: Checkout Git Branch
         run: |
@@ -41,7 +41,7 @@ jobs:
         run: gsutil -m rsync -R public gs://staging.nodejs.dev/${{ github.event.issue.number }}/
 
       - name: Comment on PR
-        uses: actions/github-script@v3
+        uses: actions/github-script@v4.0.2
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |

README.md

@@ -44,7 +44,7 @@
 
    Your site is now running at `http://localhost:8000`!
 
-   *Note: You'll also see a second link: `http://localhost:8000/___graphql`. This is a tool you can use to experiment with querying your data. Learn more about using this tool in the [Gatsby tutorial](https://next.gatsbyjs.org/tutorial/part-five/#introducing-graphiql).*
+   *Note: You'll also see a second link: `http://localhost:8000/___graphql`. This is a tool you can use to experiment with querying your data. Learn more about using this tool in the [Gatsby tutorial](https://www.gatsbyjs.com/docs/tutorial/part-five/#introducing-graphiql).*
 
 ## 🧐 What's inside?
 
@@ -112,9 +112,9 @@ A quick look at some of the top-level files and directories found in this projec
 
 11. **`gatsby-browser.js`**: This file is where Gatsby expects to find any usage of the [Gatsby browser APIs](https://www.gatsbyjs.com/docs/browser-apis/) (if any). These allow customization/extension of default Gatsby settings affecting the browser.
 
-12. **`gatsby-config.js`**: This is the main configuration file for a Gatsby site. This is where you can specify information about your site (metadata) like the site title and description, which Gatsby plugins you'd like to include, etc. (Check out the [config docs](https://next.gatsbyjs.org/docs/gatsby-config/) for more detail).
+12. **`gatsby-config.js`**: This is the main configuration file for a Gatsby site. This is where you can specify information about your site (metadata) like the site title and description, which Gatsby plugins you'd like to include, etc. (Check out the [config docs](https://www.gatsbyjs.com/docs/reference/config-files/gatsby-config/) for more detail).
 
-13. **`gatsby-node.js`**: This file is where Gatsby expects to find any usage of the [Gatsby node APIs](https://next.gatsbyjs.org/docs/node-apis/) (if any). These allow customization/extension of default Gatsby settings affecting pieces of the site build process.
+13. **`gatsby-node.js`**: This file is where Gatsby expects to find any usage of the [Gatsby node APIs](https://www.gatsbyjs.com/docs/reference/config-files/gatsby-node/) (if any). These allow customization/extension of default Gatsby settings affecting pieces of the site build process.
 
 14. **`LICENSE`**: Gatsby is licensed under the MIT license.
 
@@ -136,11 +136,11 @@ The `src/documentation` directory currently contains all the getting started con
 
 ## 🎓 Learning Gatsby
 
-Looking for more guidance? Full documentation for Gatsby lives [on the website](https://next.gatsbyjs.org/). Here are some places to start:
+Looking for more guidance? Full documentation for Gatsby lives [on the website](https://www.gatsbyjs.com/). Here are some places to start:
 
-* **For most developers, we recommend starting with our [in-depth tutorial for creating a site with Gatsby](https://next.gatsbyjs.org/tutorial/).** It starts with zero assumptions about your level of ability and walks through every step of the process.
+* **For most developers, we recommend starting with our [in-depth tutorial for creating a site with Gatsby](https://www.gatsbyjs.com/docs/tutorial/).** It starts with zero assumptions about your level of ability and walks through every step of the process.
 
-* **To dive straight into code samples head [to our documentation](https://next.gatsbyjs.org/docs/).** In particular, check out the "Guides", API reference, and "Advanced Tutorials" sections in the sidebar.
+* **To dive straight into code samples head [to our documentation](https://www.gatsbyjs.com/docs/).** In particular, check out the "Guides", API reference, and "Advanced Tutorials" sections in the sidebar.
 
 ## 🏛 Governance
 

content/about/trademark.md

@@ -0,0 +1,32 @@
+---
+title: Trademark Policy
+description: "Trademark Policy | Node.js"
+authors: fhemberger, XhmikosR, mikeal,  brianwarner, bf4
+category: trademark
+---
+
+The Node.js trademarks, service marks, and graphics marks are symbols of the
+quality, performance, and ease of use that people have come to associate with
+the Node.js software and project. To ensure that the Node.js marks continue to
+symbolize these qualities, we must ensure that the marks are only used in ways
+that do not mislead people or cause them to confuse Node.js with other software
+of lower quality. If we don’t ensure the marks are used in this way, it cannot
+only confuse users, it can make it impossible to use the mark to protect
+against people who maliciously exploit the mark in the future. The primary goal
+of this policy is to make sure that this doesn’t happen to the Node.js mark, so
+that the community and users of Node.js are always protected in the future.
+
+At the same time, we’d like community members to feel comfortable spreading the
+word about Node.js and participating in the Node.js community. Keeping that
+goal in mind, we’ve tried to make the policy as flexible and easy to understand
+as legally possible.
+
+The OpenJS Foundation has a perpetual license to use the
+[Node.js marks](https://ip-policy.openjsf.org).
+For more details on using the Node.js mark, please read the
+[full policy](https://trademark-policy.openjsf.org).
+If you have any questions don't hesitate to
+[email us](mailto:[email protected]).
+
+Guidelines for the visual display of the Node.js mark are described in
+the [Visual Guidelines](/static/documents/foundation-visual-guidelines.pdf).

content/blog/0000-00-00-mock.md

@@ -1,6 +1,7 @@
 ---
 title: mock
 author: [manishprivet]
+category: blog
 ---
 
 This is a mock markdown file to keep blog queries from failing and to keep the blog folder alive.

content/community/index.md

@@ -2,6 +2,7 @@
 title: Node.js Community
 description: "Node.js has one of the largest, most vibrant and innovative open source communities in the world. Node.js is built, used, and maintained by the community. We believe the community to be at the core of Node.js popularity. Amazing people from every part of the world, with a common interest, collaborate and shape this community."
 authors: ahmadawais, maedahbatool, saqibameen, msaaddev
+category: community
 ---
 
 ## Introduction

content/homepage/index.md

@@ -18,4 +18,5 @@ nodeFeature2: Node.js is open source and actively maintained by contributors all
 nodeFeature3: Node.js has been adapted to work in a wide variety of places
 nodeFeatureAltText: node feature
 learnLinkText: Get Started
+category: home
 ---

gatsby-config.js

@@ -69,6 +69,13 @@ module.exports = {
         path: `${__dirname}/src/data`,
       },
     },
+    {
+      resolve: 'gatsby-source-filesystem',
+      options: {
+        name: 'data',
+        path: `${__dirname}/content/about`,
+      },
+    },
     {
       resolve: `gatsby-plugin-mdx`,
       options: {
@@ -101,8 +108,7 @@ module.exports = {
             resolve: 'gatsby-remark-autolink-headers',
             options: {
               offsetY: '125',
-              icon:
-                '<svg aria-hidden="true" height="20" version="1.1" viewBox="0 0 16 16" width="20"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"></path></svg>',
+              icon: '<svg aria-hidden="true" height="20" version="1.1" viewBox="0 0 16 16" width="20"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"></path></svg>',
               className: 'autolink-headers',
               maintainCase: false,
               removeAccents: true,

gatsby-node.js

@@ -17,7 +17,16 @@ exports.createPages = ({ graphql, actions }) => {
           {
             allMarkdownRemark(
               filter: {
-                fields: { slug: { nin: ["", "nodejs-community", "homepage"] } }
+                fields: {
+                  slug: {
+                    nin: [
+                      ""
+                      "nodejs-community"
+                      "homepage"
+                      "trademark-policy"
+                    ]
+                  }
+                }
               }
               sort: { fields: [fileAbsolutePath], order: ASC }
             ) {
@@ -36,6 +45,7 @@ exports.createPages = ({ graphql, actions }) => {
                     description
                     authors
                     section
+                    category
                   }
                   fields {
                     slug
@@ -73,7 +83,7 @@ exports.createPages = ({ graphql, actions }) => {
         edges.forEach(({ node }, index) => {
           const {
             fields: { slug },
-            frontmatter: { title, section },
+            frontmatter: { title, section, category },
             parent: { relativePath },
           } = node;
 
@@ -98,20 +108,27 @@ exports.createPages = ({ graphql, actions }) => {
 
           let data;
           if (!navigationData[section]) {
-            data = { title, slug, section };
-            navigationData = { ...navigationData, [section]: [data] };
+            data = { title, slug, section, category };
+            navigationData = {
+              ...navigationData,
+              [section]: { data: [data], category },
+            };
           } else {
-            data = { title, slug, section };
+            data = { title, slug, section, category };
             navigationData = {
               ...navigationData,
-              [section]: [...navigationData[section], data],
+              [section]: {
+                data: [...navigationData[section].data, data],
+                category: navigationData[section].category,
+              },
             };
           }
           docPages.push({
             slug,
             next: nextNodeData,
             previous: previousNodeData,
             relativePath,
+            category,
           });
         });
 
@@ -122,15 +139,16 @@ exports.createPages = ({ graphql, actions }) => {
             previous: page.previous,
             relativePath: page.relativePath,
             navigationData,
+            category: page.category,
           };
 
-          if (page.slug.includes('/blog/')) {
+          if (page.category === 'blog') {
             createPage({
               path: page.slug,
               component: blogTemplate,
               context,
             });
-          } else {
+          } else if (page.category === 'learn') {
             createPage({
               path: `/learn/${page.slug}`,
               component: docTemplate,