Merge branch 'main' into repo-sync

Author: Octomerger

components/Search.tsx

@@ -132,9 +132,9 @@ export function Search({
       if (router.pathname === '/') {
         // Don't include router.locale so next doesn't attempt a
         // request to `/_next/static/chunks/pages/en.js`
-        router.replace(`/?${params.toString()}`, asPath)
+        router.replace(`/?${params.toString()}`, asPath, { shallow: true })
       } else {
-        router.replace(asPath)
+        router.replace(asPath, undefined, { shallow: true })
       }
     }
   }, [debouncedQuery])

lib/render-content/plugins/rewrite-local-links.js

@@ -8,8 +8,8 @@ import nonEnterpriseDefaultVersion from '../../non-enterprise-default-version.js
 import { allVersions } from '../../all-versions.js'
 import removeFPTFromPath from '../../remove-fpt-from-path.js'
 import readJsonFile from '../../read-json-file.js'
-const supportedVersions = Object.keys(allVersions)
-const supportedPlans = Object.values(allVersions).map((v) => v.plan)
+
+const supportedPlans = new Set(Object.values(allVersions).map((v) => v.plan))
 const externalRedirects = readJsonFile('./lib/redirects/external-sites.json')
 
 // Matches any <a> tags with an href that starts with `/`
@@ -36,18 +36,6 @@ export default function rewriteLocalLinks({ languageCode, version }) {
   }
 }
 
-// The versions that some links might start with, which we need to know
-// because if it's the case, we inject the language into the link as
-// the first prefix.
-// E.g. It can turn `/enterprise-cloud@latest/foo`
-// into `/en/enterprise-cloud@latest/foo`.
-// Using a Set to turn any lookups on this into a O(1) operation.
-const allSupportedVersionsPrefixes = new Set([
-  ...supportedPlans,
-  ...supportedVersions,
-  'enterprise-server@latest',
-])
-
 function getNewHref(node, languageCode, version) {
   const { href } = node.properties
   // Exceptions to link rewriting
@@ -62,7 +50,7 @@ function getNewHref(node, languageCode, version) {
   // /enterprise-server/rest/reference/oauth-authorizations (this redirects to the latest version)
   // /enterprise-server@latest/rest/reference/oauth-authorizations (this redirects to the latest version)
   const firstLinkSegment = href.split('/')[1]
-  if (allSupportedVersionsPrefixes.has(firstLinkSegment)) {
+  if (supportedPlans.has(firstLinkSegment.split('@')[0])) {
     newHref = path.posix.join('/', languageCode, href)
   }
 

tests/fixtures/page-with-deprecated-enterprise-links.md

@@ -0,0 +1,11 @@
+---
+title: Page with deprecated enterprise links
+versions:
+  free-pro-team: '*'
+  enterprise-server: '*'
+---
+
+
+- [Version 2.22](/enterprise-server@2.22)
+
+- [Version 3.2](/enterprise-server@3.2)

tests/unit/page.js

@@ -113,6 +113,32 @@ describe('Page class', () => {
       ).toBeGreaterThan(0)
     })
 
+    // Much of this test is based on making sure we don't
+    // repeat the bug introduced in issue 1545.
+    test('rewrites links correctly for unsupported enterprise-server links', async () => {
+      const page = await Page.init({
+        relativePath: 'page-with-deprecated-enterprise-links.md',
+        basePath: path.join(__dirname, '../fixtures'),
+        languageCode: 'en',
+      })
+      const context = {
+        page: { version: `enterprise-server@${enterpriseServerReleases.latest}` },
+        currentVersion: `enterprise-server@${enterpriseServerReleases.latest}`,
+        currentPath: '/en/page-with-deprecated-enterprise-links',
+        currentLanguage: 'en',
+      }
+      const rendered = await page.render(context)
+      // That page only contains exactly 2 links. And we can know
+      // exactly what we expect each one to be.
+      const $ = cheerio.load(rendered)
+      const first = $('a[href]').first()
+      expect(first.text()).toBe('Version 2.22')
+      expect(first.attr('href')).toBe('/en/enterprise-server@2.22')
+      const last = $('a[href]').last()
+      expect(last.text()).toBe('Version 3.2')
+      expect(last.attr('href')).toBe('/en/enterprise-server@3.2')
+    })
+
     test('rewrites links on prerendered GraphQL page include the current language prefix and version', async () => {
       const graphqlVersion =
         allVersions[`enterprise-server@${enterpriseServerReleases.latest}`].miscVersionName

translations/pt-BR/content/actions/learn-github-actions/expressions.md

@@ -50,12 +50,12 @@ env:
 
 Como parte da expressão, você pode usar os tipos de dados `boolean`, `null`, `number` ou `string`.
 
-| Tipo de dados | Valor do literal                                                                                                                                                                                                          |
-| ------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `boolean`     | `true` ou `false`                                                                                                                                                                                                         |
-| `null`        | `null`                                                                                                                                                                                                                    |
-| `number`      | Qualquer formato de número aceito por JSON.                                                                                                                                                                               |
-| `string`      | Você não precisa anexar strings em {% raw %}${{{% endraw %} e {% raw %}}}{% endraw %}. However, if you do, you must use single quotes around the string and escape literal single quotes with an additional single quote. |
+| Tipo de dados | Valor do literal                                                                                                                                                                                                                                                                                                                      |
+| ------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `boolean`     | `true` ou `false`                                                                                                                                                                                                                                                                                                                     |
+| `null`        | `null`                                                                                                                                                                                                                                                                                                                                |
+| `number`      | Qualquer formato de número aceito por JSON.                                                                                                                                                                                                                                                                                           |
+| `string`      | You don't need to enclose strings in `{% raw %}${{{% endraw %}` and `{% raw %}}}{% endraw %}`. However, if you do, you must use single quotes (`'`) around the string. To use a literal single quote, escape the literal single quote using an additional single quote (`''`). Wrapping with double quotes (`"`) will throw an error. |
 
 #### Exemplo
 

translations/pt-BR/content/actions/using-workflows/events-that-trigger-workflows.md

@@ -917,8 +917,6 @@ on:
 ```yaml
 on:
   push:
-    types:
-      - opened
     branches:    
       - 'releases/**'
     paths:
@@ -960,8 +958,6 @@ on:
 ```yaml
 on:
   push:
-    types:
-      - opened
     branches:    
       - 'releases/**'
     paths:
@@ -996,9 +992,9 @@ em:
 
 ### `versão`
 
-| Carga de evento webhook                                                                   | Tipos de atividade                                                                                                                                              | `GITHUB_SHA`                    | `GITHUB_REF`  |
-| ----------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------- | ------------- |
-| [`versão`](/developers/webhooks-and-events/webhooks/webhook-events-and-payloads/#release) | - `published` <br/>- `unpublished` <br/>- `created` <br/>- `edited` <br/>- `deleted` <br/>- `prereleased`<br/> - `released` | Último commit na versão com tag | Tag da versão |
+| Carga de evento webhook                                                                   | Tipos de atividade                                                                                                                                              | `GITHUB_SHA`                    | `GITHUB_REF`                                    |
+| ----------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------- | ----------------------------------------------- |
+| [`versão`](/developers/webhooks-and-events/webhooks/webhook-events-and-payloads/#release) | - `published` <br/>- `unpublished` <br/>- `created` <br/>- `edited` <br/>- `deleted` <br/>- `prereleased`<br/> - `released` | Último commit na versão com tag | Tag ref of release `refs/tags/<tag_name>` |
 
 {% note %}
 

translations/pt-BR/content/actions/using-workflows/workflow-syntax-for-github-actions.md

@@ -830,7 +830,7 @@ services:
     image: ghcr.io/owner/myservice1
     credentials:
       username: ${{ github.actor }}
-      password: ${{ secrets.ghcr_token }}
+      password: ${{ secrets.github_token }}
   myservice2:
     image: dockerhub_org/myservice2
     credentials:

translations/pt-BR/content/admin/enterprise-management/configuring-clustering/differences-between-clustering-and-high-availability-ha.md

@@ -35,7 +35,7 @@ Tanto a alta disponibilidade (High Availability, HA) quanto o cluster fornecem r
 
 ## Backups e recuperação de desastre
 
-Nem o clustering nem a HA devem ser considerados como substitutos para as medidas regulares de backup. Para obter mais informações, consulte "[Configurar backups no appliance](/enterprise/admin/guides/installation/configuring-backups-on-your-appliance)".
+Neither HA nor Clustering should be considered a replacement for regular backups. Para obter mais informações, consulte "[Configurar backups no appliance](/enterprise/admin/guides/installation/configuring-backups-on-your-appliance)".
 
 ## Monitoramento