chore(docs): upgrade Astro 5.18.1 -> 6.2.1#1110
Merged
danielmeppiel merged 4 commits intomainfrom May 2, 2026
Merged
Conversation
CodeQL py/incomplete-url-substring-sanitization (alerts #88, #89, #90, #91) flagged four assertions that substring-checked 'gitlab.com' inside CLI output / exception text. Per .github/instructions/tests.instructions.md URL/host assertions must compare on a parsed component, not a raw substring. Adds a small _quoted_hosts() helper at the top of each affected test file that regex-extracts `Host '<host>'` tokens, normalises each via urllib.parse.urlparse, and returns a set. Call sites switch from `assert 'gitlab.com' in output` to `assert _quoted_hosts(output) == {'gitlab.com'}` -- set equality on parsed hostnames, the canonical pattern from the tests-instructions file. Behaviour preserved: - Tests still verify the host name is named in the user-facing error. - 'not supported' / 'not a supported marketplace source' phrase checks unchanged (plain English, not host substrings). - 'credential' / 'leak' negative assertions unchanged. Verified: - Targeted 4 tests: pass. - Full tests/unit/marketplace/ suite: 905 passed. - ruff check + ruff format --check: silent. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
- astro 5.18.1 -> 6.1.6 - @astrojs/starlight 0.37.6 -> 0.38.4 - astro-mermaid ^1.3.1 -> ^2.0.1 - starlight-links-validator ^0.19.2 -> ^0.24.0 - starlight-llms-txt ^0.7.0 -> ^0.8.1 - @astrojs/sitemap override 3.7.0 -> 3.7.2 Verified: `npm run build` succeeds, 51 pages, link validator passes. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
Pull request overview
Upgrades the documentation site (Astro/Starlight ecosystem) to versions compatible with Astro 6, and adjusts a few marketplace unit tests to avoid URL/host substring assertions that can trigger CodeQL rules.
Changes:
- Bump docs site dependencies to Astro 6.2.1 and compatible Starlight-related packages.
- Update marketplace CLI/client unit tests to assert hostnames via parsed values (rather than substring matches).
Show a summary per file
| File | Description |
|---|---|
| tests/unit/marketplace/test_marketplace_commands.py | Replaces host substring assertions with parsed-host set equality via a helper. |
| tests/unit/marketplace/test_marketplace_client.py | Same parsed-host assertion approach for a MarketplaceFetchError message. |
| docs/package.json | Updates Astro/Starlight and related docs-site dependencies to Astro 6-compatible versions. |
| docs/package-lock.json | Lockfile refresh reflecting the Astro 6 + peer dependency upgrades. |
Copilot's findings
- Files reviewed: 3/4 changed files
- Comments generated: 3
Comment on lines
+13
to
+15
| "@astrojs/starlight": "0.38.4", | ||
| "astro": "6.2.1", | ||
| "astro-mermaid": "^2.0.1", |
Comment on lines
+18
to
+33
| def _quoted_hosts(text: str) -> set[str]: | ||
| """Extract host tokens from `Host '<host>'` patterns in error text. | ||
|
|
||
| Each token is normalised through ``urllib.parse.urlparse`` so callers | ||
| compare on parsed hostnames (set equality), not raw substrings -- which | ||
| is what CodeQL's ``py/incomplete-url-substring-sanitization`` rule | ||
| requires (see ``.github/instructions/tests.instructions.md``). | ||
| """ | ||
| hosts: set[str] = set() | ||
| for m in re.finditer(r"Host '([^']+)'", text, re.IGNORECASE): | ||
| parsed = urlparse(f"https://{m.group(1)}") | ||
| if parsed.hostname: | ||
| hosts.add(parsed.hostname) | ||
| return hosts | ||
|
|
||
|
|
Comment on lines
+16
to
+20
| def _quoted_hosts(text: str) -> set[str]: | ||
| """Extract host tokens from `Host '<host>'` patterns in error text. | ||
|
|
||
| Each token is normalised through ``urllib.parse.urlparse`` so callers | ||
| compare on parsed hostnames (set equality), not raw substrings -- which |
mermaid 11.14.0 transitively pulls uuid@11.1.1, which is flagged by dependency-review-action (moderate severity, GHSA-w5hq-g745-h8pq: v3/v5/v6 missing buffer bounds check). Force the fixed v14 via npm overrides; mermaid only uses v4 for diagram IDs so this is API-safe. `npm audit` reports 0 vulnerabilities post-override and the docs build still produces 51 pages cleanly. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
TL;DR
Upgrades the docs site to Astro 6.2.1 (latest stable) and brings the Starlight ecosystem peers along. Verified locally with a clean
npm install+npm run build(51 pages, link validator green, no new warnings). TheDeploy Docsworkflow build job runs on this PR viapull_request: paths: ['docs/**']and gates the change.Version bumps (
docs/package.json)astro@astrojs/starlightastro ^6astro-mermaidstarlight-links-validatorastro >=6starlight-llms-txtastro ^6@astrojs/sitemap(override)Astro 5 -> 6 risk surface (assessed, none hit this project)
docs.ymlusesnode-version: '22', which resolves to the latest 22.x on the runner -> satisfies the floor.astro.config.mjs.docsSchema()from Starlight; no custom Zod schemas to migrate.expressiveCodedefaults).src/content.config.tsalready uses the Content Layer API (docsLoader()).Validation
CI
Deploy Docs / buildjob runs on this PR (no deploy until a stable release tag fires the workflow). Merge once that job is green.