Skip to content

Commit a4283d0

Browse files
authored
Merge branch 'main' into feat/client-side-navigation
2 parents 0a59f6e + c8be2cf commit a4283d0

11 files changed

Lines changed: 364 additions & 297 deletions

File tree

‎.changeset/full-name-receiver-substring.md‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.changeset/sitemap-absolute-urls.md‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.github/workflows/update-pnpm.yml‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: Update pnpm
2+
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
- cron: '0 0 1 * *'
7+
8+
permissions:
9+
contents: write
10+
pull-requests: write
11+
12+
jobs:
13+
pnpm-update:
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- name: Harden Runner
18+
uses: step-security/harden-runner@e14015d583714f6e62063499dc959a02595150a1 # v2.21.1
19+
with:
20+
egress-policy: block
21+
allowed-endpoints: >
22+
github.com:443
23+
api.github.com:443
24+
objects.githubusercontent.com:443
25+
registry.npmjs.org:443
26+
27+
- name: Git Checkout
28+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
29+
with:
30+
persist-credentials: false
31+
32+
- name: Setup pnpm
33+
uses: pnpm/action-setup@ea17c68df8912ef543352723c149a84f56e3d413 # v6.1.0
34+
35+
# `pnpm self-update` also updates the `packageManager` field
36+
# in package.json to the newly installed version.
37+
- name: Update pnpm
38+
id: update-pnpm
39+
run: |
40+
echo "old=$(pnpm --version)" >> $GITHUB_OUTPUT
41+
pnpm self-update
42+
echo "new=$(pnpm --version)" >> $GITHUB_OUTPUT
43+
44+
- name: Open pull request
45+
if: steps.update-pnpm.outputs.old != steps.update-pnpm.outputs.new
46+
uses: gr2m/create-or-update-pull-request-action@b65137ca591da0b9f43bad7b24df13050ea45d1b # v1.10.1
47+
# Creates a PR or update the Action's existing PR, or
48+
# no-op if the base branch is already up-to-date.
49+
env:
50+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
51+
with:
52+
update-pull-request-title-and-body: true
53+
branch: chore/update-pnpm
54+
body: |
55+
Updates pnpm from ${{ steps.update-pnpm.outputs.old }} to ${{ steps.update-pnpm.outputs.new }}
56+
57+
cc @nodejs/web-infra
58+
59+
Check this workflow's logs at ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}.
60+
commit-message: 'meta: update pnpm from ${{ steps.update-pnpm.outputs.old }} to ${{ steps.update-pnpm.outputs.new }}'
61+
title: 'meta: update pnpm from ${{ steps.update-pnpm.outputs.old }} to ${{ steps.update-pnpm.outputs.new }}'
62+
draft: true

‎packages/core/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
"unist-util-remove": "^4.0.0",
8181
"unist-util-select": "^5.1.0",
8282
"unist-util-visit": "^5.1.0",
83-
"yaml": "^2.9.0"
83+
"yaml": "^2.9.1"
8484
},
8585
"devDependencies": {
8686
"ajv": "^8.20.0",

‎packages/node/CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @node-core/doc-kit
22

3+
## 2.0.5
4+
5+
### Patch Changes
6+
7+
- [#1142](https://github.com/nodejs/doc-kit/pull/1142) [`3b3a4e9`](https://github.com/nodejs/doc-kit/commit/3b3a4e9a3b1ca93110dfa2907106ac6d49ba4997) Thanks [@avivkeller](https://github.com/avivkeller)! - fix(sitemap): emit fully resolved page URLs
8+
39
## 2.0.4
410

511
### Patch Changes

‎packages/node/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@node-core/doc-kit",
33
"type": "module",
4-
"version": "2.0.4",
4+
"version": "2.0.5",
55
"description": "Node.js-specific generators for @doc-kit/core: api-links, addon-verify, and man-page",
66
"repository": {
77
"type": "git",

‎packages/react/CHANGELOG.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# @doc-kit/generator-react
22

3+
## 0.4.2
4+
5+
### Patch Changes
6+
7+
- [#1106](https://github.com/nodejs/doc-kit/pull/1106) [`cf6e157`](https://github.com/nodejs/doc-kit/commit/cf6e1577d9087208de0448cea2853b292de156f0) Thanks [@btea](https://github.com/btea)! - Render backticks in search result descriptions as inline code
8+
9+
## 0.4.1
10+
11+
### Patch Changes
12+
13+
- [#1116](https://github.com/nodejs/doc-kit/pull/1116) [`c5a3fe8`](https://github.com/nodejs/doc-kit/commit/c5a3fe851029fc8e65f812169a5098bd4873db9e) Thanks [@btea](https://github.com/btea)! - fix: resolve heading names that share a substring with their receiver
14+
15+
- [#1142](https://github.com/nodejs/doc-kit/pull/1142) [`3b3a4e9`](https://github.com/nodejs/doc-kit/commit/3b3a4e9a3b1ca93110dfa2907106ac6d49ba4997) Thanks [@avivkeller](https://github.com/avivkeller)! - fix(sitemap): emit fully resolved page URLs
16+
317
## 0.4.0
418

519
### Minor Changes

‎packages/react/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@doc-kit/generator-react",
33
"type": "module",
4-
"version": "0.4.0",
4+
"version": "0.4.2",
55
"description": "React/JSX-based generators for @doc-kit/core: html, jsx-ast, llms-txt, sitemap, and orama-db",
66
"repository": {
77
"type": "git",
@@ -35,7 +35,7 @@
3535
"@fontsource/ibm-plex-mono": "^5.3.0",
3636
"@heroicons/react": "^2.2.0",
3737
"@node-core/rehype-shiki": "^1.5.0",
38-
"@node-core/ui-components": "^1.7.6",
38+
"@node-core/ui-components": "^1.8.0",
3939
"@orama/orama": "^3.1.18",
4040
"@orama/ui": "^1.5.4",
4141
"estree-util-to-js": "^2.0.0",

‎packages/react/src/html/ui/components/SearchBox/index.jsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import SearchHit from '@node-core/ui-components/Common/Search/Results/Hit';
1010
import useOrama from '../../hooks/useOrama.mjs';
1111
import withIsland from '../../islands/withIsland.jsx';
1212
import { relativeOrAbsolute } from '../../utils/relativeOrAbsolute.mjs';
13+
import { renderLabel } from '../../utils/renderLabel.jsx';
1314
import styles from './index.module.css';
1415

1516
/**
@@ -62,6 +63,7 @@ const SearchBox = ({ pathname }) => {
6263
as={SearchHitLink}
6364
document={{
6465
...hit.document,
66+
description: renderLabel(hit.document.description),
6567
href: relativeOrAbsolute(hit.document.href, pathname),
6668
}}
6769
/>

‎packages/react/src/html/ui/utils/renderLabel.jsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ export const renderLabel = label => {
2222
}
2323

2424
return index % 2 ? (
25+
// oxlint-disable-next-line react-x/no-array-index-key -- the label is a fixed string, so the segment list never reorders
2526
<code key={index}>{segment}</code>
2627
) : (
28+
// oxlint-disable-next-line react-x/no-array-index-key -- the label is a fixed string, so the segment list never reorders
2729
<span key={index}>{segment}</span>
2830
);
2931
});

0 commit comments

Comments
 (0)