Skip to content

Commit

Permalink
Merge branch 'main' into 11276-search-field-border
Browse files Browse the repository at this point in the history
  • Loading branch information
@argl
argl authored Dec 9, 2024
2 parents 3d6f5f8 + fbd7618 commit ac4cb00
Show file tree
Hide file tree
Showing 8 changed files with 108 additions and 90 deletions.
12 changes: 7 additions & 5 deletions client/src/about/index.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,11 @@ main.about-container {
scroll-margin-top: calc(
var(--sticky-header-without-actions-height) + 1.5rem + 1rem
);
}

> h4,
p {
grid-column: full;

&:first-child {
margin-top: 0;
Expand All @@ -599,11 +604,6 @@ main.about-container {
}
}

> h4,
p {
grid-column: full;
}

h4,
h5 {
font-size: 1.75rem;
Expand Down Expand Up @@ -633,6 +633,7 @@ main.about-container {
".";
grid-template-rows: subgrid;
padding: calc(var(--team-card-padding) - 1px);
user-select: none;

@media (max-width: $screen-sm) {
grid-column: full;
Expand Down Expand Up @@ -722,6 +723,7 @@ main.about-container {
(100% - var(--team-grid-gap) - 2 * var(--team-card-padding)) / 2
)
1fr;
user-select: auto;

li:last-of-type {
max-height: unset;
Expand Down
2 changes: 1 addition & 1 deletion client/src/ui/organisms/footer/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export function Footer() {
<ul className="social-icons">
<li>
<a
href="https://mozilla.social/@mdn"
href="https://mastodon.social/@mdn"
target="_blank"
rel="me noopener noreferrer"
>
Expand Down
16 changes: 8 additions & 8 deletions deployer/poetry.lock
View file

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
View file
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.35.72"
boto3 = "^1.35.76"
python-decouple = "^3.8"
requests = {extras = ["security"], version = "^2.32.3"}
elasticsearch-dsl = "^7.4.1"
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"@inquirer/prompts": "^7.1.0",
"@lit/react": "^1.0.6",
"@mdn/bcd-utils-api": "^0.0.7",
"@mdn/browser-compat-data": "^5.6.21",
"@mdn/browser-compat-data": "^5.6.22",
"@mdn/rari": "^0.1.0",
"@mozilla/glean": "5.0.3",
"@sentry/node": "^8.42.0",
Expand Down Expand Up @@ -166,7 +166,7 @@
"@playwright/test": "^1.49.0",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
"@svgr/webpack": "^8.1.0",
"@swc/core": "^1.10.0",
"@swc/core": "^1.10.1",
"@testing-library/react": "^15.0.7",
"@types/async": "^3.2.24",
"@types/cli-progress": "^3.11.6",
Expand Down
10 changes: 10 additions & 0 deletions server/cli.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
import { concurrently } from "concurrently";
import { rariBin } from "@mdn/rari";
import { filename } from "./filename.js";
import { config } from "dotenv";
import path from "node:path";
import { cwd } from "node:process";

config({
path: path.join(cwd(), process.env.ENV_FILE || ".env"),
});

const { commands, result } = concurrently(
[
Expand All @@ -17,6 +24,9 @@ const { commands, result } = concurrently(
command: `${rariBin} serve -vv`,
name: "rari",
prefixColor: "blue",
env: {
...process.env,
},
},
],
{
Expand Down
16 changes: 11 additions & 5 deletions server/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ if (CURRICULUM_ROOT) {
data = await findCurriculumPageBySlug(slug);
} else {
try {
data = await fetch_from_rari(req.path);
data = await fetch_from_rari(req.path.replace(/index\.json$/, ""));
} catch (error) {
return res.status(500).json(JSON.stringify(error.toString()));
}
Expand Down Expand Up @@ -374,7 +374,9 @@ if (BLOG_ROOT) {
return res.json({ hyData: { posts } });
} else {
try {
const index = await fetch_from_rari(req.path);
const index = await fetch_from_rari(
req.path.replace(/index\.json$/, "")
);
return res.json(index);
} catch (error) {
return res.status(500).json(JSON.stringify(error.toString()));
Expand Down Expand Up @@ -404,7 +406,9 @@ if (BLOG_ROOT) {
return res.json(data);
} else {
try {
const index = await fetch_from_rari(req.path);
const index = await fetch_from_rari(
req.path.replace(/index\.json$/, "")
);
return res.json(index);
} catch (error) {
return res.status(500).json(JSON.stringify(error.toString()));
Expand Down Expand Up @@ -446,7 +450,7 @@ if (contentProxy) {
}
});
app.get("/[^/]+/docs/*/index.json", async (req, res) => {
const url = decodeURI(req.path.replace(/\/index.json$/, ""));
const url = decodeURI(req.path.replace(/\/index\.json$/, ""));
try {
const doc = await buildDocumentFromURL(url);
if (!doc) {
Expand Down Expand Up @@ -513,7 +517,9 @@ if (RARI) {
],
async (req, res) => {
try {
const index = await fetch_from_rari(req.path);
const index = await fetch_from_rari(
req.path.replace(/index\.json$/, "")
);
if (req.path.endsWith(".json")) {
return res.json(index);
}
Expand Down
136 changes: 68 additions & 68 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2193,10 +2193,10 @@
resolved "https://registry.yarnpkg.com/@mdn/bcd-utils-api/-/bcd-utils-api-0.0.7.tgz#555e80c33df520df068943e6b18ebc07f0e24d19"
integrity sha512-IHkkypEjlIkBkx4mJ2//Xbzog9M/Lzne1Sl8db2cIHJ/5pe3NCqSLwSchmqzcUN+/WJr/U+V3tNAbWunk2xZcA==

"@mdn/browser-compat-data@^5.6.21":
version "5.6.21"
resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-5.6.21.tgz#0c423a03d63a679df715d0eece14af38cb76e4d7"
integrity sha512-yFGyNC6llnRbCELh1vH5mhrdSkQCrBs+wOyFjcYa3E9K3qzz6aDKnUSlDfWx+7pMeVr/iSKIdl1P60g2Jxs5sg==
"@mdn/browser-compat-data@^5.6.22":
version "5.6.22"
resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-5.6.22.tgz#d1c675eda679473c1f8777de2d8a49335cae143a"
integrity sha512-tssmUJmywWtEEhCoY9GMPCm9chGWwCytYrlbBaIFgePs6Ui5IBsTPiOyYocRApvC+wFoCjnxhPMYdz51if8Nlg==

"@mdn/dinocons@^0.5.5":
version "0.5.5"
Expand Down Expand Up @@ -2952,74 +2952,74 @@
"@svgr/plugin-jsx" "8.1.0"
"@svgr/plugin-svgo" "8.1.0"

"@swc/[email protected].0":
version "1.10.0"
resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.10.0.tgz#39fd894356f8e858535e96111d34602da0a730c5"
integrity sha512-wCeUpanqZyzvgqWRtXIyhcFK3CqukAlYyP+fJpY2gWc/+ekdrenNIfZMwY7tyTFDkXDYEKzvn3BN/zDYNJFowQ==

"@swc/[email protected].0":
version "1.10.0"
resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.10.0.tgz#d1b95c1db67ac328a96324b800843bc410d17f05"
integrity sha512-0CZPzqTynUBO+SHEl/qKsFSahp2Jv/P2ZRjFG0gwZY5qIcr1+B/v+o74/GyNMBGz9rft+F2WpU31gz2sJwyF4A==

"@swc/[email protected].0":
version "1.10.0"
resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.10.0.tgz#e10510bb028bc3836948cb7345312269cd22295d"
integrity sha512-oq+DdMu5uJOFPtRkeiITc4kxmd+QSmK+v+OBzlhdGkSgoH3yRWZP+H2ao0cBXo93ZgCr2LfjiER0CqSKhjGuNA==

"@swc/[email protected].0":
version "1.10.0"
resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.10.0.tgz#a4826c0b44db5b5a02826a0c47307f5969bcc353"
integrity sha512-Y6+PC8knchEViRxiCUj3j8wsGXaIhuvU+WqrFqV834eiItEMEI9+Vh3FovqJMBE3L7d4E4ZQtgImHCXjrHfxbw==

"@swc/[email protected].0":
version "1.10.0"
resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.10.0.tgz#d4adab4a646be095e3c64226a0150ebe4b874c1a"
integrity sha512-EbrX9A5U4cECCQQfky7945AW9GYnTXtCUXElWTkTYmmyQK87yCyFfY8hmZ9qMFIwxPOH6I3I2JwMhzdi8Qoz7g==

"@swc/[email protected].0":
version "1.10.0"
resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.10.0.tgz#278655c2b2abcb2e7ada031e75e6853777ebce4c"
integrity sha512-TaxpO6snTjjfLXFYh5EjZ78se69j2gDcqEM8yB9gguPYwkCHi2Ylfmh7iVaNADnDJFtjoAQp0L41bTV/Pfq9Cg==

"@swc/[email protected].0":
version "1.10.0"
resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.10.0.tgz#7df236de40a685c1723a904d6dead99eea36a30f"
integrity sha512-IEGvDd6aEEKEyZFZ8oCKuik05G5BS7qwG5hO5PEMzdGeh8JyFZXxsfFXbfeAqjue4UaUUrhnoX+Ze3M2jBVMHw==

"@swc/[email protected].0":
version "1.10.0"
resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.10.0.tgz#99278f8f02c79e03caeeb6d64941d0487e58d7e1"
integrity sha512-UkQ952GSpY+Z6XONj9GSW8xGSkF53jrCsuLj0nrcuw7Dvr1a816U/9WYZmmcYS8tnG2vHylhpm6csQkyS8lpCw==

"@swc/[email protected].0":
version "1.10.0"
resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.10.0.tgz#a5cf2cfa3e31e8e01a3692d7e053aaa788d3cf3e"
integrity sha512-a2QpIZmTiT885u/mUInpeN2W9ClCnqrV2LnMqJR1/Fgx1Afw/hAtiDZPtQ0SqS8yDJ2VR5gfNZo3gpxWMrqdVA==

"@swc/[email protected].0":
version "1.10.0"
resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.10.0.tgz#ee1fdf8e6a627de33501b5a404465a7e676c8689"
integrity sha512-tZcCmMwf483nwsEBfUk5w9e046kMa1iSik4bP9Kwi2FGtOfHuDfIcwW4jek3hdcgF5SaBW1ktnK/lgQLDi5AtA==

"@swc/core@^1.10.0":
version "1.10.0"
resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.10.0.tgz#9584465f7c5feaf34098466c7063c0044fa08bd8"
integrity sha512-+CuuTCmQFfzaNGg1JmcZvdUVITQXJk9sMnl1C2TiDLzOSVOJRwVD4dNo5dljX/qxpMAN+2BIYlwjlSkoGi6grg==
"@swc/[email protected].1":
version "1.10.1"
resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.10.1.tgz#faaaab19b4a039ae67ef661c0144a6f20fe8a78e"
integrity sha512-NyELPp8EsVZtxH/mEqvzSyWpfPJ1lugpTQcSlMduZLj1EASLO4sC8wt8hmL1aizRlsbjCX+r0PyL+l0xQ64/6Q==

"@swc/[email protected].1":
version "1.10.1"
resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.10.1.tgz#754600f453abd24471c202d48836f1161d798f49"
integrity sha512-L4BNt1fdQ5ZZhAk5qoDfUnXRabDOXKnXBxMDJ+PWLSxOGBbWE6aJTnu4zbGjJvtot0KM46m2LPAPY8ttknqaZA==

"@swc/[email protected].1":
version "1.10.1"
resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.10.1.tgz#b0f43c482d0d1819b382a4eb4a0733ce2e386257"
integrity sha512-Y1u9OqCHgvVp2tYQAJ7hcU9qO5brDMIrA5R31rwWQIAKDkJKtv3IlTHF0hrbWk1wPR0ZdngkQSJZple7G+Grvw==

"@swc/[email protected].1":
version "1.10.1"
resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.10.1.tgz#e02a9e22c25ba85ef00335742e549e06284cf33a"
integrity sha512-tNQHO/UKdtnqjc7o04iRXng1wTUXPgVd8Y6LI4qIbHVoVPwksZydISjMcilKNLKIwOoUQAkxyJ16SlOAeADzhQ==

"@swc/[email protected].1":
version "1.10.1"
resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.10.1.tgz#3a0530af8f8bd3717f2f1bd8a2f5183fc58d4cf1"
integrity sha512-x0L2Pd9weQ6n8dI1z1Isq00VHFvpBClwQJvrt3NHzmR+1wCT/gcYl1tp9P5xHh3ldM8Cn4UjWCw+7PaUgg8FcQ==

"@swc/[email protected].1":
version "1.10.1"
resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.10.1.tgz#5eb4d282b047a22896ab1d4627403be4c3e4fa6a"
integrity sha512-yyYEwQcObV3AUsC79rSzN9z6kiWxKAVJ6Ntwq2N9YoZqSPYph+4/Am5fM1xEQYf/kb99csj0FgOelomJSobxQA==

"@swc/[email protected].1":
version "1.10.1"
resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.10.1.tgz#890f2eda3e67ccc6817cdd04eff91e6ad9e761c4"
integrity sha512-tcaS43Ydd7Fk7sW5ROpaf2Kq1zR+sI5K0RM+0qYLYYurvsJruj3GhBCaiN3gkzd8m/8wkqNqtVklWaQYSDsyqA==

"@swc/[email protected].1":
version "1.10.1"
resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.10.1.tgz#4ea7b2a2fab47f801d31ea8b001a141efaa5e6bf"
integrity sha512-D3Qo1voA7AkbOzQ2UGuKNHfYGKL6eejN8VWOoQYtGHHQi1p5KK/Q7V1ku55oxXBsj79Ny5FRMqiRJpVGad7bjQ==

"@swc/[email protected].1":
version "1.10.1"
resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.10.1.tgz#729102669ccdb72e69884cce58e3686ac63d6f36"
integrity sha512-WalYdFoU3454Og+sDKHM1MrjvxUGwA2oralknXkXL8S0I/8RkWZOB++p3pLaGbTvOO++T+6znFbQdR8KRaa7DA==

"@swc/[email protected].1":
version "1.10.1"
resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.10.1.tgz#7d665a7c69642861aed850ecb0cdf5d87197edda"
integrity sha512-JWobfQDbTnoqaIwPKQ3DVSywihVXlQMbDuwik/dDWlj33A8oEHcjPOGs4OqcA3RHv24i+lfCQpM3Mn4FAMfacA==

"@swc/core@^1.10.1":
version "1.10.1"
resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.10.1.tgz#16b3b8284bafb0ecabb253925796883971e5a761"
integrity sha512-rQ4dS6GAdmtzKiCRt3LFVxl37FaY1cgL9kSUTnhQ2xc3fmHOd7jdJK/V4pSZMG1ruGTd0bsi34O2R0Olg9Zo/w==
dependencies:
"@swc/counter" "^0.1.3"
"@swc/types" "^0.1.17"
optionalDependencies:
"@swc/core-darwin-arm64" "1.10.0"
"@swc/core-darwin-x64" "1.10.0"
"@swc/core-linux-arm-gnueabihf" "1.10.0"
"@swc/core-linux-arm64-gnu" "1.10.0"
"@swc/core-linux-arm64-musl" "1.10.0"
"@swc/core-linux-x64-gnu" "1.10.0"
"@swc/core-linux-x64-musl" "1.10.0"
"@swc/core-win32-arm64-msvc" "1.10.0"
"@swc/core-win32-ia32-msvc" "1.10.0"
"@swc/core-win32-x64-msvc" "1.10.0"
"@swc/core-darwin-arm64" "1.10.1"
"@swc/core-darwin-x64" "1.10.1"
"@swc/core-linux-arm-gnueabihf" "1.10.1"
"@swc/core-linux-arm64-gnu" "1.10.1"
"@swc/core-linux-arm64-musl" "1.10.1"
"@swc/core-linux-x64-gnu" "1.10.1"
"@swc/core-linux-x64-musl" "1.10.1"
"@swc/core-win32-arm64-msvc" "1.10.1"
"@swc/core-win32-ia32-msvc" "1.10.1"
"@swc/core-win32-x64-msvc" "1.10.1"

"@swc/counter@^0.1.3":
version "0.1.3"
Expand Down

0 comments on commit ac4cb00

Please sign in to comment.