Merge pull request github#7269 from github/repo-sync

Octomerger · web-flow · commit a2bc6c737f2c · 2021-06-11T03:32:26.000+10:00
repo sync
diff --git a/components/DefaultLayout.tsx b/components/DefaultLayout.tsx
@@ -11,7 +11,7 @@ import { useTranslation } from './hooks/useTranslation'
 
 type Props = { children?: React.ReactNode }
 export const DefaultLayout = (props: Props) => {
-  const { builtAssets, expose, page, error, isHomepageVersion } = useMainContext()
+  const { builtAssets, page, error, isHomepageVersion } = useMainContext()
   const { t } = useTranslation('errors')
   return (
     <div className="d-lg-flex">
@@ -22,7 +22,6 @@ export const DefaultLayout = (props: Props) => {
           <title>{page.fullTitle}</title>
         ) : null}
 
-        <script id="expose" type="application/json" dangerouslySetInnerHTML={{ __html: expose }} />
         <script src={builtAssets.main.js} />
 
         {/* For Google and Bots */}
diff --git a/components/Search.tsx b/components/Search.tsx
@@ -30,14 +30,11 @@ export function Search({ isStandalone = false, updateSearchParams = true, childr
   const { currentVersion } = useVersion()
 
   // Figure out language and version for index
-  const { expose } = useMainContext()
-  const {
-    searchOptions: { languages, versions, nonEnterpriseDefaultVersion },
-  } = JSON.parse(expose)
+  const { languages, searchVersions, nonEnterpriseDefaultVersion } = useMainContext()
   const router = useRouter()
   // fall back to the non-enterprise default version (FPT currently) on the homepage, 404 page, etc.
-  const version = versions[currentVersion] || versions[nonEnterpriseDefaultVersion]
-  const language = (languages.includes(router.locale) && router.locale) || 'en'
+  const version = searchVersions[currentVersion] || searchVersions[nonEnterpriseDefaultVersion]
+  const language = (Object.keys(languages).includes(router.locale || '') && router.locale) || 'en'
 
   // If the user shows up with a query in the URL, go ahead and search for it
   useEffect(() => {
diff --git a/components/context/MainContext.tsx b/components/context/MainContext.tsx
@@ -69,7 +69,6 @@ export type MainContextT = {
     article?: BreadcrumbT
   }
   builtAssets: { main: { js: string } }
-  expose: string
   activeProducts: Array<ProductT>
   currentProduct?: ProductT
   currentLayoutName: string
@@ -106,12 +105,14 @@ export type MainContextT = {
   }
 
   enterpriseServerVersions: Array<string>
+
+  searchVersions: Record<string, string>
+  nonEnterpriseDefaultVersion: string
 }
 
 export const getMainContextFromRequest = (req: any): MainContextT => {
   return {
     builtAssets: { main: { js: req.context.builtAssets.main.js } },
-    expose: req.context.expose,
     breadcrumbs: req.context.breadcrumbs || {},
     activeProducts: req.context.activeProducts,
     currentProduct: req.context.productMap[req.context.currentProduct] || null,
@@ -179,6 +180,8 @@ export const getMainContextFromRequest = (req: any): MainContextT => {
       ? getCurrentProductTree(req.context.currentProductTree)
       : null,
     featureFlags: {},
+    searchVersions: req.context.searchVersions,
+    nonEnterpriseDefaultVersion: req.context.nonEnterpriseDefaultVersion,
   }
 }
 
diff --git a/content/github/site-policy/github-candidate-privacy-policy.md b/content/github/site-policy/github-candidate-privacy-policy.md
@@ -46,7 +46,7 @@ We use the Candidate Personal Information for the following purposes:
  - To prepare and submit reports as required under local laws and regulations;
  - To manage and improve our application and recruitment process (such as making the application process more efficient and improving our diversity practices).
  
- ### How do we share your Candidate Personal Information?
+### How do we share your Candidate Personal Information?
  
 GitHub will share your Candidate Personal Information with those who have a legitimate business need for it. Whenever we permit a third party to access your Candidate Personal Information, we will make sure the information is used in a manner consistent with this policy. Your Candidate Personal Information may be shared with our affiliates (such as Microsoft) and other third parties (such as vendors) for the following purposes:
 1. In order to carry out the uses of Candidate Personal Information described above;
diff --git a/content/github/site-policy/guidelines-for-legal-requests-of-user-data.md b/content/github/site-policy/guidelines-for-legal-requests-of-user-data.md
@@ -226,6 +226,8 @@ c/o Corporation Service Company
 Sacramento, CA 95833-3505
 ```
 
+Courtesy copies may be emailed to legal@support.github.com.
+
 Please make your requests as specific and narrow as possible, including the following information:
 
 - Full information about authority issuing the request for information
diff --git a/javascripts/airgap-links.js b/javascripts/airgap-links.js
@@ -1,4 +1,6 @@
 export default function airgapLinks () {
+  if (window.IS_NEXTJS_PAGE) return
+
   // When in an airgapped environment,
   // show a tooltip on external links
   const { airgap } = JSON.parse(document.getElementById('expose').text)
diff --git a/javascripts/index.js b/javascripts/index.js
@@ -22,8 +22,10 @@ import releaseNotes from './release-notes'
 import showMore from './show-more'
 import airgapLinks from './airgap-links'
 import toggleImages from './toggle-images'
+import setNextEnv from './set-next-env'
 
 document.addEventListener('DOMContentLoaded', async () => {
+  setNextEnv()
   displayPlatformSpecificContent()
   displayToolSpecificContent()
   explorer()
diff --git a/javascripts/search.js b/javascripts/search.js
@@ -15,7 +15,7 @@ let version
 let language
 
 export default function search () {
-  if (window.next) return
+  if (window.IS_NEXTJS_PAGE) return
 
   // We don't want to mess with query params intended for the GraphQL Explorer
   isExplorerPage = Boolean(document.getElementById('graphiql'))
diff --git a/javascripts/set-next-env.js b/javascripts/set-next-env.js
@@ -0,0 +1,3 @@
+export default function setNextEnv () {
+  window.IS_NEXTJS_PAGE = !!document.querySelector('#__next')
+}
diff --git a/javascripts/survey.js b/javascripts/survey.js
@@ -46,7 +46,7 @@ function trackEvent ({ token, vote, email, comment }) {
 }
 
 export default function survey () {
-  if (window.next) return
+  if (window.IS_NEXTJS_PAGE) return
 
   const form = document.querySelector('.js-survey')
   const texts = Array.from(document.querySelectorAll('.js-survey input, .js-survey textarea'))
diff --git a/middleware/context.js b/middleware/context.js
@@ -74,6 +74,8 @@ module.exports = async function contextualize (req, res, next) {
     airgap: Boolean(process.env.AIRGAP || req.cookies.AIRGAP) || undefined
   })
   if (process.env.AIRGAP || req.cookies.AIRGAP) req.context.AIRGAP = true
+  req.context.searchVersions = searchVersions
+  req.context.nonEnterpriseDefaultVersion = nonEnterpriseDefaultVersion
 
   return next()
 }
diff --git a/tests/browser/browser.js b/tests/browser/browser.js
@@ -315,13 +315,17 @@ describe('nextjs query param', () => {
   it('conditionally renders through nextjs pipeline depending on FEATURE_NEXTJS value', async () => {
     const flagVal = require('../../feature-flags.json').FEATURE_NEXTJS
     await page.goto('http://localhost:4001/en/actions?nextjs=')
+    const IS_NEXTJS_PAGE = await page.evaluate(() => window.IS_NEXTJS_PAGE)
     const nextWrapper = await page.$('#__next')
     flagVal === true ? expect(nextWrapper).toBeDefined() : expect(nextWrapper).toBeNull()
+    flagVal === true ? expect(IS_NEXTJS_PAGE).toBe(true) : expect(IS_NEXTJS_PAGE).toBe(false)
   })
 
   it('does not render through nextjs pipeline when nextjs query param is missing', async () => {
     await page.goto('http://localhost:4001/en/actions')
     const nextWrapper = await page.$('#__next')
+    const IS_NEXTJS_PAGE = await page.evaluate(() => window.IS_NEXTJS_PAGE)
     expect(nextWrapper).toBeNull()
+    expect(IS_NEXTJS_PAGE).toBe(false)
   })
 })

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,6 @@ export type MainContextT = {`
`69`	`69`	`article?: BreadcrumbT`
`70`	`70`	`}`
`71`	`71`	`builtAssets: { main: { js: string } }`
`72`		`- expose: string`
`73`	`72`	`activeProducts: Array<ProductT>`
`74`	`73`	`currentProduct?: ProductT`
`75`	`74`	`currentLayoutName: string`
`@@ -106,12 +105,14 @@ export type MainContextT = {`
`106`	`105`	`}`
`107`	`106`
`108`	`107`	`enterpriseServerVersions: Array<string>`
	`108`	`+`
	`109`	`+ searchVersions: Record<string, string>`
	`110`	`+ nonEnterpriseDefaultVersion: string`
`109`	`111`	`}`
`110`	`112`
`111`	`113`	`export const getMainContextFromRequest = (req: any): MainContextT => {`
`112`	`114`	`return {`
`113`	`115`	`builtAssets: { main: { js: req.context.builtAssets.main.js } },`
`114`		`- expose: req.context.expose,`
`115`	`116`	`breadcrumbs: req.context.breadcrumbs \|\| {},`
`116`	`117`	`activeProducts: req.context.activeProducts,`
`117`	`118`	`currentProduct: req.context.productMap[req.context.currentProduct] \|\| null,`
`@@ -179,6 +180,8 @@ export const getMainContextFromRequest = (req: any): MainContextT => {`
`179`	`180`	`? getCurrentProductTree(req.context.currentProductTree)`
`180`	`181`	`: null,`
`181`	`182`	`featureFlags: {},`
	`183`	`+ searchVersions: req.context.searchVersions,`
	`184`	`+ nonEnterpriseDefaultVersion: req.context.nonEnterpriseDefaultVersion,`
`182`	`185`	`}`
`183`	`186`	`}`
`184`	`187`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export default function setNextEnv () {`
	`2`	`+ window.IS_NEXTJS_PAGE = !!document.querySelector('#__next')`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ function trackEvent ({ token, vote, email, comment }) {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`export default function survey () {`
`49`		`- if (window.next) return`
	`49`	`+ if (window.IS_NEXTJS_PAGE) return`
`50`	`50`
`51`	`51`	`const form = document.querySelector('.js-survey')`
`52`	`52`	`const texts = Array.from(document.querySelectorAll('.js-survey input, .js-survey textarea'))`