Merge pull request #11945 from ethereum/master

Master -> staging

Author: corwintines

public/.well-known/matrix/server

@@ -0,0 +1,3 @@
+{
+    "m.server": "matrix.ethereum.org:8448"
+}

public/.well-known/security.txt

@@ -0,0 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+Contact: mailto:[email protected]
+Expires: 2023-12-31T23:59:00.000Z
+Encryption: https://ethereum.org/security_at_ethereum.org.asc
+Acknowledgments: https://bounty.ethereum.org
+Preferred-Languages: en
+Canonical: https://ethereum.org/.well-known/security.txt
+Policy: https://bounty.ethereum.org
+Hiring: https://ethereum.org/en/community/get-involved/#ethereum-jobs
+
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAEBCAAdFiEErpbtlp5HmwCE8+F/6I0zNPpfagoFAmMV3bMACgkQ6I0zNPpf
+agrOjhAAgMDS9RJUbJzcAybRfp/STq4Kf50TFd3iqx/t8ECw5UGazefieHesOhZ5
+9B9l6VAIHEGqbm+ukkhT+eBofhkAGEupiH/rUTy3hpFo1Ggp9QGi464Y8RyB0hID
+BwjAsAVEdHyh8T6YrqxKRGvgELuEMZfuPfVhdIGU8CfEQozzuA9q3mChckXdTlSt
+TvOKTMdnNPMlEhp4dT93iQaXDBAncE48TkUi/c8U4qolkskuDhZ4qJkc7xcv5Uk4
+TfF83Xs87AF9ZmABWawlCx7VHhp0HGljtGUpobf2DXV0TG77/dZzMQ4xdyqvDq+v
+tm3djp3UHZVhOkDxMKpBzLnCkCvyvh/tvN4j/trdHHzXx6gEEkuiR5wPPoomCosi
+95AGNFf0vpe2HucL/bOrBySxME+hifAnmkiaXltLbyUUTBQPfkHMHMoq1dmPokm2
+4RZaZ1A/K7rirZLC4w/RmxONVqvxT0baFTcZGyKzYm6gEZ9kCwWw1tyEl472yK0H
+UR2cAhlo+Wa61cOTtwHVw0FMVyG0xZkR04y8WM3T8lE6imGLSmCDgPMZm8XnKdkY
+SMGD3+TzLxe6mymmw+1dGXCPjjkImdrhBGxlwEU74vkFQKiWv/GftiDYYcilcQbS
+OD1N7PTmpef+JEYXOpwxxUTSXu0SfVTSkx0wnHkqbib7Wwv5IwY=
+=g+49
+-----END PGP SIGNATURE-----

src/hooks/useClientSideGitHubContributors.ts

@@ -4,7 +4,7 @@ import { useEffect, useState } from "react"
 
 import type { Author, FileContributorsState } from "@/lib/types"
 
-import { GITHUB_COMMITS_URL, OLD_CONTENT_DIR } from "@/lib/constants"
+import { CONTENT_DIR,GITHUB_COMMITS_URL } from "@/lib/constants"
 
 export const gitHubAuthHeaders = {
   headers: new Headers({
@@ -17,8 +17,7 @@ const fetchGitHubContributors = async (
   relativePath: string,
 ): Promise<FileContributorsState> => {
   const url = new URL(GITHUB_COMMITS_URL)
-  // TODO: OLD_CONTENT_DIR -> CONTENT_DIR for production
-  const filePath = join(OLD_CONTENT_DIR, relativePath, "index.md")
+  const filePath = join(CONTENT_DIR, relativePath, "index.md")
   url.searchParams.set("path", filePath)
 
   try {

src/hooks/useClientSideGitHubLastEdit.ts

@@ -6,9 +6,9 @@ import { useRouter } from "next/router"
 import type { Lang, LastUpdatedState } from "@/lib/types"
 
 import {
+  CONTENT_DIR,
   DEFAULT_LOCALE,
   GITHUB_COMMITS_URL,
-  OLD_CONTENT_DIR,
 } from "@/lib/constants"
 
 import { gitHubAuthHeaders } from "@/hooks/useClientSideGitHubContributors"
@@ -18,12 +18,11 @@ const fetchGitHubLastEdit = async (
   locale?: Lang
 ): Promise<LastUpdatedState> => {
   const url = new URL(GITHUB_COMMITS_URL)
-  // TODO: OLD_CONTENT_DIR -> CONTENT_DIR for production
   const localePath =
     locale && locale !== DEFAULT_LOCALE
       ? join("translations", locale, relativePath)
       : relativePath
-  const filePath = join(OLD_CONTENT_DIR, localePath, "index.md")
+  const filePath = join(CONTENT_DIR, localePath, "index.md")
   url.searchParams.set("path", filePath)
 
   try {

src/lib/constants.ts

@@ -2,7 +2,6 @@ import { ReportsModel } from "@crowdin/crowdin-api-client"
 
 import i18nConfig from "../../i18n.config.json"
 
-export const OLD_CONTENT_DIR = "src/content"
 export const CONTENT_DIR = "public/content"
 export const TRANSLATIONS_DIR = "public/content/translations"
 export const TRANSLATED_IMAGES_DIR = "/content/translations"