Skip to content

Commit

Permalink
Merge branch 'main' into experiments
Browse files Browse the repository at this point in the history
  • Loading branch information
caugner committed Nov 21, 2023
2 parents 8963168 + 7c040a5 commit 135f96d
Show file tree
Hide file tree
Showing 12 changed files with 279 additions and 241 deletions.
1 change: 1 addition & 0 deletions .github/workflows/prod-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ jobs:
with:
repository: mdn/mdn-studio
path: mdn/mdn-studio
lfs: true
token: ${{ secrets.MDN_STUDIO_PAT }}

# Our usecase is a bit complicated. When the cron schedule runs this workflow,
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/stage-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ jobs:
with:
repository: mdn/mdn-studio
path: mdn/mdn-studio
lfs: true
token: ${{ secrets.MDN_STUDIO_PAT }}

# Our usecase is a bit complicated. When the cron schedule runs this workflow,
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/xyz-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ jobs:
with:
repository: mdn/mdn-studio
path: mdn/mdn-studio
lfs: true
token: ${{ secrets.MDN_STUDIO_PAT }}

- uses: actions/checkout@v4
Expand Down
34 changes: 34 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,39 @@
# Changelog

## [2.35.1](https://github.com/mdn/yari/compare/v2.35.0...v2.35.1) (2023-11-20)


### Miscellaneous

* **deps-dev:** bump @playwright/test from 1.39.0 to 1.40.0 ([#10043](https://github.com/mdn/yari/issues/10043)) ([11ce3aa](https://github.com/mdn/yari/commit/11ce3aaff8a9e74fc5b94891950a8afed80f9dd7))
* **deps-dev:** bump @testing-library/react from 14.1.0 to 14.1.2 ([#10045](https://github.com/mdn/yari/issues/10045)) ([9f2c925](https://github.com/mdn/yari/commit/9f2c92570e450d8cfb55a72e3a9ba28d3e9b4cc4))
* **deps-dev:** bump eslint from 8.53.0 to 8.54.0 ([#10047](https://github.com/mdn/yari/issues/10047)) ([a572fdf](https://github.com/mdn/yari/commit/a572fdf3a159c32e6d1a0411fe0a0c597b9edf32))
* **deps-dev:** bump html-validate from 8.7.0 to 8.7.1 ([#10017](https://github.com/mdn/yari/issues/10017)) ([c6baf8b](https://github.com/mdn/yari/commit/c6baf8ba8b0eb31e0b1325c978d7209391020e43))
* **deps-dev:** bump html-validate from 8.7.1 to 8.7.2 ([#10046](https://github.com/mdn/yari/issues/10046)) ([4686f0b](https://github.com/mdn/yari/commit/4686f0bf94384d1cdda11cd6fa3fe8b06fa88e88))
* **deps-dev:** bump react-router-dom from 6.18.0 to 6.19.0 ([#10041](https://github.com/mdn/yari/issues/10041)) ([38e6d4a](https://github.com/mdn/yari/commit/38e6d4a80deca95cbe0fa372e79e27a0167f99d4))
* **deps-dev:** bump the dependencies group in /testing/integration with 1 update ([#10013](https://github.com/mdn/yari/issues/10013)) ([45820f4](https://github.com/mdn/yari/commit/45820f4ef72f42023a183afc37fc8bebf223818e))
* **deps-dev:** bump ts-loader from 9.5.0 to 9.5.1 ([#10031](https://github.com/mdn/yari/issues/10031)) ([5f86c8f](https://github.com/mdn/yari/commit/5f86c8fc1ec9f0ebd7242abd2b6a0d61a47c9c1a))
* **deps-dev:** bump ts-loader from 9.5.0 to 9.5.1 in /client/pwa ([#10030](https://github.com/mdn/yari/issues/10030)) ([9a1e3ad](https://github.com/mdn/yari/commit/9a1e3adbc53b68ca6e7ff2bb3ff57b944afcc31a))
* **deps:** bump [@zip](https://github.com/zip).js/zip.js from 2.7.30 to 2.7.31 in /client/pwa ([#10038](https://github.com/mdn/yari/issues/10038)) ([21226a7](https://github.com/mdn/yari/commit/21226a735c13d0e682bb877fe636883bc3751524))
* **deps:** bump @mdn/browser-compat-data from 5.3.30 to 5.3.31 ([#10032](https://github.com/mdn/yari/issues/10032)) ([5abb914](https://github.com/mdn/yari/commit/5abb914ae42a952371e410fb291bd06c5c31a571))
* **deps:** bump @mdn/browser-compat-data from 5.3.31 to 5.4.0 ([#10049](https://github.com/mdn/yari/issues/10049)) ([5d8270b](https://github.com/mdn/yari/commit/5d8270baa046d001f918380cfb6f32978285ef5d))
* **deps:** bump @vscode/ripgrep from 1.15.6 to 1.15.7 ([#10042](https://github.com/mdn/yari/issues/10042)) ([5affc92](https://github.com/mdn/yari/commit/5affc926f90a3d1b61b48a4e049125def9f06107))
* **deps:** bump @webref/css from 6.0.0 to 6.7.1 ([#9731](https://github.com/mdn/yari/issues/9731)) ([4a50067](https://github.com/mdn/yari/commit/4a50067efea6b5bb45e1077d2d292dae32322378))
* **deps:** bump file-type from 18.6.0 to 18.7.0 ([#10014](https://github.com/mdn/yari/issues/10014)) ([26275e2](https://github.com/mdn/yari/commit/26275e2668f66460daa05e004bc60f5d5b712563))
* **deps:** bump lru-cache from 10.0.1 to 10.0.2 ([#10015](https://github.com/mdn/yari/issues/10015)) ([0afd35c](https://github.com/mdn/yari/commit/0afd35c3faddda3cbfcb9449366925dab0e7ab6c))
* **deps:** bump lru-cache from 10.0.2 to 10.0.3 ([#10048](https://github.com/mdn/yari/issues/10048)) ([e218e00](https://github.com/mdn/yari/commit/e218e006adc897af67d9d2cdb9eb5af43568c9f7))
* **deps:** bump openai from 4.17.3 to 4.17.4 ([#10018](https://github.com/mdn/yari/issues/10018)) ([7f707d8](https://github.com/mdn/yari/commit/7f707d85b1df5dc1c9aa9cf12a43422c7638cfde))
* **deps:** bump openai from 4.17.4 to 4.17.5 ([#10025](https://github.com/mdn/yari/issues/10025)) ([fd2af62](https://github.com/mdn/yari/commit/fd2af62b839dda0ff26e112e14c82688cf35d80e))
* **deps:** bump openai from 4.17.5 to 4.18.0 ([#10033](https://github.com/mdn/yari/issues/10033)) ([fa87b01](https://github.com/mdn/yari/commit/fa87b014f61ad5b93e0e078c7ed27c5ef97dcb8e))
* **deps:** bump openai from 4.18.0 to 4.19.0 ([#10035](https://github.com/mdn/yari/issues/10035)) ([48dbc83](https://github.com/mdn/yari/commit/48dbc833d3578a162952c3c8d9dd86a6c9f14e64))
* **deps:** bump react-markdown from 9.0.0 to 9.0.1 ([#10024](https://github.com/mdn/yari/issues/10024)) ([35532d9](https://github.com/mdn/yari/commit/35532d9a6d320fcf10e38903cfb553c4794d248d))
* **deps:** bump the dependencies group in /deployer with 1 update ([#10050](https://github.com/mdn/yari/issues/10050)) ([606520e](https://github.com/mdn/yari/commit/606520e3b3b4952daed5490e0c27ad6545d80404))
* **deps:** bump the dependencies group in /deployer with 2 updates ([#10012](https://github.com/mdn/yari/issues/10012)) ([55e1c7f](https://github.com/mdn/yari/commit/55e1c7f47874ff8c00e2a1b5a5fbe5fe6609a33f))
* **deps:** bump the sentry group with 2 updates ([#10022](https://github.com/mdn/yari/issues/10022)) ([821327f](https://github.com/mdn/yari/commit/821327f0599ad672652bc46e988049815ab554b2))
* **deps:** bump web-specs from 2.73.0 to 2.74.0 ([#10023](https://github.com/mdn/yari/issues/10023)) ([4cb364b](https://github.com/mdn/yari/commit/4cb364b64693f01a1172e105713de97222407811))
* **macros/CSSRef:** add "Using CSS math functions" ([#10026](https://github.com/mdn/yari/issues/10026)) ([d727fd8](https://github.com/mdn/yari/commit/d727fd820a5dd158a5725fee278a28653ad2dab3))
* **macros/HTTPSidebar:** remove Cookie Security link ([#9654](https://github.com/mdn/yari/issues/9654)) ([4618778](https://github.com/mdn/yari/commit/46187786c61eeda9fb0a10eaa660a60307ab25dd))

## [2.35.0](https://github.com/mdn/yari/compare/v2.34.2...v2.35.0) (2023-11-10)


Expand Down
4 changes: 2 additions & 2 deletions client/pwa/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
"dev": "webpack-cli --watch"
},
"dependencies": {
"@zip.js/zip.js": "2.7.30",
"@zip.js/zip.js": "2.7.31",
"dexie": "3.2.4"
},
"devDependencies": {
"@types/dexie": "1.3.1",
"ts-loader": "^9.5.1",
"typescript": "^5.2.2",
"typescript": "^5.3.2",
"webpack": "^5.89.0",
"webpack-cli": "^5.1.4",
"workers-preview": "^1.0.6"
Expand Down
16 changes: 8 additions & 8 deletions client/pwa/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -239,10 +239,10 @@
resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==

"@zip.js/[email protected].30":
version "2.7.30"
resolved "https://registry.yarnpkg.com/@zip.js/zip.js/-/zip.js-2.7.30.tgz#88db2d23d682a73c1fc649d1df7012e508591e9c"
integrity sha512-nhMvQCj+TF1ATBqYzFds7v+yxPBhdDYHh8J341KtC1D2UrVBUIYcYK4Jy1/GiTsxOXEiKOXSUxvPG/XR+7jMqw==
"@zip.js/[email protected].31":
version "2.7.31"
resolved "https://registry.yarnpkg.com/@zip.js/zip.js/-/zip.js-2.7.31.tgz#b23a3cd04fc260fb5e7e2faab733418b13467fd7"
integrity sha512-Q4XWZO0IXLEzHB580LUgca/KpwX9/KdtDTvfhqKqiirYL5hHvOmWjD+gyqRhv+Muk7I+LpVZvx9E+WsPv5G4Sw==

acorn-import-assertions@^1.9.0:
version "1.9.0"
Expand Down Expand Up @@ -833,10 +833,10 @@ ts-loader@^9.5.1:
semver "^7.3.4"
source-map "^0.7.4"

typescript@^5.2.2:
version "5.2.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78"
integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==
typescript@^5.3.2:
version "5.3.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.2.tgz#00d1c7c1c46928c5845c1ee8d0cc2791031d4c43"
integrity sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==

uri-js@^4.2.2:
version "4.4.1"
Expand Down
18 changes: 9 additions & 9 deletions deployer/poetry.lock

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

2 changes: 1 addition & 1 deletion 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.28.84"
boto3 = "^1.29.3"
python-decouple = "^3.8"
requests = {extras = ["security"], version = "^2.31.0"}
elasticsearch-dsl = "^7.4.1"
Expand Down
10 changes: 10 additions & 0 deletions kumascript/macros/CSSRef.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ const text = mdn.localStringMap({
'Floating_and_positioning': 'Floating and positioning',
'Margins_borders_and_padding': 'Margins, borders and padding',
'Sizing': 'Sizing',
'Math_functions': 'Math functions',
'Using_CSS_math_functions': 'Using CSS math functions',
'Media_queries': 'Media queries',
'Using_media_queries': 'Using media queries',
'Using_media_queries_for_accessibility': 'Using media queries for accessibility',
Expand Down Expand Up @@ -1352,6 +1354,14 @@ async function buildPropertylist(pages, title) {
</ol>
</details>
</li>
<li class="toggle">
<details>
<summary><%=text['Math_functions']%></summary>
<ol>
<li><%-smartLink(`${cssURL}CSS_Math_Functions/Using_CSS_math_functions`, null, text['Using_CSS_math_functions'], cssURL)%></li>
</ol>
</details>
</li>
<li class="toggle">
<details>
<summary><%=text['Media_queries']%></summary>
Expand Down
3 changes: 1 addition & 2 deletions kumascript/macros/HTTPSidebar.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ var text = mdn.localStringMap({
'ProtocolUpgradeMech': 'Protocol upgrade mechanism',
'CSP': 'Content Security Policy (CSP)'
},
'es': {
'es': {
'HTTP': 'HTTP',
'Basics': 'Fundamentos de HTTP',
'Overview': 'Generalidades de HTTP',
Expand Down Expand Up @@ -321,7 +321,6 @@ var text = mdn.localStringMap({
<ol>
<li><a href="/<%=locale%>/docs/Web/HTTP/CSP"><%=text['CSP']%></a></li>
<li><a href="/<%=locale%>/docs/Web/HTTP/Headers/Strict-Transport-Security">HTTP Strict Transport Security (HSTS)</a></li>
<li><a href="/<%=locale%>/docs/Web/HTTP/Cookies#Secure_and_HttpOnly_cookies">Cookie security</a></li>
<li><a href="/<%=locale%>/docs/Web/HTTP/Headers/X-Content-Type-Options">X-Content-Type-Options</a></li>
<li><a href="/<%=locale%>/docs/Web/HTTP/Headers/X-Frame-Options">X-Frame-Options</a></li>
<li><a href="/<%=locale%>/docs/Web/HTTP/Headers/X-XSS-Protection">X-XSS-Protection</a></li>
Expand Down
38 changes: 19 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mdn/yari",
"version": "2.35.0",
"version": "2.35.1",
"repository": "https://github.com/mdn/yari",
"license": "MPL-2.0",
"author": "MDN Web Docs",
Expand Down Expand Up @@ -69,13 +69,13 @@
"@codemirror/theme-one-dark": "^6.1.2",
"@fast-csv/parse": "^4.3.6",
"@mdn/bcd-utils-api": "^0.0.5",
"@mdn/browser-compat-data": "^5.3.31",
"@mdn/browser-compat-data": "^5.4.0",
"@mozilla/glean": "2.0.5",
"@sentry/integrations": "^7.80.1",
"@sentry/node": "^7.80.1",
"@stripe/stripe-js": "^2.1.11",
"@sentry/integrations": "^7.81.0",
"@sentry/node": "^7.81.0",
"@stripe/stripe-js": "^2.2.0",
"@use-it/interval": "^1.0.0",
"@vscode/ripgrep": "^1.15.6",
"@vscode/ripgrep": "^1.15.7",
"@webref/css": "^6.7.1",
"accept-language-parser": "^1.5.0",
"async": "^3.2.5",
Expand Down Expand Up @@ -110,14 +110,14 @@
"is-svg": "^5.0.0",
"js-yaml": "^4.1.0",
"loglevel": "^1.8.1",
"lru-cache": "^10.0.2",
"lru-cache": "^10.0.3",
"md5-file": "^5.0.0",
"mdast-util-from-markdown": "^2.0.0",
"mdast-util-phrasing": "^4.0.0",
"mdn-data": "^2.3.0",
"open": "^9.1.0",
"open-editor": "^4.1.1",
"openai": "^4.18.0",
"openai": "^4.19.1",
"prism-svelte": "^0.5.0",
"prismjs": "^1.29.0",
"react-markdown": "^9.0.1",
Expand Down Expand Up @@ -148,20 +148,20 @@
"@babel/preset-env": "^7.23.3",
"@mdn/dinocons": "^0.5.5",
"@mdn/minimalist": "^2.0.4",
"@playwright/test": "^1.39.0",
"@playwright/test": "^1.40.0",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
"@supabase/supabase-js": "^2.38.4",
"@supabase/supabase-js": "^2.38.5",
"@svgr/webpack": "^8.1.0",
"@swc/core": "^1.3.96",
"@testing-library/react": "^14.1.0",
"@swc/core": "^1.3.99",
"@testing-library/react": "^14.1.2",
"@types/async": "^3.2.23",
"@types/cli-progress": "^3.11.5",
"@types/imagemin": "^8.0.4",
"@types/jest": "^29.5.8",
"@types/imagemin": "^8.0.5",
"@types/jest": "^29.5.9",
"@types/mdast": "^4.0.3",
"@types/node": "^18.16.6",
"@types/react": "^18.2.37",
"@types/react-dom": "^18.2.15",
"@types/react": "^18.2.38",
"@types/react-dom": "^18.2.16",
"@types/react-modal": "^3.16.3",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
Expand All @@ -179,7 +179,7 @@
"css-minimizer-webpack-plugin": "^5.0.1",
"diff": "^5.1.0",
"downshift": "^7.6.1",
"eslint": "^8.53.0",
"eslint": "^8.54.0",
"eslint-config-react-app": "^7.0.1",
"eslint-gitignore": "^0.1.0",
"eslint-plugin-flowtype": "^8.0.3",
Expand All @@ -195,7 +195,7 @@
"file-loader": "^6.2.0",
"foreman": "^3.0.1",
"history": "^5.2.0",
"html-validate": "^8.7.1",
"html-validate": "^8.7.2",
"html-webpack-plugin": "^5.5.3",
"husky": "^8.0.3",
"identity-obj-proxy": "^3.0.0",
Expand Down Expand Up @@ -226,7 +226,7 @@
"react-is": "^18.2.0",
"react-refresh": "^0.14",
"react-router": "^6.17.0",
"react-router-dom": "^6.18.0",
"react-router-dom": "^6.19.0",
"remark-prettier": "^2.0.0",
"resolve": "^1.22.8",
"resolve-url-loader": "^5.0.0",
Expand Down
Loading

0 comments on commit 135f96d

Please sign in to comment.