chore: resolve merge conflict

.github/CODEOWNERS

@@ -1,19 +1,19 @@
 # Default to system one design and one dev
 
-* @carbon-design-system/developers-system @carbon-design-system/design
+* @carbon-design-system/developers-system-reviewers @carbon-design-system/design
 
 # Diana Tran is the owner for Sustainability Software Patterns
 
 src/pages/community/patterns/login-pattern/*  @dianatran18 @lukefirth
 
 # Eliad Moosavi and Natasha Decoste are the code owners for Data Visualization
 
-src/pages/data-visualization/* @theiliad @natashadecoste
+src/pages/data-visualization/* @theiliad # @natashadecoste
 
 # Zvonimir Fras for Angular tutorial
 
 /src/pages/tutorial/angular/* @zvonimirfras
 
 # Lee Chase for Vue tutorial
 
-/src/pages/tutorial/vue/* @lee-chase
+/src/pages/tutorial/vue/* @lee-chase

.github/ISSUE_TEMPLATE/docs-issue.yaml

@@ -0,0 +1,96 @@
+name: Documentation issue 📖
+description:
+  Report missing, incorrect, or otherwise inconsistent documentation here.
+title: '[Docs]: '
+labels: 'type: bug 🐛'
+body:
+  - type: markdown
+    attributes:
+      value: '## Welcome!'
+  - type: markdown
+    attributes:
+      value:
+        Thanks for taking the time to fill out this form that will help us make
+        more clear documention.
+
+  - type: dropdown
+    id: project
+    attributes:
+      label: Project
+      description: Where is the problem you're identifying in the documentation?
+      multiple: false
+      options:
+        - https://www.carbondesignsystem.com
+        - https://react.carbondesignsystem.com
+        - https://github.com/carbon-design-system/carbon/tree/main/docs
+    validations:
+      required: true
+
+  - type: input
+    id: section
+    attributes:
+      label: Section
+      description:
+        'Which page are you experiencing the problem with the documentation?'
+      placeholder: https://carbondesignsystem.com/components/accordion/usage/
+    validations:
+      required: true
+
+  - type: textarea
+    id: problem
+    attributes:
+      label: Problem
+      description:
+        'Describe the problem you’re experiencing in the documentation. Please
+        attach any screen shots or videos to illustrate the problem.'
+      placeholder:
+        The abc component is missing usage instructions about the xyz prop.
+    validations:
+      required: true
+
+  - type: textarea
+    id: solution
+    attributes:
+      label: Solution
+      description:
+        'What would you expect to see instead? Please attach any screen shots or
+        videos to illustrate a possible solution.'
+      placeholder: _Your amazing idea here_
+
+  - type: dropdown
+    id: severity
+    attributes:
+      label: Suggested Severity
+      description:
+        'Read more to understand our [severity
+        levels](https://github.com/carbon-design-system/carbon/blob/main/docs/guides/support.md#severity)'
+      options:
+        - 'Severity 1 = The documentation damages the brand or exposes
+          intellectual property.'
+        - 'Severity 2 = The documentation is wrong or missing major details. It
+          conflicts with what we are saying in another part of the system.	'
+        - "Severity 3 = The documentation is mis-leading, somewhat true, missing
+          minor details, or grammatically incorrect. It doesn't present
+          conflicts with other parts of the design system."
+        - 'Severity 4 = Unrelated to a user task. Content has a typo.'
+
+  - type: input
+    id: application
+    attributes:
+      label: Application
+      description: 'What application do you work on?'
+
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Code of Conduct
+      description: Please confirm the following
+      options:
+        - label:
+            I agree to follow this project's [Code of
+            Conduct](https://github.com/carbon-design-system/carbon/blob/f555616971a03fd454c0f4daea184adf41fff05b/.github/CODE_OF_CONDUCT.md)
+          required: true
+        - label:
+            I checked the [current
+            issues](https://github.com/carbon-design-system/carbon/issues) for
+            duplicate problems

.github/workflows/update-carbon-gatsby-deps.yml

@@ -24,11 +24,8 @@ jobs:
       - name: Update dependencies
         run: |
           yarn up \
-            @carbon/react@next \
-            @carbon/elements@next \
             @carbon/pictograms@next \
             @carbon/pictograms-react@next \
-            @carbon/icons@next \
             @carbon/icons-react@next \
             gatsby-theme-carbon@latest \
       - name: Generate token

.gitignore

@@ -113,3 +113,6 @@ build-timestamp
 
 .now
 .vercel
+
+# Yarn install state
+.yarn/install-state.gz

.husky/pre-commit

@@ -0,0 +1 @@
+npx --no-install lint-staged

README.md

@@ -3,8 +3,9 @@
 ![Deployment status](https://github.com/carbon-design-system/carbon-website/workflows/Deployment%20status/badge.svg)
 
 This is the [Carbon Design System website](http://www.carbondesignsystem.com).
-It's built using the [gatsby-theme-carbon](https://gatsby.carbondesignsystem.com/)
-with [GatsbyJS](https://www.gatsbyjs.org/).
+It's built using the
+[gatsby-theme-carbon](https://gatsby.carbondesignsystem.com/) with
+[GatsbyJS](https://www.gatsbyjs.org/).
 
 ## 📂 Structure
 
@@ -22,8 +23,10 @@ src
 ## 👩‍💻 Develop
 
 - 🤝 [Contribution guidelines](.github/CONTRIBUTING.md)
-- 📚 [Content and Markdown guidelines](https://gatsby-theme-carbon.now.sh/components/markdown)
-- 🗺 [Navigation guidelines](https://gatsby-theme-carbon.now.sh/guides/navigation/sidebar)
+- 📚
+  [Content and Markdown guidelines](https://gatsby-theme-carbon.now.sh/components/markdown)
+- 🗺
+  [Navigation guidelines](https://gatsby-theme-carbon.now.sh/guides/navigation/sidebar)
 
 - `yarn install` – install dependencies
 - `yarn dev` – start the development server

gatsby-config.js

@@ -1,6 +1,7 @@
 const path = require('path');
 
 module.exports = {
+  trailingSlash: `always`,
   siteMetadata: {
     title: 'Carbon Design System',
     siteUrl: 'https://www.carbondesignsystem.com',
@@ -38,6 +39,16 @@ module.exports = {
     'gatsby-plugin-sharp',
     'gatsby-transformer-sharp',
     'gatsby-plugin-lodash',
+    {
+      resolve: 'gatsby-plugin-manifest',
+      options: {
+        name: 'Carbon Design System',
+        short_name: 'Carbon',
+        icon: 'src/images/favicon.svg',
+        start_url: '/',
+        display: 'browser',
+      },
+    },
     {
       resolve: 'gatsby-theme-carbon',
       options: {
@@ -55,28 +66,12 @@ module.exports = {
         },
       },
     },
-    {
-      resolve: 'gatsby-plugin-manifest',
-      options: {
-        name: 'Carbon Design System',
-        short_name: 'Carbon',
-        icon: 'src/images/favicon.svg',
-      },
-    },
     'gatsby-plugin-sitemap',
-    {
-      resolve: 'gatsby-plugin-component-index',
-      options: {
-        directory: path.resolve(__dirname, './src/data/index'),
-      },
-    },
     {
       resolve: 'gatsby-plugin-chart-index',
       options: {
         directory: path.resolve(__dirname, './src/data/chart-index'),
       },
     },
-    'gatsby-plugin-remove-serviceworker',
-    'gatsby-plugin-meta-redirect',
   ],
 };

gatsby-ssr.js

@@ -21,7 +21,7 @@ export const onRenderBody = ({ setHeadComponents, setPostBodyComponents }) => {
   }`;
 
   setHeadComponents([
-    <meta key="image" name="image" content={'/ogimage.png'} />,
+    <meta key="image" name="image" content={"/ogimage.png"} />,
     <meta
       key="og:url"
       property="og:url"
@@ -33,13 +33,13 @@ export const onRenderBody = ({ setHeadComponents, setPostBodyComponents }) => {
       property="og:description"
       content="Carbon is IBM’s open source design system for products and digital experiences. With the IBM Design Language as its foundation, the system consists of working code, design tools and resources, human interface guidelines, and a vibrant community of contributors."
     />,
-    <meta key="og:image" property="og:image" content={'/ogimage.png'} />,
+    <meta key="og:image" property="og:image" content={"/ogimage.png"} />,
     <meta
       key="og:image:alt"
       property="og:image:alt"
       content="Carbon Design System logo"
     />,
-    <meta key="twitter:image" name="twitter:image" content={'/ogimage.png'} />,
+    <meta key="twitter:image" name="twitter:image" content={"/ogimage.png"} />,
     <meta
       key="twitter:image:alt"
       property="twitter:image:alt"