From adc64ecb8e8b4350366d29935a6b369461a71a0a Mon Sep 17 00:00:00 2001 From: Titus Date: Tue, 1 Feb 2022 16:54:07 +0100 Subject: [PATCH] Update things for v2 (#1926) --- docs/blog/v2.server.mdx | 84 +++++++++++++++------- docs/community/contribute.server.mdx | 2 +- docs/community/sponsor.server.mdx | 2 +- docs/community/support.server.mdx | 2 +- docs/docs/extending-mdx.server.mdx | 15 ---- docs/docs/getting-started.server.mdx | 35 ++------- docs/docs/troubleshooting-mdx.server.mdx | 13 ---- docs/docs/using-mdx.server.mdx | 17 +---- docs/docs/what-is-mdx.server.mdx | 15 ---- docs/guides/math.server.mdx | 4 +- docs/guides/syntax-highlighting.server.mdx | 6 +- docs/index.server.mdx | 17 +---- docs/migrating/v2.server.mdx | 39 ++-------- docs/playground.server.mdx | 15 ---- docs/table-of-components.server.mdx | 15 ---- package-lock.json | 65 +++++++++-------- packages/esbuild/package.json | 4 +- packages/esbuild/readme.md | 4 +- packages/loader/package.json | 4 +- packages/loader/readme.md | 20 +----- packages/mdx/package.json | 4 +- packages/mdx/readme.md | 4 +- packages/node-loader/package.json | 4 +- packages/node-loader/readme.md | 4 +- packages/preact/readme.md | 4 +- packages/react/lib/index.js | 1 + packages/react/package.json | 4 +- packages/react/readme.md | 4 +- packages/register/package.json | 4 +- packages/register/readme.md | 4 +- packages/remark-mdx/readme.md | 4 +- packages/rollup/package.json | 4 +- packages/rollup/readme.md | 4 +- packages/vue/readme.md | 4 +- website/prerender.js | 4 +- 35 files changed, 156 insertions(+), 279 deletions(-) diff --git a/docs/blog/v2.server.mdx b/docs/blog/v2.server.mdx index a13e109a7..5356a8bc8 100644 --- a/docs/blog/v2.server.mdx +++ b/docs/blog/v2.server.mdx @@ -3,21 +3,10 @@ export const info = { author: [ {name: 'Titus Wormer', github: 'wooorm', twitter: 'wooorm'} ], - published: new Date('2021-11-01'), - modified: new Date('2021-11-01') + published: new Date('2022-02-01'), + modified: new Date('2022-02-01') } - - **Note**: V2 is around the corner. - This website is for that. - It hasn’t been released yet. - But you can try out the RC. - You can be of great help by reading through these docs and letting us know - what’s confusing or wrong or other suggestions you have. - See [§ Support][support] for where to ask questions and - [§ Contribute][contribute] for how to help. - - **Note**: Info on how to migrate is available in our [Version 2 migration guide][migrating]. @@ -139,7 +128,7 @@ We also added support for JavaScript expressions, take for example: {name: 'Jane', email: 'hi@jane.com'}, {name: 'John', twitter: '@john2002'} ] - export const published = new Date('2021-11-01') + export const published = new Date('2022-02-01') Written by: {new Intl.ListFormat('en').format(authors.map(d => d.name))}. @@ -151,7 +140,7 @@ We also added support for JavaScript expressions, take for example: ```jsx path="equivalent.jsx" copy=no <>

Written by: Jane and John.

-

Published on: November 1, 2021.

+

Published on: February 1, 2022.

``` @@ -267,15 +256,64 @@ When you’re ready to migrate, please see the ## Thanks - - **Important**: To do! - We’ll do this when v2 actually hits. - So there’s still time to get your name here 😉 - - We’d like to say thanks to all our contributors and our happy users. Special thanks to -... +Thanks to John Otander ([**@johno**](https://github.com/johno)), +Christian Murphy ([**@ChristianMurphy**](https://github.com/ChristianMurphy)), +JounQin ([**@JounQin**](https://github.com/JounQin)), +Jack Bates ([**@jablko**](https://github.com/jablko)), +Sam Chen ([**@chenxsan**](https://github.com/chenxsan)), +Sam Robbins ([**@samrobbins85**](https://github.com/samrobbins85)), +Remco Haszing ([**@remcohaszing**](https://github.com/remcohaszing)), +LB ([**@laurieontech**](https://github.com/laurieontech)), +Gabriel Kirkley ([**@gdgkirkley**](https://github.com/gdgkirkley)>), +Hung-I Wang ([**@Gowee**](https://github.com/Gowee)), +Ilham Wahabi ([**@iwgx**](https://github.com/iwgx)), +Kaito Sugimoto ([**@HelloRusk**](https://github.com/HelloRusk)), +Karl Horky ([**@karlhorky**](https://github.com/karlhorky)), +Katie Hughes ([**@glitteringkatie**](https://github.com/glitteringkatie)), +Lachlan Campbell ([**@lachlanjc**](https://github.com/lachlanjc)), +Marcy Sutton ([**@marcysutton**](https://github.com/marcysutton)), +Marius Gundersen ([**@mariusGundersen**](https://github.com/mariusGundersen)), +Marius-Remus Mate, +Mark Skelton ([**@mskelton**](https://github.com/mskelton)), +Martin V ([**@ndresx**](https://github.com/ndresx)), +Matija Marohnić ([**@silvenon**](https://github.com/silvenon)), +Michael Oliver ([**@michaeloliverx**](https://github.com/michaeloliverx)), +Michaël De Boey ([**@MichaelDeBoey**](https://github.com/MichaelDeBoey)), +Muescha ([**@muescha**](https://github.com/muescha)), +Norviah ([**@Norviah**](https://github.com/Norviah)), +Paul Scanlon ([**@PaulieScanlon**](https://github.com/PaulieScanlon)), +Peter Mouland ([**@peter-mouland**](https://github.com/peter-mouland)), +Prince Wilson ([**@maxcell**](https://github.com/maxcell)), +Rafael Almeida ([**@rafaelalmeidatk**](https://github.com/rafaelalmeidatk)), +Rodrez ([**@rodrez**](https://github.com/rodrez)), +Rongjian Zhang ([**@pd4d10**](https://github.com/pd4d10)), +Taeheon Kim ([**@lonyele**](https://github.com/lonyele)), +Tom Parker-Shemilt ([**@palfrey**](https://github.com/palfrey)), +Try Ajitiono ([**@imballinst**](https://github.com/imballinst)), +Yamagishi Kazutoshi ([**@ykzts**](https://github.com/ykzts)), +Yoav Kadosh ([**@ykadosh**](https://github.com/ykadosh)), +Yordis Prieto ([**@Yordis**](https://github.com/Yordis)), +Adrian Foong ([**@adrfoong**](https://github.com/adrfoong)), +Dan Abramov ([**@gaearon**](https://github.com/gaearon)), +[**@ihupoo**](https://github.com/ihupoo), +[**@nikhog**](https://github.com/nikhog), +[**@redallen**](https://github.com/redallen), +Akshay Kadam ([**@deadcoder0904**](https://github.com/deadcoder0904)), +я котик пур-пур ([**@mvasilkov**](https://github.com/mvasilkov)), +Anders D. Johnson ([**@AndersDJohnson**](https://github.com/AndersDJohnson)), +Andrew Aylett ([**@andrewaylett**](https://github.com/andrewaylett)), +Ankeet Maini ([**@ankeetmaini**](https://github.com/ankeetmaini)), +Biswas Nandamuri ([**@Biswas-N**](https://github.com/Biswas-N)), +Bret ([**@bcomnes**](https://github.com/bcomnes)), +Chris Chinchilla ([**@ChrisChinchilla**](https://github.com/ChrisChinchilla)), +Christopher Biscardi ([**@ChristopherBiscardi**](https://github.com/ChristopherBiscardi)), +Dan Overton ([**@dan-overton**](https://github.com/dan-overton)), +Domitrius ([**@domitriusclark**](https://github.com/domitriusclark)), +Dovi Winberger ([**@dowi**](https://github.com/dowi)), +Emmie Päivärinta ([**@emmiep**](https://github.com/emmiep)), +Eugene Ghanizadeh ([**@loreanvictor**](https://github.com/loreanvictor)), and anyone we may have forgotten. [what]: /docs/what-is-mdx/ @@ -304,6 +342,4 @@ and anyone we may have forgotten. [types-mdx]: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/mdx -[support]: /community/support/ - [contribute]: /community/contribute/ diff --git a/docs/community/contribute.server.mdx b/docs/community/contribute.server.mdx index 999648276..dfba631d1 100644 --- a/docs/community/contribute.server.mdx +++ b/docs/community/contribute.server.mdx @@ -5,7 +5,7 @@ export const info = { {name: 'Titus Wormer', github: 'wooorm', twitter: 'wooorm'} ], published: new Date('2018-11-04'), - modified: new Date('2021-11-01') + modified: new Date('2022-01-25') } # Contribute diff --git a/docs/community/sponsor.server.mdx b/docs/community/sponsor.server.mdx index ee2943661..78e3fefb8 100644 --- a/docs/community/sponsor.server.mdx +++ b/docs/community/sponsor.server.mdx @@ -4,7 +4,7 @@ export const info = { {name: 'Titus Wormer', github: 'wooorm', twitter: 'wooorm'} ], published: new Date('2021-10-06'), - modified: new Date('2021-11-01') + modified: new Date('2022-01-25') } # Sponsor diff --git a/docs/community/support.server.mdx b/docs/community/support.server.mdx index bb4f764dc..4cce1e2bb 100644 --- a/docs/community/support.server.mdx +++ b/docs/community/support.server.mdx @@ -5,7 +5,7 @@ export const info = { {name: 'Titus Wormer', github: 'wooorm', twitter: 'wooorm'} ], published: new Date('2019-07-03'), - modified: new Date('2021-11-01') + modified: new Date('2022-01-25') } # Support diff --git a/docs/docs/extending-mdx.server.mdx b/docs/docs/extending-mdx.server.mdx index e7e4479c8..f76f0bed1 100644 --- a/docs/docs/extending-mdx.server.mdx +++ b/docs/docs/extending-mdx.server.mdx @@ -8,17 +8,6 @@ export const info = { modified: new Date('2021-11-01') } - - **Note**: V2 is around the corner. - This website is for that. - It hasn’t been released yet. - But you can try out the RC. - You can be of great help by reading through these docs and letting us know - what’s confusing or wrong or other suggestions you have. - See [§ Support][support] for where to ask questions and - [§ Contribute][contribute] for how to help. - - # Extending MDX This article explains how to extend MDX content—specifically, how to *transform* @@ -178,7 +167,3 @@ For info on the node types that represent MDX specific features, see [syntax-tree]: /packages/remark-mdx/#syntax-tree [playground]: /playground/ - -[support]: /community/support/ - -[contribute]: /community/contribute/ diff --git a/docs/docs/getting-started.server.mdx b/docs/docs/getting-started.server.mdx index b2b098f58..bda8b931e 100644 --- a/docs/docs/getting-started.server.mdx +++ b/docs/docs/getting-started.server.mdx @@ -5,20 +5,9 @@ export const info = { {name: 'Titus Wormer', github: 'wooorm', twitter: 'wooorm'} ], published: new Date('2021-10-05'), - modified: new Date('2021-11-01') + modified: new Date('2022-02-01') } - - **Note**: V2 is around the corner. - This website is for that. - It hasn’t been released yet. - But you can try out the RC. - You can be of great help by reading through these docs and letting us know - what’s confusing or wrong or other suggestions you have. - See [§ Support][support] for where to ask questions and - [§ Contribute][contribute] for how to help. - - # Getting started This article explains how to integrate MDX into your project. @@ -318,11 +307,6 @@ If you use more modern JavaScript features than what your users support, See also [¶ Create React App (CRA)][cra], [¶ Next.js][next], and [¶ Vue CLI][vue-cli], if you’re using webpack through them, for more info. - - **Note**: getting an error `ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING`? - See [this note on `webpack-cli`](/packages/loader/#note-webpack-cli). - - ### Build systems #### Snowpack @@ -395,10 +379,10 @@ which you’re likely using, for more info. **Note**: to support ESM in `vue.config.js` or `vue.config.mjs`, you currently - have to use their v5.0.0-beta. + have to use their v5.0.0-rc. See [`v5.0.0-beta.0`](https://github.com/vuejs/vue-cli/releases/tag/v5.0.0-beta.0) in their changelog for more info. - Their latest beta release is currently `v5.0.0-beta.6`. + Their latest beta release is currently `v5.0.0-rc.2`. #### WMR @@ -580,13 +564,6 @@ There is no need to configure your JSX runtime as React is already set up. See also [¶ Webpack][webpack] and [¶ React][react], which you’re using, for more on those tools. - - **Note**: to support ESM in Next.js, you currently have to set a flag: - `experimental: {esmExternals: true}` in `next.config.js`. - See [ES Modules Support](https://nextjs.org/blog/next-11-1#es-modules-support) - in their Next.js 11.1 blog post for more info. - - #### Parcel [Parcel 2](https://v2.parceljs.org) has their own plugin to support MDX. @@ -825,6 +802,8 @@ See their readmes on how to configure them. [jsx]: #jsx +[support]: /community/support/ + [what]: /docs/what-is-mdx/ [use]: /docs/using-mdx/ @@ -898,7 +877,3 @@ See their readmes on how to configure them. [gatsby]: #gatsby [docusaurus]: #docusaurus - -[support]: /community/support/ - -[contribute]: /community/contribute/ diff --git a/docs/docs/troubleshooting-mdx.server.mdx b/docs/docs/troubleshooting-mdx.server.mdx index e9565b519..7c5c0803b 100644 --- a/docs/docs/troubleshooting-mdx.server.mdx +++ b/docs/docs/troubleshooting-mdx.server.mdx @@ -10,17 +10,6 @@ export const info = { {/* lint disable maximum-heading-length */} - - **Note**: V2 is around the corner. - This website is for that. - It hasn’t been released yet. - But you can try out the RC. - You can be of great help by reading through these docs and letting us know - what’s confusing or wrong or other suggestions you have. - See [§ Support][support] for where to ask questions and - [§ Contribute][contribute] for how to help. - - **Note**: Had trouble with something that wasn’t explained here but should be? Please let us know. @@ -451,8 +440,6 @@ still tags open. See the rules on [¶ Interleaving in § What is MDX?](/docs/what-is-mdx/#interleaving) -[support]: /community/support/ - [contribute]: /community/contribute/ [what]: /docs/what-is-mdx/ diff --git a/docs/docs/using-mdx.server.mdx b/docs/docs/using-mdx.server.mdx index bf8ade53d..10e444f9b 100644 --- a/docs/docs/using-mdx.server.mdx +++ b/docs/docs/using-mdx.server.mdx @@ -5,20 +5,9 @@ export const info = { {name: 'Titus Wormer', github: 'wooorm', twitter: 'wooorm'} ], published: new Date('2021-09-30'), - modified: new Date('2021-11-01') + modified: new Date('2021-11-14') } - - **Note**: V2 is around the corner. - This website is for that. - It hasn’t been released yet. - But you can try out the RC. - You can be of great help by reading through these docs and letting us know - what’s confusing or wrong or other suggestions you have. - See [§ Support][support] for where to ask questions and - [§ Contribute][contribute] for how to help. - - # Using MDX This article explains how to use MDX files in your project. @@ -456,7 +445,3 @@ No component is used for `h1`. [vue]: /docs/getting-started/#vue [toc]: /table-of-components/ - -[support]: /community/support/ - -[contribute]: /community/contribute/ diff --git a/docs/docs/what-is-mdx.server.mdx b/docs/docs/what-is-mdx.server.mdx index 838fc0219..b9af3b71f 100644 --- a/docs/docs/what-is-mdx.server.mdx +++ b/docs/docs/what-is-mdx.server.mdx @@ -9,17 +9,6 @@ export const info = { modified: new Date('2021-11-01') } - - **Note**: V2 is around the corner. - This website is for that. - It hasn’t been released yet. - But you can try out the RC. - You can be of great help by reading through these docs and letting us know - what’s confusing or wrong or other suggestions you have. - See [§ Support][support] for where to ask questions and - [§ Contribute][contribute] for how to help. - - # What is MDX? This article explains what the MDX format is. @@ -368,7 +357,3 @@ the heading. [using-plugins]: /docs/extending-mdx/#using-plugins [iife]: https://developer.mozilla.org/en-US/docs/Glossary/IIFE - -[support]: /community/support/ - -[contribute]: /community/contribute/ diff --git a/docs/guides/math.server.mdx b/docs/guides/math.server.mdx index 836c02fd5..c6f185f18 100644 --- a/docs/guides/math.server.mdx +++ b/docs/guides/math.server.mdx @@ -5,7 +5,7 @@ export const info = { {name: 'Titus Wormer', github: 'wooorm', twitter: 'wooorm'} ], published: new Date('2021-10-06'), - modified: new Date('2021-11-01') + modified: new Date('2022-02-01') } # Math @@ -75,7 +75,7 @@ async function main() { At the time of writing, the last version is: ```html - + ``` diff --git a/docs/guides/syntax-highlighting.server.mdx b/docs/guides/syntax-highlighting.server.mdx index 21ec1a6d5..eacee8ca5 100644 --- a/docs/guides/syntax-highlighting.server.mdx +++ b/docs/guides/syntax-highlighting.server.mdx @@ -5,7 +5,7 @@ export const info = { {name: 'Titus Wormer', github: 'wooorm', twitter: 'wooorm'} ], published: new Date('2021-10-06'), - modified: new Date('2021-11-01') + modified: new Date('2022-02-01') } # Syntax highlighting @@ -67,14 +67,14 @@ async function main(code) { For example, to get GitHub Dark from cdnjs: ```html - + ``` If you chose `@mapbox/rehype-prism`, include something like this instead to get Prism Dark: ```html - + ``` diff --git a/docs/index.server.mdx b/docs/index.server.mdx index d437caf26..171d0869c 100644 --- a/docs/index.server.mdx +++ b/docs/index.server.mdx @@ -6,7 +6,7 @@ export const info = { {name: 'John Otander', github: 'johno', twitter: '4lpine'} ], published: new Date('2017-12-23'), - modified: new Date('2021-11-01'), + modified: new Date('2022-02-01'), schemaOrg: { "@context": "https://schema.org", "@type": "SoftwareApplication", @@ -32,17 +32,6 @@ export const info = { } export const year = 2018 - - **Note**: V2 is around the corner. - This website is for that. - It hasn’t been released yet. - But you can try out the RC. - You can be of great help by reading through these docs and letting us know - what’s confusing or wrong or other suggestions you have. - See [§ Support][support] for where to ask questions and - [§ Contribute][contribute] for how to help. - - {/* lint disable heading-style */} Markdown for the\ @@ -163,7 +152,3 @@ You’re using React, Preact, or Vue. [playground]: /playground/ [getting-started]: /docs/getting-started/ - -[support]: /community/support/ - -[contribute]: /community/contribute/ diff --git a/docs/migrating/v2.server.mdx b/docs/migrating/v2.server.mdx index b2b9fc449..87f262a82 100644 --- a/docs/migrating/v2.server.mdx +++ b/docs/migrating/v2.server.mdx @@ -4,26 +4,10 @@ export const info = { author: [ {name: 'Titus Wormer', github: 'wooorm', twitter: 'wooorm'} ], - published: new Date('2021-11-01'), - modified: new Date('2021-11-01') + published: new Date('2022-02-01'), + modified: new Date('2022-02-01') } - - **Note**: V2 is around the corner. - This website is for that. - It hasn’t been released yet. - But you can try out the RC. - You can be of great help by reading through these docs and letting us know - what’s confusing or wrong or other suggestions you have. - See [§ Support][support] for where to ask questions and - [§ Contribute][contribute] for how to help. - - - - **Note**: Please let us know of any required changes that aren’t mentioned - here. - - # Migrating from v1 to v2 ## Contents @@ -112,7 +96,7 @@ that works with our previous `@mdx-js/loader` (`1.6.22`): Then install MDX version 2: ```sh -npm install @mdx-js/loader@next @mdx-js/react@next remark-gfm +npm install @mdx-js/loader @mdx-js/react remark-gfm ``` You can update your code as follows: @@ -179,11 +163,6 @@ You can update your code as follows: - - **Note**: getting an error `ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING`? - See [this note on `webpack-cli`](/packages/loader/#note-webpack-cli). - - The above changes get MDX 2 close to how MDX 1 worked. You can make it simpler: @@ -245,7 +224,7 @@ Then make sure ESM is supported. Then install version 2: ```sh -npm install @mdx-js/react@next # Change `react` to `preact` or `vue` if needed +npm install @mdx-js/react # Change `react` to `preact` or `vue` if needed ``` Note that these packages now only add support for context based components @@ -268,7 +247,7 @@ To update our core compiler `@mdx-js/mdx`, first make sure ESM is supported. Then install version 2: ```sh -npm install @mdx-js/mdx@next @mdx-js/react@next remark-gfm +npm install @mdx-js/mdx @mdx-js/react remark-gfm ``` You can update your code as follows: @@ -375,7 +354,7 @@ Then uninstall `@mdx-js/runtime` and install `@mdx-js/mdx` and `@mdx-js/react`: ```sh npm uninstall @mdx-js/runtime -npm install @mdx-js/mdx@next @mdx-js/react@next +npm install @mdx-js/mdx @mdx-js/react ``` You can update your code as follows: @@ -455,7 +434,7 @@ To update our remark plugin `remark-mdx`, first make sure ESM is supported. Then install version 2: ```sh -npm install remark-mdx@next +npm install remark-mdx ``` For more information, please see [§ Use in `remark-mdx`][remark-mdx-use]. @@ -676,10 +655,6 @@ try to make migration easier next time. With our new AST, we’re able to create codemods from now on. \<3 -[support]: /community/support/ - -[contribute]: /community/contribute/ - [esm]: #esm [trouble]: /docs/troubleshooting-mdx/ diff --git a/docs/playground.server.mdx b/docs/playground.server.mdx index 627ca6746..230a9c5db 100644 --- a/docs/playground.server.mdx +++ b/docs/playground.server.mdx @@ -15,17 +15,6 @@ Below is an example of markdown in JSX.
Try and change the background color to \`tomato\`.` - - **Note**: V2 is around the corner. - This website is for that. - It hasn’t been released yet. - But you can try out the RC. - You can be of great help by reading through these docs and letting us know - what’s confusing or wrong or other suggestions you have. - See [§ Support][support] for where to ask questions and - [§ Contribute][contribute] for how to help. - - # Playground Here you can play with the MDX format. @@ -39,7 +28,3 @@ To read about how the MDX format works, we recommend that you start with [what]: /docs/what-is-mdx/ - -[support]: /community/support/ - -[contribute]: /community/contribute/ diff --git a/docs/table-of-components.server.mdx b/docs/table-of-components.server.mdx index 7898e7087..11e0f807b 100644 --- a/docs/table-of-components.server.mdx +++ b/docs/table-of-components.server.mdx @@ -9,17 +9,6 @@ export const info = { modified: new Date('2021-11-01') } - - **Note**: V2 is around the corner. - This website is for that. - It hasn’t been released yet. - But you can try out the RC. - You can be of great help by reading through these docs and letting us know - what’s confusing or wrong or other suggestions you have. - See [§ Support][support] for where to ask questions and - [§ Contribute][contribute] for how to help. - - # Components A great thing about MDX is that you can write markdown and specify a component @@ -443,7 +432,3 @@ More information on components is available in [commonmark]: https://spec.commonmark.org/current/ [guide-gfm]: /guides/gfm/ - -[support]: /community/support/ - -[contribute]: /community/contribute/ diff --git a/package-lock.json b/package-lock.json index 2d6ae7fea..c66b21deb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21629,6 +21629,7 @@ } }, "packages/esbuild": { + "name": "@mdx-js/esbuild", "version": "2.0.0-rc.2", "license": "MIT", "dependencies": { @@ -21641,8 +21642,8 @@ "@types/react-dom": "^17.0.0", "@types/unist": "^2.0.0", "esbuild": "^0.14.0", - "react": "^18.0.0-alpha-327d5c484-20211106", - "react-dom": "^18.0.0-alpha-327d5c484-20211106", + "react": "^18.0.0-beta-24dd07bd2-20211208", + "react-dom": "^18.0.0-beta-24dd07bd2-20211208", "vfile-message": "^3.0.0" }, "funding": { @@ -21691,6 +21692,7 @@ } }, "packages/loader": { + "name": "@mdx-js/loader", "version": "2.0.0-rc.2", "license": "MIT", "dependencies": { @@ -21706,8 +21708,8 @@ "babel-loader": "^8.0.0", "preact": "^10.0.0", "preact-render-to-string": "^5.0.0", - "react": "^18.0.0-alpha-327d5c484-20211106", - "react-dom": "^18.0.0-alpha-327d5c484-20211106", + "react": "^18.0.0-beta-24dd07bd2-20211208", + "react-dom": "^18.0.0-beta-24dd07bd2-20211208", "vue": "^3.0.0", "webpack": "^5.0.0" }, @@ -22121,6 +22123,7 @@ } }, "packages/mdx": { + "name": "@mdx-js/mdx", "version": "2.0.0-rc.2", "license": "MIT", "dependencies": { @@ -22148,8 +22151,8 @@ "nanoid": "^3.0.0", "preact": "^10.0.0", "preact-render-to-string": "^5.0.0", - "react": "^18.0.0-alpha-327d5c484-20211106", - "react-dom": "^18.0.0-alpha-327d5c484-20211106", + "react": "^18.0.0-beta-24dd07bd2-20211208", + "react-dom": "^18.0.0-beta-24dd07bd2-20211208", "rehype-katex": "^6.0.0", "rehype-raw": "^6.0.0", "remark-frontmatter": "^4.0.0", @@ -22202,6 +22205,7 @@ } }, "packages/node-loader": { + "name": "@mdx-js/node-loader", "version": "2.0.0-rc.2", "license": "MIT", "dependencies": { @@ -22211,8 +22215,8 @@ "devDependencies": { "@types/react": "^17.0.0", "@types/react-dom": "^17.0.0", - "react": "^18.0.0-alpha-327d5c484-20211106", - "react-dom": "^18.0.0-alpha-327d5c484-20211106" + "react": "^18.0.0-beta-24dd07bd2-20211208", + "react-dom": "^18.0.0-beta-24dd07bd2-20211208" }, "funding": { "type": "opencollective", @@ -22257,6 +22261,7 @@ } }, "packages/preact": { + "name": "@mdx-js/preact", "version": "2.0.0-rc.2", "license": "MIT", "dependencies": { @@ -22276,6 +22281,7 @@ } }, "packages/react": { + "name": "@mdx-js/react", "version": "2.0.0-rc.2", "license": "MIT", "dependencies": { @@ -22286,8 +22292,8 @@ "@mdx-js/mdx": "^2.0.0-rc.2", "@types/react": "^17.0.0", "@types/react-dom": "^17.0.0", - "react": "^18.0.0-alpha-327d5c484-20211106", - "react-dom": "^18.0.0-alpha-327d5c484-20211106" + "react": "^18.0.0-beta-24dd07bd2-20211208", + "react-dom": "^18.0.0-beta-24dd07bd2-20211208" }, "funding": { "type": "opencollective", @@ -22335,6 +22341,7 @@ } }, "packages/register": { + "name": "@mdx-js/register", "version": "2.0.0-rc.2", "license": "MIT", "dependencies": { @@ -22343,8 +22350,8 @@ "devDependencies": { "@types/react": "^17.0.0", "@types/react-dom": "^17.0.0", - "react": "^18.0.0-alpha-327d5c484-20211106", - "react-dom": "^18.0.0-alpha-327d5c484-20211106" + "react": "^18.0.0-beta-24dd07bd2-20211208", + "react-dom": "^18.0.0-beta-24dd07bd2-20211208" }, "funding": { "type": "opencollective", @@ -22412,6 +22419,7 @@ } }, "packages/rollup": { + "name": "@mdx-js/rollup", "version": "2.0.0-rc.2", "license": "MIT", "dependencies": { @@ -22422,8 +22430,8 @@ "devDependencies": { "@types/react": "^17.0.0", "@types/react-dom": "^17.0.0", - "react": "^18.0.0-alpha-327d5c484-20211106", - "react-dom": "^18.0.0-alpha-327d5c484-20211106", + "react": "^18.0.0-beta-24dd07bd2-20211208", + "react-dom": "^18.0.0-beta-24dd07bd2-20211208", "rollup": "^2.0.0" }, "funding": { @@ -22472,6 +22480,7 @@ } }, "packages/vue": { + "name": "@mdx-js/vue", "version": "2.0.0-rc.2", "license": "MIT", "devDependencies": { @@ -23373,8 +23382,8 @@ "@types/unist": "^2.0.0", "esbuild": "^0.14.0", "got": "^11.0.0", - "react": "^18.0.0-alpha-327d5c484-20211106", - "react-dom": "^18.0.0-alpha-327d5c484-20211106", + "react": "^18.0.0-beta-24dd07bd2-20211208", + "react-dom": "^18.0.0-beta-24dd07bd2-20211208", "vfile": "^5.0.0", "vfile-message": "^3.0.0" }, @@ -23424,8 +23433,8 @@ "babel-loader": "^8.0.0", "preact": "^10.0.0", "preact-render-to-string": "^5.0.0", - "react": "^18.0.0-alpha-327d5c484-20211106", - "react-dom": "^18.0.0-alpha-327d5c484-20211106", + "react": "^18.0.0-beta-24dd07bd2-20211208", + "react-dom": "^18.0.0-beta-24dd07bd2-20211208", "source-map": "^0.7.0", "vue": "^3.0.0", "webpack": "^5.0.0" @@ -23760,8 +23769,8 @@ "periscopic": "^3.0.0", "preact": "^10.0.0", "preact-render-to-string": "^5.0.0", - "react": "^18.0.0-alpha-327d5c484-20211106", - "react-dom": "^18.0.0-alpha-327d5c484-20211106", + "react": "^18.0.0-beta-24dd07bd2-20211208", + "react-dom": "^18.0.0-beta-24dd07bd2-20211208", "rehype-katex": "^6.0.0", "rehype-raw": "^6.0.0", "remark-frontmatter": "^4.0.0", @@ -23819,8 +23828,8 @@ "@mdx-js/mdx": "^2.0.0-rc.2", "@types/react": "^17.0.0", "@types/react-dom": "^17.0.0", - "react": "^18.0.0-alpha-327d5c484-20211106", - "react-dom": "^18.0.0-alpha-327d5c484-20211106", + "react": "^18.0.0-beta-24dd07bd2-20211208", + "react-dom": "^18.0.0-beta-24dd07bd2-20211208", "vfile": "^5.0.0" }, "dependencies": { @@ -23873,8 +23882,8 @@ "@types/mdx": "^2.0.0", "@types/react": "^17.0.0", "@types/react-dom": "^17.0.0", - "react": "^18.0.0-alpha-327d5c484-20211106", - "react-dom": "^18.0.0-alpha-327d5c484-20211106" + "react": "^18.0.0-beta-24dd07bd2-20211208", + "react-dom": "^18.0.0-beta-24dd07bd2-20211208" }, "dependencies": { "react": { @@ -23917,8 +23926,8 @@ "@types/react": "^17.0.0", "@types/react-dom": "^17.0.0", "deasync": "^0.1.0", - "react": "^18.0.0-alpha-327d5c484-20211106", - "react-dom": "^18.0.0-alpha-327d5c484-20211106" + "react": "^18.0.0-beta-24dd07bd2-20211208", + "react-dom": "^18.0.0-beta-24dd07bd2-20211208" }, "dependencies": { "react": { @@ -23961,8 +23970,8 @@ "@rollup/pluginutils": "^4.0.0", "@types/react": "^17.0.0", "@types/react-dom": "^17.0.0", - "react": "^18.0.0-alpha-327d5c484-20211106", - "react-dom": "^18.0.0-alpha-327d5c484-20211106", + "react": "^18.0.0-beta-24dd07bd2-20211208", + "react-dom": "^18.0.0-beta-24dd07bd2-20211208", "rollup": "^2.0.0", "source-map": "^0.7.0" }, diff --git a/packages/esbuild/package.json b/packages/esbuild/package.json index 22c3456a1..ed69dffc3 100644 --- a/packages/esbuild/package.json +++ b/packages/esbuild/package.json @@ -50,8 +50,8 @@ "@types/react-dom": "^17.0.0", "@types/unist": "^2.0.0", "esbuild": "^0.14.0", - "react": "^18.0.0-alpha-327d5c484-20211106", - "react-dom": "^18.0.0-alpha-327d5c484-20211106", + "react": "^18.0.0-beta-24dd07bd2-20211208", + "react-dom": "^18.0.0-beta-24dd07bd2-20211208", "vfile-message": "^3.0.0" }, "scripts": { diff --git a/packages/esbuild/readme.md b/packages/esbuild/readme.md index b12733209..e59f5d994 100644 --- a/packages/esbuild/readme.md +++ b/packages/esbuild/readme.md @@ -47,13 +47,13 @@ Node 12+ is needed to use it and it must be `import`ed instead of `require`d. [npm][]: ```sh -npm install @mdx-js/esbuild@next +npm install @mdx-js/esbuild ``` [yarn][]: ```sh -yarn add @mdx-js/esbuild@next +yarn add @mdx-js/esbuild ``` ## Use diff --git a/packages/loader/package.json b/packages/loader/package.json index 22962ebc4..823a953b0 100644 --- a/packages/loader/package.json +++ b/packages/loader/package.json @@ -58,8 +58,8 @@ "babel-loader": "^8.0.0", "preact": "^10.0.0", "preact-render-to-string": "^5.0.0", - "react": "^18.0.0-alpha-327d5c484-20211106", - "react-dom": "^18.0.0-alpha-327d5c484-20211106", + "react": "^18.0.0-beta-24dd07bd2-20211208", + "react-dom": "^18.0.0-beta-24dd07bd2-20211208", "vue": "^3.0.0", "webpack": "^5.0.0" }, diff --git a/packages/loader/readme.md b/packages/loader/readme.md index d605fafd5..c13c5bd77 100644 --- a/packages/loader/readme.md +++ b/packages/loader/readme.md @@ -47,13 +47,13 @@ Node 12+ is needed to use it and it must be `import`ed instead of `require`d. [npm][]: ```sh -npm install @mdx-js/loader@next +npm install @mdx-js/loader ``` [yarn][]: ```sh -yarn add @mdx-js/loader@next +yarn add @mdx-js/loader ``` ## Use @@ -115,20 +115,6 @@ use: [ // … ``` -###### Note: `webpack-cli` - -`webpack-cli` doesn’t support loaders in ESM directly or even *indirectly*. -Because `@mdx-js/mdx` itself is ESM, this means the `@mdx-js/loader` loader -(even though it’s CJS) doesn’t work with `webpack-cli` (it does work when using -the webpack API). -To use this loader with `webpack-cli`, set the `DISABLE_V8_COMPILE_CACHE=1` -environment variable. -See [this issue][webpack-v8] for details. - -```sh -DISABLE_V8_COMPILE_CACHE=1 webpack -``` - ## Types This package is fully typed with [TypeScript][]. @@ -203,8 +189,6 @@ abide by its terms. [babel-loader]: https://webpack.js.org/loaders/babel-loader/ -[webpack-v8]: https://github.com/wooorm/xdm/issues/11#issuecomment-785043772 - [cra]: https://mdxjs.com/getting-started/#create-react-app-cra [next]: https://mdxjs.com/getting-started/#nextjs diff --git a/packages/mdx/package.json b/packages/mdx/package.json index 030cdb5f7..7af0a976e 100644 --- a/packages/mdx/package.json +++ b/packages/mdx/package.json @@ -70,8 +70,8 @@ "nanoid": "^3.0.0", "preact": "^10.0.0", "preact-render-to-string": "^5.0.0", - "react": "^18.0.0-alpha-327d5c484-20211106", - "react-dom": "^18.0.0-alpha-327d5c484-20211106", + "react": "^18.0.0-beta-24dd07bd2-20211208", + "react-dom": "^18.0.0-beta-24dd07bd2-20211208", "rehype-katex": "^6.0.0", "rehype-raw": "^6.0.0", "remark-frontmatter": "^4.0.0", diff --git a/packages/mdx/readme.md b/packages/mdx/readme.md index 976563d8c..2444cd2a0 100644 --- a/packages/mdx/readme.md +++ b/packages/mdx/readme.md @@ -53,13 +53,13 @@ Node 12+ is needed to use it and it must be `import`ed instead of `require`d. [npm][]: ```sh -npm install @mdx-js/mdx@next +npm install @mdx-js/mdx ``` [yarn][]: ```sh -yarn add @mdx-js/mdx@next +yarn add @mdx-js/mdx ``` ## Use diff --git a/packages/node-loader/package.json b/packages/node-loader/package.json index 96138f485..50fd3b7d5 100644 --- a/packages/node-loader/package.json +++ b/packages/node-loader/package.json @@ -43,8 +43,8 @@ "devDependencies": { "@types/react": "^17.0.0", "@types/react-dom": "^17.0.0", - "react": "^18.0.0-alpha-327d5c484-20211106", - "react-dom": "^18.0.0-alpha-327d5c484-20211106" + "react": "^18.0.0-beta-24dd07bd2-20211208", + "react-dom": "^18.0.0-beta-24dd07bd2-20211208" }, "scripts": { "prepack": "npm run build", diff --git a/packages/node-loader/readme.md b/packages/node-loader/readme.md index c1f75bee9..139f25cbb 100644 --- a/packages/node-loader/readme.md +++ b/packages/node-loader/readme.md @@ -52,13 +52,13 @@ Node 12+ is needed to use it and it must be `import`ed instead of `require`d. [npm][]: ```sh -npm install @mdx-js/node-loader@next +npm install @mdx-js/node-loader ``` [yarn][]: ```sh -yarn add @mdx-js/node-loader@next +yarn add @mdx-js/node-loader ``` ## Use diff --git a/packages/preact/readme.md b/packages/preact/readme.md index 2ebf9fd13..52e552bf8 100644 --- a/packages/preact/readme.md +++ b/packages/preact/readme.md @@ -47,13 +47,13 @@ Node 12+ is needed to use it and it must be `import`ed instead of `require`d. [npm][]: ```sh -npm install @mdx-js/preact@next +npm install @mdx-js/preact ``` [yarn][]: ```sh -yarn add @mdx-js/preact@next +yarn add @mdx-js/preact ``` ## Use diff --git a/packages/react/lib/index.js b/packages/react/lib/index.js index 30cbf9726..96ece0953 100644 --- a/packages/react/lib/index.js +++ b/packages/react/lib/index.js @@ -71,6 +71,7 @@ export function useMDXComponents(components) { if (typeof components === 'function') { return components(contextComponents) } + return {...contextComponents, ...components} }, [contextComponents, components]) } diff --git a/packages/react/package.json b/packages/react/package.json index ae783c7f1..836fc1760 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -51,8 +51,8 @@ "@mdx-js/mdx": "^2.0.0-rc.2", "@types/react": "^17.0.0", "@types/react-dom": "^17.0.0", - "react": "^18.0.0-alpha-327d5c484-20211106", - "react-dom": "^18.0.0-alpha-327d5c484-20211106" + "react": "^18.0.0-beta-24dd07bd2-20211208", + "react-dom": "^18.0.0-beta-24dd07bd2-20211208" }, "scripts": { "prepack": "npm run build", diff --git a/packages/react/readme.md b/packages/react/readme.md index 35402874d..75bdddd3e 100644 --- a/packages/react/readme.md +++ b/packages/react/readme.md @@ -47,13 +47,13 @@ Node 12+ is needed to use it and it must be `import`ed instead of `require`d. [npm][]: ```sh -npm install @mdx-js/react@next +npm install @mdx-js/react ``` [yarn][]: ```sh -yarn add @mdx-js/react@next +yarn add @mdx-js/react ``` ## Use diff --git a/packages/register/package.json b/packages/register/package.json index 6c76034fd..4d15ab6a1 100644 --- a/packages/register/package.json +++ b/packages/register/package.json @@ -43,8 +43,8 @@ "devDependencies": { "@types/react": "^17.0.0", "@types/react-dom": "^17.0.0", - "react": "^18.0.0-alpha-327d5c484-20211106", - "react-dom": "^18.0.0-alpha-327d5c484-20211106" + "react": "^18.0.0-beta-24dd07bd2-20211208", + "react-dom": "^18.0.0-beta-24dd07bd2-20211208" }, "scripts": { "#prepack": "npm run build", diff --git a/packages/register/readme.md b/packages/register/readme.md index 7252914f2..01d35fd19 100644 --- a/packages/register/readme.md +++ b/packages/register/readme.md @@ -49,13 +49,13 @@ Node 12+ is needed to use it. [npm][]: ```sh -npm install @mdx-js/register@next +npm install @mdx-js/register ``` [yarn][]: ```sh -yarn add @mdx-js/register@next +yarn add @mdx-js/register ``` ## Use diff --git a/packages/remark-mdx/readme.md b/packages/remark-mdx/readme.md index 8c109e599..43d7b6a59 100644 --- a/packages/remark-mdx/readme.md +++ b/packages/remark-mdx/readme.md @@ -64,13 +64,13 @@ Node 12+ is needed to use it and it must be `import`ed instead of `require`d. [npm][]: ```sh -npm install remark-mdx@next +npm install remark-mdx ``` [yarn][]: ```sh -yarn add remark-mdx@next +yarn add remark-mdx ``` ## Use diff --git a/packages/rollup/package.json b/packages/rollup/package.json index 11659e3df..24f1fcfbc 100644 --- a/packages/rollup/package.json +++ b/packages/rollup/package.json @@ -48,8 +48,8 @@ "devDependencies": { "@types/react": "^17.0.0", "@types/react-dom": "^17.0.0", - "react": "^18.0.0-alpha-327d5c484-20211106", - "react-dom": "^18.0.0-alpha-327d5c484-20211106", + "react": "^18.0.0-beta-24dd07bd2-20211208", + "react-dom": "^18.0.0-beta-24dd07bd2-20211208", "rollup": "^2.0.0" }, "scripts": { diff --git a/packages/rollup/readme.md b/packages/rollup/readme.md index 9e073d4fc..77b49663a 100644 --- a/packages/rollup/readme.md +++ b/packages/rollup/readme.md @@ -47,13 +47,13 @@ Node 12+ is needed to use it and it must be `import`ed instead of `require`d. [npm][]: ```sh -npm install @mdx-js/rollup@next +npm install @mdx-js/rollup ``` [yarn][]: ```sh -yarn add @mdx-js/rollup@next +yarn add @mdx-js/rollup ``` ## Use diff --git a/packages/vue/readme.md b/packages/vue/readme.md index 25391c2ad..42c8109dc 100644 --- a/packages/vue/readme.md +++ b/packages/vue/readme.md @@ -44,13 +44,13 @@ Node 12+ is needed to use it and it must be `import`ed instead of `require`d. [npm][]: ```sh -npm install @mdx-js/vue@next +npm install @mdx-js/vue ``` [yarn][]: ```sh -yarn add @mdx-js/vue@next +yarn add @mdx-js/vue ``` ## Use diff --git a/website/prerender.js b/website/prerender.js index 36bc9c8f5..71cd4b296 100644 --- a/website/prerender.js +++ b/website/prerender.js @@ -115,10 +115,10 @@ async function main() { }) .use(rehypeLazyCss, [ { - href: 'https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.2.0/styles/github.min.css' + href: 'https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.4.0/styles/github.min.css' }, { - href: 'https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.2.0/styles/github-dark.min.css', + href: 'https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.4.0/styles/github-dark.min.css', media: '(prefers-color-scheme: dark)' } ])