resolve merge conflicts

.circleci/config.yml

@@ -26,7 +26,7 @@ aliases:
 defaults: &defaults
   working_directory: ~/docusaurus
   docker:
-    - image: circleci/node:10
+    - image: circleci/node:12
   resource_class: large
 
 version: 2

.github/workflows/build-size.yml

@@ -10,10 +10,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        # Workaround for https://github.com/preactjs/compressed-size-action/issues/54
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
       - uses: preactjs/compressed-size-action@v2
         with:
           repo-token: '${{ secrets.GITHUB_TOKEN }}'
           build-script: 'build:v2:en'
           pattern: '{website/build/assets/js/main*js,website/build/assets/css/styles*css,website/build/index.html,website/build/blog/**/introducing-docusaurus/*,website/build/docs/introduction/index.html}'
           strip-hash: '\.([^;]\w{7})\.'
-          minimum-change-threshold: 100
+          minimum-change-threshold: 30
+          compression: 'none'

.github/workflows/canary-releases.yml

@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [10.x]
+        node-version: [12.x]
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js ${{ matrix.node-version }}

.github/workflows/e2e-test.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: ['10']
+        node: ['12']
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js ${{ matrix.node }}

.github/workflows/migration-cli-e2e-test.yml

@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: ['10']
+        node: ['12']
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js ${{ matrix.node }}

.github/workflows/nodejs-windows.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        node: ['10']
+        node: ['12']
     steps:
       - uses: actions/checkout@v2
       - uses: dorny/paths-filter@v2

.husky/.gitignore

@@ -0,0 +1 @@
+_

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+yarn lint-staged --allow-empty

.nvmrc

@@ -1 +1 @@
-10.15.1
+12.13.0

README.md

@@ -15,7 +15,7 @@
   <a href="#license"><img src="https://img.shields.io/github/license/sourcerer-io/hall-of-fame.svg?colorB=ff0000"></a>
   <a href="https://github.com/facebook/jest"><img src="https://img.shields.io/badge/tested_with-jest-99424f.svg" alt="Tested with Jest"></a>
   <a href="https://gitpod.io/#https://github.com/facebook/docusaurus"><img src="https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod" alt="Gitpod Ready-to-Code"/></a>
-  <a href="https://app.netlify.com/sites/docusaurus-preview/deploys"><img src="https://api.netlify.com/api/v1/badges/57ebb454-c937-4c1d-a228-d9dccb494f49/deploy-status" alt="Netlify Status"></a>
+  <a href="https://app.netlify.com/sites/docusaurus-2/deploys"><img src="https://api.netlify.com/api/v1/badges/9e1ff559-4405-4ebe-8718-5e21c0774bc8/deploy-status" alt="Netlify Status"></a>
   <a href="https://meercode.io/facebook/docusaurus"><img src="https://meercode.io/badge/facebook/docusaurus?type=ci-score" alt="CI Score"></a>
 </p>
 

package.json

@@ -36,7 +36,9 @@
     "canary:bumpVersion": "yarn lerna version 2.0.0-alpha.`git rev-parse --short HEAD` --exact --no-push --yes",
     "canary:publish": "yarn lerna publish from-package --dist-tag canary --yes --no-verify-access",
     "changelog": "lerna-changelog",
-    "postinstall": "yarn lock:update && yarn build:packages",
+    "postinstall": "run-p postinstall:**",
+    "postinstall:main": "yarn lock:update && yarn build:packages",
+    "postinstall:dev": "is-ci || husky install",
     "prettier": "prettier --config .prettierrc --write \"**/*.{js,jsx,ts,tsx}\"",
     "prettier:diff": "prettier --config .prettierrc --list-different \"**/*.{js,jsx,ts,tsx}\"",
     "prettier-docs": "prettier --config .prettierrc --write \"**/*.md\"",
@@ -62,16 +64,16 @@
     "lock:update": "npx yarn-deduplicate"
   },
   "devDependencies": {
-    "@babel/cli": "^7.12.1",
-    "@babel/core": "^7.12.3",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
-    "@babel/plugin-proposal-optional-chaining": "^7.12.1",
-    "@babel/plugin-transform-modules-commonjs": "^7.12.1",
-    "@babel/preset-typescript": "^7.12.1",
-    "@crowdin/cli": "^3.5.2",
+    "@babel/cli": "^7.12.16",
+    "@babel/core": "^7.12.16",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.13",
+    "@babel/plugin-proposal-optional-chaining": "^7.12.16",
+    "@babel/plugin-transform-modules-commonjs": "^7.12.13",
+    "@babel/preset-typescript": "^7.12.16",
+    "@crowdin/cli": "^3.5.3",
     "@types/express": "^4.17.2",
     "@types/fs-extra": "^9.0.6",
-    "@types/jest": "^25.2.1",
+    "@types/jest": "^26.0.20",
     "@types/loader-utils": "^1.1.3",
     "@types/lodash.camelcase": "^4.3.6",
     "@types/lodash.flatmap": "^4.5.6",
@@ -86,7 +88,7 @@
     "@types/node": "^14.14.22",
     "@types/prismjs": "^1.16.2",
     "@types/prompts": "^2.0.9",
-    "@types/react": "^16.9.52",
+    "@types/react": "^17.0.2",
     "@types/react-dev-utils": "^9.0.1",
     "@types/react-helmet": "^6.0.0",
     "@types/react-loadable": "^5.5.3",
@@ -102,7 +104,7 @@
     "babel-eslint": "^10.0.3",
     "concurrently": "^5.3.0",
     "cross-env": "^7.0.3",
-    "eslint": "^7.13.0",
+    "eslint": "^7.20.0",
     "eslint-config-airbnb": "^18.2.1",
     "eslint-config-prettier": "^6.15.0",
     "eslint-plugin-header": "^3.0.0",
@@ -111,19 +113,21 @@
     "eslint-plugin-react": "^7.21.5",
     "eslint-plugin-react-hooks": "^4.2.0",
     "glob": "^7.1.6",
-    "husky": "^4.2.3",
-    "jest": "^25.2.7",
+    "husky": "^5.0.9",
+    "is-ci": "^2.0.0",
+    "jest": "^26.6.3",
     "lerna": "^3.22.1",
     "lerna-changelog": "^1.0.1",
-    "lint-staged": "^10.1.2",
+    "lint-staged": "^10.5.4",
     "netlify-cli": "^2.58.0",
     "nodemon": "^2.0.7",
-    "prettier": "^2.0.2",
+    "npm-run-all": "^4.1.5",
+    "prettier": "^2.2.1",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
     "rimraf": "^3.0.2",
     "serve": "^11.3.2",
-    "stylelint": "^13.2.1",
+    "stylelint": "^13.10.0",
     "typescript": "^3.9.5"
   },
   "lint-staged": {
@@ -135,12 +139,7 @@
       "prettier --write"
     ]
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
   "engines": {
-    "node": ">=10.15.1"
+    "node": ">=12.13.0"
   }
 }

packages/docusaurus-1.x/.eslintrc.js

@@ -42,6 +42,7 @@ module.exports = {
     'react/forbid-prop-types': OFF, // 1
     'react/require-default-props': OFF, // 1
     'jsx-a11y/control-has-associated-label': OFF, // 1
+    'react/jsx-no-target-blank': OFF, // 1
     'react/jsx-props-no-spreading': OFF, // 2
     'max-classes-per-file': OFF, // 2
     'prefer-object-spread': OFF, // 5

packages/docusaurus-1.x/package.json

@@ -67,7 +67,7 @@
     "postcss": "^7.0.23",
     "prismjs": "^1.22.0",
     "react": "^16.8.4",
-    "react-dev-utils": "^9.1.0",
+    "react-dev-utils": "^11.0.1",
     "react-dom": "^16.8.4",
     "remarkable": "^2.0.0",
     "request": "^2.88.0",

packages/docusaurus-cssnano-preset/index.js

@@ -6,14 +6,12 @@
  */
 
 const advancedBasePreset = require('cssnano-preset-advanced');
-const postCssCombineDuplicatedSelectors = require('postcss-combine-duplicated-selectors');
 const postCssSortMediaQueries = require('postcss-sort-media-queries');
 const postCssRemoveOverriddenCustomProperties = require('./src/remove-overridden-custom-properties');
 
 const preset = advancedBasePreset({autoprefixer: {add: true}});
 
 preset.plugins.unshift(
-  [postCssCombineDuplicatedSelectors, {removeDuplicatedValues: true}],
   [postCssSortMediaQueries],
   [postCssRemoveOverriddenCustomProperties],
 );

packages/docusaurus-cssnano-preset/package.json

@@ -15,7 +15,6 @@
   "dependencies": {
     "cssnano-preset-advanced": "^4.0.7",
     "postcss": "^7.0.2",
-    "postcss-combine-duplicated-selectors": "^9.1.0",
     "postcss-sort-media-queries": "^1.7.26"
   },
   "devDependencies": {

packages/docusaurus-init/package.json

@@ -23,14 +23,14 @@
   "license": "MIT",
   "dependencies": {
     "chalk": "^4.1.0",
-    "commander": "^4.0.1",
+    "commander": "^5.1.0",
     "fs-extra": "^9.1.0",
     "lodash.kebabcase": "^4.1.1",
     "prompts": "^2.4.0",
-    "semver": "^6.3.0",
+    "semver": "^7.3.4",
     "shelljs": "^0.8.4"
   },
   "engines": {
-    "node": ">=10.15.1"
+    "node": ">=12.13.0"
   }
 }

packages/docusaurus-mdx-loader/package.json

@@ -16,8 +16,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@babel/parser": "^7.12.5",
-    "@babel/traverse": "^7.12.5",
+    "@babel/parser": "^7.12.16",
+    "@babel/traverse": "^7.12.13",
     "@docusaurus/core": "2.0.0-alpha.70",
     "@docusaurus/utils": "2.0.0-alpha.70",
     "@mdx-js/mdx": "^1.6.21",
@@ -41,13 +41,13 @@
     "remark-mdx": "^1.6.21",
     "to-vfile": "^6.0.0",
     "unist-builder": "^2.0.3",
-    "unist-util-remove-position": "^2.0.1"
+    "unist-util-remove-position": "^3.0.0"
   },
   "peerDependencies": {
     "react": "^16.8.4 || ^17.0.0",
     "react-dom": "^16.8.4 || ^17.0.0"
   },
   "engines": {
-    "node": ">=10.15.1"
+    "node": ">=12.13.0"
   }
 }

packages/docusaurus-mdx-loader/src/index.js

@@ -13,12 +13,13 @@ const matter = require('gray-matter');
 const stringifyObject = require('stringify-object');
 const slug = require('./remark/slug');
 const toc = require('./remark/toc');
+const unwrapMdxCodeBlocks = require('./remark/unwrapMdxCodeBlocks');
 const transformImage = require('./remark/transformImage');
 const transformLinks = require('./remark/transformLinks');
 
 const DEFAULT_OPTIONS = {
   rehypePlugins: [],
-  remarkPlugins: [emoji, slug, toc],
+  remarkPlugins: [unwrapMdxCodeBlocks, emoji, slug, toc],
 };
 
 module.exports = async function docusaurusMdxLoader(fileString) {