chore: resolve merge conflicts

Author: codebender828

package.json

@@ -114,7 +114,7 @@
     "mixpanel-browser": "^2.36.0",
     "node-fetch": "^2.6.0",
     "node-sass": "^4.13.1",
-    "nuxt": "^2.12.2",
+    "nuxt": "^2.13.3",
     "portal-vue": "^2.1.6",
     "prismjs": "^1.19.0",
     "register-service-worker": "^1.6.2",
@@ -141,7 +141,7 @@
     "@testing-library/user-event": "^10.0.0",
     "@testing-library/vue": "^4.1.0",
     "@vue/devtools": "^5.3.3",
-    "babel-eslint": "^10.0.1",
+    "babel-eslint": "^10.1.0",
     "bundlesize": "^0.18.0",
     "cross-env": "^7.0.2",
     "eslint-config-prettier": "^6.10.0",

packages/chakra-ui-docs/nuxt.config.js

@@ -40,12 +40,12 @@ export default {
     'css/page.css'
   ],
   buildModules: [
-    '@nuxtjs/eslint-module'
+    '@nuxtjs/eslint-module',
+    'modules/routes'
   ],
   modules: [
     '@nuxtjs/emotion',
-    '@nuxtjs/pwa',
-    'modules/routes'
+    '@nuxtjs/pwa'
   ],
   router: {
     prefetchLinks: true

packages/chakra-ui-docs/package.json

@@ -5,7 +5,7 @@
   "private": true,
   "scripts": {
     "dev": "nuxt",
-    "build": "nuxt generate --max_old_space_size=8000",
+    "build": "yarn build-static && yarn export",
     "build-static": "nuxt build --target static",
     "export": "nuxt export",
     "start": "nuxt start --max_old_space_size=8000",
@@ -35,7 +35,6 @@
     "@nuxtjs/emotion": "^0.0.1",
     "@nuxtjs/now-builder": "^0.17.0",
     "@nuxtjs/pwa": "^3.0.0-0",
-    "@nuxtjs/router": "^1.5.0",
     "copy-to-clipboard": "^3.3.1",
     "core-js": "2",
     "dotenv-defaults": "^1.1.1",
@@ -45,7 +44,7 @@
     "mdx-vue-loader": "^1.0.2",
     "mixpanel-browser": "^2.36.0",
     "node-sass": "^4.13.1",
-    "nuxt": "^2.12.2",
+    "nuxt": "^2.13.3",
     "prismjs": "^1.19.0",
     "sass-loader": "^8.0.2",
     "vue": "^2.6.11",
@@ -59,7 +58,7 @@
   "devDependencies": {
     "@nuxtjs/eslint-config": "^2.0.0",
     "@nuxtjs/eslint-module": "^1.0.0",
-    "babel-eslint": "^10.0.1",
+    "babel-eslint": "^10.1.0",
     "eslint": "^6.1.0",
     "eslint-config-prettier": "^6.10.0",
     "eslint-plugin-nuxt": ">=0.4.2",

packages/chakra-ui-docs/pages/alert.mdx

@@ -73,7 +73,7 @@ The status of the alerts can be changed by passing the `status` prop. This affec
 ```
 
 ### Custom Alert icons
-You can also use custom Alert icons by passing the name of the icon in the `name` prop of the `CAlertIcon`. <nuxt-link to="/icons">Click here</nuxt-link> to see how to add icons to your Chakra app.
+You can also use custom Alert icons by passing the name of the icon in the `name` prop of the `CAlertIcon`. [Click here](/icon) to see how to add icons to your Chakra app.
 
 ```vue live=true
 <c-alert>

packages/chakra-ui-docs/pages/breadcrumb.mdx

@@ -182,4 +182,4 @@ The `CBreadcrumbLink` composes the <nuxt-link to="/link">CLink</nuxt-link> compo
 
 ### BreadcrumbSeparator Props
 
-The BreadcrumbSeparator composes the <nuxt-link to="/boc">CBox</nuxt-link> component so it accepts all CBox props.
+The BreadcrumbSeparator composes the <nuxt-link to="/box">CBox</nuxt-link> component so it accepts all CBox props.

packages/chakra-ui-docs/pages/button.mdx

@@ -70,7 +70,7 @@ Use the `variant` prop to change the visual style of the `CButton`. You can set
 
 ### Button with Icon
 
-You can add left and right icons to the Button component. See how to [add icons](#/icons) to your project.
+You can add left and right icons to the Button component. See how to [add icons](#/icon) to your project.
 
 ```vue live=true
 <c-button-group :spacing="4">

packages/chakra-ui-docs/pages/grid.mdx

@@ -51,4 +51,4 @@ time.
 
 ## Props
 
-> `CGrid` composes the `CBox` component. So it accepts all Box props along with the related CSS grid props. See <nuxt-link to="/box#props">Box</nuxt-link> component for list of props
+> `CGrid` composes the `CBox` component. So it accepts all Box props along with the related CSS grid props. See [Box](/box#props) component for list of props

packages/chakra-ui-docs/pages/iconbutton.mdx

@@ -65,7 +65,7 @@ the button.
 ### With custom icon
 
 The `CIconButton` component accepts all icons accessible under `this.$chakra.icons`. You can
-see <nuxt-link to="/icons#using-an-icon-library">Icon</nuxt-link> to see how to add fontawesome icons
+see <nuxt-link to="/icon#using-an-icon-library">Icon</nuxt-link> to see how to add fontawesome icons
 to Chakra UI.
 
 ```vue live=true