[pull] main from github:main

.devcontainer/Dockerfile

@@ -1,21 +1,3 @@
 # To find available Node images, see https://mcr.microsoft.com/en-us/product/devcontainers/javascript-node/tags
-
-# [Choice] Node.js version
-ARG VARIANT="dev-20-bullseye"
-FROM mcr.microsoft.com/devcontainers/javascript-node:${VARIANT}
-
-# [Optional] Uncomment this section to install additional OS packages.
-# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-#     && apt-get -y install --no-install-recommends <your-package-list-here>
-
-# [Optional] Uncomment if you want to install an additional version of node using nvm
-# ARG EXTRA_NODE_VERSION=10
-# RUN su node -c "source /usr/local/share/nvm/nvm.sh && nvm install ${EXTRA_NODE_VERSION}"
-
-# [Optional] Uncomment if you want to install more global node modules
-# RUN su node -c "npm install -g <your-package-list-here>"
-
-# Install the GitHub CLI see:
-# https://github.com/microsoft/vscode-dev-containers/blob/3d59f9fe37edb68f78874620f33dac5a62ef2b93/script-library/docs/github.md
-COPY library-scripts/github-debian.sh /tmp/library-scripts/
-RUN apt-get update && bash /tmp/library-scripts/github-debian.sh
+ARG VARIANT=dev-24-bullseye
+FROM mcr.microsoft.com/devcontainers/javascript-node:dev-24-bullseye@sha256:3502f1f21b1989500e8c72ada7d6e496dc4540b0707d4ea4ff743077f88a6c2d

.devcontainer/devcontainer.json

@@ -2,66 +2,77 @@
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.177.0/containers/javascript-node
 // -
 {
-    "name": "docs.github.com",
-    "build": {
-        "dockerfile": "Dockerfile",
-        // Update 'VARIANT' to pick a Node version
-        "args": { "VARIANT": "20" }
-    },
+  "name": "docs.github.com",
+  "build": {
+    "dockerfile": "Dockerfile",
+    // Update 'VARIANT' to pick a Node version
+    "args": { "VARIANT": "24" }
+  },
 
-    // Install features. Type 'feature' in the VS Code command palette for a full list.
-    "features": {
-        "sshd": "latest"
+  // Install features. Type 'feature' in the VS Code command palette for a full list.
+  "features": {
+    "sshd": "latest",
+    "ghcr.io/devcontainers/features/copilot-cli:1": {
+      "version": "prerelease"
     },
+    "ghcr.io/devcontainers/features/github-cli:1": {},
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {}
+  },
 
-    "customizations": {
-        "vscode": {
-            // Set *default* container specific settings.json values on container create.
-            "settings": {
-                "terminal.integrated.shell.linux": "/bin/bash",
-                "cSpell.language": ",en"
-            },
-            // Visual Studio Code extensions which help authoring for docs.github.com.
-            "extensions": [
-                "dbaeumer.vscode-eslint",
-                "sissel.shopify-liquid",
-                "davidanson.vscode-markdownlint",
-                "bierner.markdown-preview-github-styles",
-                "streetsidesoftware.code-spell-checker",
-                "alistairchristie.open-reusables",
-                "AlistairChristie.version-identifier",
-                "GitHub.copilot",
-                "GitHub.copilot-chat"
-            ]
-        },
-        "codespaces": {
-            "repositories": {
-                // allow Codespaces to pull from separate repo when user has access
-                "github/docs-early-access": {
-                    "permissions": {
-                        "contents": "write"
-                    }
-                }
-            }
-        }
+  "customizations": {
+    "vscode": {
+      // Set *default* container specific settings.json values on container create.
+      "settings": {
+        "terminal.integrated.shell.linux": "/bin/bash",
+        "cSpell.language": ",en",
+        "git.autofetch": true
+      },
+      // Visual Studio Code extensions which help authoring for docs.github.com.
+      "extensions": [
+        "dbaeumer.vscode-eslint",
+        "sissel.shopify-liquid",
+        "davidanson.vscode-markdownlint",
+        "bierner.markdown-preview-github-styles",
+        "streetsidesoftware.code-spell-checker",
+        "alistairchristie.open-reusables",
+        "AlistairChristie.version-identifier",
+        "peterbe.ghdocs-goer",
+        "GitHub.copilot",
+        "GitHub.copilot-chat"
+      ]
     },
-
-    // Use 'forwardPorts' to make a list of ports inside the container available locally.
-    "forwardPorts": [4000],
-
-    "portsAttributes": {
-        "4000": {
-            "label": "Preview"
+    "codespaces": {
+      "repositories": {
+        // allow Codespaces to pull from separate repo when user has access
+        "github/docs-early-access": {
+          "permissions": {
+            "contents": "write"
+          }
         }
-    },
-
-    // Use 'postCreateCommand' to run commands after the container is created.
-    "postCreateCommand": "npm ci",
+      }
+    }
+  },
 
-    // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-    "remoteUser": "node",
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  "forwardPorts": [4000],
 
-    "hostRequirements": {
-        "memory": "8gb"
+  "portsAttributes": {
+    "4000": {
+      "label": "Review"
     }
+  },
+
+  // Lifecycle commands
+  // Start a web server and keep it running
+  "postStartCommand": "nohup bash -c 'npm ci && npm start &'",
+  // Set port 4000 to be public
+  "postAttachCommand": "gh cs ports visibility 4000:public -c \"$CODESPACE_NAME\"",
+
+  // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+  "remoteUser": "node",
+
+  "hostRequirements": {
+    "memory": "16gb",
+    "cpus": "4"
+  }
 }

.dockerignore

@@ -4,9 +4,7 @@
 .vscode/
 contributing/
 docs/
+docs-early-access/
 node_modules/
+README.md
 tests/
-# 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
-user-code/

.env.example

@@ -0,0 +1,28 @@
+# This file is a template for what your untracked .env file might look like for local development.
+# Please copy this to a new .env file and fill in the values as needed.
+
+# Requires a running local Elasticsearch service. Can be started via Docker, see https://github.com/github/technical-content/blob/main/engineering/search/elasticsearch-locally.md
+# When this value is unset searches will be proxied to the production Elasticsearch endpoint
+ELASTICSEARCH_URL=http://localhost:9200
+
+# Set for sending events in local development. See https://github.com/github/technical-content/blob/main/analytics/hydro-mock.md
+HYDRO_ENDPOINT=
+HYDRO_SECRET=
+
+# Localization variables
+# See https://github.com/github/docs-internal/tree/main/src/languages#working-with-translated-content-locally
+ENABLED_LANGUAGES=
+TRANSLATIONS_ROOT=
+
+# For running the src/search/scripts/scrape script
+# You may want a lower value depending on your CPU
+BUILD_RECORDS_MAX_CONCURRENT=100
+BUILD_RECORDS_MIN_TIME=
+
+# Set to true to enable the /fastly-cache-test route for debugging Fastly headers
+ENABLE_FASTLY_TESTING=
+
+# Needed to auth for AI search
+CSE_COPILOT_SECRET=
+CSE_COPILOT_ENDPOINT=https://cse-copilot-staging.service.iad.github.net
+

.gitattributes

@@ -1,6 +1,7 @@
 # Set default behavior, in case users don't have core.autocrlf set.
 * text=auto
-# Explicitly declare text files we want to always be normalized and converted
-# to native line endings on checkout.
-*.md text diff=markdown
+# Explicitly declare text files we want to always be normalized, and for
+# Markdown files, enforce LF line endings on checkout.
+*.md text eol=lf diff=markdown
 *.json.br filter=lfs diff=lfs merge=lfs -text
+.github/workflows/*.lock.yml linguist-generated=true merge=ours

.github/CODEOWNERS

@@ -4,14 +4,7 @@
 # https://git-scm.com/docs/gitignore
 
 # Site Policy
-/content/site-policy/ @github/site-policy-admins
-
-# Enterprise
-/data/release-notes/**/*.yml @github/docs-content-enterprise
-src/ghes-releases/lib/enterprise-dates.json @github/docs-content-enterprise
+content/site-policy/ @github/site-policy-admins
 
 # Requires review of #actions-oidc-integration, docs-engineering/issues/1506
-content/actions/deployment/security-hardening-your-deployments/** @github/oidc
-
-# RAI - CELA
-data/reusables/rai/** @github/legal-product
+# content/actions/deployment/security-hardening-your-deployments/** @github/oidc