Merge pull request #44 from HiDeoo/hd-starlight-0-26-0

HiDeoo · Aug 16, 2024 · ce82dd2 · ce82dd2
2 parents 9dbd329 + 707be11
commit ce82dd2
Show file tree

Hide file tree

Showing 7 changed files with 123 additions and 106 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -15,35 +15,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4
         with:
           version: 8.6.12
 
       - name: Install Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           cache: pnpm
           node-version: 18
 
       - name: Install dependencies
         run: pnpm install
 
-      - name: Store Playwright Version
-        run: |
-          PLAYWRIGHT_VERSION=$(pnpm playwright --version | sed 's/Version //')
-          echo "PLAYWRIGHT_VERSION=$PLAYWRIGHT_VERSION" >> $GITHUB_ENV
-        working-directory: packages/starlight-openapi
-
-      - name: Setup Playwright cache
-        id: cache-playwright
-        uses: actions/cache@v3
-        with:
-          key: playwright-${{ env.PLAYWRIGHT_VERSION }}
-          path: ~/.cache/ms-playwright
-
       - name: Generates docs TypeScript types
         run: pnpm astro sync
         working-directory: docs

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
       id-token: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -30,7 +30,7 @@ jobs:
           version: 8.6.12
 
       - name: Install Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           cache: pnpm
           node-version: 18

diff --git a/docs/package.json b/docs/package.json
@@ -14,7 +14,7 @@
     "lint": "prettier -c --cache . && eslint . --cache --max-warnings=0"
   },
   "dependencies": {
-    "@astrojs/starlight": "0.24.4",
+    "@astrojs/starlight": "0.26.0",
     "@hideoo/starlight-plugins-docs-components": "^0.2.2",
     "astro": "4.11.1",
     "sharp": "0.32.6",

diff --git a/docs/src/libs/sidebar.ts b/docs/src/libs/sidebar.ts
@@ -20,7 +20,7 @@ export function starlightOpenAPIDocsDemoPlugin(): StarlightPlugin {
 }
 
 function isSidebarGroup(item: unknown): item is SidebarGroup {
-  return 'items' in (item as SidebarGroup)
+  return typeof item !== 'string' && 'items' in (item as SidebarGroup)
 }
 
 export interface SidebarGroup {

diff --git a/packages/starlight-openapi/libs/starlight.ts b/packages/starlight-openapi/libs/starlight.ts
@@ -78,7 +78,7 @@ export function makeSidebarLink(label: string, link: string): SidebarLink {
 }
 
 function isSidebarManualGroup(item: NonNullable<StarlightUserConfigSidebar>[number]): item is SidebarManualGroup {
-  return 'items' in item
+  return typeof item !== 'string' && 'items' in item
 }
 
 function getOverviewHeadings({ document }: Schema): MarkdownHeading[] {

diff --git a/packages/starlight-openapi/package.json b/packages/starlight-openapi/package.json
@@ -19,16 +19,16 @@
     "github-slugger": "2.0.0"
   },
   "devDependencies": {
-    "@astrojs/starlight": "0.24.4",
+    "@astrojs/starlight": "0.26.0",
     "@playwright/test": "1.36.2",
     "@types/node": "18.17.3",
     "astro": "4.11.1",
     "openapi-types": "12.1.3"
   },
   "peerDependencies": {
     "@astrojs/markdown-remark": ">=4.2.0",
-    "@astrojs/starlight": ">=0.19.0",
-    "astro": ">=4.2.7"
+    "@astrojs/starlight": ">=0.26.0",
+    "astro": ">=4.8.6"
   },
   "engines": {
     "node": ">=18.14.1"