diff --git a/packages/create-docusaurus/templates/classic-typescript/package.json b/packages/create-docusaurus/templates/classic-typescript/package.json index f470e201f1..2a0dd4fa2d 100644 --- a/packages/create-docusaurus/templates/classic-typescript/package.json +++ b/packages/create-docusaurus/templates/classic-typescript/package.json @@ -17,7 +17,7 @@ "dependencies": { "@docusaurus/core": "2.0.0-beta.15", "@docusaurus/preset-classic": "2.0.0-beta.15", - "@mdx-js/react": "^1.6.21", + "@mdx-js/react": "^1.6.22", "clsx": "^1.1.1", "prism-react-renderer": "^1.2.1", "react": "^17.0.1", diff --git a/packages/create-docusaurus/templates/classic/package.json b/packages/create-docusaurus/templates/classic/package.json index 4430589eb6..3df1d14361 100644 --- a/packages/create-docusaurus/templates/classic/package.json +++ b/packages/create-docusaurus/templates/classic/package.json @@ -16,7 +16,7 @@ "dependencies": { "@docusaurus/core": "2.0.0-beta.15", "@docusaurus/preset-classic": "2.0.0-beta.15", - "@mdx-js/react": "^1.6.21", + "@mdx-js/react": "^1.6.22", "clsx": "^1.1.1", "prism-react-renderer": "^1.2.1", "react": "^17.0.1", diff --git a/packages/create-docusaurus/templates/facebook/package.json b/packages/create-docusaurus/templates/facebook/package.json index 6dcf76c2cf..e6fb380c24 100644 --- a/packages/create-docusaurus/templates/facebook/package.json +++ b/packages/create-docusaurus/templates/facebook/package.json @@ -20,7 +20,7 @@ "dependencies": { "@docusaurus/core": "2.0.0-beta.15", "@docusaurus/preset-classic": "2.0.0-beta.15", - "@mdx-js/react": "^1.6.21", + "@mdx-js/react": "^1.6.22", "clsx": "^1.1.1", "react": "^17.0.1", "react-dom": "^17.0.1" diff --git a/packages/docusaurus-mdx-loader/package.json b/packages/docusaurus-mdx-loader/package.json index cdb971ded4..5d3eb1a0c2 100644 --- a/packages/docusaurus-mdx-loader/package.json +++ b/packages/docusaurus-mdx-loader/package.json @@ -22,7 +22,7 @@ "@babel/traverse": "^7.16.3", "@docusaurus/logger": "2.0.0-beta.15", "@docusaurus/utils": "2.0.0-beta.15", - "@mdx-js/mdx": "^1.6.21", + "@mdx-js/mdx": "^1.6.22", "escape-html": "^1.0.3", "file-loader": "^6.2.0", "fs-extra": "^10.0.0", @@ -48,7 +48,6 @@ "unist-util-remove-position": "^3.0.0" }, "peerDependencies": { - "@babel/core": "^7.0.0", "react": "^16.8.4 || ^17.0.0", "react-dom": "^16.8.4 || ^17.0.0" }, diff --git a/packages/docusaurus-plugin-content-blog/package.json b/packages/docusaurus-plugin-content-blog/package.json index b07685162b..bed39a8402 100644 --- a/packages/docusaurus-plugin-content-blog/package.json +++ b/packages/docusaurus-plugin-content-blog/package.json @@ -39,7 +39,6 @@ "escape-string-regexp": "^4.0.0" }, "peerDependencies": { - "@babel/core": "^7.0.0", "react": "^16.8.4 || ^17.0.0", "react-dom": "^16.8.4 || ^17.0.0" }, diff --git a/packages/docusaurus-plugin-content-blog/src/index.ts b/packages/docusaurus-plugin-content-blog/src/index.ts index c7d0b5e9d0..a49529224a 100644 --- a/packages/docusaurus-plugin-content-blog/src/index.ts +++ b/packages/docusaurus-plugin-content-blog/src/index.ts @@ -37,13 +37,11 @@ import type { import {PluginOptionSchema} from './pluginOptionSchema'; import type { LoadContext, - ConfigureWebpackUtils, Plugin, HtmlTags, OptionValidationContext, ValidationResult, } from '@docusaurus/types'; -import type {Configuration} from 'webpack'; import { generateBlogPosts, getSourceToPermalink, @@ -405,12 +403,7 @@ export default async function pluginContentBlog( return translateContent(content, translationFiles); }, - configureWebpack( - _config: Configuration, - isServer: boolean, - {getJSLoader}: ConfigureWebpackUtils, - content, - ) { + configureWebpack(_config, isServer, {getJSLoader}, content) { const { rehypePlugins, remarkPlugins, diff --git a/packages/docusaurus-plugin-content-docs/package.json b/packages/docusaurus-plugin-content-docs/package.json index ae422c4be7..12602c682a 100644 --- a/packages/docusaurus-plugin-content-docs/package.json +++ b/packages/docusaurus-plugin-content-docs/package.json @@ -50,7 +50,6 @@ "utility-types": "^3.10.0" }, "peerDependencies": { - "@babel/core": "^7.0.0", "react": "^16.8.4 || ^17.0.0", "react-dom": "^16.8.4 || ^17.0.0" }, diff --git a/packages/docusaurus-plugin-content-pages/package.json b/packages/docusaurus-plugin-content-pages/package.json index b96913a2fc..379e979293 100644 --- a/packages/docusaurus-plugin-content-pages/package.json +++ b/packages/docusaurus-plugin-content-pages/package.json @@ -32,7 +32,6 @@ "@docusaurus/types": "2.0.0-beta.15" }, "peerDependencies": { - "@babel/core": "^7.0.0", "react": "^16.8.4 || ^17.0.0", "react-dom": "^16.8.4 || ^17.0.0" }, diff --git a/packages/docusaurus-plugin-content-pages/src/index.ts b/packages/docusaurus-plugin-content-pages/src/index.ts index 4a8fc3ca26..9cc4e389b4 100644 --- a/packages/docusaurus-plugin-content-pages/src/index.ts +++ b/packages/docusaurus-plugin-content-pages/src/index.ts @@ -26,9 +26,7 @@ import type { Plugin, OptionValidationContext, ValidationResult, - ConfigureWebpackUtils, } from '@docusaurus/types'; -import type {Configuration} from 'webpack'; import admonitions from 'remark-admonitions'; import {PluginOptionSchema} from './pluginOptionSchema'; import {validatePageFrontMatter} from './pageFrontMatter'; @@ -178,11 +176,7 @@ export default async function pluginContentPages( ); }, - configureWebpack( - _config: Configuration, - isServer: boolean, - {getJSLoader}: ConfigureWebpackUtils, - ) { + configureWebpack(_config, isServer, {getJSLoader}) { const { rehypePlugins, remarkPlugins, diff --git a/packages/docusaurus-plugin-debug/package.json b/packages/docusaurus-plugin-debug/package.json index 6bd95675d6..07dc856451 100644 --- a/packages/docusaurus-plugin-debug/package.json +++ b/packages/docusaurus-plugin-debug/package.json @@ -28,10 +28,8 @@ "@docusaurus/types": "2.0.0-beta.15" }, "peerDependencies": { - "@babel/core": "^7.0.0", "react": "^16.8.4 || ^17.0.0", - "react-dom": "^16.8.4 || ^17.0.0", - "webpack": "^5.0.0" + "react-dom": "^16.8.4 || ^17.0.0" }, "engines": { "node": ">=14" diff --git a/packages/docusaurus-plugin-google-analytics/package.json b/packages/docusaurus-plugin-google-analytics/package.json index d7c4778c96..691c3099fb 100644 --- a/packages/docusaurus-plugin-google-analytics/package.json +++ b/packages/docusaurus-plugin-google-analytics/package.json @@ -26,10 +26,8 @@ "@docusaurus/types": "2.0.0-beta.15" }, "peerDependencies": { - "@babel/core": "^7.0.0", "react": "^16.8.4 || ^17.0.0", - "react-dom": "^16.8.4 || ^17.0.0", - "webpack": "^5.0.0" + "react-dom": "^16.8.4 || ^17.0.0" }, "engines": { "node": ">=14" diff --git a/packages/docusaurus-plugin-google-gtag/package.json b/packages/docusaurus-plugin-google-gtag/package.json index 34c048d039..21933fc5a7 100644 --- a/packages/docusaurus-plugin-google-gtag/package.json +++ b/packages/docusaurus-plugin-google-gtag/package.json @@ -26,10 +26,8 @@ "@docusaurus/types": "2.0.0-beta.15" }, "peerDependencies": { - "@babel/core": "^7.0.0", "react": "^16.8.4 || ^17.0.0", - "react-dom": "^16.8.4 || ^17.0.0", - "webpack": "^5.0.0" + "react-dom": "^16.8.4 || ^17.0.0" }, "engines": { "node": ">=14" diff --git a/packages/docusaurus-plugin-ideal-image/src/index.ts b/packages/docusaurus-plugin-ideal-image/src/index.ts index e82165e581..39e5aa0be9 100644 --- a/packages/docusaurus-plugin-ideal-image/src/index.ts +++ b/packages/docusaurus-plugin-ideal-image/src/index.ts @@ -12,7 +12,6 @@ import type { ValidationResult, } from '@docusaurus/types'; import type {PluginOptions} from '@docusaurus/plugin-ideal-image'; -import type {Configuration} from 'webpack'; import {Joi} from '@docusaurus/utils-validation'; import {readDefaultCodeTranslationMessages} from '@docusaurus/theme-translations'; @@ -44,7 +43,7 @@ export default function pluginIdealImage( }); }, - configureWebpack(_config: Configuration, isServer: boolean) { + configureWebpack(_config, isServer) { const {disableInDev, ...loaderOptions} = options; if (disableInDev && process.env.NODE_ENV !== 'production') { return {}; diff --git a/packages/docusaurus-plugin-pwa/package.json b/packages/docusaurus-plugin-pwa/package.json index de657e4dd6..9af612b74a 100644 --- a/packages/docusaurus-plugin-pwa/package.json +++ b/packages/docusaurus-plugin-pwa/package.json @@ -42,7 +42,6 @@ "fs-extra": "^10.0.0" }, "peerDependencies": { - "@babel/core": "^7.0.0", "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 89e44ad367..4e8d2eae2b 100644 --- a/packages/docusaurus-plugin-sitemap/package.json +++ b/packages/docusaurus-plugin-sitemap/package.json @@ -30,10 +30,8 @@ "@docusaurus/types": "2.0.0-beta.15" }, "peerDependencies": { - "@babel/core": "^7.0.0", "react": "^16.8.4 || ^17.0.0", - "react-dom": "^16.8.4 || ^17.0.0", - "webpack": "^5.0.0" + "react-dom": "^16.8.4 || ^17.0.0" }, "engines": { "node": ">=14" diff --git a/packages/docusaurus-preset-classic/package.json b/packages/docusaurus-preset-classic/package.json index c96460eca3..1e87dcc106 100644 --- a/packages/docusaurus-preset-classic/package.json +++ b/packages/docusaurus-preset-classic/package.json @@ -31,11 +31,8 @@ "@docusaurus/theme-search-algolia": "2.0.0-beta.15" }, "peerDependencies": { - "@babel/core": "^7.0.0", - "prism-react-renderer": "^1.2.1", "react": "^16.8.4 || ^17.0.0", - "react-dom": "^16.8.4 || ^17.0.0", - "webpack": "^5.0.0" + "react-dom": "^16.8.4 || ^17.0.0" }, "engines": { "node": ">=14" diff --git a/packages/docusaurus-theme-classic/package.json b/packages/docusaurus-theme-classic/package.json index 5d68541a53..9ac1058019 100644 --- a/packages/docusaurus-theme-classic/package.json +++ b/packages/docusaurus-theme-classic/package.json @@ -30,7 +30,7 @@ "@docusaurus/utils": "2.0.0-beta.15", "@docusaurus/utils-common": "2.0.0-beta.15", "@docusaurus/utils-validation": "2.0.0-beta.15", - "@mdx-js/react": "^1.6.21", + "@mdx-js/react": "^1.6.22", "clsx": "^1.1.1", "copy-text-to-clipboard": "^3.0.1", "infima": "0.2.0-alpha.37", @@ -54,10 +54,8 @@ "utility-types": "^3.10.0" }, "peerDependencies": { - "@babel/core": "^7.0.0", "react": "^16.8.4 || ^17.0.0", - "react-dom": "^16.8.4 || ^17.0.0", - "webpack": "^5.0.0" + "react-dom": "^16.8.4 || ^17.0.0" }, "engines": { "node": ">=14" diff --git a/packages/docusaurus-theme-common/package.json b/packages/docusaurus-theme-common/package.json index 05699af314..9a34bde7ad 100644 --- a/packages/docusaurus-theme-common/package.json +++ b/packages/docusaurus-theme-common/package.json @@ -23,6 +23,7 @@ "@docusaurus/plugin-content-pages": "2.0.0-beta.15", "clsx": "^1.1.1", "parse-numeric-range": "^1.3.0", + "prism-react-renderer": "^1.2.1", "tslib": "^2.3.1", "utility-types": "^3.10.0" }, @@ -35,8 +36,6 @@ "lodash": "^4.17.20" }, "peerDependencies": { - "@babel/core": "^7.0.0", - "prism-react-renderer": "^1.2.1", "react": "^16.8.4 || ^17.0.0", "react-dom": "^16.8.4 || ^17.0.0" }, diff --git a/packages/docusaurus-theme-search-algolia/package.json b/packages/docusaurus-theme-search-algolia/package.json index 1f4a033989..b053717958 100644 --- a/packages/docusaurus-theme-search-algolia/package.json +++ b/packages/docusaurus-theme-search-algolia/package.json @@ -45,11 +45,8 @@ "fs-extra": "^10.0.0" }, "peerDependencies": { - "@babel/core": "^7.0.0", - "prism-react-renderer": "^1.2.1", "react": "^16.8.4 || ^17.0.0", - "react-dom": "^16.8.4 || ^17.0.0", - "webpack": "^5.0.0" + "react-dom": "^16.8.4 || ^17.0.0" }, "engines": { "node": ">=14" diff --git a/packages/docusaurus-utils-validation/package.json b/packages/docusaurus-utils-validation/package.json index b3ba314b43..7bcf827e3b 100644 --- a/packages/docusaurus-utils-validation/package.json +++ b/packages/docusaurus-utils-validation/package.json @@ -24,10 +24,8 @@ "tslib": "^2.3.1" }, "peerDependencies": { - "@babel/core": "^7.0.0", "react": "*", - "react-dom": "*", - "webpack": "^5.0.0" + "react-dom": "*" }, "engines": { "node": ">=14" diff --git a/packages/docusaurus-utils/package.json b/packages/docusaurus-utils/package.json index 03cde25ee7..05e6b2b399 100644 --- a/packages/docusaurus-utils/package.json +++ b/packages/docusaurus-utils/package.json @@ -19,7 +19,6 @@ "license": "MIT", "dependencies": { "@docusaurus/logger": "2.0.0-beta.15", - "@mdx-js/runtime": "^1.6.22", "@svgr/webpack": "^6.0.0", "file-loader": "^6.2.0", "fs-extra": "^10.0.0", @@ -29,11 +28,10 @@ "js-yaml": "^4.0.0", "lodash": "^4.17.20", "micromatch": "^4.0.4", - "remark-mdx-remove-exports": "^1.6.22", - "remark-mdx-remove-imports": "^1.6.22", "resolve-pathname": "^3.0.0", "tslib": "^2.3.1", - "url-loader": "^4.1.1" + "url-loader": "^4.1.1", + "webpack": "^5.68.0" }, "engines": { "node": ">=14" @@ -44,13 +42,10 @@ "@types/github-slugger": "^1.3.0", "@types/micromatch": "^4.0.2", "@types/react-dom": "^17.0.1", - "dedent": "^0.7.0", - "tslib": "^2.3.1" + "dedent": "^0.7.0" }, "peerDependencies": { - "@babel/core": "^7.0.0", "react": "*", - "react-dom": "*", - "webpack": "^5.0.0" + "react-dom": "*" } } diff --git a/packages/docusaurus-utils/src/deps.d.ts b/packages/docusaurus-utils/src/deps.d.ts index 0a591d14db..79a7896f34 100644 --- a/packages/docusaurus-utils/src/deps.d.ts +++ b/packages/docusaurus-utils/src/deps.d.ts @@ -8,7 +8,3 @@ declare module 'resolve-pathname' { export default function resolvePathname(to: string, from?: string): string; } - -declare module '@mdx-js/runtime'; -declare module 'remark-mdx-remove-imports'; -declare module 'remark-mdx-remove-exports'; diff --git a/yarn.lock b/yarn.lock index e097c636b3..0b762c8417 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2667,7 +2667,7 @@ semver "^7.3.5" tar "^6.1.11" -"@mdx-js/mdx@1.6.22", "@mdx-js/mdx@^1.6.21": +"@mdx-js/mdx@^1.6.22": version "1.6.22" resolved "https://registry.yarnpkg.com/@mdx-js/mdx/-/mdx-1.6.22.tgz#8a723157bf90e78f17dc0f27995398e6c731f1ba" integrity sha512-AMxuLxPz2j5/6TpF/XSdKpQP1NlG0z11dFOlq+2IP/lSgl11GY8ji6S/rgsViN/L0BDvHvUMruRb7ub+24LUYA== @@ -2692,20 +2692,11 @@ unist-builder "2.0.3" unist-util-visit "2.0.3" -"@mdx-js/react@1.6.22", "@mdx-js/react@^1.6.21": +"@mdx-js/react@^1.6.22": version "1.6.22" resolved "https://registry.yarnpkg.com/@mdx-js/react/-/react-1.6.22.tgz#ae09b4744fddc74714ee9f9d6f17a66e77c43573" integrity sha512-TDoPum4SHdfPiGSAaRBw7ECyI8VaHpK8GJugbJIJuqyh6kzw9ZLJZW3HGL3NNrJGxcAixUvqROm+YuQOo5eXtg== -"@mdx-js/runtime@^1.6.22": - version "1.6.22" - resolved "https://registry.yarnpkg.com/@mdx-js/runtime/-/runtime-1.6.22.tgz#3edd388bf68a519ffa1aaf9c446b548165102345" - integrity sha512-p17spaO2+55VLCuxXA3LVHC4phRx60NR2XMdZ+qgVU1lKvEX4y88dmFNOzGDCPLJ03IZyKrJ/rPWWRiBrd9JrQ== - dependencies: - "@mdx-js/mdx" "1.6.22" - "@mdx-js/react" "1.6.22" - buble-jsx-only "^0.19.8" - "@mdx-js/util@1.6.22": version "1.6.22" resolved "https://registry.yarnpkg.com/@mdx-js/util/-/util-1.6.22.tgz#219dfd89ae5b97a8801f015323ffa4b62f45718b" @@ -5668,19 +5659,6 @@ bser@2.1.1: dependencies: node-int64 "^0.4.0" -buble-jsx-only@^0.19.8: - version "0.19.8" - resolved "https://registry.yarnpkg.com/buble-jsx-only/-/buble-jsx-only-0.19.8.tgz#6e3524aa0f1c523de32496ac9aceb9cc2b493867" - integrity sha512-7AW19pf7PrKFnGTEDzs6u9+JZqQwM1VnLS19OlqYDhXomtFFknnoQJAPHeg84RMFWAvOhYrG7harizJNwUKJsA== - dependencies: - acorn "^6.1.1" - acorn-dynamic-import "^4.0.0" - acorn-jsx "^5.0.1" - chalk "^2.4.2" - magic-string "^0.25.3" - minimist "^1.2.0" - regexpu-core "^4.5.4" - buble@0.19.6: version "0.19.6" resolved "https://registry.yarnpkg.com/buble/-/buble-0.19.6.tgz#915909b6bd5b11ee03b1c885ec914a8b974d34d3" @@ -15898,20 +15876,6 @@ remark-math@^3.0.1: resolved "https://registry.yarnpkg.com/remark-math/-/remark-math-3.0.1.tgz#85a02a15b15cad34b89a27244d4887b3a95185bb" integrity sha512-epT77R/HK0x7NqrWHdSV75uNLwn8g9qTyMqCRCDujL0vj/6T6+yhdrR7mjELWtkse+Fw02kijAaBuVcHBor1+Q== -remark-mdx-remove-exports@^1.6.22: - version "1.6.22" - resolved "https://registry.yarnpkg.com/remark-mdx-remove-exports/-/remark-mdx-remove-exports-1.6.22.tgz#9e34f3d02c9c54b02ca0a1fde946449338d06ecb" - integrity sha512-7g2uiTmTGfz5QyVb+toeX25frbk1Y6yd03RXGPtqx0+DVh86Gb7MkNYbk7H2X27zdZ3CQv1W/JqlFO0Oo8IxVA== - dependencies: - unist-util-remove "2.0.0" - -remark-mdx-remove-imports@^1.6.22: - version "1.6.22" - resolved "https://registry.yarnpkg.com/remark-mdx-remove-imports/-/remark-mdx-remove-imports-1.6.22.tgz#79f711c95359cff437a120d1fbdc1326ec455826" - integrity sha512-lmjAXD8Ltw0TsvBzb45S+Dxx7LTJAtDaMneMAv8LAUIPEyYoKkmGbmVsiF0/pY6mhM1Q16swCmu1TN+ie/vn/A== - dependencies: - unist-util-remove "2.0.0" - remark-mdx@1.6.22, remark-mdx@^1.6.21: version "1.6.22" resolved "https://registry.yarnpkg.com/remark-mdx/-/remark-mdx-1.6.22.tgz#06a8dab07dcfdd57f3373af7f86bd0e992108bbd" @@ -18388,13 +18352,6 @@ unist-util-remove-position@^4.0.0: "@types/unist" "^2.0.0" unist-util-visit "^4.0.0" -unist-util-remove@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unist-util-remove/-/unist-util-remove-2.0.0.tgz#32c2ad5578802f2ca62ab808173d505b2c898488" - integrity sha512-HwwWyNHKkeg/eXRnE11IpzY8JT55JNM1YCwwU9YNCnfzk6s8GhPXrVBBZWiwLeATJbI7euvoGSzcy9M29UeW3g== - dependencies: - unist-util-is "^4.0.0" - unist-util-remove@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/unist-util-remove/-/unist-util-remove-2.1.0.tgz#b0b4738aa7ee445c402fda9328d604a02d010588"