Merge branch 'main' into main

Author: lecoursen

.devcontainer/devcontainer.json

@@ -17,7 +17,6 @@
 
 	// Install features. Type 'feature' in the VS Code command palette for a full list.
 	"features": {
-		"git-lfs": "latest",
 		"sshd": "latest"
 	 },
 
@@ -42,7 +41,7 @@
 	},
 
 	// Use 'postCreateCommand' to run commands after the container is created.
-	"postCreateCommand": "git lfs pull && npm ci",
+	"postCreateCommand": "npm ci",
 
 	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	"remoteUser": "node"

.dockerignore

@@ -7,6 +7,8 @@ docs/
 node_modules/
 script/
 tests/
+# These files are currently being added by automation in github/github. We will be removing the files permanently when we fix the broken automation in github/github.
+lib/rest/static/dereferenced
 # Folder is cloned during the preview + prod workflows, the assets are merged into other locations for use before the build
 docs-early-access/
 # During the preview deploy untrusted user code may be cloned into this directory

.env.example

@@ -1 +0,0 @@
-ALLOW_TRANSLATION_COMMITS=

.github/CODEOWNERS

@@ -15,11 +15,6 @@ Dockerfile @github/docs-engineering
 package-lock.json @github/docs-engineering
 package.json @github/docs-engineering
 
-# Localization
-/.github/actions-scripts/msft-create-translation-batch-pr.js @github/docs-engineering
-/.github/workflows/msft-create-translation-batch-pr.yml @github/docs-engineering
-/translations/ @Octomerger
-
 # Site Policy
 /content/site-policy/ @github/site-policy-admins
 

.github/actions-scripts/content-changes-table-comment.js

@@ -28,50 +28,58 @@ const MAX_COMMENT_SIZE = 125000
 
 const PROD_URL = 'https://docs.github.com'
 
-run()
+// When this file is invoked directly from action as opposed to being imported
+if (import.meta.url.endsWith(process.argv[1])) {
+  const owner = context.repo.owner
+  const repo = context.payload.repository.name
+  const baseSHA = context.payload.pull_request.base.sha
+  const headSHA = context.payload.pull_request.head.sha
 
-async function run() {
   const isHealthy = await waitUntilUrlIsHealthy(new URL('/healthz', APP_URL).toString())
   if (!isHealthy) {
-    return core.setFailed(`Timeout waiting for preview environment: ${APP_URL}`)
+    core.setFailed(`Timeout waiting for preview environment: ${APP_URL}`)
+  } else {
+    const markdownTable = await main(owner, repo, baseSHA, headSHA)
+    core.setOutput('changesTable', markdownTable)
   }
+}
 
+async function main(owner, repo, baseSHA, headSHA) {
   const octokit = github.getOctokit(GITHUB_TOKEN)
   // get the list of file changes from the PR
   const response = await octokit.rest.repos.compareCommitsWithBasehead({
-    owner: context.repo.owner,
-    repo: context.payload.repository.name,
-    basehead: `${context.payload.pull_request.base.sha}...${context.payload.pull_request.head.sha}`,
+    owner,
+    repo,
+    basehead: `${baseSHA}...${headSHA}`,
   })
 
   const { files } = response.data
 
-  let markdownTable =
-    '| **Source** | **Preview** | **Production** | **What Changed** |\n|:----------- |:----------- |:----------- |:----------- |\n'
+  const markdownTableHead = [
+    '| **Source** | **Preview** | **Production** | **What Changed** |',
+    '|:----------- |:----------- |:----------- |:----------- |',
+  ]
+  let markdownTable = ''
 
   const pathPrefix = 'content/'
-  const articleFiles = files.filter(
-    ({ filename }) => filename.startsWith(pathPrefix) && !filename.endsWith('/index.md')
-  )
+  const articleFiles = files.filter(({ filename }) => filename.startsWith(pathPrefix))
 
   const lines = await Promise.all(
     articleFiles.map(async (file) => {
       const sourceUrl = file.blob_url
       const fileName = file.filename.slice(pathPrefix.length)
-      const fileUrl = fileName.slice(0, fileName.lastIndexOf('.'))
+      const fileUrl = fileName.replace('/index.md', '').replace(/\.md$/, '')
 
       // get the file contents and decode them
       // this script is called from the main branch, so we need the API call to get the contents from the branch, instead
       const fileContents = await getContents(
-        context.repo.owner,
-        context.payload.repository.name,
+        owner,
+        repo,
         // Can't get its content if it no longer exists.
         // Meaning, you'd get a 404 on the `getContents()` utility function.
         // So, to be able to get necessary meta data about what it *was*,
         // if it was removed, fall back to the 'base'.
-        file.status === 'removed'
-          ? context.payload.pull_request.base.sha
-          : context.payload.pull_request.head.sha,
+        file.status === 'removed' ? baseSHA : headSHA,
         file.filename
       )
 
@@ -164,7 +172,13 @@ async function run() {
     return previous
   }, markdownTable.length)
 
+  if (cappedLines.length) {
+    cappedLines.unshift(...markdownTableHead)
+  }
+
   markdownTable += cappedLines.join('\n')
 
-  core.setOutput('changesTable', markdownTable)
+  return markdownTable
 }
+
+export default main

.github/actions-scripts/enterprise-server-issue-templates/release-issue.md

@@ -101,7 +101,7 @@ This file should be automatically updated, but you can also run `script/update-e
 
 ### 🚢 🛳️ 🚢 Shipping the release branch
 
-- [ ] The megabranch creator should push the search index LFS objects for the public `github/docs` repo. The LFS objects were already pushed for the internal repo after the `sync-english-index-for-<PLAN@RELEASE>` was added to the megabranch. To push the LFS objects to the public repo:
+- [ ] Sync the search indices for the new release:
   1. First navigate to the [sync search indices workflow](https://github.com/github/docs-internal/actions/workflows/sync-search-indices.yml). 
   2. Then, to run the workflow with parameters, click on `Run workflow` button. 
   3. A modal will pop up where you will set the following inputs: