Skip to content

Commit

Permalink
Merge branch 'main' into MP-455-improve-fraud-resistance
Browse files Browse the repository at this point in the history
  • Loading branch information
caugner committed Oct 27, 2023
2 parents 52e3415 + 55d9d83 commit 75aaf33
Show file tree
Hide file tree
Showing 174 changed files with 5,769 additions and 4,387 deletions.
25 changes: 21 additions & 4 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,10 +1,27 @@
// @ts-check
const path = require("node:path");
const { readGitignoreFiles } = require("eslint-gitignore");

const ignores = readGitignoreFiles({
cwd: path.join(".git", "info"),
patterns: ["exclude"],
});
/** @type {string[]} */
let ignores = [];
try {
ignores = readGitignoreFiles({
cwd: path.join(".git", "info"),
patterns: ["exclude"],
});
} catch (error) {
if (error.code === "ENOTDIR") {
console.log(
`${path.join(
".git",
"info",
"exclude"
)} dir doesn't exist, we're probably a submodule`
);
} else {
throw error;
}
}

module.exports = {
ignorePatterns: ignores,
Expand Down
17 changes: 17 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# ----------------------------------------------------------------------------
# MDN Yari CODEOWNERS
# ----------------------------------------------------------------------------
# Order is important. The last matching pattern takes precedence.
# For more detailed information, see:
# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
# ----------------------------------------------------------------------------

# ----------------------------------------------------------------------------
# DEFAULT OWNERS
# ----------------------------------------------------------------------------
* @mdn/core-dev

# These are @mdn-bot because the auto-merge GHA workflow uses the PAT of this account.
# If another reviewer is specified, update the PAT token or auto-merge will cease to be automatic.
/package.json @mdn-bot
/yarn.lock @mdn-bot
24 changes: 24 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,16 @@ updates:
schedule:
interval: daily
open-pull-requests-limit: 35
groups:
sentry:
patterns:
- "@sentry/*"
types:
patterns:
- "@types/*"
update-types:
- "minor"
- "patch"
ignore:
# Temporarily disable updates to Dinocons
- dependency-name: "@mdn/dinocons"
Expand All @@ -19,11 +29,25 @@ updates:
directory: "/deployer"
schedule:
interval: "weekly"
groups:
dependencies:
patterns:
- "*"
update-types:
- "minor"
- "patch"

- package-ecosystem: "pip"
directory: "/testing/integration"
schedule:
interval: "weekly"
groups:
dependencies:
patterns:
- "*"
update-types:
- "minor"
- "patch"

- package-ecosystem: npm
directory: "/client/pwa"
Expand Down
27 changes: 25 additions & 2 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,45 @@
blog:
- "**/blog/**/*"
browser-compat:
- "client/src/document/ingredients/browser-compatability-table/**/*"
- "**/browser-compatability-table/**/*"
macros:
- "kumascript/**/*"
cloud-function:
- "cloud-function/**/*"
copy:
- "copy/**/*"
dependencies:
- "**/poetry.lock"
- "**/yarn.lock"
deployer:
- "deployer/**/*"
filecheck:
- "filecheck/**/*"
flaw-system:
- "build/flaws/**/*"
github-actions:
- ".github/workflows/**/*"
markdown:
- "markdown/**/*"
metrics:
- "**/telemetry/**/*"
placement:
- "**/placement/**/*"
- "**/pong/**/*"
plus:
- "client/src/plus/**/*"
- "**/plus/**/*"
- "**/plus-docs/**/*"
plus:ai-help:
- "**/ai-help/**/*"
plus:offline:
- "client/pwa/src/**/*"
- "client/src/offline-settings/**/*"
plus:playground:
- "**/playground/**/*"
plus:updates:
- "client/src/plus/updates/**/*"
python:
- "**/*.py"
redirects:
- "cloud-function/src/middlewares/redirect-*"
- "libs/fundamental-redirects/**/*"
12 changes: 6 additions & 6 deletions .github/workflows/dev-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: mdn/content
path: mdn/content
Expand All @@ -51,20 +51,20 @@ jobs:
# so we can figure out each document's last-modified date.
fetch-depth: 0

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: mdn/translated-content
path: mdn/translated-content
# See matching warning for mdn/content checkout step
fetch-depth: 0

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: mdn/mdn-contributor-spotlight
path: mdn/mdn-contributor-spotlight

- name: Setup Node.js environment
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
cache: yarn
Expand Down Expand Up @@ -205,7 +205,7 @@ jobs:
poetry run deployer search-index ../client/build
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1-node16
uses: aws-actions/configure-aws-credentials@v4.0.1
with:
aws-access-key-id: ${{ secrets.DEPLOYER_STAGE_AND_DEV_AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.DEPLOYER_STAGE_AND_DEV_AWS_SECRET_ACCESS_KEY }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/developing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: mdn/content
path: mdn/content

- name: Setup Node.js environment
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
cache: yarn
Expand Down
11 changes: 9 additions & 2 deletions .github/workflows/npm-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,20 @@ jobs:
with:
release-type: node
package-name: release-please-action
changelog-types: |
[
{"type": "feat", "section": "Features", "hidden": false},
{"type": "fix", "section": "Bug Fixes", "hidden": false},
{"type": "enhance", "section": "Enhancements", "hidden": false},
{"type": "chore", "section": "Miscellaneous", "hidden": false}
]
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
if: steps.release.outputs.release_created

- name: Setup
uses: actions/setup-node@v3
uses: actions/setup-node@v4
if: steps.release.outputs.release_created
with:
node-version: 18
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/npm-published-simulation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: mdn/content
path: mdn/content

- name: Setup Node.js environment
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
cache: "yarn"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/performance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# Needed because of
# https://github.com/GoogleChrome/lighthouse-ci/issues/172
ref: ${{ github.event.pull_request.head.sha }}

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: mdn/content
path: mdn/content

- name: Setup Node.js environment
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
cache: yarn
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-deployer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install Python
id: setup-python
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup Node.js environment
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
cache: "yarn"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-kumascript.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup Node.js environment
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
cache: yarn
Expand Down
Loading

0 comments on commit 75aaf33

Please sign in to comment.