Skip to content

Commit 2c23268

Browse files
authored
Merge branch 'github:main' into main
2 parents 7df0d25 + f29a870 commit 2c23268

File tree

24,420 files changed

+5700284
-8455265
lines changed

Some content is hidden

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

24,420 files changed

+5700284
-8455265
lines changed

.babelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"presets": ["next/babel"],
3-
"plugins": [["styled-components", { "ssr": true }], "@babel/plugin-syntax-top-level-await"]
3+
"plugins": ["styled-components"]
44
}

.devcontainer/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.177.0/containers/javascript-node/.devcontainer/base.Dockerfile
1+
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/blob/main/containers/javascript-node/.devcontainer/base.Dockerfile
22

3-
# [Choice] Node.js version: 16, 14, 12
4-
ARG VARIANT="16-buster"
3+
# [Choice] Node.js version
4+
ARG VARIANT="18-buster"
55
FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
66

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

.devcontainer/devcontainer.json

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"name": "docs.github.com",
66
"build": {
77
"dockerfile": "Dockerfile",
8-
// Update 'VARIANT' to pick a Node version: 12, 14, 16
9-
"args": { "VARIANT": "16" }
8+
// Update 'VARIANT' to pick a Node version
9+
"args": { "VARIANT": "18" }
1010
},
1111

1212
// Set *default* container specific settings.json values on container create.
@@ -17,7 +17,7 @@
1717

1818
// Install features. Type 'feature' in the VS Code command palette for a full list.
1919
"features": {
20-
"git-lfs": "latest"
20+
"sshd": "latest"
2121
},
2222

2323
// Visual Studio Code extensions which help authoring for docs.github.com.
@@ -32,11 +32,21 @@
3232

3333
// Use 'forwardPorts' to make a list of ports inside the container available locally.
3434
"forwardPorts": [4000],
35+
36+
"portsAttributes": {
37+
"4000": {
38+
"label": "Preview",
39+
"onAutoForward": "openPreview"
40+
}
41+
},
3542

3643
// Use 'postCreateCommand' to run commands after the container is created.
37-
"postCreateCommand": "git lfs pull && npm ci",
44+
"postCreateCommand": "npm ci",
3845

3946
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
4047
"remoteUser": "node"
41-
48+
,
49+
"hostRequirements": {
50+
"memory": "8gb"
51+
}
4252
}

.devcontainer/test-custom-devcontainer/devcontainer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"name": "test",
3+
"image": "mcr.microsoft.com/devcontainers/universal:linux",
34

45
"settings": {
56
"terminal.integrated.shell.linux": "/bin/zsh",

.dockerignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ docs/
77
node_modules/
88
script/
99
tests/
10-
lib/rest/static/dereferenced
1110
# Folder is cloned during the preview + prod workflows, the assets are merged into other locations for use before the build
1211
docs-early-access/
1312
# During the preview deploy untrusted user code may be cloned into this directory

.env.example

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
ALLOW_TRANSLATION_COMMITS=

.eslintrc.cjs

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
module.exports = {
2+
env: {
3+
browser: true,
4+
commonjs: true,
5+
es2020: true,
6+
node: true,
7+
},
8+
parser: '@babel/eslint-parser',
9+
extends: ['eslint:recommended', 'standard', 'prettier'],
10+
parserOptions: {
11+
ecmaVersion: 11,
12+
requireConfigFile: 'false',
13+
babelOptions: { configFile: './.babelrc' },
14+
sourceType: 'module',
15+
},
16+
ignorePatterns: ['tmp/*', '!/.*', '/.next/', 'script/bookmarklets/*'],
17+
rules: {
18+
'import/no-extraneous-dependencies': ['error', { packageDir: '.' }],
19+
},
20+
overrides: [
21+
{
22+
files: ['**/tests/**/*.js'],
23+
env: {
24+
jest: true,
25+
},
26+
},
27+
{
28+
files: ['**/*.tsx', '**/*.ts'],
29+
plugins: ['@typescript-eslint', 'jsx-a11y'],
30+
extends: ['plugin:jsx-a11y/recommended'],
31+
parser: '@typescript-eslint/parser',
32+
rules: {
33+
camelcase: 'off',
34+
'no-unused-vars': 'off',
35+
'no-undef': 'off',
36+
'no-use-before-define': 'off',
37+
'@typescript-eslint/no-unused-vars': ['error'],
38+
'jsx-a11y/no-onchange': 'off',
39+
},
40+
},
41+
],
42+
}

.eslintrc.js

Lines changed: 0 additions & 42 deletions
This file was deleted.

.github/CODEOWNERS

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,6 @@ Dockerfile @github/docs-engineering
1515
package-lock.json @github/docs-engineering
1616
package.json @github/docs-engineering
1717

18-
# Localization
19-
/.github/actions-scripts/create-translation-batch-pr.js @github/docs-localization
20-
/.github/workflows/create-translation-batch-pr.yml @github/docs-localization
21-
/.github/workflows/crowdin.yml @github/docs-localization
22-
/crowdin*.yml @github/docs-engineering @github/docs-localization
23-
/translations/ @github/docs-engineering @github/docs-localization @Octomerger
24-
/translations/log/ @github/docs-localization @Octomerger
25-
2618
# Site Policy
2719
/content/site-policy/ @github/site-policy-admins
2820

@@ -32,3 +24,6 @@ package.json @github/docs-engineering
3224
/contributing/content-model.md @github/docs-content-strategy
3325
/contributing/content-style-guide.md @github/docs-content-strategy
3426
/contributing/content-templates.md @github/docs-content-strategy
27+
28+
# Requires review of #actions-oidc-integration, docs-engineering/issues/1506
29+
content/actions/deployment/security-hardening-your-deployments/** @github/oidc

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,20 @@
11
<!--
2-
Thank you for contributing to this project! You must fill out the information below before we can review this pull request. By explaining why you're making a change (or linking to a pull request) and what changes you've made, we can triage your pull request to the best possible team for review.
3-
4-
See our [CONTRIBUTING.md](/main/CONTRIBUTING.md) for information how to contribute.
5-
6-
For changes to content in [site policy](https://github.com/github/docs/tree/main/content/github/site-policy), see the [CONTRIBUTING guide in the site-policy repo](https://github.com/github/site-policy/blob/main/CONTRIBUTING.md).
7-
8-
We cannot accept changes to our translated content right now. See the [types-of-contributions.md](/main/contributing/types-of-contributions.md#earth_asia-translations) for more information.
9-
10-
Thanks again!
2+
Thank you for contributing to this project! You must fill out the information below before we can review this pull request. By explaining why you're making a change (or linking to an issue) and what changes you've made, we can triage your pull request to the best possible team for review.
113
-->
124

135
### Why:
146

15-
Closes [issue link]
7+
Closes ISSUE
168

17-
<!--
18-
- If there's an existing issue for your change, please link to it.
19-
- If there's _not_ an existing issue, please open one first to make it more likely that this update will be accepted: https://github.com/github/docs/issues/new/choose. -->
9+
<!-- If there's an existing issue for your change, please replace ISSUE above with a link to the issue.
10+
If there's _not_ an existing issue, please open one first to make it more likely that this update will be accepted: https://github.com/github/docs/issues/new/choose. -->
2011

21-
### What's being changed:
12+
### What's being changed (if available, include any code snippets, screenshots, or gifs):
2213

23-
<!-- Share artifacts of the changes, be they code snippets, GIFs or screenshots; whatever shares the most context. If you made changes to the `content` directory, a table will populate in a comment below with the staging and live article links -->
14+
<!-- Let us know what you are changing. Share anything that could provide the most context.
15+
If you made changes to the `content` directory, a table will populate in a comment below with links to the preview and current production articles. -->
2416

2517
### Check off the following:
2618

27-
- [ ] I have reviewed my changes in staging (look for "Automatically generated comment" and click **Modified** to view your latest changes).
19+
- [ ] I have reviewed my changes in staging (look for the "Automatically generated comment" and click the links in the "Preview" column to view your latest changes).
2820
- [ ] For content changes, I have completed the [self-review checklist](https://github.com/github/docs/blob/main/contributing/self-review.md#self-review).
29-
30-
### Writer impact (This section is for GitHub staff members only):
31-
32-
- [ ] This pull request impacts the contribution experience
33-
- [ ] I have added the 'writer impact' label
34-
- [ ] I have added a description and/or a video demo of the changes below (e.g. a "before and after video")
35-
36-
<!-- Description of the writer impact here -->

0 commit comments

Comments
 (0)