From a719fd9eb0d017cd749c60b3b09b824152da9806 Mon Sep 17 00:00:00 2001 From: FabianLars Date: Tue, 24 Sep 2024 14:39:36 +0200 Subject: [PATCH] chore: Update starlight patch --- package.json | 4 +-- ...patch => @astrojs__starlight@0.28.2.patch} | 14 ++++----- pnpm-lock.yaml | 30 +++++++++---------- 3 files changed, 24 insertions(+), 24 deletions(-) rename patches/{@astrojs__starlight@0.26.3.patch => @astrojs__starlight@0.28.2.patch} (76%) diff --git a/package.json b/package.json index be861618a..c5097b3a8 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "dependencies": { "@astrojs/markdown-remark": "^5.2.0", "@astrojs/rss": "^4.0.7", - "@astrojs/starlight": "^0.28.1", + "@astrojs/starlight": "0.28.2", "@lorenzo_lewis/starlight-utils": "^0.1.0", "@types/json-schema": "^7.0.15", "astro": "^4.15.7", @@ -48,7 +48,7 @@ }, "pnpm": { "patchedDependencies": { - "@astrojs/starlight": "patches/@astrojs__starlight@0.26.3.patch" + "@astrojs/starlight@0.28.2": "patches/@astrojs__starlight@0.28.2.patch" } } } diff --git a/patches/@astrojs__starlight@0.26.3.patch b/patches/@astrojs__starlight@0.28.2.patch similarity index 76% rename from patches/@astrojs__starlight@0.26.3.patch rename to patches/@astrojs__starlight@0.28.2.patch index 1b43c209e..aac484357 100644 --- a/patches/@astrojs__starlight@0.26.3.patch +++ b/patches/@astrojs__starlight@0.28.2.patch @@ -1,5 +1,5 @@ diff --git a/schemas/sidebar.ts b/schemas/sidebar.ts -index b71d159ed44f89ef83298a7036a66edf25945f20..7706b3b25b0e62f2735f0cad61780f9c745b131b 100644 +index 2c4cc1d588f27b0106a82135ca3772cba86c5309..59a46a986a3fac739043c71f8a97801fa50e3e64 100644 --- a/schemas/sidebar.ts +++ b/schemas/sidebar.ts @@ -49,6 +49,8 @@ const AutoSidebarGroupSchema = SidebarGroupSchema.extend({ @@ -12,29 +12,29 @@ index b71d159ed44f89ef83298a7036a66edf25945f20..7706b3b25b0e62f2735f0cad61780f9c }).strict(); export type AutoSidebarGroup = z.infer; diff --git a/utils/navigation.ts b/utils/navigation.ts -index cd1475d15221caca34d03bfdc026f211b41e0c07..b72b230da9262f76e8e7573e5b8aeb59aaec01e4 100644 +index 526d9f29ddc4a2a050be1869b708065a401758f3..9b6a2151b2500a131425a7d4d7279bdab7d54173 100644 --- a/utils/navigation.ts +++ b/utils/navigation.ts -@@ -96,7 +96,7 @@ function groupFromAutogenerateConfig( +@@ -97,7 +97,7 @@ function groupFromAutogenerateConfig( routes: Route[], currentPathname: string ): Group { - const { collapsed: subgroupCollapsed, directory } = item.autogenerate; -+ const { collapsed: subgroupCollapsed, directory, sort, order } = item.autogenerate; ++ const { collapsed: subgroupCollapsed, directory , sort, order } = item.autogenerate; const localeDir = locale ? locale + '/' + directory : directory; const dirDocs = routes.filter( (doc) => -@@ -105,7 +105,8 @@ function groupFromAutogenerateConfig( +@@ -106,7 +106,8 @@ function groupFromAutogenerateConfig( // Match against `foo/anything/else.md`. doc.id.startsWith(localeDir + '/') ); - const tree = treeify(dirDocs, localeDir); + const sorted = !sort ? dirDocs : dirDocs.sort(sortHandler(sort, order)).map((doc, i) => {doc.entry.data.sidebar.order = i; return doc}); + const tree = treeify(sorted, localeDir); + const label = pickLang(item.translations, localeToLang(locale)) || item.label; return { type: 'group', - label: pickLang(item.translations, localeToLang(locale)) || item.label, -@@ -115,6 +116,13 @@ function groupFromAutogenerateConfig( +@@ -117,6 +118,13 @@ function groupFromAutogenerateConfig( }; } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 69d4f932e..5236b6380 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,9 +5,9 @@ settings: excludeLinksFromLockfile: false patchedDependencies: - '@astrojs/starlight': - hash: 5ks2kbrw4rj2cgj3w5pymglnvm - path: patches/@astrojs__starlight@0.26.3.patch + '@astrojs/starlight@0.28.2': + hash: 76yyhncu6egc3t2dne72gvpf4e + path: patches/@astrojs__starlight@0.28.2.patch importers: @@ -20,11 +20,11 @@ importers: specifier: ^4.0.7 version: 4.0.7 '@astrojs/starlight': - specifier: ^0.28.1 - version: 0.28.2(patch_hash=5ks2kbrw4rj2cgj3w5pymglnvm)(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)) + specifier: 0.28.2 + version: 0.28.2(patch_hash=76yyhncu6egc3t2dne72gvpf4e)(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)) '@lorenzo_lewis/starlight-utils': specifier: ^0.1.0 - version: 0.1.2(@astrojs/starlight@0.28.2(patch_hash=5ks2kbrw4rj2cgj3w5pymglnvm)(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)))(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)) + version: 0.1.2(@astrojs/starlight@0.28.2(patch_hash=76yyhncu6egc3t2dne72gvpf4e)(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)))(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)) '@types/json-schema': specifier: ^7.0.15 version: 7.0.15 @@ -66,10 +66,10 @@ importers: version: 1.18.0 starlight-blog: specifier: ^0.12.0 - version: 0.12.0(@astrojs/starlight@0.28.2(patch_hash=5ks2kbrw4rj2cgj3w5pymglnvm)(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)))(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)) + version: 0.12.0(@astrojs/starlight@0.28.2(patch_hash=76yyhncu6egc3t2dne72gvpf4e)(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)))(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)) starlight-links-validator: specifier: ^0.12.0 - version: 0.12.1(@astrojs/starlight@0.28.2(patch_hash=5ks2kbrw4rj2cgj3w5pymglnvm)(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)))(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)) + version: 0.12.1(@astrojs/starlight@0.28.2(patch_hash=76yyhncu6egc3t2dne72gvpf4e)(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)))(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)) packages/cli-generator: dependencies: @@ -3912,7 +3912,7 @@ snapshots: stream-replace-string: 2.0.0 zod: 3.23.8 - '@astrojs/starlight@0.28.2(patch_hash=5ks2kbrw4rj2cgj3w5pymglnvm)(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2))': + '@astrojs/starlight@0.28.2(patch_hash=76yyhncu6egc3t2dne72gvpf4e)(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2))': dependencies: '@astrojs/mdx': 3.1.7(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)) '@astrojs/sitemap': 3.1.6 @@ -4904,9 +4904,9 @@ snapshots: '@kwsites/promise-deferred@1.1.1': {} - '@lorenzo_lewis/starlight-utils@0.1.2(@astrojs/starlight@0.28.2(patch_hash=5ks2kbrw4rj2cgj3w5pymglnvm)(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)))(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2))': + '@lorenzo_lewis/starlight-utils@0.1.2(@astrojs/starlight@0.28.2(patch_hash=76yyhncu6egc3t2dne72gvpf4e)(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)))(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2))': dependencies: - '@astrojs/starlight': 0.28.2(patch_hash=5ks2kbrw4rj2cgj3w5pymglnvm)(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)) + '@astrojs/starlight': 0.28.2(patch_hash=76yyhncu6egc3t2dne72gvpf4e)(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)) astro: 4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2) astro-integration-kit: 0.14.0(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)) transitivePeerDependencies: @@ -7719,10 +7719,10 @@ snapshots: sprintf-js@1.0.3: {} - starlight-blog@0.12.0(@astrojs/starlight@0.28.2(patch_hash=5ks2kbrw4rj2cgj3w5pymglnvm)(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)))(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)): + starlight-blog@0.12.0(@astrojs/starlight@0.28.2(patch_hash=76yyhncu6egc3t2dne72gvpf4e)(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)))(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)): dependencies: '@astrojs/rss': 4.0.5 - '@astrojs/starlight': 0.28.2(patch_hash=5ks2kbrw4rj2cgj3w5pymglnvm)(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)) + '@astrojs/starlight': 0.28.2(patch_hash=76yyhncu6egc3t2dne72gvpf4e)(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)) astro: 4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2) astro-remote: 0.3.2 github-slugger: 2.0.0 @@ -7730,9 +7730,9 @@ snapshots: marked-plaintify: 1.0.1(marked@12.0.2) ultrahtml: 1.5.3 - starlight-links-validator@0.12.1(@astrojs/starlight@0.28.2(patch_hash=5ks2kbrw4rj2cgj3w5pymglnvm)(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)))(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)): + starlight-links-validator@0.12.1(@astrojs/starlight@0.28.2(patch_hash=76yyhncu6egc3t2dne72gvpf4e)(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)))(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)): dependencies: - '@astrojs/starlight': 0.28.2(patch_hash=5ks2kbrw4rj2cgj3w5pymglnvm)(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)) + '@astrojs/starlight': 0.28.2(patch_hash=76yyhncu6egc3t2dne72gvpf4e)(astro@4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2)) '@types/picomatch': 2.3.3 astro: 4.15.9(@types/node@22.6.1)(rollup@2.79.1)(sass@1.79.3)(terser@5.31.0)(typescript@5.6.2) github-slugger: 2.0.0