Merge pull request #12951 from github/repo-sync

repo sync

Author: Octomerger

components/release-notes/GHAEReleaseNotePatch.tsx

@@ -26,7 +26,7 @@ export function GHAEReleaseNotePatch({ patch, didEnterView }: Props) {
     >
       <header
         style={{ zIndex: 1 }}
-        className="container-xl position-sticky top-0 color-bg-subtle border-bottom px-3 pt-4 pb-2"
+        className="container-xl color-bg-subtle border-bottom px-3 pt-4 pb-2"
       >
         <div className="d-flex flex-items-center">
           <h2 className="border-bottom-0 m-0 p-0">{patch.title}</h2>

components/release-notes/GHAEReleaseNotes.tsx

@@ -5,6 +5,8 @@ import { GHAEReleaseNotePatch } from './GHAEReleaseNotePatch'
 import { GHAEReleaseNotesContextT } from './types'
 import { MarkdownContent } from 'components/ui/MarkdownContent'
 
+import styles from './PatchNotes.module.scss'
+
 type GitHubAEProps = {
   context: GHAEReleaseNotesContextT
 }
@@ -35,8 +37,10 @@ export function GHAEReleaseNotes({ context }: GitHubAEProps) {
       </article>
 
       <aside
-        className="position-sticky top-0 d-none d-md-block border-left no-print color-bg-default flex-shrink-0"
-        style={{ width: 260, height: '100vh' }}
+        className={cx(
+          'position-sticky d-none d-md-block border-left no-print color-bg-default flex-shrink-0',
+          styles.aside
+        )}
       >
         <nav className="height-full overflow-auto">
           <MarkdownContent data-search="article-content">

components/release-notes/GHESReleaseNotePatch.tsx

@@ -40,7 +40,7 @@ export function GHESReleaseNotePatch({
     >
       <header
         style={{ zIndex: 1 }}
-        className="container-xl position-sticky top-0 color-bg-subtle border-bottom px-3 pt-4 pb-2"
+        className="container-xl color-bg-subtle border-bottom px-3 pt-4 pb-2"
       >
         <div className="d-flex flex-items-center">
           <h2 className="border-bottom-0 m-0 p-0">

components/release-notes/GHESReleaseNotes.tsx

@@ -15,6 +15,8 @@ import { MarkdownContent } from 'components/ui/MarkdownContent'
 import { GHESReleaseNotesContextT } from './types'
 import { GHESReleaseNotePatch } from './GHESReleaseNotePatch'
 
+import styles from './PatchNotes.module.scss'
+
 type Props = {
   context: GHESReleaseNotesContextT
 }
@@ -82,8 +84,10 @@ export function GHESReleaseNotes({ context }: Props) {
       </article>
 
       <aside
-        className="position-sticky top-0 d-none d-md-block border-left no-print color-bg-default flex-shrink-0"
-        style={{ width: 260, height: '100vh' }}
+        className={cx(
+          'position-sticky d-none d-md-block border-left no-print color-bg-default flex-shrink-0',
+          styles.aside
+        )}
       >
         <nav className="height-full overflow-auto">
           <MarkdownContent data-search="article-content">

components/release-notes/PatchNotes.module.scss

@@ -1,8 +1,11 @@
 @import "@primer/css/layout/index.scss";
 
 .sectionHeading {
-  scroll-margin-top: 280px !important;
-  @include breakpoint(sm) {
-    scroll-margin-top: 200px !important;
-  }
+  scroll-margin-top: 70px !important;
+}
+
+.aside {
+  width: 260px;
+  height: calc(100vh - 70px);
+  top: 70px;
 }

lib/rest/index.js

@@ -12,9 +12,11 @@ export default async function getRest() {
   const operations = {}
   fs.readdirSync(schemasPath).forEach((filename) => {
     // In staging deploys, the `.json` files might have been converted to
-    // to `.json.br`. The `readCompressedJsonFileFallback()` function
-    // can handle both but you need to call it with the `.json` filename.
-    const key = path.parse(filename).name
+    // to `.json.br`. In that case, we need to also remove the `.json`
+    // extension from the key
+    const key = path.parse(filename).name.replace('.json', '')
+    // The `readCompressedJsonFileFallback()` function
+    // will check for both a .br and .json extension.
     const value = readCompressedJsonFileFallback(path.join(schemasPath, filename))
     operations[key] = value
   })

lib/search/indexes/github-docs-3.0-cn-records.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5b07a8e48fc921d0dbbfba5eccb4c7e11a839d1e20493a7ea369a30e9562567a
-size 606407
+oid sha256:2be7450f959923e9e74ef2417ba1e0f98f2b0f8f769edc7a0dccbe32d374bc43
+size 606254

lib/search/indexes/github-docs-3.0-cn.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6a0f80a844047da849c32e1879dfb46413599c962bde418bb32dee450a42f84a
-size 1519551
+oid sha256:e29e0333ed08ac36598d6ff228d4e458bf00c473068fdef283cdd91646e4ca71
+size 1519746

lib/search/indexes/github-docs-3.0-en-records.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e66729712c893e76869a47bd36a825f097af5b2f0e483bbe96bba1a607552ce7
-size 946758
+oid sha256:957fd9236b3cff0840a3d908ebecef15ab68c42eb30c6f9c804aa5d0b3ff7ece
+size 946504

lib/search/indexes/github-docs-3.0-en.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7397a575e3104b98d807cfa77cad9d738dbb236580035bffb851b52eb8bc3cbc
-size 3862906
+oid sha256:cede915d8b6ada5024a210e84607cf3d5f3a57b6aea03ea6e094f50dc8cc69e6
+size 3861798