Sarah Rainsberger
32cedb3dab
[docs] Markdoc README syntax fixes ( #7798 )
2023-07-25 14:05:03 -03:00
bholmesdev
25e04a2ecb
[ci] format
2023-07-24 23:36:32 +00:00
Alex Sherwin
7461e82c81
Add "allowHTML" option for Markdoc with HTML parsing/processing ( #7597 )
...
* 7576 - initial support for HTML inside Markdoc.
This uses htmlparser2 to perform a pure token transform/mutation
on the markdown-it tokens, replacing the original raw HTML string
tokens with a richer set of tokens per HTML node, and in the process
Markdoc tags are interleaved in the resulting token graph at the
appropriate locations
This removes the legacy config of the @astrojs/markdoc integration
entirely (suggested by @bholmesdev) and introduces a new type for
options to be specified in the astro config, initially, with just the new
"enableHTML" option
When "enableHTML" is *not* enabled (the default), the behavior
of the entire @astrojs/markdoc integration should remain functionally
equivalent to before this change
* 7576 - fixed issues with whitespace preservation
also:
* cleaned up " to ' for astro project preferred linting
* made the html rendering test fixture use a dynamic path
* 7576 - detailed nested HTML test coverage
* 7576 - component + HTML interleaved tests
* 7576 - fix lint problems from previous changes
* 7576 - some commentary
* 7576 - file naming, refactor html under imports, package.json exports definition for html
* 7576
* move out of extensions dir, remove export
* cdata handling changes
* 7576
* inline license from third party code
* cleanup test class copy of HTML output
* remove // third party indicators for imports (clarification: not third party code, just a indicator this group of imports is third party)
* 7576 - fixed test before/after for DRY'ness
* 7576 - no need to React-ify HTML attribute case
* 7576 - rename "enableHTML" option to "allowHTML"
* Added Markdoc allowHTML feature changeset
* 7576 - updated README with allowHTML info
* 7576 - fixed changeset typo
* 7576 - minor edits based on PR feedback for docs
* 7576 - minor edits based on PR feedback for docs
2023-07-24 19:34:06 -04:00
Ben Holmes
c135633bf6
Fix: Markdoc v0.4.0 docs ( #7593 )
...
* docs: add docs link to markdoc error
* docs: add named exports guide to README
* chore: changeset
* edit: no like so
Co-authored-by: Chris Swithinbank <swithinbank@gmail.com>
* edit: exposed as named exports
Co-authored-by: Chris Swithinbank <swithinbank@gmail.com>
---------
Co-authored-by: bholmesdev <bholmesdev@gmail.com>
Co-authored-by: Chris Swithinbank <swithinbank@gmail.com>
2023-07-07 09:22:26 -04:00
zyoshoka
6f1c4ea388
Fix code snippet in markdoc README ( #7592 )
2023-07-07 07:22:47 -04:00
Hippo
bc9ce779d3
Move code block titles into comments to match docs ( #7543 )
...
Co-authored-by: Yan Thomas <61414485+Yan-Thomas@users.noreply.github.com>
2023-07-01 16:34:49 +02:00
Bjorn Lu
8e3cb20b5c
Format markdown files ( #7439 )
...
Co-authored-by: Chris Swithinbank <swithinbank@gmail.com>
2023-06-26 11:34:13 +08:00
Ben Holmes
2a4bb23b2f
Fix missing styles and scripts on document: {render:null} ( #7309 )
...
* fix: propagate assets when using document `render: null`
* fix: reverse spread order
* refactor: use README rec in test
* chore: changeset
* chore: revert unneeded changes
2023-06-06 13:40:04 -04:00
Ben Holmes
bef3a75dbc
Markdoc - remove $entry variable ( #7244 )
...
* refactor: remove entry prop from `getRenderModule()`
* refactor: remove `$entry` from markdoc
* test: update entry-prop -> variables test
* refactor: unify `getEntryConfigByExt`
* chore: clean up shared content / data get logic
* docs: update `$entry` recommendation
* chore: rename entry-prop -> variables
* chore: changeset
* chore: missed a spot
2023-05-30 16:18:20 -04:00
Ben Holmes
c7897f20a9
Markdoc: new README for Markdoc nodes ( #7225 )
...
* docs: all-new nodes documentation
* edit: `.astro` ONLY
Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
* edit: `.` outside links, line break
Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
* edit: such as, not like
Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
* edit: more Astro less probs
Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
* edit: reviewers React to
Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
* edit: tagz
Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
* chore: add `default: 'article'` for document
* edit: reword client-side instructions
* edit: prism stylesheet got lost
* fix: heading -> blockquote
---------
Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
2023-05-30 14:51:38 -04:00
Ben Holmes
16b8364119
Markdoc - improve syntax highlighting support ( #7209 )
...
* feat: prism and shiki support, with better exports!
* chore: update tests
* chore: fix lock
* chore: add prism test
* chore: remove `async` from prism
* docs: update syntax highlight readme
* chore: changeset
* edit: remove `await` from prism docs
* chore: update old changest with new shiki instructions
* fix: add trailing newline on ts-expect-error
* refactor: resolve promises internally
* docs: remove `await` from shiki examples
2023-05-25 11:35:07 -04:00
Ben Holmes
1efaef6be0
Markdoc - Shiki ( #7187 )
...
* chore: remove unused util
* chore: changeset
* deps: shiki
* wip: first stab at shiki markdoc config
* feat: get shiki working!
* refactor: return HTML string directly from transform
* chore: move shiki to markdoc dev dep
* refactor: use async cache with clear docs on why
* test: transform units with Shiki config options
* refactor: switch to `extends` model
* refactor: nodes/ -> extensions/
* feat: raise friendly error for Promise extensions
* docs: README
* chore: lint
* chore: dead file
* chore: lowercase for fuzzy find please
* fix: bad ctx spread
* chore: clean up cache, add shiki imp error
* chore: add shiki to optional peer deps
* chore: hoist those consts
* docs: more explicit "install shiki now please"
Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
* oops bad find and replace
* chore: update changeset
* nit: period haunts me
---------
Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
2023-05-24 16:52:22 -04:00
Ben Holmes
fb84622af0
[Markdoc] headings and heading IDs ( #7095 )
...
* deps: markdown-remark
* wip: heading-ids function
* chore: add `@astrojs/markdoc` to external
* feat: `headings` support
* fix: allow `render` config on headings
* fix: nonexistent `userConfig`
* test: headings, toc, astro component render
* docs: README
* chore: changeset
* refactor: expose Markdoc helpers from runtime
* fix: bad named exports (commonjsssss)
* refactor: defaultNodes -> nodes
* deps: github-slugger
* fix: reset slugger cache on each render
* fix: bad astroNodes import
* docs: explain headingSlugger export
* docs: add back double stringify comment
* chore: bump to minor for internal exports change
2023-05-17 09:13:10 -04:00
Ben Holmes
3a9f72c7f3
[Markdoc] Validation and debugging improvements ( #7045 )
...
* feat: better validation logs
* chore: add warning to restart server on config chnage
* feat: expose Markdoc global from markdoc/config
* docs: update `nodes` reference
* chore: changeset
* docs: simplify headings explainer
* chore: ignore eslint log errors
* fix: make legacyConfig prop optional
2023-05-09 17:20:55 -04:00
Ben Holmes
7c439868a3
[Markdoc] New config format with runtime variable support! ( #6653 )
...
* deps: esbuild
* feat: support direct component imports for render!
* deps: add devalue back
* refactor: remove unused components prop
* refactor: load experimental assets config separately
* fix: upate Content type def to support props
* refactor: replace astro stub with inline data
* feat: pass through viteId to getRenderMod
* fix: add back $entry var with defaults convention
* chore: remove unneeded validateRenderProps
* chore: remove uneeded validateComponents
* fix: remove userMarkdocConfig prop
* chore: add helpful error for legacy config
* deps: kleur
* fix: add back `isCapitalized`
* fix: log instead of throw to avoid scary stacktrace
* chore: delete more old logic (nice)
* chore: delete MORE unused utils
* chore: comment on separate assets config
* chore: remove console.log
* chore: general code cleanup
* test: new render config
* docs: new README
* fix: add expect-error on astro:assets
* feat: add defineMarkdocConfig helper
* docs: update example README
* test: add runtime variable
* chore: lint
* chore: changeset
* chore: add component import deletion
* docs: add notes on Vite fork
* fix: astro check
* chore: add `.mts` to markdoc config formats
2023-03-27 18:04:37 -04:00
paulrudy
b37b865400
edit commands for installing @markdoc/markdoc ( #6622 )
...
* edit commands for installing @markdoc/markdoc
* Create twenty-islands-protect.md
---------
Co-authored-by: Ben Holmes <hey@bholmes.dev>
2023-03-21 20:53:46 -04:00
Ben Holmes
f42f47dc6a
feat: Expose $entry variable to Markdoc ( #6588 )
...
* wip: dream api
* deps: rollup types
* feat: get entry data in there
* fix: properly show mdoc errors in overlay
* feat: implement with cache
* fix: wait for in-flight entry resolution
* test: entry properties can be rendered
* chore: changeset
* fix: remove rollup type import
* Revert "deps: rollup types"
This reverts commit 484ccb1c81
2023-03-21 09:20:23 -04:00
Tc001
67d3d1d65a
Replace tabs with double spaces ( #6562 )
2023-03-16 15:46:31 +02:00
Sarah Rainsberger
60c7690b4c
[docs] Fix Markdoc README links ( #6458 )
2023-03-08 09:12:01 -04:00
Ben Holmes
fec583909a
@astrojs/markdoc ( #6209 )
...
* chore: integration setup
* feat: get markdoc contents
* wip: expose Markdoc from integration
* feat: basic Astro renderer in with-markdoc
* fix: component render bug
* deps: stringify-attributes
* fix: render attributes to html
* wip: play with separate markdoc config
* wip: get dream API for file loader working
* chore: unit tests
* deps: graymatter
* feat: addContentEntryType integration hook
* deps: move to @astrojs/markdoc
* feat: move Renderer to markdoc, get Content component!
* wip: scaffold content types
* deps: mdx
* wip: move mdx to collection type API
* refactor: move plain md to content entry type
* refactor: pass file contents
* oops, forgot to commit untracked
* fix: markdoc.config loading
* refactor: remove fallback loader
* chore: remove unused dream file
* deps: devalue, test fixture
* test: entry and collections parse
* play: make sure md also works
* deps: add shiki for Code comp error
* fix: remove "components" from tsconfig
* chore: ignore `.astro` type error
* fix: avoid import if no config present (prod build error)
* fix: stop bundling markdoc for isTag
* test: prod builds
* test: content component dev and build
* chore: Markdoc working! log
* fix: ContentEntryType import
* chore: remove content-types. Too early!
* chore: remove unused options object
* play: add docs example with Aside and Since ported
* chore: with-markdoc strictNullChecks
* chore: unused file
* feat: allow Render type injection
* feat: content prop types for markdoc!
* chore: clean up Markdoc starter to essentials
* chore: unused style tag
* chore: remove unused deps
* fix: glob for single content extension
* chore: remove unused fixture dep
* chore: remove markdoc.config loader
* docs: update example README
* docs: @astrojs/markdoc README intro
* fix: line endings in test
* docs: add usage and examples to Markdoc README
* docs: change with-markdoc title
* docs: README edits
* refactor: clean up astroNode
* nit: reorder type import
* docs: add note on Aside src
* chore: changeset
* nit: 0.0.0 to avoid version bump
* fix: lock
* refactor: remove unneeded async
* fix: import types from @astrojs/markdoc
* fix: type inferencing in preview
* fix: remove unneeded html-escaper
* deps: remove html-escaper
* feat: support `.md` overrides for content collections
* chore: mdoc -> md
* feat: generate `.md` types override
* Revert "feat: support `.md` overrides for content collections"
This reverts commit c06f83ef85c06f83ef85c06f83ef8545fac9922dfbab73c96ea206106098#6435 )
* Expose the ssr manifest
* Add changeset
* Add types for virtual mod
commit 2751584387694918a56b#6344 )
* feat(assets): Add Vite plugin
* feat(images): Set up Image component
* fix(types): Attempt to fix type generation
* Revert "fix(types): Attempt to fix type generation"
This reverts commit 063aa276e2#6381 )
* feat(images): Make frontmatter extraction more generic than images for future
* feat(image): Add support for building
* fix(image): Fix types
* fix(images): Fix compatibility with image integration
* feat(images): Cuter generation stats
* fix(images): Globals are unsafe, it turns out
* fix(images): Only generate images if flag is enabled
* fix(images): Only create `addStaticImage` in build
* feat(images): Add SSR endpoint
* fix(images): Only inject route in SSR
* Add tests for SSR
* Remove console.log
* Updated lockfile
* rename to satisfy the link gods
* skip build tests for now
* fix(images): Fix WASM files not being copied in dev
* feat(images): Add quality presets
* fix build tests running
* Remove console.log
* Add tests for getImage
* Test local services
* Test the content collections API
* Add tests for quality
* Skipping content collections test
* feat(image): Add support for `~/assets` alias
* test(image): Add tests for aliases in dev
* Fix windows + content collections
* test(image): Add tests for aliased images and images in Markdown
* Fix markdown images being built
* Should be posix join
* Use the optimized image
* fix test
* Fixes windows smoke
* fix(image): Nits
* feat(images): Add automatic update for `env.d.ts` when experimental images are enabled
* fix(images): Revert env.d.ts change if the user opted-out of the experimental image support
* chore: remove bad image example project
* feat(image): Rename `experimental.images` to `experimental.assets`
* fix(images): Remove unused code in MDX integration
* chore: Remove unrelated change
* fix(images): Remove export from astro/components
* Fix, esm import on Win
* test(images): Add test for format
* fix(images): Add `client-image.d.ts` to export map
* chore: changeset
* fix(images): Adjust with feedback, no more automatic refine, asset() -> image()
* fix(images): Fix types
* fix(images): Remove unnecessary spread
* fix(images): Better types for parseUrl and transform
* fix(images): Fix types
* fix(images): Adjust from feedback
* fix(images): Pass width and height through getHTMLAttributes even if they're not added by the uesr
* fix(images): Recusirsively extract frontmatter assets
* fix(images): Use a reduce instead
* feat(images): Add support for data: URIs
* chore: changeset
* docs(images): Misc docs fixes
* Update .changeset/gold-rocks-cry.md
Co-authored-by: Chris Swithinbank <swithinbank@gmail.com>
* Update .changeset/gold-rocks-cry.md
Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
* Update packages/astro/src/@types/astro.ts
Co-authored-by: Chris Swithinbank <swithinbank@gmail.com>
* Update packages/astro/src/assets/services/service.ts
Co-authored-by: Chris Swithinbank <swithinbank@gmail.com>
* Update packages/astro/src/assets/services/service.ts
Co-authored-by: Chris Swithinbank <swithinbank@gmail.com>
* Update packages/astro/src/assets/services/service.ts
Co-authored-by: Chris Swithinbank <swithinbank@gmail.com>
* Update packages/astro/src/assets/types.ts
Co-authored-by: Chris Swithinbank <swithinbank@gmail.com>
* Update packages/astro/src/assets/types.ts
Co-authored-by: Chris Swithinbank <swithinbank@gmail.com>
---------
Co-authored-by: Matthew Phillips <matthew@skypack.dev>
Co-authored-by: Matthew Phillips <matthew@matthewphillips.info>
Co-authored-by: Chris Swithinbank <swithinbank@gmail.com>
Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
commit 377530a810fe88f89512#6429 )
commit e1858e633475921b3cd9#6356 )
* feat(cli): add `--watch` to `astro check` command
* chore: refactor in a leaner way, logic not changed
* chore: lint
* chore: revert changes in sync command
* chore: tweak server settings
* test: add one test case
* chore: increase timeout
* test: predictable testing
* chore: add changeset
* chore: code suggestions
* code suggestions
* chore: use directly `chokidar`
* chore: tweak code
* fix: open documents first
* chore: disable test
* chore: code suggestions
* chore: code suggestions
* Apply suggestions from code review
Co-authored-by: Erika <3019731+Princesseuh@users.noreply.github.com>
* code suggestions
* chore: rebase
---------
Co-authored-by: Erika <3019731+Princesseuh@users.noreply.github.com>
commit 1291afc09d#6442 )
commit 00a0af7ed4#6433 )
commit af05a4fa46#6437 )
* Update README.md
* Update README.md
commit 8ebf4b7481#6436 )
commit afbbc4d5bf#6213 )
* config(esbuild): Update esbuild target to node16
* config(package): Update root package.json node engine
* config(tsconfig): Update all the tsconfigs module and targets
* chore: changeset
* chore: remove unneeded file
commit 18acae3edc#6423 )
commit 8b49d1781da4a74ab70c#6394 )
Co-authored-by: Happydev <81974850+MoustaphaDev@users.noreply.github.com>
commit b087b83fe2#6150 )
* feat(astro): add InferGetStaticParamsType and InferGetStaticPropsType type helpers
* chore(astro): added changeset
commit 19fe4cb629#6414 )
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* Revert "Squashed commit of the following:"
This reverts commit fbe129bf953e997837bb
2023-03-07 14:05:19 -05:00
Sarah Rainsberger
bholmesdev
Alex Sherwin
Ben Holmes
zyoshoka
Hippo
Bjorn Lu
paulrudy
Tc001