Skip to content

Commit 2aa56a6

Browse files
authored
Merge branch 'master' into sort-search-by-popularity
2 parents fe00ab5 + 145bc00 commit 2aa56a6

File tree

288 files changed

+3878
-2014
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

288 files changed

+3878
-2014
lines changed

.github/workflows/algolia-index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/checkout@v4
12-
- uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
12+
- uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
1313
id: setup-node
1414
with:
1515
node-version-file: 'package.json'

.github/workflows/bump-api-schema-sha.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/[email protected]
1515
- name: Get auth token
1616
id: token
17-
uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
17+
uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3
1818
with:
1919
app-id: ${{ vars.SENTRY_INTERNAL_APP_ID }}
2020
private-key: ${{ secrets.SENTRY_INTERNAL_APP_PRIVATE_KEY }}

.github/workflows/lint-404s.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v4
14-
- uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
14+
- uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
1515
id: setup-node
1616
with:
1717
node-version-file: 'package.json'

.github/workflows/prepare-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
- name: Get auth token
1717
id: token
18-
uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
18+
uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3
1919
with:
2020
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
2121
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

.github/workflows/react-to-product-owners-yml-changes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212
- uses: actions/[email protected]
1313

14-
- uses: getsentry/action-setup-venv@v1.0.5
14+
- uses: getsentry/action-setup-venv@v2.1.1
1515
with:
1616
python-version: 3.11.3
1717

.github/workflows/sync-labels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
steps:
2424
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2525

26-
- uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
26+
- uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
2727
id: setup-node
2828
with:
2929
node-version-file: 'package.json'

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
app_id: ${{ vars.SENTRY_INTERNAL_APP_ID }}
2222
private_key: ${{ secrets.SENTRY_INTERNAL_APP_PRIVATE_KEY }}
2323

24-
- uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
24+
- uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
2525
id: setup-node
2626
with:
2727
node-version-file: 'package.json'

app/[[...path]]/page.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,8 @@ export async function generateMetadata(props: MetadataProps): Promise<Metadata>
209209
? [{url: `${previewDomain ?? domain}/og.png`, width: 1200, height: 630}]
210210
: [];
211211

212+
let noindex: undefined | boolean = undefined;
213+
212214
const rootNode = await getDocsRootNode();
213215

214216
if (params.path) {
@@ -227,6 +229,8 @@ export async function generateMetadata(props: MetadataProps): Promise<Metadata>
227229
if (pageNode.frontmatter.customCanonicalTag) {
228230
customCanonicalTag = formatCanonicalTag(pageNode.frontmatter.customCanonicalTag);
229231
}
232+
233+
noindex = pageNode.frontmatter.noindex;
230234
}
231235
}
232236

@@ -253,5 +257,6 @@ export async function generateMetadata(props: MetadataProps): Promise<Metadata>
253257
alternates: {
254258
canonical,
255259
},
260+
robots: noindex ? 'noindex' : undefined,
256261
};
257262
}

app/not-found.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,18 @@ export default function NotFound() {
2424

2525
<div className="max-w-md pt-8">
2626
<p className="pb-4">Let's give it another shot:</p>
27-
<Search autoFocus path={pathname} searchPlatforms={[]} showChatBot={false} />
27+
<Search
28+
autoFocus
29+
path={pathname}
30+
searchPlatforms={[]}
31+
showChatBot={false}
32+
useStoredSearchPlatforms={false}
33+
/>
2834
</div>
2935
<div className="pt-8 flex gap-4">
3036
<Button variant="solid" size="3" asChild>
3137
<a href={reportUrl} target="_blank" rel="noreferrer">
32-
Report 404 on Github
38+
Report 404 on GitHub
3339
</a>
3440
</Button>
3541
<Button variant="soft" size="3" asChild>

apps/changelog/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"@radix-ui/react-icons": "^1.3.2",
2626
"@radix-ui/react-toolbar": "^1.1.0",
2727
"@radix-ui/themes": "^3.1.3",
28-
"@sentry/nextjs": "9.0.0-alpha.0",
28+
"@sentry/nextjs": "9.0.0-alpha.2",
2929
"@spotlightjs/spotlight": "^2.1.1",
3030
"next": "15.1.2",
3131
"next-auth": "^4.24.5",

0 commit comments

Comments
 (0)