Merge remote-tracking branch 'upstream/main' into MP-739-curriculum-b…

…uilder
mdn · Feb 26, 2024 · 5a14544 · 5a14544
2 parents e601474 + 0117ac1
commit 5a14544
Show file tree

Hide file tree

Showing 25 changed files with 1,674 additions and 1,193 deletions.
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "2.39.3"
+  ".": "2.39.4"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,50 @@
 # Changelog
 
+## [2.39.4](https://github.com/mdn/yari/compare/v2.39.3...v2.39.4) (2024-02-21)
+
+
+### Bug Fixes
+
+* **ai-help:** send correct context when editing question ([#10511](https://github.com/mdn/yari/issues/10511)) ([c49c125](https://github.com/mdn/yari/commit/c49c125e3cd217595095d5a2c755a6535ead43b7))
+* **bcd:** re-surface "see bug xxxxx" notes ([#10549](https://github.com/mdn/yari/issues/10549)) ([6da4660](https://github.com/mdn/yari/commit/6da4660634350f39e3adfa0afcf15e1fcf838bc1))
+* locale missing page - no data due to missing await ([#10550](https://github.com/mdn/yari/issues/10550)) ([d022ba5](https://github.com/mdn/yari/commit/d022ba56efbbacdc302996991e2c50ed0cb077d9))
+
+
+### Miscellaneous
+
+* **ai-help:** update Usage Guidance copy ([#10531](https://github.com/mdn/yari/issues/10531)) ([475fe4e](https://github.com/mdn/yari/commit/475fe4e26ec5d4e65243bbc84dff10d753f51c04))
+* **build:** remove the translation_of metadata ([#10037](https://github.com/mdn/yari/issues/10037)) ([e457ab8](https://github.com/mdn/yari/commit/e457ab8bee5c90d743d226e7a713f51d4b2cf9b4))
+* **deps-dev:** bump @swc/core from 1.4.1 to 1.4.2 ([#10547](https://github.com/mdn/yari/issues/10547)) ([ee212ec](https://github.com/mdn/yari/commit/ee212ecc1f48aed98a2ba5fd292765b84f67ab04))
+* **deps-dev:** bump browserslist from 4.22.3 to 4.23.0 ([#10526](https://github.com/mdn/yari/issues/10526)) ([7bf19e8](https://github.com/mdn/yari/commit/7bf19e80d7f5150be919b5e529cdfe5fcd41c19c))
+* **deps-dev:** bump eslint-plugin-jest from 27.8.0 to 27.9.0 ([#10544](https://github.com/mdn/yari/issues/10544)) ([5e74f17](https://github.com/mdn/yari/commit/5e74f17be451042495b705a73f3ed0e19e0d41d3))
+* **deps-dev:** bump postcss-preset-env from 9.3.0 to 9.4.0 ([#10555](https://github.com/mdn/yari/issues/10555)) ([aa8384d](https://github.com/mdn/yari/commit/aa8384d6c48eb19e3d321abcb05ec38db5f458a8))
+* **deps-dev:** bump prettier-plugin-packagejson from 2.4.10 to 2.4.11 ([#10534](https://github.com/mdn/yari/issues/10534)) ([e14678d](https://github.com/mdn/yari/commit/e14678d3b32a7c22bde1f2d1a8a294077a6c3644))
+* **deps-dev:** bump react-router-dom from 6.22.0 to 6.22.1 ([#10546](https://github.com/mdn/yari/issues/10546)) ([5aa121f](https://github.com/mdn/yari/commit/5aa121fa363d14d09ee1b079acf8aa73b704c470))
+* **deps-dev:** bump sass from 1.70.0 to 1.71.0 ([#10536](https://github.com/mdn/yari/issues/10536)) ([b41eac2](https://github.com/mdn/yari/commit/b41eac27929ade4cd85a76a873f24944a005cdb0))
+* **deps-dev:** bump sass from 1.71.0 to 1.71.1 ([#10565](https://github.com/mdn/yari/issues/10565)) ([74c1448](https://github.com/mdn/yari/commit/74c1448abe481aea8ca40b1559c00e8e5410e07c))
+* **deps-dev:** bump sass-loader from 14.1.0 to 14.1.1 ([#10558](https://github.com/mdn/yari/issues/10558)) ([20075de](https://github.com/mdn/yari/commit/20075de977828a2dc4d9a822bef4af6d91f4c924))
+* **deps-dev:** bump swr from 2.2.4 to 2.2.5 ([#10538](https://github.com/mdn/yari/issues/10538)) ([4cc6e36](https://github.com/mdn/yari/commit/4cc6e3688b8ec80e91bc9d15be01c65523e96164))
+* **deps-dev:** bump the types group with 1 update ([#10542](https://github.com/mdn/yari/issues/10542)) ([6b95d7c](https://github.com/mdn/yari/commit/6b95d7ce3980ae332d75da3058b9f275f5e187f6))
+* **deps-dev:** bump the types group with 1 update ([#10552](https://github.com/mdn/yari/issues/10552)) ([f553b79](https://github.com/mdn/yari/commit/f553b79b3645c620ae69cad6b0ad8b61a2bc6b84))
+* **deps-dev:** bump webpack from 5.90.1 to 5.90.2 ([#10537](https://github.com/mdn/yari/issues/10537)) ([c976a8c](https://github.com/mdn/yari/commit/c976a8c6a46adfee78c42b6a960d157d4f3f7b08))
+* **deps-dev:** bump webpack from 5.90.1 to 5.90.2 in /client/pwa ([#10539](https://github.com/mdn/yari/issues/10539)) ([b485006](https://github.com/mdn/yari/commit/b485006bdae9dcddb7fbef4feac33b74d16063e9))
+* **deps-dev:** bump webpack from 5.90.2 to 5.90.3 ([#10553](https://github.com/mdn/yari/issues/10553)) ([52b9751](https://github.com/mdn/yari/commit/52b97510c87e23d611611e3e7e6d0d002b5435e2))
+* **deps-dev:** bump webpack from 5.90.2 to 5.90.3 in /client/pwa ([#10551](https://github.com/mdn/yari/issues/10551)) ([c326deb](https://github.com/mdn/yari/commit/c326debb90ad94e768ff4bd4dbc491cf36f9cc99))
+* **deps:** bump @codemirror/lang-javascript from 6.2.1 to 6.2.2 ([#10563](https://github.com/mdn/yari/issues/10563)) ([7052044](https://github.com/mdn/yari/commit/7052044cbcd0b3cbcd40003776327277ebc3a287))
+* **deps:** bump @codemirror/state from 6.4.0 to 6.4.1 ([#10559](https://github.com/mdn/yari/issues/10559)) ([5a8debb](https://github.com/mdn/yari/commit/5a8debb77a0eb010a040ba726a0181dd88f4544b))
+* **deps:** bump @mdn/browser-compat-data from 5.5.10 to 5.5.11 ([#10566](https://github.com/mdn/yari/issues/10566)) ([ab04c11](https://github.com/mdn/yari/commit/ab04c1104bd988f3a8a86bcfbd8b09e85254f929))
+* **deps:** bump @webref/css from 6.11.1 to 6.11.2 ([#10525](https://github.com/mdn/yari/issues/10525)) ([0759aff](https://github.com/mdn/yari/commit/0759aff7075500244df4a2dc335c9a0797d0325f))
+* **deps:** bump cryptography from 42.0.0 to 42.0.2 in /deployer ([#10540](https://github.com/mdn/yari/issues/10540)) ([dbd7f1c](https://github.com/mdn/yari/commit/dbd7f1ccf8cba54510a5288465b799771c789aea))
+* **deps:** bump cryptography from 42.0.2 to 42.0.4 in /deployer ([#10568](https://github.com/mdn/yari/issues/10568)) ([da1b839](https://github.com/mdn/yari/commit/da1b8398dd624400c6e72c30e199afaa053ada34))
+* **deps:** bump dotenv from 16.4.4 to 16.4.5 ([#10554](https://github.com/mdn/yari/issues/10554)) ([e42b736](https://github.com/mdn/yari/commit/e42b73663541d7ee707eebcd8bb8567f0556e9b3))
+* **deps:** bump inquirer from 9.2.14 to 9.2.15 ([#10556](https://github.com/mdn/yari/issues/10556)) ([cc69204](https://github.com/mdn/yari/commit/cc692045f5533ade6974da4f86cd1b8dc2b637b6))
+* **deps:** bump the dependencies group in /deployer with 3 updates ([#10541](https://github.com/mdn/yari/issues/10541)) ([50d18a1](https://github.com/mdn/yari/commit/50d18a10fe2c8eb0901df1950fe385056929f030))
+* **deps:** bump the dependencies group in /testing/integration with 2 updates ([#10548](https://github.com/mdn/yari/issues/10548)) ([2f4a09d](https://github.com/mdn/yari/commit/2f4a09d0021817207f1dc3a1dea368267ab49d28))
+* **deps:** bump the sentry group with 2 updates ([#10523](https://github.com/mdn/yari/issues/10523)) ([5edaf3c](https://github.com/mdn/yari/commit/5edaf3c2ae90085c343aca7917e6632630415bbb))
+* **deps:** bump the sentry group with 2 updates ([#10561](https://github.com/mdn/yari/issues/10561)) ([a8be690](https://github.com/mdn/yari/commit/a8be690e6f6802d8fcae9c336fdc4ee026d7e858))
+* **deps:** bump web-specs from 3.0.0 to 3.1.0 ([#10524](https://github.com/mdn/yari/issues/10524)) ([5aee08a](https://github.com/mdn/yari/commit/5aee08ae17675693180f4a0c0803c7d173e682ef))
+* **deps:** bump web-specs from 3.1.0 to 3.3.0 ([#10557](https://github.com/mdn/yari/issues/10557)) ([d4cd051](https://github.com/mdn/yari/commit/d4cd0514c8f8a25f7df11f7e0ca91c52a4006c16))
+
 ## [2.39.3](https://github.com/mdn/yari/compare/v2.39.2...v2.39.3) (2024-02-14)
 
 

diff --git a/client/config/getHttpsConfig.js b/client/config/getHttpsConfig.js
@@ -50,15 +50,18 @@ function getHttpsConfig() {
   if (isHttps && SSL_CRT_FILE && SSL_KEY_FILE) {
     const crtFile = path.resolve(paths.appPath, SSL_CRT_FILE);
     const keyFile = path.resolve(paths.appPath, SSL_KEY_FILE);
-    const config = {
+    const options = {
       cert: readEnvFile(crtFile, "SSL_CRT_FILE"),
       key: readEnvFile(keyFile, "SSL_KEY_FILE"),
     };
 
-    validateKeyAndCerts({ ...config, keyFile, crtFile });
-    return config;
+    validateKeyAndCerts({ ...options, keyFile, crtFile });
+    return {
+      type: "https",
+      options,
+    };
   }
-  return isHttps;
+  return isHttps ? "https" : "http";
 }
 
 export default getHttpsConfig;
diff --git a/client/config/webpack.config.js b/client/config/webpack.config.js
@@ -721,9 +721,6 @@ function config(webpackEnv) {
               { file: "**/src/setupTests.*" },
             ],
           },
-          logger: {
-            infrastructure: "silent",
-          },
         }),
       !disableESLintPlugin &&
         new ESLintPlugin({

diff --git a/client/config/webpackDevServer.config.js b/client/config/webpackDevServer.config.js
@@ -5,7 +5,7 @@ import ignoredFiles from "react-dev-utils/ignoredFiles.js";
 import redirectServedPath from "react-dev-utils/redirectServedPathMiddleware.js";
 
 import paths from "./paths.js";
-import getHttpsConfig from "./getHttpsConfig.js";
+import getServerConfig from "./getHttpsConfig.js";
 
 const host = process.env.HOST || "0.0.0.0";
 const sockHost = process.env.WDS_SOCKET_HOST;
@@ -93,8 +93,7 @@ function config(proxy, allowedHost) {
       // remove last slash so user can land on `/test` instead of `/test/`
       publicPath: paths.publicUrlOrPath.slice(0, -1),
     },
-
-    https: getHttpsConfig(),
+    server: getServerConfig(),
     host,
     historyApiFallback: {
       // Paths with dots should still use the history fallback.

diff --git a/client/pwa/package.json b/client/pwa/package.json
@@ -12,14 +12,14 @@
     "dev": "webpack-cli --watch"
   },
   "dependencies": {
-    "@zip.js/zip.js": "2.7.34",
+    "@zip.js/zip.js": "2.7.35",
     "dexie": "3.2.5"
   },
   "devDependencies": {
     "@types/dexie": "1.3.1",
     "ts-loader": "^9.5.1",
     "typescript": "^5.3.3",
-    "webpack": "^5.90.2",
+    "webpack": "^5.90.3",
     "webpack-cli": "^5.1.4",
     "workers-preview": "^1.0.6"
   }

diff --git a/client/pwa/yarn.lock b/client/pwa/yarn.lock
@@ -249,10 +249,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].34":
-  version "2.7.34"
-  resolved "https://registry.yarnpkg.com/@zip.js/zip.js/-/zip.js-2.7.34.tgz#2d5c84cffa4b6b27a94e8eb1bbb3682de6598bdf"
-  integrity sha512-SWAK+hLYKRHswhakNUirPYrdsflSFOxykUckfbWDcPvP8tjLuV5EWyd3GHV0hVaJLDps40jJnv8yQVDbWnQDfg==
+"@zip.js/[email protected].35":
+  version "2.7.35"
+  resolved "https://registry.yarnpkg.com/@zip.js/zip.js/-/zip.js-2.7.35.tgz#a0879a490be871ac0cceb856470d796017c1601b"
+  integrity sha512-uJFi70fSL4EBGtMyx+mmOVEdsvCd8TwJJdjYK2PkRdO+RmPJKzimhqofw0LcchWQ4qqo2xdLVnZGid7/fRZmxA==
 
 acorn-import-assertions@^1.9.0:
   version "1.9.0"
@@ -909,10 +909,10 @@ webpack-sources@^3.2.3:
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack@^5.90.2:
-  version "5.90.2"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.90.2.tgz#189686a8a292427076db9907d495625345805fab"
-  integrity sha512-ziXu8ABGr0InCMEYFnHrYweinHK2PWrMqnwdHk2oK3rRhv/1B+2FnfwYv5oD+RrknK/Pp/Hmyvu+eAsaMYhzCw==
+webpack@^5.90.3:
+  version "5.90.3"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.90.3.tgz#37b8f74d3ded061ba789bb22b31e82eed75bd9ac"
+  integrity sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
     "@types/estree" "^1.0.5"

diff --git a/client/scripts/start.js b/client/scripts/start.js
@@ -130,16 +130,14 @@ checkBrowsers(paths.appPath, isInteractive)
 
     ["SIGINT", "SIGTERM"].forEach(function (sig) {
       process.on(sig, function () {
-        devServer.close();
-        process.exit();
+        devServer.stopCallback(() => process.exit());
       });
     });
 
     if (process.env.CI !== "true") {
       // Gracefully exit when stdin ends
       process.stdin.on("end", function () {
-        devServer.close();
-        process.exit();
+        devServer.stopCallback(() => process.exit());
       });
     }
   })

diff --git a/client/src/plus/ai-help/index.tsx b/client/src/plus/ai-help/index.tsx
@@ -858,8 +858,9 @@ export function AIHelpInner() {
                       </header>
                       <div className="modal-body">
                         <p>
-                          Our AI Help feature employs {gptVersion}, a Large
-                          Language Model (LLM) developed by{" "}
+                          Our AI Help feature integrates GPT-3.5 for MDN Plus
+                          free users and GPT-4 for paying subscribers,
+                          leveraging Large Language Models (LLMs) developed by{" "}
                           <a
                             href="https://platform.openai.com/docs/api-reference/models"
                             className="external"
@@ -868,31 +869,29 @@ export function AIHelpInner() {
                           >
                             OpenAI
                           </a>
-                          . While it's designed to offer helpful and relevant
-                          information drawn from MDN's comprehensive
-                          documentation, it's important to bear in mind that it
-                          is an LLM and may not produce perfectly accurate
-                          information in every circumstance.
+                          . This tool is designed to enhance your experience by
+                          providing relevant insights from MDN's extensive
+                          documentation. However, given the nature of LLMs, it's
+                          crucial to approach the generated information with a
+                          discerning eye, especially for complex or critical
+                          subjects.
                         </p>
                         <p>
-                          We strongly advise all users to cross-verify the
-                          information generated by this AI Help feature,
-                          particularly for complex or critical topics. While we
-                          strive for accuracy and relevance, the nature of AI
-                          means that responses may vary in precision.
+                          We encourage users to verify the AI Help's output. For
+                          convenience and accuracy, links for further reading
+                          and verification are provided at the beginning of
+                          responses, directing you to the relevant MDN
+                          documentation. This ensures immediate access to deeper
+                          insights and broader context.
                         </p>
                         <p>
-                          The AI Help feature provides links at the end of its
-                          responses to support further reading and verification
-                          within the MDN documentation. These links are intended
-                          to facilitate deeper understanding and context.
-                        </p>
-                        <p>
-                          As you use the AI Help feature, keep in mind its
-                          nature as an LLM. It's not perfect, but it's here to
-                          assist you as best as it can. We're excited to have
-                          you try AI Help, and we hope it makes your MDN
-                          experience even better.
+                          Remember, while AI Help aims to be a valuable
+                          resource, its responses, influenced by the
+                          complexities of AI, might not always hit the mark with
+                          absolute precision. We invite you to explore this
+                          feature, designed to complement your MDN exploration.
+                          Your feedback is invaluable as we continue to refine
+                          AI Help to better serve your needs.
                         </p>
                       </div>
                     </MDNModal>

diff --git a/client/src/plus/ai-help/rust-types.ts b/client/src/plus/ai-help/rust-types.ts
@@ -13,9 +13,9 @@ export interface AIHelpMeta {
   type: MetaType;
   chat_id: string;
   message_id: string;
-  parent_id?: string;
+  parent_id?: string | null;
   sources: RefDoc[];
-  quota?: AIHelpLimit;
+  quota?: AIHelpLimit | null;
   created_at: string;
 }