Skip to content

Commit 2f294e4

Browse files
authored
Node 22 (#52828)
1 parent eaa13fa commit 2f294e4

File tree

6 files changed

+87
-93
lines changed

6 files changed

+87
-93
lines changed

.devcontainer/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# To find available Node images, see https://mcr.microsoft.com/en-us/product/devcontainers/javascript-node/tags
22

33
# [Choice] Node.js version
4-
ARG VARIANT="dev-20-bullseye"
4+
ARG VARIANT="dev-22-bullseye"
55
FROM mcr.microsoft.com/devcontainers/javascript-node:${VARIANT}
66

77
# [Optional] Uncomment this section to install additional OS packages.

.devcontainer/devcontainer.json

+55-55
Original file line numberDiff line numberDiff line change
@@ -2,67 +2,67 @@
22
// https://github.com/microsoft/vscode-dev-containers/tree/v0.177.0/containers/javascript-node
33
// -
44
{
5-
"name": "docs.github.com",
6-
"build": {
7-
"dockerfile": "Dockerfile",
8-
// Update 'VARIANT' to pick a Node version
9-
"args": { "VARIANT": "20" }
10-
},
5+
"name": "docs.github.com",
6+
"build": {
7+
"dockerfile": "Dockerfile",
8+
// Update 'VARIANT' to pick a Node version
9+
"args": { "VARIANT": "22" }
10+
},
1111

12-
// Install features. Type 'feature' in the VS Code command palette for a full list.
13-
"features": {
14-
"sshd": "latest"
15-
},
12+
// Install features. Type 'feature' in the VS Code command palette for a full list.
13+
"features": {
14+
"sshd": "latest"
15+
},
1616

17-
"customizations": {
18-
"vscode": {
19-
// Set *default* container specific settings.json values on container create.
20-
"settings": {
21-
"terminal.integrated.shell.linux": "/bin/bash",
22-
"cSpell.language": ",en"
23-
},
24-
// Visual Studio Code extensions which help authoring for docs.github.com.
25-
"extensions": [
26-
"dbaeumer.vscode-eslint",
27-
"sissel.shopify-liquid",
28-
"davidanson.vscode-markdownlint",
29-
"bierner.markdown-preview-github-styles",
30-
"streetsidesoftware.code-spell-checker",
31-
"alistairchristie.open-reusables",
32-
"AlistairChristie.version-identifier",
33-
"peterbe.ghdocs-goer",
34-
"GitHub.copilot",
35-
"GitHub.copilot-chat"
36-
]
37-
},
38-
"codespaces": {
39-
"repositories": {
40-
// allow Codespaces to pull from separate repo when user has access
41-
"github/docs-early-access": {
42-
"permissions": {
43-
"contents": "write"
44-
}
45-
}
46-
}
47-
}
17+
"customizations": {
18+
"vscode": {
19+
// Set *default* container specific settings.json values on container create.
20+
"settings": {
21+
"terminal.integrated.shell.linux": "/bin/bash",
22+
"cSpell.language": ",en"
23+
},
24+
// Visual Studio Code extensions which help authoring for docs.github.com.
25+
"extensions": [
26+
"dbaeumer.vscode-eslint",
27+
"sissel.shopify-liquid",
28+
"davidanson.vscode-markdownlint",
29+
"bierner.markdown-preview-github-styles",
30+
"streetsidesoftware.code-spell-checker",
31+
"alistairchristie.open-reusables",
32+
"AlistairChristie.version-identifier",
33+
"peterbe.ghdocs-goer",
34+
"GitHub.copilot",
35+
"GitHub.copilot-chat"
36+
]
4837
},
38+
"codespaces": {
39+
"repositories": {
40+
// allow Codespaces to pull from separate repo when user has access
41+
"github/docs-early-access": {
42+
"permissions": {
43+
"contents": "write"
44+
}
45+
}
46+
}
47+
}
48+
},
4949

50-
// Use 'forwardPorts' to make a list of ports inside the container available locally.
51-
"forwardPorts": [4000],
50+
// Use 'forwardPorts' to make a list of ports inside the container available locally.
51+
"forwardPorts": [4000],
5252

53-
"portsAttributes": {
54-
"4000": {
55-
"label": "Preview"
56-
}
57-
},
53+
"portsAttributes": {
54+
"4000": {
55+
"label": "Preview"
56+
}
57+
},
5858

59-
// Use 'postCreateCommand' to run commands after the container is created.
60-
"postCreateCommand": "npm ci",
59+
// Use 'postCreateCommand' to run commands after the container is created.
60+
"postCreateCommand": "npm ci",
6161

62-
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
63-
"remoteUser": "node",
62+
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
63+
"remoteUser": "node",
6464

65-
"hostRequirements": {
66-
"memory": "8gb"
67-
}
65+
"hostRequirements": {
66+
"memory": "8gb"
67+
}
6868
}

.github/workflows/local-dev.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ jobs:
2121
- name: Check out repo
2222
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2323

24-
- name: Install dependencies
25-
run: npm install
24+
- uses: ./.github/actions/node-npm-setup
2625

2726
- uses: ./.github/actions/get-docs-early-access
2827
if: ${{ github.repository == 'github/docs-internal' }}

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# --------------------------------------------------------------------------------
66
# To update the sha, run `docker pull node:$VERSION-alpine`
77
# look for something like: `Digest: sha256:0123456789abcdef`
8-
FROM node:20-alpine@sha256:66f7f89199daea88a6b5d5aadaa6d20f7a16a90fc35274deda8e901e267d4bd7 AS base
8+
FROM node:22-alpine@sha256:c13b26e7e602ef2f1074aef304ce6e9b7dd284c419b35d89fcf3cc8e44a8def9 AS base
99

1010
# This directory is owned by the node user
1111
ARG APP_HOME=/home/node/app

package-lock.json

+26-31
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -320,12 +320,12 @@
320320
"devDependencies": {
321321
"@actions/core": "^1.10.0",
322322
"@actions/github": "^6.0.0",
323-
"@axe-core/playwright": "^4.9.1",
323+
"@axe-core/playwright": "^4.10.0",
324324
"@github/markdownlint-github": "^0.6.2",
325325
"@graphql-inspector/core": "^6.1.0",
326326
"@graphql-tools/load": "^8.0.0",
327327
"@octokit/rest": "21.0.2",
328-
"@playwright/test": "1.46.1",
328+
"@playwright/test": "^1.48.1",
329329
"@types/accept-language-parser": "1.5.6",
330330
"@types/connect-datadog": "0.0.10",
331331
"@types/connect-timeout": "0.0.39",
@@ -391,7 +391,7 @@
391391
"esm": "^3.2.25"
392392
},
393393
"engines": {
394-
"node": "^18 || ^20 || ^22"
394+
"node": "^20 || ^22"
395395
},
396396
"cacheDirectories": [
397397
"node_modules",

0 commit comments

Comments
 (0)