Skip to content

Commit e9e0c8e

Browse files
a-haritia-hariti
committed
Merge branch 'master' into og-previews
2 parents ae40fcd + ff31278 commit e9e0c8e

File tree

362 files changed

+4821
-2038
lines changed

Some content is hidden

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

362 files changed

+4821
-2038
lines changed

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,6 @@
5151
# /src/platforms/javascript/common/session-replay/ @getsentry/replay @getsentry/replay-sdk-web
5252
# /src/wizard/javascript/replay-onboarding/ @getsentry/replay @getsentry/replay-sdk-web
5353

54+
# /src/docs/product/dev-toolbar/ @getsentry/replay
55+
5456
# ###### End Replays #######

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,19 @@ jobs:
1212
name: 'Bump API Schema SHA'
1313
steps:
1414
- uses: actions/[email protected]
15+
- name: Get auth token
16+
id: token
17+
uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
18+
with:
19+
app-id: ${{ vars.SENTRY_INTERNAL_APP_ID }}
20+
private-key: ${{ secrets.SENTRY_INTERNAL_APP_PRIVATE_KEY }}
1521
- name: 'Bump API Schema SHA'
1622
shell: bash
1723
env:
1824
# An elevated token is necessary because with plain github.token
1925
# GitHub does not recursively call workflows, which means CI does not
2026
# kick off for the PR we're about to create.
21-
GITHUB_TOKEN: ${{ secrets.GH_RELEASE_PAT }}
27+
GITHUB_TOKEN: ${{ steps.token.outputs.token }}
2228
run: |
2329
set -euo pipefail
2430

‎.github/workflows/prepare-release.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,20 @@ jobs:
1313
runs-on: ubuntu-latest
1414
name: "Release a new version"
1515
steps:
16+
- name: Get auth token
17+
id: token
18+
uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
19+
with:
20+
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
21+
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}
1622
- uses: actions/[email protected]
1723
with:
18-
token: ${{ secrets.GH_RELEASE_PAT }}
24+
token: ${{ steps.token.outputs.token }}
1925
fetch-depth: 0
2026
- name: Prepare release
2127
uses: getsentry/action-prepare-release@v1
2228
env:
23-
GITHUB_TOKEN: ${{ secrets.GH_RELEASE_PAT }}
29+
GITHUB_TOKEN: ${{ steps.token.outputs.token }}
2430
with:
2531
version: ${{ github.event.inputs.version }}
2632
force: ${{ github.event.inputs.force }}

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ repos:
1313
- id: detect-private-key
1414
exclude: |
1515
(?x)^(
16-
develop-docs/api-server/config.mdx|
16+
develop-docs/backend/config.mdx|
1717
develop-docs/integrations/github.mdx|
1818
develop-docs/self-hosted/sso.mdx
1919
)$

‎.vscode/settings.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,8 @@
1212
"git.ignoreLimitWarning": true,
1313
"search.exclude": {
1414
"**/src/wizard/**": true
15-
}
15+
},
16+
"cSpell.words": [
17+
"laravel"
18+
]
1619
}

‎CONTRIBUTING.md‎

Lines changed: 5 additions & 0 deletions

‎app/layout.tsx‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import {Theme} from '@radix-ui/themes';
44
import type {Metadata} from 'next';
55
import {Rubik} from 'next/font/google';
66
import Script from 'next/script';
7+
import PlausibleProvider from 'next-plausible';
78

89
import {ThemeProvider} from 'sentry-docs/components/theme-provider';
910

@@ -31,6 +32,9 @@ export const metadata: Metadata = {
3132
export default function RootLayout({children}: {children: React.ReactNode}) {
3233
return (
3334
<html lang="en" suppressHydrationWarning>
35+
<head>
36+
<PlausibleProvider domain="docs.sentry.io,rollup.sentry.io" />
37+
</head>
3438
<body className={rubik.variable} suppressHydrationWarning>
3539
<ThemeProvider
3640
attribute="class"
@@ -42,13 +46,20 @@ export default function RootLayout({children}: {children: React.ReactNode}) {
4246
{children}
4347
</Theme>
4448
</ThemeProvider>
49+
<Script
50+
async
51+
src="https://widget.kapa.ai/kapa-widget.bundle.js"
52+
data-website-id="cac7cc70-969e-4bc1-a968-55534a839be4"
53+
data-button-hide // do not render kapa ai button
54+
data-modal-override-open-class="kapa-ai-class" // all elements with this class will open the kapa ai modal
55+
data-project-name="Sentry"
56+
data-project-color="#6A5FC1"
57+
data-project-logo="https://avatars.githubusercontent.com/u/1396951?s=280&v=4"
58+
data-font-family="var(--font-rubik)"
59+
data-modal-disclaimer="Disclaimer: Welcome to our knowledge search bot! While we'd love to be able to answer all your questions, please remember this is a tool for searching our publicly available sources and not a support forum. Don't include any sensitive or personal information in your queries. For more on how Sentry handles your data, see our [Privacy Policy](https://sentry.io/privacy/). This form is protected by reCAPTCHA. Google's Privacy Policy and Google's Terms of Service apply."
60+
data-modal-example-questions="How to set up Sentry for Next.js?,What are tracePropagationTargets?"
61+
/>
4562
</body>
46-
<Script
47-
defer
48-
data-domain="docs.sentry.io,rollup.sentry.io"
49-
data-api="https://plausible.io/api/event"
50-
src="https://plausible.io/js/script.tagged-events.js"
51-
/>
5263
</html>
5364
);
5465
}

‎apps/changelog/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"@radix-ui/themes": "^3.1.3",
2727
"@sentry/nextjs": "8.36.0",
2828
"@spotlightjs/spotlight": "^2.1.1",
29-
"next": "15.0.3",
29+
"next": "15.1.2",
3030
"next-auth": "^4.24.5",
3131
"next-mdx-remote": "^4.4.1",
3232
"nextjs-toploader": "^1.6.6",

‎apps/changelog/src/client/components/list.tsx‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import type {Category} from '@prisma/client';
44
import {MDXRemote, MDXRemoteSerializeResult} from 'next-mdx-remote';
55
import Link from 'next/link';
66
import {parseAsArrayOf, parseAsInteger, parseAsString, useQueryState} from 'nuqs';
7-
import {Fragment} from 'react';
7+
import {Fragment, useState} from 'react';
88
import {Article} from './article';
99
import {Pagination} from './pagination';
1010
import {CategoryTag} from './tag';
@@ -35,7 +35,8 @@ function changelogEntryPublishDateToAddressableTag(date: Date) {
3535
}
3636

3737
export function ChangelogList({changelogs}: {changelogs: ChangelogEntry[]}) {
38-
const [searchValue, setSearchValue] = useQueryState('search', parseAsString);
38+
const [searchValue, setSearchValue] = useState<string | null>('');
39+
const [, setQuerySearchValue] = useQueryState('search', parseAsString);
3940

4041
const [monthAndYearParam, setMonthParam] = useQueryState('month');
4142
const [selectedCategoriesIds, setSelectedCategoriesIds] = useQueryState(
@@ -207,7 +208,9 @@ export function ChangelogList({changelogs}: {changelogs: ChangelogEntry[]}) {
207208
value={searchValue ?? ''}
208209
onChange={e => {
209210
setPageParam(null);
210-
setSearchValue(e.target.value ? e.target.value : null);
211+
const newSearchValue = e.target.value ? e.target.value : null;
212+
setSearchValue(newSearchValue);
213+
setQuerySearchValue(newSearchValue);
211214
}}
212215
placeholder="Search..."
213216
className="form-input flex-1 rounded-md border border-gray-300 bg-white px-4 py-2 text-gray-900 focus:border-primary-500 focus:ring-primary-500"
@@ -217,6 +220,7 @@ export function ChangelogList({changelogs}: {changelogs: ChangelogEntry[]}) {
217220
className={`${someFilterIsActive ? 'text-purple font-medium cursor-pointer' : 'text-gray-500 cursor-not-allowed'} hover:text-gray-700`}
218221
onClick={() => {
219222
setSearchValue(null);
223+
setQuerySearchValue(null);
220224
setSelectedCategoriesIds(null);
221225
setMonthParam(null);
222226
setPageParam(null);

‎develop-docs/application-architecture/feedback-architecture.mdx‎

Lines changed: 10 additions & 11 deletions

0 commit comments

Comments
 (0)