Merge remote-tracking branch 'origin/master' into lex111/iss3728

.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/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

examples/classic/package.json

@@ -33,4 +33,4 @@
     ]
   },
   "description": "Docusaurus example project"
-}
+}

examples/facebook/package.json

@@ -50,4 +50,4 @@
     ]
   },
   "description": "Docusaurus example project (facebook template)"
-}
+}

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,9 +104,7 @@
     "babel-eslint": "^10.0.3",
     "concurrently": "^5.3.0",
     "cross-env": "^7.0.3",
-    "enzyme": "^3.10.0",
-    "enzyme-adapter-react-16": "^1.15.1",
-    "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",
@@ -113,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",
-    "react": "^16.8.4",
-    "react-dom": "^16.8.4",
+    "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": {
@@ -137,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

@@ -45,6 +45,8 @@
     "commander": "^4.0.1",
     "crowdin-cli": "^0.3.0",
     "cssnano": "^4.1.10",
+    "enzyme": "^3.10.0",
+    "enzyme-adapter-react-16": "^1.15.1",
     "escape-string-regexp": "^2.0.0",
     "express": "^4.17.1",
     "feed": "^4.2.1",

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

@@ -31,6 +31,6 @@
     "shelljs": "^0.8.4"
   },
   "engines": {
-    "node": ">=10.15.1"
+    "node": ">=12.13.0"
   }
 }

packages/docusaurus-init/templates/bootstrap/package.json

@@ -17,8 +17,8 @@
     "@docusaurus/preset-bootstrap": "2.0.0-alpha.70",
     "@mdx-js/react": "^1.5.8",
     "classnames": "^2.2.6",
-    "react": "^16.8.4",
-    "react-dom": "^16.8.4"
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1"
   },
   "browserslist": {
     "production": [

packages/docusaurus-init/templates/classic/package.json

@@ -17,8 +17,8 @@
     "@docusaurus/preset-classic": "2.0.0-alpha.70",
     "@mdx-js/react": "^1.6.21",
     "clsx": "^1.1.1",
-    "react": "^16.8.4",
-    "react-dom": "^16.8.4"
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1"
   },
   "browserslist": {
     "production": [

packages/docusaurus-init/templates/facebook/package.json

@@ -21,8 +21,8 @@
     "@docusaurus/preset-classic": "2.0.0-alpha.70",
     "@mdx-js/react": "^1.6.21",
     "clsx": "^1.1.1",
-    "react": "^16.8.4",
-    "react-dom": "^16.8.4"
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1"
   },
   "devDependencies": {
     "babel-eslint": "^10.0.3",

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",
-    "react-dom": "^16.8.4"
+    "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-migrate/package.json

@@ -23,7 +23,7 @@
     "docusaurus-migrate": "bin/index.js"
   },
   "dependencies": {
-    "@babel/preset-env": "^7.1.6",
+    "@babel/preset-env": "^7.12.16",
     "@mapbox/hast-util-to-jsx": "^1.0.0",
     "chalk": "^4.1.0",
     "color": "^3.1.3",

packages/docusaurus-migrate/src/index.ts

@@ -106,8 +106,8 @@ export async function migrateDocusaurusProject(
     '@docusaurus/core': DOCUSAURUS_VERSION,
     '@docusaurus/preset-classic': DOCUSAURUS_VERSION,
     clsx: '^1.1.1',
-    react: '^16.10.2',
-    'react-dom': '^16.10.2',
+    react: '^17.0.1',
+    'react-dom': '^17.0.1',
   };
   try {
     createClientRedirects(siteConfig, deps, config);
@@ -592,9 +592,9 @@ function migrateVersionedSidebar(
               acc: {[key: string]: Array<Record<string, unknown> | string>},
               val,
             ) => {
-              acc[val[0].replace(versionRegex, '')] = (val[1] as Array<
-                any
-              >).map((item) => {
+              acc[
+                val[0].replace(versionRegex, '')
+              ] = (val[1] as Array<any>).map((item) => {
                 if (typeof item === 'string') {
                   return item.replace(versionRegex, '');
                 }

packages/docusaurus-module-type-aliases/src/index.d.ts

@@ -52,7 +52,7 @@ declare module '@generated/i18n' {
     defaultLocale: string;
     locales: [string, ...string[]];
     currentLocale: string;
-    localeConfigs: Record<string, {label: string}>;
+    localeConfigs: Record<string, {label: string; direction: string}>;
   };
   export default i18n;
 }

packages/docusaurus-plugin-client-redirects/package.json

@@ -25,12 +25,12 @@
     "eta": "^1.11.0",
     "fs-extra": "^9.0.1",
     "globby": "^11.0.2",
-    "joi": "^17.2.1",
+    "joi": "^17.4.0",
     "lodash": "^4.17.20"
   },
   "peerDependencies": {
-    "react": "^16.8.4",
-    "react-dom": "^16.8.4"
+    "react": "^16.8.4 || ^17.0.0",
+    "react-dom": "^16.8.4 || ^17.0.0"
   },
   "engines": {
     "node": ">=10.9.0"

packages/docusaurus-plugin-content-blog/package.json

@@ -27,18 +27,18 @@
     "feed": "^4.2.2",
     "fs-extra": "^9.1.0",
     "globby": "^11.0.2",
-    "joi": "^17.2.1",
+    "joi": "^17.4.0",
     "loader-utils": "^1.2.3",
     "lodash": "^4.17.20",
     "reading-time": "^1.3.0",
     "remark-admonitions": "^1.2.1",
     "webpack": "^4.44.1"
   },
   "peerDependencies": {
-    "react": "^16.8.4",
-    "react-dom": "^16.8.4"
+    "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-plugin-content-blog/src/__tests__/index.test.ts

@@ -184,26 +184,31 @@ describe('loadBlog', () => {
     expect(editUrlFunction).toHaveBeenCalledWith({
       blogDirPath: 'blog',
       blogPath: 'date-matter.md',
+      permalink: '/blog/date-matter',
       locale: 'en',
     });
     expect(editUrlFunction).toHaveBeenCalledWith({
       blogDirPath: 'blog',
       blogPath: 'draft.md',
+      permalink: '/blog/draft',
       locale: 'en',
     });
     expect(editUrlFunction).toHaveBeenCalledWith({
       blogDirPath: 'blog',
       blogPath: 'complex-slug.md',
+      permalink: '/blog/hey/my super path/héllô',
       locale: 'en',
     });
     expect(editUrlFunction).toHaveBeenCalledWith({
       blogDirPath: 'blog',
       blogPath: 'simple-slug.md',
+      permalink: '/blog/simple/slug',
       locale: 'en',
     });
     expect(editUrlFunction).toHaveBeenCalledWith({
       blogDirPath: 'i18n/en/docusaurus-plugin-content-blog',
       blogPath: '2018-12-14-Happy-First-Birthday-Slash.md',
+      permalink: '/blog/2018/12/14/Happy-First-Birthday-Slash',
       locale: 'en',
     });
   });