Merge/maintov3

CONTRIBUTING.md

@@ -42,8 +42,6 @@ The core team will review your pull request and will either merge it, request ch
 
 ### Contribution Workflow
 
-<!-- TODO add contrib-docs and link here -->
-
 #### Setting up
 
 1. Fork the `documentation` repository.
@@ -87,7 +85,7 @@ The core team will review your pull request and will either merge it, request ch
     ```
 
 #### Writing
-We can't provide you specific procedures with step-by-step instructions to write technical documentation. But if you have any question or need help, do feel free to reach us through [our forum](https://forum.strapi.io/).
+We can't provide you specific procedures with step-by-step instructions to write technical documentation. But our ["12 Rules of Technical Writing"](https://handbook.strapi.io/user-success-manual/12-rules-of-technical-writing) and [style guide](https://handbook.strapi.io/user-success-manual/strapi-documentation-style-guide) should help you get started. If you have any question or need help, do feel free to reach us through [our forum](https://forum.strapi.io/).
 
 #### Sharing & reviewing
 

README.md

@@ -24,7 +24,7 @@ Strapi is a free and open-source headless CMS delivering your content anywhere y
 
 The following are required if you are submitting pull requests to the documentation. For more information on how to contribute please see our [contribution guide](./CONTRIBUTING.md)
 
-- NodeJS >= 10.16 <=12
+- NodeJS >=12.x <=14.x
 - NPM >= 6.x
 - Yarn >= 1.22.x
 

docs/.vuepress/config.js

@@ -48,8 +48,7 @@ const sidebar = {
           children: [
             {
               title: 'Hosting Provider Guides',
-              path:
-                '/developer-docs/latest/setup-deployment-guides/deployment.html#hosting-provider-guides',
+              path: '/developer-docs/latest/setup-deployment-guides/deployment.html#hosting-provider-guides',
               collapsable: true,
               children: [
                 [
@@ -93,8 +92,7 @@ const sidebar = {
             },
             {
               title: 'Optional Software Guides',
-              path:
-                '/developer-docs/latest/setup-deployment-guides/deployment.html#optional-software-guides',
+              path: '/developer-docs/latest/setup-deployment-guides/deployment.html#optional-software-guides',
               collapsable: true,
               children: [
                 [
@@ -380,27 +378,82 @@ const checklinksIgnoredFiles = [
   './developer-docs/latest/update-migration-guides/migration-guides/migration-guide-beta.20-to-3.0.0.md', // line 93
 ];
 
+const plugins = [
+  ['vuepress-plugin-element-tabs', {}],
+  ['check-md', {
+    ignore: checklinksIgnoredFiles,
+  }],
+  ['seo', {
+    siteTitle: (_, $site) => $site.title,
+    title: $page => $page.title,
+  }],
+  ['vuepress-plugin-code-copy', {
+    color: '#ffffff',
+    successText: 'Copied to clipboard!',
+  }],
+  ['@vuepress/back-to-top', {}],
+  ['vuepress-plugin-container', {
+    type: 'callout',
+    defaultTitle: ''
+  }],
+  ['vuepress-plugin-container', {
+    type: 'strapi',
+    defaultTitle: '',
+    before: info => `<div class="custom-block strapi"><p class="custom-block-title">🤓 ${info}</p>`,
+    after: '</div>'
+  }],
+  ['vuepress-plugin-container', {
+    type: 'tip',
+    before: info => `<div class="custom-block tip"><p class="custom-block-title">💡 ${info}</p>`,
+    after: '</div>'
+  }],
+  ['vuepress-plugin-container', {
+    type: 'note',
+    before: info => `<div class="custom-block note"><p class="custom-block-title">✏️ ${info}</p>`,
+    after: '</div>'
+  }],
+  ['vuepress-plugin-container', {
+    type: 'caution',
+    before: info => `<div class="custom-block caution"><p class="custom-block-title">✋ ${info}</p>`,
+    after: '</div>'
+  }],
+  ['vuepress-plugin-container', {
+    type: 'warning',
+    before: info => `<div class="custom-block warning"><p class="custom-block-title">️❗️ ${info}</p>`,
+    after: '</div>'
+  }],
+  ['vuepress-plugin-container', {
+    type: 'prerequisites',
+    defaultTitle: 'PREREQUISITES'
+  }],
+  ['vuepress-plugin-container', {
+    type: 'api-call',
+    defaultTitle: ''
+  }],
+  ['vuepress-plugin-container', {
+    type: 'request',
+    defaultTitle: 'Request'
+  }],
+  ['vuepress-plugin-container', {
+    type: 'response',
+    defaultTitle: 'Response'
+  }]
+];
+
+const checkLegacy = () => {
+  if (process.env.DEPLOY_ENV == 'legacy') {
+    return '/documentation/';
+  } else {
+    return '/';
+  }
+};
+
 module.exports = {
   title: '',
   port: 8080,
   description: 'The headless CMS developers love.',
-  base: '/documentation/',
-  plugins: {
-    '@vuepress/medium-zoom': {},
-    'vuepress-plugin-element-tabs': {},
-    'check-md': {
-      ignore: checklinksIgnoredFiles,
-    },
-    seo: {
-      siteTitle: (_, $site) => $site.title,
-      title: $page => $page.title,
-    },
-    'vuepress-plugin-code-copy': {
-      color: '#ffffff',
-      successText: 'Copied to clipboard!',
-    },
-    '@vuepress/back-to-top': {},
-  },
+  base: checkLegacy(),
+  plugins: plugins,
   head: [
     [
       'link',
@@ -503,6 +556,10 @@ module.exports = {
   themeConfig: {
     logo: '/assets/logo.png',
     nav: [
+      {
+        text: 'Resource Center',
+        link: 'https://strapi.io/resource-center',
+      },
       {
         text: 'Documentation',
         items: [
@@ -544,13 +601,11 @@ module.exports = {
               },
               {
                 text: 'Content-Types Builder',
-                link:
-                  '/user-docs/latest/content-types-builder/introduction-to-content-types-builder.html',
+                link: '/user-docs/latest/content-types-builder/introduction-to-content-types-builder.html',
               },
               {
                 text: 'Users, Roles, and Permissions',
-                link:
-                  '/user-docs/latest/users-roles-permissions/introduction-to-users-roles-permissions.html',
+                link: '/user-docs/latest/users-roles-permissions/introduction-to-users-roles-permissions.html',
               },
               {
                 text: 'Plugins',
@@ -592,8 +647,8 @@ module.exports = {
                 link: 'https://forum.strapi.io',
               },
               {
-                text: 'Slack',
-                link: 'https://slack.strapi.io',
+                text: 'Discord',
+                link: 'https://discord.strapi.io',
               },
               {
                 text: 'Awesome-Strapi',
@@ -616,6 +671,10 @@ module.exports = {
           },
         ],
       },
+      {
+        text: "We're hiring!",
+        link: 'https://strapi.io/careers#open-positions',
+      },
     ],
     repo: 'strapi/documentation',
     docsDir: 'docs',
@@ -634,4 +693,10 @@ module.exports = {
       '/user-docs/latest/': sidebar.user,
     },
   },
+  markdown: {
+    extendMarkdown: md => {
+      // use more markdown-it plugins!
+      md.use(require('markdown-it-include'))
+    }
+  }
 };

docs/.vuepress/styles/index.styl

@@ -2,4 +2,6 @@
   color: $accentColor !important
 
 .el-tabs__item:not(.is-disabled):hover
-  color: $accentColor !important
+  color: $accentColor !important
+
+@import "strapi-custom-blocks.styl"