-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
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.
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(markdown): Add support for imageReference
paths when collecting images
#8475
Merged
Princesseuh
merged 1 commit into
withastro:main
from
webpro:feat/support-image-refs-in-md
Sep 13, 2023
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
'@astrojs/markdown-remark': minor | ||
--- | ||
|
||
feat(markdown): Add support for `imageReference` paths when collecting images |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
packages/markdown/remark/test/remark-collect-images.test.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
import { renderMarkdown } from '../dist/index.js'; | ||
import { mockRenderMarkdownParams } from './test-utils.js'; | ||
import chai from 'chai'; | ||
|
||
describe('collect images', () => { | ||
it('should collect inline image paths', async () => { | ||
const { code, vfile } = await renderMarkdown( | ||
`Hello `, | ||
mockRenderMarkdownParams | ||
); | ||
|
||
chai | ||
.expect(code) | ||
.to.equal('<p>Hello <img alt="inline image url" __ASTRO_IMAGE_="./img.png"></p>'); | ||
|
||
chai.expect(Array.from(vfile.data.imagePaths)).to.deep.equal(['./img.png']); | ||
}); | ||
|
||
it('should add image paths from definition', async () => { | ||
const { code, vfile } = await renderMarkdown( | ||
`Hello ![image ref][img-ref]\n\n[img-ref]: ./img.webp`, | ||
mockRenderMarkdownParams | ||
); | ||
|
||
chai.expect(code).to.equal('<p>Hello <img alt="image ref" __ASTRO_IMAGE_="./img.webp"></p>'); | ||
chai.expect(Array.from(vfile.data.imagePaths)).to.deep.equal(['./img.webp']); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
export const mockRenderMarkdownParams = { | ||
fileURL: 'file.md', | ||
contentDir: new URL('file:///src/content/'), | ||
}; |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of pre-loading the
definitions(tree)
, we could also look them up lazily here. This would lower the performance impact when not using the additionalimageReference
syntax (the majority I guess), but slow down the implementation in this PR when that syntax is used.Either way, this type of AST traversal is fast. We could traverse only direct
tree.children
(no further descendants) to minimize overhead.