Merge pull request #23190 from github/repo-sync

repo sync

components/context/ArticleContext.tsx

@@ -62,7 +62,7 @@ export const getArticleContextFromRequest = (req: any): ArticleContextT => {
   }
 
   return {
-    title: page.titlePlainText,
+    title: page.title,
     intro: page.intro,
     effectiveDate: page.effectiveDate || '',
     renderedPage: req.context.renderedPage || '',

components/context/AutomatedPageContext.tsx

@@ -28,7 +28,7 @@ export const getAutomatedPageContextFromRequest = (req: any): AutomatedPageConte
   const page = req.context.page
 
   return {
-    title: page.titlePlainText,
+    title: page.title,
     intro: page.intro,
     renderedPage: req.context.renderedPage || '',
     miniTocItems: req.context.miniTocItems || [],

components/context/TocLandingContext.tsx

@@ -11,7 +11,7 @@ export type TocItem = {
 
 export type TocLandingContextT = {
   title: string
-  introPlainText: string
+  intro: string
   productCallout: string
   tocItems: Array<TocItem>
   variant?: 'compact' | 'expanded'
@@ -34,9 +34,9 @@ export const useTocLandingContext = (): TocLandingContextT => {
 
 export const getTocLandingContextFromRequest = (req: any): TocLandingContextT => {
   return {
-    title: req.context.page.titlePlainText,
+    title: req.context.page.title,
     productCallout: req.context.page.product || '',
-    introPlainText: req.context.page.introPlainText,
+    intro: req.context.page.intro,
     tocItems: (req.context.genericTocFlat || req.context.genericTocNested || []).map((obj: any) =>
       pick(obj, ['fullPath', 'title', 'intro', 'childTocItems'])
     ),

components/landing/TocLanding.tsx

@@ -18,7 +18,7 @@ export const TocLanding = () => {
   const router = useRouter()
   const {
     title,
-    introPlainText,
+    intro,
     tocItems,
     productCallout,
     variant,
@@ -39,7 +39,7 @@ export const TocLanding = () => {
         <ArticleGridLayout>
           <ArticleTitle>{title}</ArticleTitle>
 
-          {introPlainText && <Lead data-search="lead">{introPlainText}</Lead>}
+          {intro && <Lead data-search="lead">{intro}</Lead>}
 
           {productCallout && (
             <Callout variant="success" dangerouslySetInnerHTML={{ __html: productCallout }} />

lib/page.js

@@ -178,10 +178,6 @@ class Page {
     })
     this.title = await renderContentWithFallback(this, 'rawTitle', context, {
       textOnly: true,
-      encodeEntities: true,
-    })
-    this.titlePlainText = await renderContentWithFallback(this, 'rawTitle', context, {
-      textOnly: true,
     })
     this.shortTitle = await renderContentWithFallback(this, 'shortTitle', context, {
       textOnly: true,

middleware/render-page.js

@@ -81,7 +81,7 @@ export default async function renderPage(req, res) {
   if (isConnectionDropped(req, res)) return
 
   // Create string for <title> tag
-  page.fullTitle = page.titlePlainText
+  page.fullTitle = page.title
 
   // add localized ` - GitHub Docs` suffix to <title> tag (except for the homepage)
   if (!patterns.homepagePath.test(path)) {