Skip to content

Commit

Permalink
Merge branch 'main' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
caugner committed Apr 29, 2024
2 parents eb5ca72 + 7a24a17 commit 5efa01f
Show file tree
Hide file tree
Showing 7 changed files with 147 additions and 152 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ export function LocalizedContentNote({
"此页面由社区从英文翻译而来。了解更多并加入 MDN Web Docs 社区。",
url: "/zh-CN/docs/MDN/Community/Contributing/Translated_content#活跃语言",
},
"zh-TW": {
linkText:
"此頁面由社群從英文翻譯而來。了解更多並加入 MDN Web Docs 社群。",
url: "/zh-TW/docs/MDN/Community/Contributing/Translated_content#活躍的語言",
},
};
const inactiveLocaleNoteContent = {
"en-US": {
Expand Down
78 changes: 39 additions & 39 deletions deployer/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions deployer/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ readme = "README.md"
[tool.poetry.dependencies]
python = "^3.10"
click = "^8.1.7"
boto3 = "^1.34.88"
boto3 = "^1.34.93"
python-decouple = "^3.8"
requests = {extras = ["security"], version = "^2.31.0"}
elasticsearch-dsl = "^7.4.1"
Expand All @@ -21,7 +21,7 @@ unidiff = "^0.7.5"
[tool.poetry.dev-dependencies]
black = "^24.4"
flake8 = "^7.0.0"
pytest = "^8.1.1"
pytest = "^8.2.0"

[tool.poetry.scripts]
deployer = "deployer.main:cli"
Expand Down
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"cookie": "^0.6.0",
"cookie-parser": "^1.4.6",
"css-tree": "^2.3.1",
"dayjs": "^1.11.10",
"dayjs": "^1.11.11",
"dexie": "^4.0.4",
"dotenv": "^16.4.5",
"ejs": "^3.1.10",
Expand All @@ -108,11 +108,11 @@
"imagemin-mozjpeg": "^10.0.0",
"imagemin-pngquant": "^9.0.2",
"imagemin-svgo": "^10.0.1",
"inquirer": "^9.2.19",
"inquirer": "^9.2.20",
"is-svg": "^5.0.0",
"js-yaml": "^4.1.0",
"loglevel": "^1.9.1",
"lru-cache": "^10.2.1",
"lru-cache": "^10.2.2",
"md5-file": "^5.0.0",
"mdast-util-from-markdown": "^2.0.0",
"mdast-util-phrasing": "^4.1.0",
Expand Down Expand Up @@ -156,18 +156,18 @@
"@mdn/dinocons": "^0.5.5",
"@mdn/minimalist": "^2.0.4",
"@playwright/test": "^1.43.1",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.13",
"@svgr/webpack": "^8.1.0",
"@swc/core": "^1.5.0",
"@testing-library/react": "^15.0.4",
"@testing-library/react": "^15.0.5",
"@types/async": "^3.2.24",
"@types/cli-progress": "^3.11.5",
"@types/imagemin": "^8.0.5",
"@types/jest": "^29.5.12",
"@types/mdast": "^4.0.3",
"@types/node": "^18.16.6",
"@types/react": "^18.3.0",
"@types/react-dom": "^18.2.25",
"@types/react": "^18.3.1",
"@types/react-dom": "^18.3.0",
"@types/react-modal": "^3.16.3",
"babel-jest": "^29.7.0",
"babel-loader": "^9.1.3",
Expand All @@ -188,11 +188,11 @@
"eslint-gitignore": "^0.1.0",
"eslint-plugin-flowtype": "^8.0.3",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jest": "^28.2.0",
"eslint-plugin-jest": "^28.3.0",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-n": "^17.3.1",
"eslint-plugin-react": "^7.34.1",
"eslint-plugin-react-hooks": "^4.6.1",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-unicorn": "^52.0.0",
"eslint-webpack-plugin": "^4.1.0",
"extend": "^3.0.2",
Expand Down Expand Up @@ -223,11 +223,11 @@
"prettier": "^3.2.5",
"prettier-plugin-packagejson": "^2.5.0",
"prompts": "^2.4.2",
"react": "^18.3.0",
"react": "^18.3.1",
"react-app-polyfill": "^3.0.0",
"react-dev-utils": "^12.0.1",
"react-dom": "^18.2.0",
"react-is": "^18.3.0",
"react-dom": "^18.3.1",
"react-is": "^18.3.1",
"react-refresh": "^0.14",
"react-router": "^6.17.0",
"react-router-dom": "^6.23.0",
Expand Down
Loading

0 comments on commit 5efa01f

Please sign in to comment.