Merge pull request #13098 from github/repo-sync

repo sync

Author: Octomerger

Dockerfile

@@ -17,8 +17,8 @@ WORKDIR /usr/src/docs
 # ---------------
 FROM base as all_deps
 
-COPY package*.json ./
 COPY .npmrc ./
+COPY package*.json ./
 
 RUN npm ci
 
@@ -36,14 +36,12 @@ RUN npm prune --production
 # ---------------
 FROM all_deps as builder
 
-ENV NODE_ENV production
-
 COPY stylesheets ./stylesheets
 COPY pages ./pages
 COPY components ./components
 COPY lib ./lib
 
-# one part of the build relies on this content file to pull all-products
+# One part of the build relies on this content file to pull all-products
 COPY content/index.md ./content/index.md
 
 COPY next.config.js ./next.config.js
@@ -76,24 +74,27 @@ COPY --chown=node:node --from=builder /usr/src/docs/.next /usr/src/docs/.next
 # We should always be running in production mode
 ENV NODE_ENV production
 
-# Hide iframes, add warnings to external links
-ENV AIRGAP true
+# Whether to hide iframes, add warnings to external links
+ENV AIRGAP false
+
+# By default we typically don't want to run in clustered mode
+ENV WEB_CONCURRENCY 1
+
+# This makes sure server.mjs always picks up the preferred port
+ENV PORT 4000
 
 # Copy only what's needed to run the server
 COPY --chown=node:node assets ./assets
-COPY --chown=node:node content ./content
-COPY --chown=node:node data ./data
 COPY --chown=node:node includes ./includes
+COPY --chown=node:node translations ./translations
+COPY --chown=node:node content ./content
 COPY --chown=node:node lib ./lib
 COPY --chown=node:node middleware ./middleware
-COPY --chown=node:node translations ./translations
-COPY --chown=node:node server.mjs ./server.mjs
-COPY --chown=node:node package*.json ./
 COPY --chown=node:node feature-flags.json ./
+COPY --chown=node:node data ./data
 COPY --chown=node:node next.config.js ./
+COPY --chown=node:node server.mjs ./server.mjs
 
-# This makes sure server.mjs always picks up the preferred port
-ENV PORT=4000
 EXPOSE $PORT
 
 CMD ["node", "server.mjs"]

components/context/ProductLandingContext.tsx

@@ -87,9 +87,9 @@ export const getFeaturedLinksFromReq = (req: any): Record<string, Array<Featured
         ((entries as Array<any>) || []).map((entry: any) => ({
           href: entry.href,
           title: entry.title,
-          intro: entry.intro,
-          authors: entry.page.authors || [],
-          fullTitle: entry.fullTitle,
+          intro: entry.intro || null,
+          authors: entry.page?.authors || [],
+          fullTitle: entry.fullTitle || null,
         })),
       ]
     })
@@ -141,13 +141,13 @@ export const getProductLandingContextFromRequest = (req: any): ProductLandingCon
 
     featuredArticles: Object.entries(req.context.featuredLinks || [])
       .filter(([key]) => {
-        return key === 'guides' || key === 'popular'
+        return key === 'guides' || key === 'popular' || key === 'videos'
       })
       .map(([key, links]: any) => {
         return {
           label:
-            key === 'popular'
-              ? req.context.page.featuredLinks.popularHeading || req.context.site.data.ui.toc[key]
+            key === 'popular' || key === 'videos'
+              ? req.context.page.featuredLinks[key + 'Heading'] || req.context.site.data.ui.toc[key]
               : req.context.site.data.ui.toc[key],
           viewAllHref:
             key === 'guides' && !req.context.currentCategory && hasGuidesPage
@@ -158,9 +158,9 @@ export const getProductLandingContextFromRequest = (req: any): ProductLandingCon
               hideIntro: key === 'popular',
               href: link.href,
               title: link.title,
-              intro: link.intro,
-              authors: link.page.authors || [],
-              fullTitle: link.fullTitle,
+              intro: link.intro || null,
+              authors: link.page?.authors || [],
+              fullTitle: link.fullTitle || null,
             }
           }),
         }