Skip to content

Update astro-expressive-code to v0.38 #2551

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

Merged
merged 7 commits into from
Nov 8, 2024
Merged

Update astro-expressive-code to v0.38 #2551

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5a40b55
Update `astro-expressive-code` to v0.38
hippotastic Nov 1, 2024
98da040
Bump EC to latest patch
hippotastic Nov 4, 2024
dfaba77
Bump EC again, fix `getBlockLocale` for `<Code>` component
hippotastic Nov 5, 2024
af1d0b1
Merge branch 'main' into update-ec-to-0.38
hippotastic Nov 6, 2024
98da5ea
Adapt `slugToLocale` usage to new export signature
hippotastic Nov 6, 2024
997f1a9
Update Vitest thresholds
delucis Nov 6, 2024
f594927
Bump EC again, making `shiki.lang` types less strict
hippotastic Nov 7, 2024
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
7 changes: 7 additions & 0 deletions .changeset/kind-ravens-cross.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@astrojs/starlight': minor
---

Updates the `astro-expressive-code` dependency to the latest version (0.38).

The new version allows using `ec.config.mjs` to selectively override individual Expressive Code styles and settings provided by Starlight themes and plugins, speeds up Shiki language loading, and adds the config option `expressiveCode.shiki.injectLangsIntoNestedCodeBlocks`. See the [Expressive Code release notes](https://expressive-code.com/releases/#0380) for full details.
7 changes: 5 additions & 2 deletions packages/starlight/integrations/expressive-code/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { addClassName } from 'astro-expressive-code/hast';
import type { AstroIntegration } from 'astro';
import type { StarlightConfig } from '../../types';
import type { createTranslationSystemFromFs } from '../../utils/translations-fs';
import { pathToLocale } from '../shared/pathToLocale';
import { pathToLocale, slugToLocale } from '../shared/pathToLocale';
import {
applyStarlightUiThemeColors,
preprocessThemes,
Expand Down Expand Up @@ -152,7 +152,10 @@ export function getStarlightEcConfigPreprocessor({
},
...otherStyleOverrides,
},
getBlockLocale: ({ file }) => pathToLocale(file.path, { starlightConfig, astroConfig }),
getBlockLocale: ({ file }) =>
file.url
? slugToLocale(file.url.pathname.slice(1), starlightConfig.locales)
: pathToLocale(file.path, { starlightConfig, astroConfig }),
plugins,
...rest,
};
Expand Down
2 changes: 1 addition & 1 deletion packages/starlight/integrations/shared/pathToLocale.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { AstroConfig } from 'astro';
import type { StarlightConfig } from '../../types';

function slugToLocale(
export function slugToLocale(
slug: string | undefined,
localesConfig: StarlightConfig['locales']
): string | undefined {
Expand Down
6 changes: 3 additions & 3 deletions packages/starlight/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,16 +180,16 @@
"@types/node": "^18.16.19",
"@vitest/coverage-v8": "^1.6.0",
"astro": "^4.15.3",
"vitest": "^1.6.0",
"linkedom": "^0.18.4"
"linkedom": "^0.18.4",
"vitest": "^1.6.0"
},
"dependencies": {
"@astrojs/mdx": "^3.1.3",
"@astrojs/sitemap": "^3.1.6",
"@pagefind/default-ui": "^1.0.3",
"@types/hast": "^3.0.4",
"@types/mdast": "^4.0.4",
"astro-expressive-code": "^0.35.6",
"astro-expressive-code": "^0.38.2",
"bcp-47": "^2.1.0",
"hast-util-from-html": "^2.0.1",
"hast-util-select": "^6.0.2",
Expand Down
130 changes: 102 additions & 28 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading