Refactor autogenerated sidebar groups#3618
Conversation
🦋 Changeset detectedLatest commit: ad5286c The changes in this PR will be included in the next version bump. This PR includes changesets to release 1 package
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
✅ Deploy Preview for astro-starlight ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
Lunaria Status Overview🌕 This pull request will trigger status changes. Learn moreBy default, every PR changing files present in the Lunaria configuration's You can change this by adding one of the keywords present in the Tracked Files
Warnings reference
|
Co-authored-by: Chris Swithinbank <swithinbank@gmail.com>
delucis
left a comment
There was a problem hiding this comment.
I think this is in pretty good shape!
There’s this note-to-self #3618 (comment) that you might want to revisit @HiDeoo?
Otherwise, unless you think we should add any additional autogenerate metadata to the sidebar links structure, I’d love to get this out in the next minor release 🚀
|
Pushed a new update adressing this comment and refactoring the previously exposed I also included in a dedicated commit some changes adressing this previous note regarding type error location. I did that in a dedicated commit so it can be easily reverted as I think it may be getting out of hand and trying to fight TypeScript too much to get best possible error and locations. Not sure if the extra complexity is worth for a workaround that took me a few hours to even figure out and implement. We already have what I would qualify as quite good runtime validation with detailed error messages, and even migration steps. It also feels a bit fragile as it's relying on some specific TypeScript behavior that is not guaranteed to be stable. |
delucis
left a comment
There was a problem hiding this comment.
Thanks for the updates @HiDeoo!
Re: the Typescript stuff — I don’t have too strong an opinion. It’s definitely getting very arcane and hard to understand with these subtle things like void vs never, but I’ll let you decide if you want to keep it or not.
This reverts commit bcd1741.
|
Pushed a few updates:
I also played a bit with the idea of allowing either
Only my opinion of course, and happy to discuss further, but I kept |
delucis
left a comment
There was a problem hiding this comment.
Beautiful work as always @HiDeoo!
I agree that '' for the root directory option works. It feels natural to go from 'dir/sub-dir' => 'dir' => '' and, like you say, this avoids the hint of the relative path syntax meaning current directory and suggesting '..' or './dir' might work.
Left a few comments — mostly pretty minor, although the collapsed question might warrant some discussion?
Co-authored-by: delucis <357379+delucis@users.noreply.github.com>
Co-authored-by: delucis <357379+delucis@users.noreply.github.com>
Co-authored-by: delucis <357379+delucis@users.noreply.github.com>
|
Thanks for the thorough review and super helpful suggestions as always 🙌 |
This PR contains the following updates: | Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) | |---|---|---|---| | [@astrojs/starlight](https://starlight.astro.build) ([source](https://github.com/withastro/starlight/tree/HEAD/packages/starlight)) | [`0.38.5` → `0.39.2`](https://renovatebot.com/diffs/npm/@astrojs%2fstarlight/0.38.5/0.39.2) |  |  | --- ### Release Notes <details> <summary>withastro/starlight (@​astrojs/starlight)</summary> ### [`v0.39.2`](https://github.com/withastro/starlight/blob/HEAD/packages/starlight/CHANGELOG.md#0392) [Compare Source](https://github.com/withastro/starlight/compare/@astrojs/starlight@0.39.1...@astrojs/starlight@0.39.2) ##### Patch Changes - [#​3890](withastro/starlight#3890) [`2d05e18`](withastro/starlight@2d05e18) Thanks [@​tats-u](https://github.com/tats-u)! - Fixes CSS selector for `text-autospace` styles in Chromium browsers ### [`v0.39.1`](https://github.com/withastro/starlight/blob/HEAD/packages/starlight/CHANGELOG.md#0391) [Compare Source](https://github.com/withastro/starlight/compare/@astrojs/starlight@0.39.0...@astrojs/starlight@0.39.1) ##### Patch Changes - [#​3885](withastro/starlight#3885) [`010eed1`](withastro/starlight@010eed1) Thanks [@​ArmandPhilippot](https://github.com/ArmandPhilippot)! - Fixes the version mentioned in an error message related to autogenerated sidebar groups support. - [#​3887](withastro/starlight#3887) [`b3c6990`](withastro/starlight@b3c6990) Thanks [@​delucis](https://github.com/delucis)! - Adds 13 new icons: `clock`, `desktop`, `mobile-android`, `window`, `database`, `server`, `code-branch`, `notes`, `question`, `question-circle`, `analytics`, `padlock`, and `solidjs`. ### [`v0.39.0`](https://github.com/withastro/starlight/blob/HEAD/packages/starlight/CHANGELOG.md#0390) [Compare Source](https://github.com/withastro/starlight/compare/@astrojs/starlight@0.38.5...@astrojs/starlight@0.39.0) ##### Minor Changes - [#​3618](withastro/starlight#3618) [`dcf6d09`](withastro/starlight@dcf6d09) Thanks [@​HiDeoo](https://github.com/HiDeoo)! - **⚠️ BREAKING CHANGE:** This release changes how autogenerated links work in Starlight’s sidebar configuration. If you have sidebar groups using the `autogenerate` key, you must now wrap that configuration in an `items` array: ```diff { label: 'My group', - autogenerate: { directory: 'some-dir' }, + items: [{ autogenerate: { directory: 'some-dir' } }], } ``` This change unlocks the possibility to mix autogenerated links and other links in a single group, for example: ```js { label: 'Mixed group', items: [ 'example-page', { autogenerate: { directory: 'examples' } }, { label: 'More examples', link: 'https://example.com' }, ], } ``` This release also updates the shape of autogenerated sidebar entries in route data. Autogenerated links and groups in `Astro.locals.starlightRoute.sidebar` now include an `autogenerate` object with the [configured `directory` value](https://starlight.astro.build/guides/sidebar/#autogenerated-groups): ```js { type: 'link', label: 'Example', href: '/examples/example/', isCurrent: false, autogenerate: { directory: 'examples' } } ``` - [#​3618](withastro/starlight#3618) [`dcf6d09`](withastro/starlight@dcf6d09) Thanks [@​HiDeoo](https://github.com/HiDeoo)! - **⚠️ BREAKING CHANGE:** This release changes the default collapsed state of autogenerated sidebar subgroups. Autogenerated subgroups no longer inherit the `collapsed` value from their parent group. They are now expanded by default unless explicitly configured with [`autogenerate.collapsed`](https://starlight.astro.build/reference/configuration/#collapsing-groups). If your sidebar configuration relies on a collapsed parent group to also collapse its autogenerated subgroups, update your configuration to set `autogenerate.collapsed` to `true`: ```diff { label: 'Reference', collapsed: true, items: [ - { autogenerate: { directory: 'reference' } }, + { autogenerate: { directory: 'reference', collapsed: true } }, ], } ``` - [#​3845](withastro/starlight#3845) [`4d755f5`](withastro/starlight@4d755f5) Thanks [@​delucis](https://github.com/delucis)! - Adds a `<link rel="alternate" hreflang="x-default" href="...">` tag pointing to the default locale in multilingual sites. The `x-default` alternate is used as a signal of which language to fall back to if no other is available. Learn more in Google’s [SEO localization docs](https://developers.google.com/search/docs/specialty/international/localized-versions#xdefault). - [#​3862](withastro/starlight#3862) [`ec70630`](withastro/starlight@ec70630) Thanks [@​itrew](https://github.com/itrew)! - Makes spacing of items in nested lists more consistent - [#​3872](withastro/starlight#3872) [`417a66c`](withastro/starlight@417a66c) Thanks [@​tats-u](https://github.com/tats-u)! - Enables [the CSS property `text-autospace`](https://developer.mozilla.org/docs/Web/CSS/Reference/Properties/text-autospace) in Chinese and Japanese documents. If you would prefer to disable autospacing in Chinese and Japanese pages, you can add the following custom CSS to your site: ```css [lang]:where(:lang(zh, ja)) { text-autospace: initial; } ``` - [#​3797](withastro/starlight#3797) [`9764ebd`](withastro/starlight@9764ebd) Thanks [@​delucis](https://github.com/delucis)! - Avoids the risk of layout shift when users expand and collapse sidebar groups This release can introduce additional padding to the site sidebar on certain devices to reserve space for scrollbars. You may wish to inspect your site sidebar visually when upgrading. If you would prefer to keep the previous styling, you can add the following custom CSS to your site: ```css .sidebar-pane { scrollbar-gutter: auto; } ``` - [#​3858](withastro/starlight#3858) [`6672c35`](withastro/starlight@6672c35) Thanks [@​delucis](https://github.com/delucis)! - Updates `i18next`, used for Starlight’s localization APIs, from v23 to v26 There should not be any user-facing changes from this update </details> --- ### Configuration 📅 **Schedule**: (UTC) - Branch creation - At any time (no schedule defined) - Automerge - At any time (no schedule defined) 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My4xNjAuNyIsInVwZGF0ZWRJblZlciI6IjQzLjE3MC4yMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->


Description
This PR adds a new feature which has been discussed and approved here.
Closes Groupless autogenarated sidebar links #3336
This PR removes the notion of "autogenerated sidebar groups" in favor of simply using "autogenerated sidebar links" which can be used in regular sidebar groups. As discussed in #3336, this simplifies the mental model around groups and also allows for use cases that were not possible before, such as having a sidebar entirely made of autogenerated links for a specific directory without having it nested inside a group.
For users, the gist of the change is:
{ label: 'My group', - autogenerate: { directory: 'some-dir' }, + items: [{ autogenerate: { directory: 'some-dir' } }], }Such refactor removes the 1:1 mapping that was previously available between an autogenerated sidebar group in the Starlight configuration and such autogenerated group in the Starlight route data. To address such change, the Starlight route data has been updated and many solutions are possible to address this, e.g. having multiple types (
link,autolink,group, andautogroup). This PR has gone through multiple variations of such approach, and the current implementation does not introduce new types but rather adds anautogeneratedproperty set to totruefor links and subgroups that were autogenerated. Of course, other approaches are possible and feedback is welcome.To make sure such change does not impact plugins with previous features that would no longer be possible due to the changes, I rewrote locally the
starlight-auto-sidebarplugin, which was heavily relying on that 1:1 mapping and to my knowledge, may be one of the "largest" plugins tweaking sidebar route data for autogenerated groups with a large enough set of tests. I managed to rewrite it successfully while using the Starlight version from this PR and achieved the same results as before.Note: I also addded a few tests for some behaviors that were not covered before and were impacted by this change, e.g. the
collapsedstate of autogenerated subgroups.Remaining tasks