From dd5ee5286e262abe23fd4fec3d6f967f21213595 Mon Sep 17 00:00:00 2001 From: Mike Surowiec Date: Fri, 19 Nov 2021 12:21:23 -0600 Subject: [PATCH 1/2] Add @react-aria/ssr to fix SSR warnings (#23007) --- package-lock.json | 1 + package.json | 1 + pages/_app.tsx | 15 +++++++++------ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 83ea943afd..69719e3a19 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,6 +14,7 @@ "@primer/css": "^18.2.0", "@primer/octicons": "^16.1.1", "@primer/octicons-react": "^16.1.1", + "@react-aria/ssr": "^3.1.0", "accept-language-parser": "^1.5.0", "ajv": "^8.7.1", "ajv-formats": "^2.1.1", diff --git a/package.json b/package.json index fd731077da..2cbcc2bb50 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "@primer/css": "^18.2.0", "@primer/octicons": "^16.1.1", "@primer/octicons-react": "^16.1.1", + "@react-aria/ssr": "^3.1.0", "accept-language-parser": "^1.5.0", "ajv": "^8.7.1", "ajv-formats": "^2.1.1", diff --git a/pages/_app.tsx b/pages/_app.tsx index 5e39547183..7f8f522d97 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -3,6 +3,7 @@ import App from 'next/app' import type { AppProps, AppContext } from 'next/app' import Head from 'next/head' import { useTheme, ThemeProvider } from '@primer/components' +import { SSRProvider } from '@react-aria/ssr' import { defaultComponentThemeProps, getThemeProps } from 'components/lib/getThemeProps' import '../stylesheets/index.scss' @@ -43,12 +44,14 @@ const MyApp = ({ Component, pageProps, csrfToken, themeProps, languagesContext } - - - - - - + + + + + + + + ) } From 5b1ac5337980992762d2a4c25d5bd1083e951b5a Mon Sep 17 00:00:00 2001 From: Kevin Heis Date: Fri, 19 Nov 2021 10:32:20 -0800 Subject: [PATCH 2/2] A few things that Prettier seemed to miss (#23005) --- .github/actions-scripts/create-enterprise-issue.js | 4 +++- lib/excluded-links.js | 2 +- lib/languages.js | 2 +- script/rest/utils/create-code-samples.js | 2 +- script/search/search-qa-test.js | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/actions-scripts/create-enterprise-issue.js b/.github/actions-scripts/create-enterprise-issue.js index 72e36a0dd3..4ae065133c 100755 --- a/.github/actions-scripts/create-enterprise-issue.js +++ b/.github/actions-scripts/create-enterprise-issue.js @@ -86,7 +86,9 @@ async function run() { 'utf8' ) const issueLabels = - milestone === 'release' ? ['enterprise release'] : ['enterprise deprecation', 'priority-4', 'batch', 'time sensitive'] + milestone === 'release' + ? ['enterprise release'] + : ['enterprise deprecation', 'priority-4', 'batch', 'time sensitive'] const issueTitle = `[${nextMilestoneDate}] Enterprise Server ${versionNumber} ${milestone} (technical steps)` const issueBody = `GHES ${versionNumber} ${milestone} occurs on ${nextMilestoneDate}. diff --git a/lib/excluded-links.js b/lib/excluded-links.js index 88bf7ca0c4..d676989446 100644 --- a/lib/excluded-links.js +++ b/lib/excluded-links.js @@ -19,5 +19,5 @@ export default [ 'https://en.liberapay.com/', 'https://nbviewer.jupyter.org/github/bokeh/bokeh-notebooks/blob/main/tutorial/06%20-%20Linking%20and%20Interactions.ipynb', 'https://www.vmware.com/products/esxi-and-esx.html', - 'https://www.ecfr.gov/cgi-bin/text-idx?SID=ad384e1f1e017076f8c0136f322f0a4c&mc=true&node=pt15.2.744&rgn=div5' + 'https://www.ecfr.gov/cgi-bin/text-idx?SID=ad384e1f1e017076f8c0136f322f0a4c&mc=true&node=pt15.2.744&rgn=div5', ] diff --git a/lib/languages.js b/lib/languages.js index 2da5833067..5488a89a6f 100644 --- a/lib/languages.js +++ b/lib/languages.js @@ -41,7 +41,7 @@ const languages = { hreflang: 'pt', dir: 'translations/pt-BR', wip: false, - } + }, } if (process.env.ENABLED_LANGUAGES) { diff --git a/script/rest/utils/create-code-samples.js b/script/rest/utils/create-code-samples.js index ec9639d485..dd912ebd03 100644 --- a/script/rest/utils/create-code-samples.js +++ b/script/rest/utils/create-code-samples.js @@ -174,6 +174,6 @@ function getExampleParamValue(name, schema) { case 'array': return [getExampleParamValue(name, schema.items)] } - + throw new Error(`Unknown data type in schema:, ${JSON.stringify(schema, null, 2)}`) } diff --git a/script/search/search-qa-test.js b/script/search/search-qa-test.js index 15476812d7..70b82bf65a 100755 --- a/script/search/search-qa-test.js +++ b/script/search/search-qa-test.js @@ -6,8 +6,8 @@ // This test runs example queries and expects a specific page to land in the top // 3 results. // -// The data source used by this script is a JSON file `script/search/search-qa-data.json`, -// which is populated from spreadsheet data here: +// The data source used by this script is a JSON file `script/search/search-qa-data.json`, +// which is populated from spreadsheet data here: // https://docs.google.com/spreadsheets/d/1Dt5JRVcmyAGWKBwGjwmXxi7Ww_vdfYLfZ-EFpu2S2CQ/edit?usp=sharing // // [end-readme]