From 2127475016d31cf7a58629789b26da0590c15cf1 Mon Sep 17 00:00:00 2001 From: Alexey Pyltsyn Date: Fri, 12 Feb 2021 02:26:50 +0300 Subject: [PATCH 1/8] chore(v2): allow React v17 as peer dependency --- examples/classic/package.json | 6 ++--- examples/facebook/package.json | 6 ++--- .../templates/classic/package.json | 4 +-- .../templates/facebook/package.json | 4 +-- packages/docusaurus-mdx-loader/package.json | 4 +-- .../package.json | 4 +-- .../package.json | 4 +-- .../package.json | 4 +-- .../package.json | 4 +-- packages/docusaurus-plugin-debug/package.json | 4 +-- .../package.json | 4 +-- .../package.json | 4 +-- .../package.json | 4 +-- packages/docusaurus-plugin-pwa/package.json | 4 +-- .../docusaurus-plugin-sitemap/package.json | 4 +-- .../docusaurus-preset-bootstrap/package.json | 4 +-- .../docusaurus-preset-classic/package.json | 4 +-- .../package.json | 4 +-- .../docusaurus-theme-classic/package.json | 4 +-- packages/docusaurus-theme-common/package.json | 4 +-- .../package.json | 4 +-- .../package.json | 4 +-- packages/docusaurus/package.json | 4 +-- yarn.lock | 25 +++++++++++++++++++ 24 files changed, 73 insertions(+), 48 deletions(-) diff --git a/examples/classic/package.json b/examples/classic/package.json index c1c1c68aef96..1ddb1970747e 100644 --- a/examples/classic/package.json +++ b/examples/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": "^16.8.4 || ^17.0.0", + "react-dom": "^16.8.4 || ^17.0.0" }, "browserslist": { "production": [ @@ -33,4 +33,4 @@ ] }, "description": "Docusaurus example project" -} \ No newline at end of file +} diff --git a/examples/facebook/package.json b/examples/facebook/package.json index 29652ef2f7a8..f8b2f02ccee9 100644 --- a/examples/facebook/package.json +++ b/examples/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": "^16.8.4 || ^17.0.0", + "react-dom": "^16.8.4 || ^17.0.0" }, "devDependencies": { "babel-eslint": "^10.0.3", @@ -50,4 +50,4 @@ ] }, "description": "Docusaurus example project (facebook template)" -} \ No newline at end of file +} diff --git a/packages/docusaurus-init/templates/classic/package.json b/packages/docusaurus-init/templates/classic/package.json index 1b747864aa1f..24f338dfe4ec 100644 --- a/packages/docusaurus-init/templates/classic/package.json +++ b/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": [ diff --git a/packages/docusaurus-init/templates/facebook/package.json b/packages/docusaurus-init/templates/facebook/package.json index 2e172de7cbf9..d4490c356c35 100644 --- a/packages/docusaurus-init/templates/facebook/package.json +++ b/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": "^16.8.4 || ^17.0.0", + "react-dom": "^16.8.4 || ^17.0.0" }, "devDependencies": { "babel-eslint": "^10.0.3", diff --git a/packages/docusaurus-mdx-loader/package.json b/packages/docusaurus-mdx-loader/package.json index b966ce25a4b1..c29ff1b58e1f 100644 --- a/packages/docusaurus-mdx-loader/package.json +++ b/packages/docusaurus-mdx-loader/package.json @@ -44,8 +44,8 @@ "unist-util-remove-position": "^2.0.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" diff --git a/packages/docusaurus-plugin-client-redirects/package.json b/packages/docusaurus-plugin-client-redirects/package.json index 4416588d1a16..2618319dced7 100644 --- a/packages/docusaurus-plugin-client-redirects/package.json +++ b/packages/docusaurus-plugin-client-redirects/package.json @@ -29,8 +29,8 @@ "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" diff --git a/packages/docusaurus-plugin-content-blog/package.json b/packages/docusaurus-plugin-content-blog/package.json index 35a6e92758e6..a042da0f5952 100644 --- a/packages/docusaurus-plugin-content-blog/package.json +++ b/packages/docusaurus-plugin-content-blog/package.json @@ -35,8 +35,8 @@ "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" diff --git a/packages/docusaurus-plugin-content-docs/package.json b/packages/docusaurus-plugin-content-docs/package.json index 1c879d77608a..e924d66b16a3 100644 --- a/packages/docusaurus-plugin-content-docs/package.json +++ b/packages/docusaurus-plugin-content-docs/package.json @@ -48,8 +48,8 @@ "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" diff --git a/packages/docusaurus-plugin-content-pages/package.json b/packages/docusaurus-plugin-content-pages/package.json index 54e1673d6ab4..fb7ac6892e9a 100644 --- a/packages/docusaurus-plugin-content-pages/package.json +++ b/packages/docusaurus-plugin-content-pages/package.json @@ -33,8 +33,8 @@ "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" diff --git a/packages/docusaurus-plugin-debug/package.json b/packages/docusaurus-plugin-debug/package.json index 5493fe788df1..277882923cc3 100644 --- a/packages/docusaurus-plugin-debug/package.json +++ b/packages/docusaurus-plugin-debug/package.json @@ -23,8 +23,8 @@ "react-json-view": "^1.20.4" }, "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" diff --git a/packages/docusaurus-plugin-google-analytics/package.json b/packages/docusaurus-plugin-google-analytics/package.json index a1484beb9045..e7cb6b24a737 100644 --- a/packages/docusaurus-plugin-google-analytics/package.json +++ b/packages/docusaurus-plugin-google-analytics/package.json @@ -16,8 +16,8 @@ "@docusaurus/core": "2.0.0-alpha.70" }, "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" diff --git a/packages/docusaurus-plugin-google-gtag/package.json b/packages/docusaurus-plugin-google-gtag/package.json index 7b17f86c4046..d9ab4790e71d 100644 --- a/packages/docusaurus-plugin-google-gtag/package.json +++ b/packages/docusaurus-plugin-google-gtag/package.json @@ -16,8 +16,8 @@ "@docusaurus/core": "2.0.0-alpha.70" }, "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" diff --git a/packages/docusaurus-plugin-ideal-image/package.json b/packages/docusaurus-plugin-ideal-image/package.json index c88b5d57f3a8..fe9b5cb36105 100644 --- a/packages/docusaurus-plugin-ideal-image/package.json +++ b/packages/docusaurus-plugin-ideal-image/package.json @@ -30,8 +30,8 @@ "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" diff --git a/packages/docusaurus-plugin-pwa/package.json b/packages/docusaurus-plugin-pwa/package.json index a8f6a95f8d02..90608c34176c 100644 --- a/packages/docusaurus-plugin-pwa/package.json +++ b/packages/docusaurus-plugin-pwa/package.json @@ -29,7 +29,7 @@ "workbox-window": "^6.0.2" }, "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" } } diff --git a/packages/docusaurus-plugin-sitemap/package.json b/packages/docusaurus-plugin-sitemap/package.json index 17743bfa39b9..f86dea977e5c 100644 --- a/packages/docusaurus-plugin-sitemap/package.json +++ b/packages/docusaurus-plugin-sitemap/package.json @@ -25,8 +25,8 @@ "sitemap": "^3.2.2" }, "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" diff --git a/packages/docusaurus-preset-bootstrap/package.json b/packages/docusaurus-preset-bootstrap/package.json index 5bcddbbd56da..61612ab4b6f5 100644 --- a/packages/docusaurus-preset-bootstrap/package.json +++ b/packages/docusaurus-preset-bootstrap/package.json @@ -20,8 +20,8 @@ "@docusaurus/theme-bootstrap": "2.0.0-alpha.70" }, "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" diff --git a/packages/docusaurus-preset-classic/package.json b/packages/docusaurus-preset-classic/package.json index e057799e3dfe..4aa8df4b4596 100644 --- a/packages/docusaurus-preset-classic/package.json +++ b/packages/docusaurus-preset-classic/package.json @@ -25,8 +25,8 @@ "@docusaurus/theme-search-algolia": "2.0.0-alpha.70" }, "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" diff --git a/packages/docusaurus-remark-plugin-npm2yarn/package.json b/packages/docusaurus-remark-plugin-npm2yarn/package.json index e9007e3ba29c..de5331db1a72 100644 --- a/packages/docusaurus-remark-plugin-npm2yarn/package.json +++ b/packages/docusaurus-remark-plugin-npm2yarn/package.json @@ -21,8 +21,8 @@ "to-vfile": "^6.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" diff --git a/packages/docusaurus-theme-classic/package.json b/packages/docusaurus-theme-classic/package.json index 692047c13120..91994e61f7f5 100644 --- a/packages/docusaurus-theme-classic/package.json +++ b/packages/docusaurus-theme-classic/package.json @@ -50,8 +50,8 @@ "@docusaurus/module-type-aliases": "2.0.0-alpha.70" }, "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" diff --git a/packages/docusaurus-theme-common/package.json b/packages/docusaurus-theme-common/package.json index 9250f6799420..b017e981a188 100644 --- a/packages/docusaurus-theme-common/package.json +++ b/packages/docusaurus-theme-common/package.json @@ -28,8 +28,8 @@ "@docusaurus/module-type-aliases": "2.0.0-alpha.70" }, "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" diff --git a/packages/docusaurus-theme-live-codeblock/package.json b/packages/docusaurus-theme-live-codeblock/package.json index ca13cf51323f..f006b45d4948 100644 --- a/packages/docusaurus-theme-live-codeblock/package.json +++ b/packages/docusaurus-theme-live-codeblock/package.json @@ -21,8 +21,8 @@ "react-live": "^2.2.3" }, "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" diff --git a/packages/docusaurus-theme-search-algolia/package.json b/packages/docusaurus-theme-search-algolia/package.json index 350876d8ee48..b4161b5c4dd6 100644 --- a/packages/docusaurus-theme-search-algolia/package.json +++ b/packages/docusaurus-theme-search-algolia/package.json @@ -25,8 +25,8 @@ "lodash": "^4.17.19" }, "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" diff --git a/packages/docusaurus/package.json b/packages/docusaurus/package.json index a654fe78dca3..bb334991d242 100644 --- a/packages/docusaurus/package.json +++ b/packages/docusaurus/package.json @@ -116,8 +116,8 @@ "webpackbar": "^5.0.0-3" }, "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" diff --git a/yarn.lock b/yarn.lock index c09b91b8f905..9e5630d1484d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16721,6 +16721,15 @@ react-dom@^16.8.4: prop-types "^15.6.2" scheduler "^0.19.1" +react-dom@^17.0.1: + version "17.0.1" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.1.tgz#1de2560474ec9f0e334285662ede52dbc5426fc6" + integrity sha512-6eV150oJZ9U2t9svnsspTMrWNyHc6chX0KzDeAOXftRa8bNeOKTTfCJ7KorIwenkHd2xqVTBTCZd79yk/lx/Ug== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + scheduler "^0.20.1" + react-error-overlay@^6.0.3, react-error-overlay@^6.0.7: version "6.0.7" resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.7.tgz#1dcfb459ab671d53f660a991513cb2f0a0553108" @@ -16899,6 +16908,14 @@ react@^16.8.4: object-assign "^4.1.1" prop-types "^15.6.2" +react@^17.0.1: + version "17.0.1" + resolved "https://registry.yarnpkg.com/react/-/react-17.0.1.tgz#6e0600416bd57574e3f86d92edba3d9008726127" + integrity sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + reactstrap@^8.4.1: version "8.5.1" resolved "https://registry.yarnpkg.com/reactstrap/-/reactstrap-8.5.1.tgz#dde43539602117888a138042b53703b7621c4318" @@ -17808,6 +17825,14 @@ scheduler@^0.19.1: loose-envify "^1.1.0" object-assign "^4.1.1" +scheduler@^0.20.1: + version "0.20.1" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.1.tgz#da0b907e24026b01181ecbc75efdc7f27b5a000c" + integrity sha512-LKTe+2xNJBNxu/QhHvDR14wUXHRQbVY5ZOYpOGWRzhydZUqrLb2JBvLPY7cAqFmqrWuDED0Mjk7013SZiOz6Bw== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + schema-utils@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770" From ccfe2c50a62a2723d87557d2c3e5251620f98c70 Mon Sep 17 00:00:00 2001 From: slorber Date: Fri, 12 Feb 2021 15:12:56 +0100 Subject: [PATCH 2/8] minor React 17 changes --- packages/docusaurus-init/templates/bootstrap/package.json | 4 ++-- packages/docusaurus-init/templates/facebook/package.json | 4 ++-- website/package.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/docusaurus-init/templates/bootstrap/package.json b/packages/docusaurus-init/templates/bootstrap/package.json index 3d17e73b2357..f052f6488f58 100644 --- a/packages/docusaurus-init/templates/bootstrap/package.json +++ b/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": [ diff --git a/packages/docusaurus-init/templates/facebook/package.json b/packages/docusaurus-init/templates/facebook/package.json index d4490c356c35..abd540bf827a 100644 --- a/packages/docusaurus-init/templates/facebook/package.json +++ b/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 || ^17.0.0", - "react-dom": "^16.8.4 || ^17.0.0" + "react": "^17.0.1", + "react-dom": "^17.0.1" }, "devDependencies": { "babel-eslint": "^10.0.3", diff --git a/website/package.json b/website/package.json index 281e45b12793..049aaf5fd722 100644 --- a/website/package.json +++ b/website/package.json @@ -40,8 +40,8 @@ "clsx": "^1.1.1", "color": "^3.1.3", "npm-to-yarn": "^1.0.0-2", - "react": "^16.8.4", - "react-dom": "^16.8.4", + "react": "^17.0.1", + "react-dom": "^17.0.1", "workbox-routing": "^5.0.0", "workbox-strategies": "^5.0.0" }, From a0c8f4a71a5fd1c01fe5b37df73100eafb7d2e94 Mon Sep 17 00:00:00 2001 From: Alexey Pyltsyn Date: Fri, 12 Feb 2021 17:43:52 +0300 Subject: [PATCH 3/8] Revert examples --- examples/classic/package.json | 4 ++-- examples/facebook/package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/classic/package.json b/examples/classic/package.json index 1ddb1970747e..c51d1adc1959 100644 --- a/examples/classic/package.json +++ b/examples/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 || ^17.0.0", - "react-dom": "^16.8.4 || ^17.0.0" + "react": "^16.8.4", + "react-dom": "^16.8.4" }, "browserslist": { "production": [ diff --git a/examples/facebook/package.json b/examples/facebook/package.json index f8b2f02ccee9..eb2a153c591e 100644 --- a/examples/facebook/package.json +++ b/examples/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 || ^17.0.0", - "react-dom": "^16.8.4 || ^17.0.0" + "react": "^16.8.4", + "react-dom": "^16.8.4" }, "devDependencies": { "babel-eslint": "^10.0.3", From d9ad72bf663c3a2a30f82d0ada4841caa918280a Mon Sep 17 00:00:00 2001 From: Alexey Pyltsyn Date: Fri, 12 Feb 2021 17:56:28 +0300 Subject: [PATCH 4/8] Possible fix --- packages/docusaurus-migrate/src/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/docusaurus-migrate/src/index.ts b/packages/docusaurus-migrate/src/index.ts index c39b668d9852..1b6694c4f700 100644 --- a/packages/docusaurus-migrate/src/index.ts +++ b/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); From b53fafb00087a0aa06a364c709c6c6f8fe49f15e Mon Sep 17 00:00:00 2001 From: slorber Date: Fri, 12 Feb 2021 16:02:54 +0100 Subject: [PATCH 5/8] Use @docusaurus/react-loadable fork --- packages/docusaurus/package.json | 3 ++- packages/docusaurus/src/webpack/base.ts | 3 +++ .../src/webpack/sharedModuleAliases.ts | 19 +++++++++++++ yarn.lock | 27 +++++++++++-------- 4 files changed, 40 insertions(+), 12 deletions(-) create mode 100644 packages/docusaurus/src/webpack/sharedModuleAliases.ts diff --git a/packages/docusaurus/package.json b/packages/docusaurus/package.json index bb334991d242..d0d4eb2a7502 100644 --- a/packages/docusaurus/package.json +++ b/packages/docusaurus/package.json @@ -50,6 +50,7 @@ "@babel/runtime-corejs3": "^7.12.5", "@babel/traverse": "^7.12.12", "@docusaurus/cssnano-preset": "2.0.0-alpha.70", + "@docusaurus/react-loadable": "5.5.0", "@docusaurus/types": "2.0.0-alpha.70", "@docusaurus/utils": "2.0.0-alpha.70", "@docusaurus/utils-validation": "2.0.0-alpha.70", @@ -86,6 +87,7 @@ "lodash.isplainobject": "^4.0.6", "lodash.isstring": "^4.0.1", "mini-css-extract-plugin": "^0.8.0", + "module-alias": "^2.2.2", "nprogress": "^0.2.0", "null-loader": "^4.0.0", "optimize-css-assets-webpack-plugin": "^5.0.4", @@ -95,7 +97,6 @@ "prompts": "^2.4.0", "react-dev-utils": "^10.2.1", "react-helmet": "^6.1.0", - "react-loadable": "^5.5.0", "react-loadable-ssr-addon": "^0.3.0", "react-router": "^5.2.0", "react-router-config": "^5.1.1", diff --git a/packages/docusaurus/src/webpack/base.ts b/packages/docusaurus/src/webpack/base.ts index e9863318ea4b..6cb9306f02f9 100644 --- a/packages/docusaurus/src/webpack/base.ts +++ b/packages/docusaurus/src/webpack/base.ts @@ -20,6 +20,7 @@ import { getMinimizer, } from './utils'; import {STATIC_DIR_NAME} from '../constants'; +import SharedModuleAliases from './sharedModuleAliases'; const CSS_REGEX = /\.css$/; const CSS_MODULE_REGEX = /\.module\.css$/; @@ -101,6 +102,8 @@ export function createBaseConfig( process.cwd(), ], alias: { + ...SharedModuleAliases, + '@site': siteDir, '@generated': generatedFilesDir, diff --git a/packages/docusaurus/src/webpack/sharedModuleAliases.ts b/packages/docusaurus/src/webpack/sharedModuleAliases.ts new file mode 100644 index 000000000000..84d8102e9bee --- /dev/null +++ b/packages/docusaurus/src/webpack/sharedModuleAliases.ts @@ -0,0 +1,19 @@ +/** + * Copyright (c) Facebook, Inc. and its affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +import moduleAlias from 'module-alias'; + +// The shared module aliases are module aliases that need to work in both SSR/NodeJS + Webpack +const SharedModuleAliases = { + // Useful to fix the react-loadable warning + // See https://github.com/jamiebuilds/react-loadable/pull/213#issuecomment-778246548 + 'react-loadable': '@docusaurus/react-loadable', +}; + +moduleAlias.addAliases(SharedModuleAliases); + +export default SharedModuleAliases; diff --git a/yarn.lock b/yarn.lock index 9e5630d1484d..5754e6943be0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1120,9 +1120,9 @@ regenerator-runtime "^0.13.4" "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.2.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e" - integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.13.tgz#0a21452352b02542db0ffb928ac2d3ca7cb6d66d" + integrity sha512-8+3UMPBrjFa/6TtKi/7sehPKqfAm4g6K+YQjyyFOLUTxzOngcRZTlAVY8sc2CORJYqdHQY8gRPHmn+qo15rCBw== dependencies: regenerator-runtime "^0.13.4" @@ -1263,6 +1263,13 @@ "@docsearch/css" "3.0.0-alpha.32" algoliasearch "^4.0.0" +"@docusaurus/react-loadable@5.5.5": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@docusaurus/react-loadable/-/react-loadable-5.5.0.tgz#6d6f0c8fd9a434b62a1ab1f8645ee7bde5a9ec21" + integrity sha512-Ld/kwUE6yATIOTLq3JCsWiTa/drisajwKqBQ2Rw6IcT+sFsKfYek8F2jSH8f68AT73xX97UehduZeCSlnuCBIg== + dependencies: + prop-types "^15.6.2" + "@endiliey/react-ideal-image@^0.0.11": version "0.0.11" resolved "https://registry.yarnpkg.com/@endiliey/react-ideal-image/-/react-ideal-image-0.0.11.tgz#dc3803d04e1409cf88efa4bba0f67667807bdf27" @@ -13693,6 +13700,11 @@ modify-values@^1.0.0: resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022" integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw== +module-alias@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/module-alias/-/module-alias-2.2.2.tgz#151cdcecc24e25739ff0aa6e51e1c5716974c0e0" + integrity sha512-A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q== + module-definition@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/module-definition/-/module-definition-3.3.0.tgz#aae06d68c99c5f93841e59b8a4469b974956d4d4" @@ -16330,7 +16342,7 @@ prop-types-exact@^1.2.0: object.assign "^4.1.0" reflect.ownkeys "^0.2.0" -prop-types@^15.0.0, prop-types@^15.5.0, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2: +prop-types@^15.0.0, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2: version "15.7.2" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== @@ -16790,13 +16802,6 @@ react-loadable-ssr-addon@^0.3.0: dependencies: "@babel/runtime" "^7.10.3" -react-loadable@^5.5.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/react-loadable/-/react-loadable-5.5.0.tgz#582251679d3da86c32aae2c8e689c59f1196d8c4" - integrity sha512-C8Aui0ZpMd4KokxRdVAm2bQtI03k2RMRNzOB+IipV3yxFTSVICv7WoUr5L9ALB5BmKO1iHgZtWM8EvYG83otdg== - dependencies: - prop-types "^15.5.0" - react-popper@^1.3.6: version "1.3.7" resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.7.tgz#f6a3471362ef1f0d10a4963673789de1baca2324" From 3ac4ce06682c0f366719d9d4ca9cc82c60f4280e Mon Sep 17 00:00:00 2001 From: slorber Date: Fri, 12 Feb 2021 16:25:02 +0100 Subject: [PATCH 6/8] add back react-loadable to please eslint/ts/linters, even if it's unused in practice --- packages/docusaurus/package.json | 1 + yarn.lock | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/docusaurus/package.json b/packages/docusaurus/package.json index d0d4eb2a7502..1864e8335f4f 100644 --- a/packages/docusaurus/package.json +++ b/packages/docusaurus/package.json @@ -97,6 +97,7 @@ "prompts": "^2.4.0", "react-dev-utils": "^10.2.1", "react-helmet": "^6.1.0", + "react-loadable": "^5.5.0", "react-loadable-ssr-addon": "^0.3.0", "react-router": "^5.2.0", "react-router-config": "^5.1.1", diff --git a/yarn.lock b/yarn.lock index 5754e6943be0..da1c8b7df0a9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1263,7 +1263,7 @@ "@docsearch/css" "3.0.0-alpha.32" algoliasearch "^4.0.0" -"@docusaurus/react-loadable@5.5.5": +"@docusaurus/react-loadable@5.5.0": version "5.5.0" resolved "https://registry.yarnpkg.com/@docusaurus/react-loadable/-/react-loadable-5.5.0.tgz#6d6f0c8fd9a434b62a1ab1f8645ee7bde5a9ec21" integrity sha512-Ld/kwUE6yATIOTLq3JCsWiTa/drisajwKqBQ2Rw6IcT+sFsKfYek8F2jSH8f68AT73xX97UehduZeCSlnuCBIg== @@ -16342,7 +16342,7 @@ prop-types-exact@^1.2.0: object.assign "^4.1.0" reflect.ownkeys "^0.2.0" -prop-types@^15.0.0, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2: +prop-types@^15.0.0, prop-types@^15.5.0, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2: version "15.7.2" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== @@ -16802,6 +16802,13 @@ react-loadable-ssr-addon@^0.3.0: dependencies: "@babel/runtime" "^7.10.3" +react-loadable@^5.5.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/react-loadable/-/react-loadable-5.5.0.tgz#582251679d3da86c32aae2c8e689c59f1196d8c4" + integrity sha512-C8Aui0ZpMd4KokxRdVAm2bQtI03k2RMRNzOB+IipV3yxFTSVICv7WoUr5L9ALB5BmKO1iHgZtWM8EvYG83otdg== + dependencies: + prop-types "^15.5.0" + react-popper@^1.3.6: version "1.3.7" resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.7.tgz#f6a3471362ef1f0d10a4963673789de1baca2324" From 1fff3a4b8e4bdd65476be359bef5beb2c4b7bc00 Mon Sep 17 00:00:00 2001 From: slorber Date: Fri, 12 Feb 2021 16:33:32 +0100 Subject: [PATCH 7/8] missing dependency bump --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 2443c5274d5a..9637a88fa39e 100644 --- a/package.json +++ b/package.json @@ -121,8 +121,8 @@ "netlify-cli": "^2.58.0", "nodemon": "^2.0.7", "prettier": "^2.0.2", - "react": "^16.8.4", - "react-dom": "^16.8.4", + "react": "^17.0.1", + "react-dom": "^17.0.1", "rimraf": "^3.0.2", "serve": "^11.3.2", "stylelint": "^13.2.1", From 099bbae1e9744520661fdd9434658e8ccfe85bba Mon Sep 17 00:00:00 2001 From: slorber Date: Fri, 12 Feb 2021 16:48:18 +0100 Subject: [PATCH 8/8] move enzyme dependencies to docusaurus v1 --- package.json | 2 -- packages/docusaurus-1.x/package.json | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 9637a88fa39e..967c746a25d1 100644 --- a/package.json +++ b/package.json @@ -102,8 +102,6 @@ "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-config-airbnb": "^18.2.1", "eslint-config-prettier": "^6.15.0", diff --git a/packages/docusaurus-1.x/package.json b/packages/docusaurus-1.x/package.json index 6d48c8a6ed94..9be14fcf89be 100644 --- a/packages/docusaurus-1.x/package.json +++ b/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",