Merge remote-tracking branch 'upstream/main' into rari-beta

mdn · Nov 27, 2024 · e32e0cb · e32e0cb
2 parents 4e73f09 + 040f52f
commit e32e0cb
Show file tree

Hide file tree

Showing 11 changed files with 177 additions and 137 deletions.
diff --git a/.github/workflows/prod-build.yml b/.github/workflows/prod-build.yml
@@ -239,7 +239,7 @@ jobs:
 
           # Surveys.
           REACT_APP_SURVEY_START_HOMEPAGE_FEEDBACK_2024: 1731369600000 # new Date("2024-11-12Z").getTime()
-          REACT_APP_SURVEY_END_HOMEPAGE_FEEDBACK_2024: 1732665600000 # new Date("2024-11-27Z").getTime()
+          REACT_APP_SURVEY_END_HOMEPAGE_FEEDBACK_2024: 1733184000000 # new Date("2024-12-03Z").getTime()
           REACT_APP_SURVEY_RATE_FROM_HOMEPAGE_FEEDBACK_2024: 0.0
           REACT_APP_SURVEY_RATE_TILL_HOMEPAGE_FEEDBACK_2024: 1 # 100%
           REACT_APP_SURVEY_START_WEBDX_EDITING_2024: 1731628800000 # new Date("2024-11-15Z").getTime()

diff --git a/client/pwa/package.json b/client/pwa/package.json
@@ -18,7 +18,7 @@
   "devDependencies": {
     "@types/dexie": "1.3.35",
     "ts-loader": "^9.5.1",
-    "typescript": "^5.6.3",
+    "typescript": "^5.7.2",
     "webpack": "^5.96.1",
     "webpack-cli": "^5.1.4",
     "workers-preview": "^1.0.6"

diff --git a/client/pwa/yarn.lock b/client/pwa/yarn.lock
@@ -842,10 +842,10 @@ ts-loader@^9.5.1:
     semver "^7.3.4"
     source-map "^0.7.4"
 
-typescript@^5.6.3:
-  version "5.6.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.3.tgz#5f3449e31c9d94febb17de03cc081dd56d81db5b"
-  integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==
+typescript@^5.7.2:
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.2.tgz#3169cf8c4c8a828cde53ba9ecb3d2b1d5dd67be6"
+  integrity sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==
 
 update-browserslist-db@^1.1.1:
   version "1.1.1"

diff --git a/client/src/document/ingredients/browser-compatibility-table/index.scss b/client/src/document/ingredients/browser-compatibility-table/index.scss
@@ -146,6 +146,7 @@
   line-height: 1;
   padding-top: 0.5rem;
   position: relative;
+  text-orientation: sideways;
   transform: rotate(180deg);
   white-space: nowrap;
   -ms-writing-mode: tb-rl;

diff --git a/client/src/ui/atoms/icon/index.scss b/client/src/ui/atoms/icon/index.scss
@@ -1,17 +1,17 @@
 $icons: "add-filled", "add", "altname", "bell", "bell-filled", "bell-ring",
   "bookmark-filled", "bookmark", "cancel", "chatgpt", "checkmark", "chevron",
   "chrome", "critical", "curriculum-next", "curriculum-prev", "deno",
-  "deprecated", "desktop", "disabled", "edge", "edit", "edit-filled", "ellipses",
-  "experimental", "external", "eye-filled", "eye", "feed", "filter", "footnote",
-  "github-mark-small", "ie", "information", "highlight", "history", "language",
-  "mastodon", "menu-filled", "menu", "mobile", "more", "theme-dark", "new-topic",
-  "next", "no", "nodejs", "nonstandard", "note-info", "note-warning",
-  "note-deprecated", "opera", "padlock", "partial", "play", "prefix", "preview",
-  "previous", "question-mark", "queue", "queued", "quote", "return", "safari",
-  "samsunginternet", "search", "send", "server", "sidebar", "simple-firefox",
-  "small-arrow", "theme-light", "star-filled", "star", "theme-os-default",
-  "thumbs-down", "thumbs-up", "trash", "trash-filled", "twitter-x", "unknown",
-  "warning", "webview", "yes", "yes-circle";
+  "deprecated", "desktop", "disabled", "edge", "edit", "edit-filled",
+  "ellipses", "experimental", "external", "eye-filled", "eye", "feed", "filter",
+  "footnote", "github-mark-small", "ie", "information", "highlight", "history",
+  "language", "mastodon", "menu-filled", "menu", "mobile", "more", "theme-dark",
+  "new-topic", "next", "no", "nodejs", "nonstandard", "note-info",
+  "note-warning", "note-deprecated", "opera", "padlock", "partial", "play",
+  "prefix", "preview", "previous", "question-mark", "queue", "queued", "quote",
+  "return", "safari", "samsunginternet", "search", "send", "server", "sidebar",
+  "simple-firefox", "small-arrow", "theme-light", "star-filled", "star",
+  "theme-os-default", "thumbs-down", "thumbs-up", "trash", "trash-filled",
+  "twitter-x", "unknown", "warning", "webview", "yes", "yes-circle";
 
 .icon {
   --size: var(--icon-size, 1rem);

diff --git a/client/src/ui/base/_themes.scss b/client/src/ui/base/_themes.scss
@@ -40,7 +40,10 @@
       $mdn-theme-light-icon-success,
       $alpha: -0.9
     )};
-  --background-del: #{color.adjust($mdn-theme-light-icon-critical, $alpha: -0.5)};
+  --background-del: #{color.adjust(
+      $mdn-theme-light-icon-critical,
+      $alpha: -0.5
+    )};
   --background-ins: #{color.adjust($mdn-theme-light-icon-success, $alpha: -0.5)};
 
   --border-primary: #{$mdn-theme-light-border-primary};
@@ -354,7 +357,10 @@
       $mdn-theme-light-icon-success,
       $alpha: -0.9
     )};
-  --background-del: #{color.adjust($mdn-theme-light-icon-critical, $alpha: -0.5)};
+  --background-del: #{color.adjust(
+      $mdn-theme-light-icon-critical,
+      $alpha: -0.5
+    )};
   --background-ins: #{color.adjust($mdn-theme-light-icon-success, $alpha: -0.5)};
 
   --border-primary: #{$mdn-theme-dark-border-primary};

diff --git a/client/src/ui/organisms/placement/index.tsx b/client/src/ui/organisms/placement/index.tsx
@@ -83,8 +83,41 @@ function TopPlacementFallbackContent() {
   const observedNode = useViewed(() => {
     gleanClick(BANNER_SCRIMBA_VIEW);
   });
+  const now = Date.now();
 
-  return (
+  return now < Date.parse("2024-12-01") ? (
+    <p className="fallback-copy">
+      Learn front-end with MDN’s course partner{" "}
+      <a
+        href="https://scrimba.com/learn/frontend?via=mdn"
+        target="_blank"
+        rel="noreferrer"
+        ref={observedNode}
+        onClick={() => {
+          gleanClick(BANNER_SCRIMBA_CLICK);
+        }}
+      >
+        Scrimba
+      </a>{" "}
+      - 30% discount this week!
+    </p>
+  ) : now < Date.parse("2024-12-25") ? (
+    <p className="fallback-copy">
+      Take our daily challenges on Scrimba until 24th December and win exciting
+      prizes.{" "}
+      <a
+        href="https://scrimba.com/learn/frontend?via=mdn"
+        target="_blank"
+        rel="noreferrer"
+        ref={observedNode}
+        onClick={() => {
+          gleanClick(BANNER_SCRIMBA_CLICK);
+        }}
+      >
+        Join now
+      </a>
+    </p>
+  ) : (
     <p className="fallback-copy">
       Learn front-end development with high quality, interactive courses from{" "}
       <a

diff --git a/deployer/poetry.lock b/deployer/poetry.lock
diff --git a/deployer/pyproject.toml b/deployer/pyproject.toml
@@ -10,7 +10,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = "^3.10"
 click = "^8.1.7"
-boto3 = "^1.35.63"
+boto3 = "^1.35.68"
 python-decouple = "^3.8"
 requests = {extras = ["security"], version = "^2.32.3"}
 elasticsearch-dsl = "^7.4.1"

diff --git a/package.json b/package.json
@@ -68,7 +68,7 @@
   },
   "dependencies": {
     "@caporal/core": "^2.0.7",
-    "@codemirror/lang-css": "^6.3.0",
+    "@codemirror/lang-css": "^6.3.1",
     "@codemirror/lang-html": "^6.4.9",
     "@codemirror/lang-javascript": "^6.2.2",
     "@codemirror/state": "^6.4.1",
@@ -77,14 +77,14 @@
     "@inquirer/prompts": "^7.1.0",
     "@lit/react": "^1.0.6",
     "@mdn/bcd-utils-api": "^0.0.7",
-    "@mdn/browser-compat-data": "^5.6.18",
+    "@mdn/browser-compat-data": "^5.6.19",
     "@mdn/rari": "^0.0.24",
     "@mozilla/glean": "5.0.3",
     "@sentry/node": "^8.40.0",
     "@stripe/stripe-js": "^4.10.0",
     "@use-it/interval": "^1.0.0",
     "@vscode/ripgrep": "^1.15.9",
-    "@webref/css": "^6.17.3",
+    "@webref/css": "^6.17.4",
     "accept-language-parser": "^1.5.0",
     "async": "^3.2.6",
     "chalk": "^5.3.0",
@@ -127,7 +127,7 @@
     "mdn-data": "^2.12.2",
     "open": "^10.1.0",
     "open-editor": "^5.0.0",
-    "openai": "^4.73.0",
+    "openai": "^4.73.1",
     "pg": "^8.13.1",
     "pgvector": "^0.2.0",
     "prism-svelte": "^0.5.0",
@@ -153,8 +153,8 @@
     "unified": "^11.0.5",
     "unist-builder": "^4.0.0",
     "unist-util-visit": "^5.0.0",
-    "web-features": "^2.7.0",
-    "web-specs": "^3.27.0"
+    "web-features": "^2.8.0",
+    "web-specs": "^3.28.0"
   },
   "devDependencies": {
     "@babel/core": "^7.26.0",
@@ -174,7 +174,7 @@
     "@types/jest": "^29.5.14",
     "@types/js-yaml": "^4.0.9",
     "@types/mdast": "^4.0.4",
-    "@types/node": "^18.19.64",
+    "@types/node": "^18.19.66",
     "@types/prismjs": "^1.26.5",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
@@ -232,8 +232,8 @@
     "postcss-loader": "^8.1.1",
     "postcss-normalize": "^13.0.1",
     "postcss-preset-env": "^10.1.1",
-    "prettier": "^3.3.3",
-    "prettier-plugin-packagejson": "^2.5.5",
+    "prettier": "^3.4.1",
+    "prettier-plugin-packagejson": "^2.5.6",
     "prompts": "^2.4.2",
     "react": "^18.3.1",
     "react-app-polyfill": "^3.0.0",
@@ -265,7 +265,7 @@
     "ts-loader": "^9.5.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.6.3",
-    "typescript-eslint": "^8.15.0",
+    "typescript-eslint": "^8.16.0",
     "webpack": "^5.96.1",
     "webpack-bundle-analyzer": "^4.10.2",
     "webpack-cli": "^5.1.4",