Merge branch 'main' into patch-2

Author: ramyaparimi

.devcontainer/devcontainer.json

@@ -33,4 +33,5 @@
 
 	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	"remoteUser": "node"
+
 }

.eslintrc.js

@@ -13,7 +13,7 @@ module.exports = {
     babelOptions: { configFile: './.babelrc' },
     sourceType: 'module',
   },
-  ignorePatterns: ['tmp/*'],
+  ignorePatterns: ['tmp/*', '!/.*', '/.next/'],
   rules: {
     'import/no-extraneous-dependencies': ['error', { packageDir: '.' }],
   },

.github/CODEOWNERS

@@ -10,6 +10,7 @@
 /.github/ @github/docs-engineering
 /script/ @github/docs-engineering
 /includes/ @github/docs-engineering
+/lib/search/popular-pages.json @github/docs-engineering
 app.json @github/docs-engineering
 Dockerfile @github/docs-engineering
 package-lock.json @github/docs-engineering
@@ -19,8 +20,8 @@ package.json @github/docs-engineering
 /.github/workflows/create-translation-batch-pr.yml @github/docs-localization
 /.github/workflows/crowdin.yml @github/docs-localization
 /crowdin*.yml @github/docs-engineering @github/docs-localization
-/translations/ @github/docs-engineering @github/docs-localization @github-actions
-/translations/log/ @github/docs-localization
+/translations/ @github/docs-engineering @github/docs-localization @Octomerger
+/translations/log/ @github/docs-localization @Octomerger
 
 # Site Policy
 /content/github/site-policy/ @github/site-policy-admins

.github/actions-scripts/fr-add-docs-reviewers-requests.js

@@ -134,8 +134,8 @@ async function run() {
   // Exclude existing items going forward.
   // Until we have a way to check from a PR whether the PR is in a project,
   // this is how we (roughly) avoid overwriting PRs that are already on the board
-  let newItemIDs = []
-  let newItemAuthors = []
+  const newItemIDs = []
+  const newItemAuthors = []
   itemIDs.forEach((id, index) => {
     if (!existingItemIDs.includes(id)) {
       newItemIDs.push(id)

.github/actions-scripts/purge-fastly-edge-cache.js

@@ -2,10 +2,4 @@
 
 import purgeEdgeCache from '../../script/deployment/purge-edge-cache.js'
 
-try {
-  await purgeEdgeCache()
-} catch (error) {
-  console.error(`Failed to purge the edge cache: ${error.message}`)
-  console.error(error)
-  throw error
-}
+await purgeEdgeCache()

.github/actions-scripts/ready-for-docs-review.js

@@ -85,8 +85,8 @@ async function run() {
     // - affected docs sets (not considering changes to data/assets)
     let numFiles = 0
     let numChanges = 0
-    let features = new Set([])
-    const files = data.item.files.nodes.forEach((node) => {
+    const features = new Set([])
+    data.item.files.nodes.forEach((node) => {
       numFiles += 1
       numChanges += node.additions
       numChanges += node.deletions

.github/actions-scripts/staging-commit-status-success.js

@@ -0,0 +1,42 @@
+#!/usr/bin/env node
+
+import * as github from '@actions/github'
+
+import getOctokit from '../../script/helpers/github.js'
+
+const { GITHUB_TOKEN } = process.env
+
+// Exit if GitHub Actions PAT is not found
+if (!GITHUB_TOKEN) {
+  throw new Error('You must supply a GITHUB_TOKEN environment variable!')
+}
+
+// This helper uses the `GITHUB_TOKEN` implicitly!
+// We're using our usual version of Octokit vs. the provided `github`
+// instance to avoid versioning discrepancies.
+const octokit = getOctokit()
+
+const { CONTEXT_NAME, ACTIONS_RUN_LOG, HEAD_SHA } = process.env
+if (!CONTEXT_NAME) {
+  throw new Error('$CONTEXT_NAME not set')
+}
+if (!ACTIONS_RUN_LOG) {
+  throw new Error('$ACTIONS_RUN_LOG not set')
+}
+if (!HEAD_SHA) {
+  throw new Error('$HEAD_SHA not set')
+}
+
+const { context } = github
+const owner = context.repo.owner
+const repo = context.payload.repository.name
+
+await octokit.repos.createCommitStatus({
+  owner,
+  repo,
+  sha: HEAD_SHA,
+  context: CONTEXT_NAME,
+  state: 'success',
+  description: 'Successfully deployed! See logs.',
+  target_url: ACTIONS_RUN_LOG,
+})

.github/actions-scripts/staging-deploy.js

@@ -21,7 +21,7 @@ if (!HEROKU_API_TOKEN) {
 // instance to avoid versioning discrepancies.
 const octokit = getOctokit()
 
-const { RUN_ID, PR_URL, SOURCE_BLOB_URL, CONTEXT_NAME, ACTIONS_RUN_LOG, HEAD_SHA } = process.env
+const { RUN_ID, PR_URL, SOURCE_BLOB_URL } = process.env
 if (!RUN_ID) {
   throw new Error('$RUN_ID not set')
 }
@@ -31,15 +31,6 @@ if (!PR_URL) {
 if (!SOURCE_BLOB_URL) {
   throw new Error('$SOURCE_BLOB_URL not set')
 }
-if (!CONTEXT_NAME) {
-  throw new Error('$CONTEXT_NAME not set')
-}
-if (!ACTIONS_RUN_LOG) {
-  throw new Error('$ACTIONS_RUN_LOG not set')
-}
-if (!HEAD_SHA) {
-  throw new Error('$HEAD_SHA not set')
-}
 
 const { owner, repo, pullNumber } = parsePrUrl(PR_URL)
 if (!owner || !repo || !pullNumber) {
@@ -62,13 +53,3 @@ await deployToStaging({
   sourceBlobUrl: SOURCE_BLOB_URL,
   runId: RUN_ID,
 })
-
-await octokit.repos.createCommitStatus({
-  owner,
-  repo,
-  sha: HEAD_SHA,
-  context: CONTEXT_NAME,
-  state: 'success',
-  description: 'Successfully deployed! See logs.',
-  target_url: ACTIONS_RUN_LOG,
-})

.github/actions-scripts/update-merge-queue-branch.js

@@ -8,15 +8,17 @@ const github = getOctokit(token)
 // https://docs.github.com/en/graphql/reference/enums#mergestatestatus
 // https://docs.github.com/en/graphql/reference/enums#mergeablestate
 
-/* 
-  This script gets a list of automerge-enabled PRs and sorts them 
+/*
+  This script gets a list of automerge-enabled PRs and sorts them
   by priority. The PRs with the skip-to-front-of-merge-queue label
-  are prioritized first. The rest of the PRs are sorted by the date 
-  they were updated. This is basically a FIFO queue, while allowing 
+  are prioritized first. The rest of the PRs are sorted by the date
+  they were updated. This is basically a FIFO queue, while allowing
   writers the ability to skip the line when high-priority ships are
   needed but a freeze isn't necessary.
 */
 
+const DRY_RUN = Boolean(JSON.parse(process.env.DRY_RUN || 'false'))
+
 main()
 
 async function main() {
@@ -47,6 +49,15 @@ async function main() {
                   name
                 }
               }
+              commits(last: 1) {
+                nodes {
+                  commit {
+                    statusCheckRollup {
+                      state
+                    }
+                  }
+                }
+              }
             }
           }
           pageInfo {
@@ -105,6 +116,14 @@ async function main() {
       // a PR is green and the automerge is enabled
       .filter((pr) => pr.mergeStateStatus !== 'DIRTY')
       .filter((pr) => pr.mergeStateStatus !== 'UNSTABLE')
+      .filter((pr) => {
+        const nodes = pr.commits.nodes
+        if (!nodes || !nodes.length) {
+          // If it has no commits, why is it even here? Anyway, skip it.
+          return false
+        }
+        return nodes[0].commit.statusCheckRollup.state !== 'FAILURE'
+      })
 
     autoMergeEnabledPRs.push(...filteredPrs)
   }
@@ -120,11 +139,15 @@ async function main() {
   if (prioritizedPrList.length) {
     const nextInQueue = prioritizedPrList.shift()
     // Update the branch for the next PR in the merge queue
-    github.rest.pulls.updateBranch({
-      owner: org,
-      repo,
-      pull_number: nextInQueue.number,
-    })
+    if (DRY_RUN) {
+      console.log('DRY RUN! But *would* update on next-in-queue')
+    } else {
+      github.rest.pulls.updateBranch({
+        owner: org,
+        repo,
+        pull_number: nextInQueue.number,
+      })
+    }
     console.log(`⏱ Total PRs in the merge queue: ${prioritizedPrList.length + 1}`)
     console.log(`🚂 Updated branch for PR #${JSON.stringify(nextInQueue, null, 2)}`)
   }

.github/allowed-actions.js

@@ -13,8 +13,8 @@ export default [
   'actions/upload-artifact@27121b0bdffd731efa15d66772be8dc71245d074', // v2.2.4
   'alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488', // v0.8.1
   'andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90', // v1.0.4
-  'crowdin/github-action@d0622816ed4f4744db27d04374b2cef6867f7bed', // v1.4.1
   'cschleiden/actions-linter@caffd707beda4fc6083926a3dff48444bc7c24aa', // uses github-actions-parser v0.23.0
+  'lee-dohm/close-matching-issues@e9e43aad2fa6f06a058cedfd8fb975fd93b56d8f', // v2.1.0
   'dawidd6/action-delete-branch@47743101a121ad657031e6704086271ca81b1911', // v3.0.2
   'dawidd6/action-download-artifact@af92a8455a59214b7b932932f2662fdefbd78126', // v2.15.0
   'dorny/paths-filter@eb75a1edc117d3756a18ef89958ee59f9500ba58',