Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: upgrade to remark 13 #29678

Merged
merged 35 commits into from
Apr 9, 2021
Merged

feat: upgrade to remark 13 #29678

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
a360619
chore(gatsby-transformer-remark): ugprade remark-related deps
vladar Feb 22, 2021
24f7bf9
tests: update snapshots for ToC
vladar Feb 22, 2021
9ea526a
enable remark-gfm in a backwards compatible way
vladar Feb 22, 2021
045092a
gatsby-remark-autolink-headers: bump deps
vladar Feb 22, 2021
7989fc6
gatsby-remark-code-repls: bump deps
vladar Feb 22, 2021
f72c32e
gatsby-remark-copy-linked-files: bump deps
vladar Feb 22, 2021
27493a1
gatsby-remark-prismjs: bump deps
vladar Feb 22, 2021
7b1f34f
gatsby-remark-prismjs: fix breaks
vladar Feb 22, 2021
3fb3f89
gatsby-remark-embed-snippet: bump deps and fix breaks
vladar Feb 22, 2021
006b0bb
gatsby-remark-graphviz: bump deps
vladar Feb 22, 2021
ef93e70
gatsby-remark-images: bump deps
vladar Feb 22, 2021
d94e615
gatsby-remark-images-contentful: bump deps
vladar Feb 22, 2021
8c60fdb
gatsby-remark-katex: bump deps
vladar Feb 22, 2021
16f8a5d
gatsby-remark-responsive-iframe: bump deps
vladar Feb 22, 2021
62f3b2f
gatsby-remark-smartypants: bump deps
vladar Feb 22, 2021
0dfcec3
update yarn.lock
vladar Feb 22, 2021
eb0ffd2
gatsby-remark-prismjs: update snapshots
vladar Feb 23, 2021
1a8d8c6
gatsby-remark-images-contentful: bump deps
vladar Feb 23, 2021
a6e8d4d
chore: bump root remark deps
vladar Feb 23, 2021
2b813a6
gatsby-remark-katex: update snapshot
vladar Feb 23, 2021
55a6736
gatsby-remark-responsive-iframe: update snapshot
vladar Feb 23, 2021
2d6afe2
gatsby-remark-autolink-headers: update snapshot
vladar Feb 23, 2021
a5ae815
gatsby-remark-autolink-headers: update snapshot
vladar Feb 23, 2021
712e5bb
gatsby-remark-autolink-headers: fix tests
vladar Feb 23, 2021
e0a4418
gatsby-remark-code-repls: update snapshot
vladar Feb 23, 2021
765f18c
gatsby-remark-smartypants: update snapshot
vladar Feb 23, 2021
ca18fbe
gatsby-remark-custom-blocks: disable plugin tests
vladar Feb 23, 2021
b773f15
Merge branch 'master' into v3/remark-upgrade
vladar Mar 18, 2021
93dc1a5
dummy commit for canary
vladar Mar 18, 2021
71ceb68
Merge branch 'master' into v3/remark-upgrade
vladar Apr 7, 2021
5de695d
run prettier and update yarn.lock
vladar Apr 7, 2021
6de6c41
Merge branch 'master' into v3/remark-upgrade
vladar Apr 7, 2021
0eca694
gatsby-transformer-remark: update unified and unist-utils
vladar Apr 8, 2021
5c5de00
gatsby-remark-autolink-headers: correct text in tests
vladar Apr 8, 2021
bc03b7b
gatsby-remark-custom-blocks: incompatibility notice
vladar Apr 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions packages/gatsby-transformer-remark/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,17 @@
"bluebird": "^3.7.2",
"gatsby-core-utils": "^2.0.0-next.1",
"gray-matter": "^4.0.2",
"hast-util-raw": "^4.0.0",
"hast-util-to-html": "^4.0.1",
"hast-util-raw": "^6.0.2",
"hast-util-to-html": "^7.1.2",
"lodash": "^4.17.20",
"mdast-util-to-hast": "^3.0.4",
"mdast-util-to-string": "^1.1.0",
"mdast-util-toc": "^5.0",
"remark": "^10.0.1",
"remark-parse": "^6.0.3",
"remark-retext": "^3.1.3",
"remark-stringify": "6.0.4",
"mdast-util-to-hast": "^10.2.0",
"mdast-util-to-string": "^2.0.0",
"mdast-util-toc": "^5.1.0",
"remark": "^13.0.0",
"remark-gfm": "^1.0.0",
"remark-parse": "^9.0.0",
"remark-retext": "^4.0.0",
"remark-stringify": "^9.0.1",
"retext-english": "^3.0.4",
"sanitize-html": "^1.27.5",
"underscore.string": "^3.3.5",
Expand Down
8 changes: 6 additions & 2 deletions packages/gatsby-transformer-remark/src/__tests__/__snapshots__/extend-node.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,9 @@ Object {
<li><a href=\\"/my%20little%20pony/#second-title\\">second title</a></li>
</ul>
</li>
<li><a href=\\"/my%20little%20pony/#third-title\\">third title</a></li>
<li>
<p><a href=\\"/my%20little%20pony/#third-title\\">third title</a></p>
</li>
Comment on lines +634 to +636
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a pre-13.0 change (happens even with 12.0) Makes sense to me because now top-level list items have consistent markup (expand above to compare with the item having a sub-list)

</ul>",
}
`;
Expand All @@ -648,7 +650,9 @@ Object {
<li><a href=\\"#second-title\\">second title</a></li>
</ul>
</li>
<li><a href=\\"#third-title\\">third title</a></li>
<li>
<p><a href=\\"#third-title\\">third title</a></p>
</li>
</ul>",
}
`;
Expand Down
7 changes: 6 additions & 1 deletion packages/gatsby-transformer-remark/src/extend-node-type.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ const mdastToString = require(`mdast-util-to-string`)
const Promise = require(`bluebird`)
const unified = require(`unified`)
const parse = require(`remark-parse`)
const remarkGfm = require(`remark-gfm`)
const stringify = require(`remark-stringify`)
const english = require(`retext-english`)
const remark2retext = require(`remark-retext`)
Expand Down Expand Up @@ -108,14 +109,18 @@ module.exports = function remarkExtendNodeType(
const remarkOptions = {
commonmark,
footnotes,
gfm,
pedantic,
}
if (_.isArray(blocks)) {
remarkOptions.blocks = blocks
}
let remark = new Remark().data(`settings`, remarkOptions)

if (gfm) {
// TODO: deprecate `gfm` option in favor of explicit remark-gfm as a plugin?
remark = remark.use(remarkGfm)
}

for (let plugin of pluginOptions.plugins) {
const requiredPlugin = require(plugin.resolve)
if (_.isFunction(requiredPlugin.setParserPlugins)) {
Expand Down
Loading