Skip to content

Upgrade Astro/Starlight to latest versions #261

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

Open
Adammatthiesen wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Upgrade Astro/Starlight to latest versions #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 20 additions & 17 deletions astro.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { getTranslations } from './src/starlight-sidebar/translate.ts';
import { devServerFileWatcher } from './src/integrations/dev-file-watcher.ts';
import { remarkFallbackLang } from './src/plugins/remark-fallback-pages.ts';
import starlightLlmsTxt from 'starlight-llms-txt';
import { unified } from "@astrojs/markdown-remark";

// Define the Site URL
const site = process.env.DOKPLOY_DEPLOY_URL
Expand Down Expand Up @@ -58,8 +59,10 @@ export default defineConfig({
]
},
markdown: {
rehypePlugins,
remarkPlugins: [remarkFallbackLang()],
processor: unified({
rehypePlugins,
remarkPlugins: [remarkFallbackLang()],
}),
},
integrations: [
devServerFileWatcher([
Expand Down Expand Up @@ -195,12 +198,12 @@ export default defineConfig({
{
label: getTranslations('start-here').en,
translations: getTranslations('start-here'),
autogenerate: { directory: 'start-here' },
items: [{ autogenerate: { directory: 'start-here' } }],
},
{
label: getTranslations('how-it-works').en,
translations: getTranslations('how-it-works'),
autogenerate: { directory: 'how-it-works' },
items: [{ autogenerate: { directory: 'how-it-works' } }],
},
{
label: getTranslations('features').en,
Expand All @@ -210,13 +213,13 @@ export default defineConfig({
label: getTranslations('plugins').en,
translations: getTranslations('plugins'),
collapsed: true,
autogenerate: { directory: 'plugins' },
items: [{ autogenerate: { directory: 'plugins' } }],
},
{
label: getTranslations('storage-api').en,
translations: getTranslations('storage-api'),
collapsed: true,
autogenerate: { directory: 'storage-api' },
items: [{ autogenerate: { directory: 'storage-api' } }],
},
// TODO - Document more StudioCMS features here
],
Expand All @@ -232,7 +235,7 @@ export default defineConfig({
{
label: getTranslations('contributing').en,
translations: getTranslations('contributing'),
autogenerate: { directory: 'guides/contributing' },
items: [{ autogenerate: { directory: 'guides/contributing' } }],
},
{
label: getTranslations('upgrade').en,
Expand All @@ -254,19 +257,19 @@ export default defineConfig({
label: getTranslations('version').en,
translations: getTranslations('version'),
collapsed: true,
autogenerate: { directory: 'guides/upgrade/version-guides' },
items: [{ autogenerate: { directory: 'guides/upgrade/version-guides' } }],
},
],
},
{
label: getTranslations('custom-frontend').en,
translations: getTranslations('custom-frontend'),
autogenerate: { directory: 'guides/custom-frontend' },
items: [{ autogenerate: { directory: 'guides/custom-frontend' } }],
},
{
label: getTranslations('database').en,
translations: getTranslations('database'),
autogenerate: { directory: 'guides/database' },
items: [{ autogenerate: { directory: 'guides/database' } }],
},
],
},
Expand All @@ -288,13 +291,13 @@ export default defineConfig({
{
label: getTranslations('ecosystem-packages').en,
translations: getTranslations('ecosystem-packages'),
autogenerate: { directory: 'ecosystem/packages' },
items: [{ autogenerate: { directory: 'ecosystem/packages' } }],
collapsed: true,
},
{
label: getTranslations('ecosystem-bots').en,
translations: getTranslations('ecosystem-bots'),
autogenerate: { directory: 'ecosystem/bots' },
items: [{ autogenerate: { directory: 'ecosystem/bots' } }],
collapsed: true,
},
],
Expand All @@ -313,19 +316,19 @@ export default defineConfig({
{
label: getTranslations('storage-managers').en,
translations: getTranslations('storage-managers'),
autogenerate: { directory: 'package-catalog/storage-managers' },
items: [{ autogenerate: { directory: 'package-catalog/storage-managers' } }],
collapsed: true,
},
{
label: getTranslations('studiocms-plugins').en,
translations: getTranslations('studiocms-plugins'),
autogenerate: { directory: 'package-catalog/studiocms-plugins' },
items: [{ autogenerate: { directory: 'package-catalog/studiocms-plugins' } }],
collapsed: true,
},
{
label: getTranslations('community-plugins').en,
translations: getTranslations('community-plugins'),
autogenerate: { directory: 'package-catalog/community-plugins' },
items: [{ autogenerate: { directory: 'package-catalog/community-plugins' } }],
collapsed: true,
},
],
Expand All @@ -341,12 +344,12 @@ export default defineConfig({
{
label: getTranslations('config-reference').en,
translations: getTranslations('config-reference'),
autogenerate: { directory: 'config-reference' },
items: [{ autogenerate: { directory: 'config-reference' } }],
},
{
label: getTranslations('api-docs').en,
translations: getTranslations('api-docs'),
autogenerate: { directory: 'api-docs' },
items: [{ autogenerate: { directory: 'api-docs' } }],
},
],
},
Expand Down
29 changes: 15 additions & 14 deletions ec.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
import { defineEcConfig } from '@astrojs/starlight/expressive-code';
import { transformerColorizedBrackets } from '@shikijs/colorized-brackets';
import ecTwoSlash from 'expressive-code-twoslash';
import ts from 'typescript';
// import ecTwoSlash from 'expressive-code-twoslash';
// import ts from 'typescript';

export default defineEcConfig({
shiki: {
transformers: [transformerColorizedBrackets()],
},
themes: ['dark-plus', 'light-plus'],
plugins: [
ecTwoSlash({
twoslashOptions: {
handbookOptions: {
errors: [2353, 2339, 2307, 2379, 2305, 2345, 7031, 2554, 2375, 2322],
},
compilerOptions: {
moduleResolution: ts.ModuleResolutionKind.Bundler,
target: ts.ScriptTarget.ESNext,
module: ts.ModuleKind.ESNext,
},
},
}),
// Disabled for now till we have time to actually update the twoslash plugin for latest versions of Astro/Starlight/Expressive Code.
// ecTwoSlash({
// twoslashOptions: {
// handbookOptions: {
// errors: [2353, 2339, 2307, 2379, 2305, 2345, 7031, 2554, 2375, 2322],
// },
// compilerOptions: {
// moduleResolution: ts.ModuleResolutionKind.Bundler,
// target: ts.ScriptTarget.ESNext,
// module: ts.ModuleKind.ESNext,
// },
// },
// }),
],
styleOverrides: {
frames: {
Expand Down
38 changes: 16 additions & 22 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,27 +41,25 @@

"@11ty/eleventy-fetch": "^5.0.2",
"@actions/core": "^3.0.0",
"@astrojs/check": "^0.9.6",
"@astrojs/node": "^9.5.4",
"@astrojs/starlight": "^0.37.6",
"@astrojs/check": "^0.9.10",
"@astrojs/node": "^11.1.4",
"@astrojs/starlight": "^0.41.10",
"@astrojs/markdown-remark": "^7.2.4",
"@biomejs/biome": "1.9.4",
"@docsearch/css": "^3.6.0",
"@docsearch/js": "^3.6.0",
"@fontsource-variable/onest": "5.1.1",
"@fontsource-variable/onest": "5.3.0",
"@lunariajs/core": "https://pkg.pr.new/lunariajs/lunaria/@lunariajs/core@722c34c",
"@shikijs/colorized-brackets": "^3.2.1",
"@studiocms/ui": "^1.0.0",
"@studiocms/web-vitals": "^4.5.3",
"@shikijs/colorized-brackets": "^4.4.3",
"@studiocms/ui": "^1.2.2",
"@types/hast": "^3.0.4",
"@types/html-escaper": "^3.0.4",
"@types/mdast": "^4.0.4",
"@types/node": "^24.1.0",
"@types/semver": "^7.7.0",
"astro": "^5.18.0",
"astro-embed": "^0.12.0",
"astro-integration-kit": "^0.19.1",
"astro": "^7.2.9",
"astro-embed": "^0.14.0",
"effect": "^3.19.19",
"expressive-code-twoslash": "^0.5.3",
"fast-glob": "^3.3.3",
"hast-util-to-string": "^3.0.1",
"hastscript": "^9.0.1",
Expand All @@ -76,22 +74,21 @@
"rehype-slug": "^6.0.0",
"semver": "^7.7.1",
"sharp": "^0.33.5",
"starlight-image-zoom": "^0.13.2",
"starlight-links-validator": "^0.19.2",
"starlight-llms-txt": "^0.7.0",
"starlight-image-zoom": "^0.15.0",
"starlight-links-validator": "^0.25.3",
"starlight-llms-txt": "^0.11.0",
"starlight-package-managers": "^0.12.0",
"starlight-sidebar-topics": "^0.6.2",
"starlight-sidebar-topics": "^0.8.0",
"tsm": "^2.3.0",
"typescript": "^5.9.3",
"ultrahtml": "^1.6.0",
"unified": "^11.0.5",
"unist-util-visit": "^5.0.0"
},
"__pnpmOverridesNote": "This is a version fix to lock all installations of vite to the same version, as it is a peer dependency of many of the packages we use.",
"devDependencies": {
"@resvg/resvg-js": "^2.6.2"
},
"pnpm": {
"overrides": {
"vite": "^6.3.4"
},
"onlyBuiltDependencies": [
"@biomejs/biome",
"@parcel/watcher",
Expand All @@ -101,8 +98,5 @@
"oxc-resolver",
"sharp"
]
},
"devDependencies": {
"@resvg/resvg-js": "^2.6.2"
}
}
Loading
Loading