Skip to content

Commit d5afbb1

Browse files
authored
Merge pull request #12154 from github/repo-sync
repo sync
2 parents 94a6359 + 3879c02 commit d5afbb1

8 files changed

Lines changed: 19 additions & 12 deletions

File tree

.github/actions-scripts/create-enterprise-issue.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@ async function run() {
8686
'utf8'
8787
)
8888
const issueLabels =
89-
milestone === 'release' ? ['enterprise release'] : ['enterprise deprecation', 'priority-4', 'batch', 'time sensitive']
89+
milestone === 'release'
90+
? ['enterprise release']
91+
: ['enterprise deprecation', 'priority-4', 'batch', 'time sensitive']
9092
const issueTitle = `[${nextMilestoneDate}] Enterprise Server ${versionNumber} ${milestone} (technical steps)`
9193

9294
const issueBody = `GHES ${versionNumber} ${milestone} occurs on ${nextMilestoneDate}.

lib/excluded-links.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ export default [
1919
'https://en.liberapay.com/',
2020
'https://nbviewer.jupyter.org/github/bokeh/bokeh-notebooks/blob/main/tutorial/06%20-%20Linking%20and%20Interactions.ipynb',
2121
'https://www.vmware.com/products/esxi-and-esx.html',
22-
'https://www.ecfr.gov/cgi-bin/text-idx?SID=ad384e1f1e017076f8c0136f322f0a4c&mc=true&node=pt15.2.744&rgn=div5'
22+
'https://www.ecfr.gov/cgi-bin/text-idx?SID=ad384e1f1e017076f8c0136f322f0a4c&mc=true&node=pt15.2.744&rgn=div5',
2323
]

lib/languages.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const languages = {
4141
hreflang: 'pt',
4242
dir: 'translations/pt-BR',
4343
wip: false,
44-
}
44+
},
4545
}
4646

4747
if (process.env.ENABLED_LANGUAGES) {

package-lock.json

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"@primer/css": "^18.2.0",
1717
"@primer/octicons": "^16.1.1",
1818
"@primer/octicons-react": "^16.1.1",
19+
"@react-aria/ssr": "^3.1.0",
1920
"accept-language-parser": "^1.5.0",
2021
"ajv": "^8.7.1",
2122
"ajv-formats": "^2.1.1",

pages/_app.tsx

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import App from 'next/app'
33
import type { AppProps, AppContext } from 'next/app'
44
import Head from 'next/head'
55
import { useTheme, ThemeProvider } from '@primer/components'
6+
import { SSRProvider } from '@react-aria/ssr'
67
import { defaultComponentThemeProps, getThemeProps } from 'components/lib/getThemeProps'
78

89
import '../stylesheets/index.scss'
@@ -43,12 +44,14 @@ const MyApp = ({ Component, pageProps, csrfToken, themeProps, languagesContext }
4344

4445
<meta name="csrf-token" content={csrfToken} />
4546
</Head>
46-
<ThemeProvider dayScheme={themeProps.dayTheme} nightScheme={themeProps.nightTheme}>
47-
<LanguagesContext.Provider value={languagesContext}>
48-
<SetTheme themeProps={themeProps} />
49-
<Component {...pageProps} />
50-
</LanguagesContext.Provider>
51-
</ThemeProvider>
47+
<SSRProvider>
48+
<ThemeProvider dayScheme={themeProps.dayTheme} nightScheme={themeProps.nightTheme}>
49+
<LanguagesContext.Provider value={languagesContext}>
50+
<SetTheme themeProps={themeProps} />
51+
<Component {...pageProps} />
52+
</LanguagesContext.Provider>
53+
</ThemeProvider>
54+
</SSRProvider>
5255
</>
5356
)
5457
}

script/rest/utils/create-code-samples.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,6 @@ function getExampleParamValue(name, schema) {
174174
case 'array':
175175
return [getExampleParamValue(name, schema.items)]
176176
}
177-
177+
178178
throw new Error(`Unknown data type in schema:, ${JSON.stringify(schema, null, 2)}`)
179179
}

script/search/search-qa-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
// This test runs example queries and expects a specific page to land in the top
77
// 3 results.
88
//
9-
// The data source used by this script is a JSON file `script/search/search-qa-data.json`,
10-
// which is populated from spreadsheet data here:
9+
// The data source used by this script is a JSON file `script/search/search-qa-data.json`,
10+
// which is populated from spreadsheet data here:
1111
// https://docs.google.com/spreadsheets/d/1Dt5JRVcmyAGWKBwGjwmXxi7Ww_vdfYLfZ-EFpu2S2CQ/edit?usp=sharing
1212
//
1313
// [end-readme]

0 commit comments

Comments
 (0)