diff --git a/src/components/codeBlock.tsx b/src/components/codeBlock.tsx index bbe2243b6c7583..8ff63ca19c2ff2 100644 --- a/src/components/codeBlock.tsx +++ b/src/components/codeBlock.tsx @@ -13,36 +13,38 @@ import {CodeContext, createOrgAuthToken} from './codeContext'; const KEYWORDS_REGEX = /\b___(?:([A-Z_][A-Z0-9_]*)\.)?([A-Z_][A-Z0-9_]*)___\b/g; -const ORG_AUTH_TOKEN_REGEX = /__ORG_AUTH_TOKEN__/g; +const ORG_AUTH_TOKEN_REGEX = /___ORG_AUTH_TOKEN___/g; + +type ChildrenItem = ReturnType[number] | React.ReactNode; function makeKeywordsClickable(children: React.ReactNode) { const items = Children.toArray(children); - return items.reduce((arr: any[], child) => { + return items.reduce((arr: ChildrenItem[], child) => { if (typeof child !== 'string') { arr.push(child); return arr; } - if (KEYWORDS_REGEX.test(child)) { - makeProjectKeywordsClickable(arr, child); - } else if (ORG_AUTH_TOKEN_REGEX.test(child)) { + if (ORG_AUTH_TOKEN_REGEX.test(child)) { makeOrgAuthTokenClickable(arr, child); + } else if (KEYWORDS_REGEX.test(child)) { + makeProjectKeywordsClickable(arr, child); } else { arr.push(child); } return arr; - }, []); + }, [] as ChildrenItem[]); } -function makeOrgAuthTokenClickable(arr: any[], str: string) { +function makeOrgAuthTokenClickable(arr: ChildrenItem[], str: string) { runRegex(arr, str, ORG_AUTH_TOKEN_REGEX, lastIndex => ( )); } -function makeProjectKeywordsClickable(arr: any[], str: string) { +function makeProjectKeywordsClickable(arr: ChildrenItem[], str: string) { runRegex(arr, str, KEYWORDS_REGEX, (lastIndex, match) => ( React.ReactNode @@ -143,14 +145,14 @@ function OrgAuthTokenCreator() { return ( - {tokenState === 'none' - ? 'Click to generate token' - : tokenState === 'loading' - ? 'Generating...' - : token - ? token - : 'Error generating token'} - + {tokenState === 'none' + ? 'Click to generate token' + : tokenState === 'loading' + ? 'Generating...' + : token + ? token + : 'Error generating token'} + ); } @@ -400,7 +402,7 @@ const ItemButton = styled('button')<{isActive: boolean}>` `} `; -function CodeWrapper(props) { +export function CodeWrapper(props) { const {children, class: className, ...rest} = props; return ( diff --git a/src/platform-includes/sourcemaps/upload/webpack/javascript.mdx b/src/platform-includes/sourcemaps/upload/webpack/javascript.mdx index 6ff5c9358b440a..b018056e711de5 100644 --- a/src/platform-includes/sourcemaps/upload/webpack/javascript.mdx +++ b/src/platform-includes/sourcemaps/upload/webpack/javascript.mdx @@ -43,7 +43,7 @@ SENTRY_ORG=___ORG_SLUG___ SENTRY_PROJECT=___PROJECT_SLUG___ # Auth tokens can be obtained from # https://sentry.io/settings/auth-tokens/ -SENTRY_AUTH_TOKEN=__ORG_AUTH_TOKEN__ +SENTRY_AUTH_TOKEN=___ORG_AUTH_TOKEN___ ``` And the following Webpack config: