Merge branch 'main' into repo-sync

Author: Octomerger

.github/actions-scripts/enable-automerge.js

@@ -1,11 +1,20 @@
 import { getOctokit } from '@actions/github'
-const token = process.env.GITHUB_TOKEN
-const prNumber = process.env.AUTOMERGE_PR_NUMBER
-const [org, repo] = process.env.GITHUB_REPOSITORY.split('/')
-const github = getOctokit(token)
 
 main()
 async function main() {
+  const [org, repo] = process.env.GITHUB_REPOSITORY.split('/')
+  if (!org || !repo) {
+    throw new Error('GITHUB_REPOSITORY environment variable not set')
+  }
+  const prNumber = process.env.AUTOMERGE_PR_NUMBER
+  if (!prNumber) {
+    throw new Error(`AUTOMERGE_PR_NUMBER environment variable not set`)
+  }
+  const token = process.env.GITHUB_TOKEN
+  if (!token) {
+    throw new Error(`GITHUB_TOKEN environment variable not set`)
+  }
+  const github = getOctokit(token)
   const pull = await github.rest.pulls.get({
     owner: org,
     repo: repo,

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

@@ -20,10 +20,14 @@ const github = getOctokit(token)
 main()
 
 async function main() {
+  const [org, repo] = process.env.GITHUB_REPOSITORY.split('/')
+  if (!org || !repo) {
+    throw new Error('GITHUB_REPOSITORY environment variable not set')
+  }
   // Get a list of open PRs and order them from oldest to newest
-  const query = `query ($first: Int, $after: String, $firstLabels: Int) {
-    organization(login: "github") {
-      repository(name: "docs-internal") {
+  const query = `query ($first: Int, $after: String, $firstLabels: Int, $repo: String!, $org: String!) {
+    organization(login: $org) {
+      repository(name: $repo) {
         pullRequests(first: $first, after: $after, states: OPEN, orderBy: {field: UPDATED_AT, direction: ASC}) {
           edges{
             node {
@@ -55,6 +59,8 @@ async function main() {
   }`
 
   const queryVariables = {
+    repo,
+    org,
     first: 100,
     after: null, // when pagination in null it will get first page
     firstLabels: 100,
@@ -105,20 +111,25 @@ async function main() {
 
   // Get the list of prs with the skip label so they can
   // be put at the beginning of the list
-  const prioritizedPrList = autoMergeEnabledPRs
-    .filter((pr) => pr.labels.includes('skip-to-front-of-merge-queue'))
-    .concat(autoMergeEnabledPRs.filter((pr) => !pr.labels.includes('skip-to-front-of-merge-queue')))
+  const prioritizedPrList = autoMergeEnabledPRs.sort(
+    (a, b) =>
+      Number(b.labels.includes('skip-to-front-of-merge-queue')) -
+      Number(a.labels.includes('skip-to-front-of-merge-queue'))
+  )
 
-  const nextInQueue = prioritizedPrList.shift()
-  // Update the branch for the next PR in the merge queue
-  github.rest.pulls.updateBranch({
-    owner: 'github',
-    repo: 'docs-internal',
-    pull_number: parseInt(nextInQueue.number),
-  })
+  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,
+    })
+    console.log(`⏱ Total PRs in the merge queue: ${prioritizedPrList.length + 1}`)
+    console.log(`🚂 Updated branch for PR #${JSON.stringify(nextInQueue, null, 2)}`)
+  }
 
-  console.log(`⏱ Total PRs in the merge queue: ${prioritizedPrList.length + 1}`)
-  console.log(`🚂 Updated branch for PR #${JSON.stringify(nextInQueue, null, 2)}`)
-  console.log(`🚏 Next up in the queue: `)
-  console.log(JSON.stringify(prioritizedPrList, null, 2))
+  prioritizedPrList.length
+    ? console.log(`🚏 Next up in the queue: \n ${JSON.stringify(prioritizedPrList, null, 2)}`)
+    : console.log(`⚡ The merge queue is empty`)
 }

.github/workflows/autoupdate-branch.yml

@@ -30,6 +30,15 @@ jobs:
     name: autoupdate
     runs-on: ubuntu-latest
     steps:
+      - name: Check out repo content
+        uses: actions/checkout@1e204e9a9253d643386038d443f96446fa156a97
+
+      - name: Setup Node
+        uses: actions/setup-node@270253e841af726300e85d718a5f606959b2903c
+        with:
+          node-version: 16.13.x
+          cache: npm
+
       - name: Update next PR in queue
         env:
           GITHUB_TOKEN: ${{ secrets.DOCUBOT_REPO_PAT }}

package-lock.json

@@ -16,6 +16,7 @@
     "@primer/css": "^18.2.0",
     "@primer/octicons": "^16.1.1",
     "@primer/octicons-react": "^16.1.1",
+    "@react-aria/ssr": "^3.1.0",
     "accept-language-parser": "^1.5.0",
     "ajv": "^8.7.1",
     "ajv-formats": "^2.1.1",

package.json

@@ -3,6 +3,7 @@ import App from 'next/app'
 import type { AppProps, AppContext } from 'next/app'
 import Head from 'next/head'
 import { useTheme, ThemeProvider } from '@primer/components'
+import { SSRProvider } from '@react-aria/ssr'
 import { defaultComponentThemeProps, getThemeProps } from 'components/lib/getThemeProps'
 
 import '../stylesheets/index.scss'
@@ -43,12 +44,14 @@ const MyApp = ({ Component, pageProps, csrfToken, themeProps, languagesContext }
 
         <meta name="csrf-token" content={csrfToken} />
       </Head>
-      <ThemeProvider dayScheme={themeProps.dayTheme} nightScheme={themeProps.nightTheme}>
-        <LanguagesContext.Provider value={languagesContext}>
-          <SetTheme themeProps={themeProps} />
-          <Component {...pageProps} />
-        </LanguagesContext.Provider>
-      </ThemeProvider>
+      <SSRProvider>
+        <ThemeProvider dayScheme={themeProps.dayTheme} nightScheme={themeProps.nightTheme}>
+          <LanguagesContext.Provider value={languagesContext}>
+            <SetTheme themeProps={themeProps} />
+            <Component {...pageProps} />
+          </LanguagesContext.Provider>
+        </ThemeProvider>
+      </SSRProvider>
     </>
   )
 }