Skip to content

Commit 56b987f

Browse files
authored
Merge pull request #39244 from github/repo-sync
Repo sync
2 parents dceaba2 + ad1238c commit 56b987f

File tree

130 files changed

+610
-238
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+610
-238
lines changed

.github/workflows/lint-entire-content-data-markdown.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
REPORT_AUTHOR: docs-bot
4242
REPORT_LABEL: broken content markdown report
4343
REPORT_REPOSITORY: github/docs-content
44-
run: npm run post-lints -- --path /tmp/lint-results.json
44+
run: npm run lint-report -- --path /tmp/lint-results.json
4545

4646
- uses: ./.github/actions/slack-alert
4747
if: ${{ failure() && github.event_name != 'workflow_dispatch' }}

data/reusables/contributing/content-linter-rules.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
| GHD038 | expired-content | Expired content must be remediated. | warning | expired |
6565
| GHD039 | expiring-soon | Content that expires soon should be proactively addressed. | warning | expired |
6666
| [GHD040](https://github.com/github/docs/blob/main/src/content-linter/README.md) | table-liquid-versioning | Tables must use the correct liquid versioning format | error | tables |
67+
| GHD047 | table-column-integrity | Tables must have consistent column counts across all rows | warning | tables, accessibility, formatting |
6768
| GHD041 | third-party-action-pinning | Code examples that use third-party actions must always pin to a full length commit SHA | error | feature, actions |
6869
| GHD042 | liquid-tag-whitespace | Liquid tags should start and end with one whitespace. Liquid tag arguments should be separated by only one whitespace. | error | liquid, format |
6970
| GHD043 | link-quotation | Internal link titles must not be surrounded by quotations | error | links, url |

next.config.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ import fs from 'fs'
22
import path from 'path'
33

44
import frontmatter from 'gray-matter'
5-
import { languageKeys } from '#src/languages/lib/languages.js'
65
import { ROOT } from '#src/frame/lib/constants.js'
76

7+
// Hard-coded language keys to avoid TypeScript import in config file
8+
const languageKeys = ['en', 'es', 'ja', 'pt', 'zh', 'ru', 'fr', 'ko', 'de']
9+
810
const homepage = path.posix.join(ROOT, 'content/index.md')
911
const { data } = frontmatter(fs.readFileSync(homepage, 'utf8'))
1012
const productIds = data.children

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"move-content": "tsx src/content-render/scripts/move-content.js",
6767
"openapi-docs": "tsx src/rest/docs.js",
6868
"playwright-test": "playwright test --config src/fixtures/playwright.config.ts --project=\"Google Chrome\"",
69-
"post-lints": "tsx src/content-linter/scripts/post-lints.js",
69+
"lint-report": "tsx src/content-linter/scripts/lint-report.js",
7070
"postinstall": "cp package-lock.json .installed.package-lock.json && echo \"Updated .installed.package-lock.json\" # see husky/post-checkout and husky/post-merge",
7171
"precompute-pageinfo": "tsx src/article-api/scripts/precompute-pageinfo.ts",
7272
"prepare": "husky src/workflows/husky",

src/archives/lib/old-versions-utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import path from 'path'
22
import { supported, latest } from '@/versions/lib/enterprise-server-releases.js'
33
import patterns from '@/frame/lib/patterns.js'
44
import nonEnterpriseDefaultVersion from '@/versions/lib/non-enterprise-default-version.js'
5-
import { allVersions } from '@/versions/lib/all-versions.js'
5+
import { allVersions } from '@/versions/lib/all-versions'
66
const latestNewVersion = `enterprise-server@${latest}`
77
const oldVersions = ['dotcom'].concat(supported)
88
const newVersions = Object.keys(allVersions)

src/archives/middleware/archived-enterprise-versions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
} from '@/frame/middleware/set-fastly-surrogate-key.js'
1818
import { readCompressedJsonFileFallbackLazily } from '@/frame/lib/read-json-file.js'
1919
import { archivedCacheControl, languageCacheControl } from '@/frame/middleware/cache-control.js'
20-
import { pathLanguagePrefixed, languagePrefixPathRegex } from '@/languages/lib/languages.js'
20+
import { pathLanguagePrefixed, languagePrefixPathRegex } from '@/languages/lib/languages'
2121
import getRedirect, { splitPathByLanguage } from '@/redirects/lib/get-redirect.js'
2222
import getRemoteJSON from '@/frame/lib/get-remote-json.js'
2323
import { ExtendedRequest } from '@/types'

src/article-api/scripts/precompute-pageinfo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import { brotliCompressSync } from 'zlib'
3030
import chalk from 'chalk'
3131
import { program, Option } from 'commander'
3232

33-
import { languageKeys } from '@/languages/lib/languages.js'
33+
import { languageKeys } from '@/languages/lib/languages'
3434
import { loadPages, loadUnversionedTree } from '@/frame/lib/page-data.js'
3535
import { CACHE_FILE_PATH, getPageInfo } from '../middleware/article-pageinfo'
3636

src/article-api/tests/pagelist.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { beforeAll, describe, expect, test } from 'vitest'
22

33
import { get } from '@/tests/helpers/e2etest.js'
44

5-
import { allVersionKeys } from '@/versions/lib/all-versions.js'
5+
import { allVersionKeys } from '@/versions/lib/all-versions'
66
import nonEnterpriseDefaultVersion from '@/versions/lib/non-enterprise-default-version.js'
77

88
describe.each(allVersionKeys)('pagelist api for %s', async (versionKey) => {

src/audit-logs/lib/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import path from 'path'
22

33
import { readCompressedJsonFileFallback } from '@/frame/lib/read-json-file.js'
4-
import { getOpenApiVersion } from '@/versions/lib/all-versions.js'
4+
import { getOpenApiVersion } from '@/versions/lib/all-versions'
55
import type {
66
AuditLogEventT,
77
CategorizedEvents,

src/audit-logs/tests/rendering.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { describe, expect, test, vi } from 'vitest'
22

33
import { getDOM } from '@/tests/helpers/e2etest.js'
4-
import { allVersions } from '@/versions/lib/all-versions.js'
4+
import { allVersions } from '@/versions/lib/all-versions'
55
import { getCategorizedAuditLogEvents } from '../lib'
66

77
describe('audit log events docs', () => {

0 commit comments

Comments
 (0)