Merge pull request #7137 from ethereum/resolve-404-pages

Resolve 404 pages

Author: pettinarip

gatsby-browser.tsx

@@ -22,6 +22,7 @@ import {
   defaultLanguage,
   isLang,
 } from "./src/utils/languages"
+import { IS_DEV } from "./src/utils/env"
 import { Context } from "./src/types"
 
 // Default languages included:
@@ -42,7 +43,7 @@ export const wrapPageElement: GatsbyBrowser<
 
   // client side redirect on paths that don't have a locale in them. Most useful
   // on dev env where we don't have server redirects
-  if (!isLang(pathLocale)) {
+  if (IS_DEV && !isLang(pathLocale)) {
     let detected =
       window.localStorage.getItem("eth-org-language") ||
       browserLang({

gatsby-config.ts

@@ -230,9 +230,19 @@ const config: GatsbyConfig = {
       },
     },
     // Needed for Gatsby Cloud redirect support
-    `gatsby-plugin-gatsby-cloud`,
+    {
+      resolve: `gatsby-plugin-gatsby-cloud`,
+      options: {
+        generateMatchPathRewrites: false,
+      },
+    },
     // Creates `_redirects` & `_headers` build files for Netlify
-    `gatsby-plugin-netlify`,
+    {
+      resolve: `gatsby-plugin-netlify`,
+      options: {
+        generateMatchPathRewrites: false,
+      },
+    },
   ],
   // https://www.gatsbyjs.com/docs/reference/release-notes/v2.28/#feature-flags-in-gatsby-configjs
   flags: {

gatsby-node.ts

@@ -420,6 +420,20 @@ export const onCreatePage: GatsbyNode<any, Context>["onCreatePage"] = async ({
   }
 }
 
+export const onPostBootstrap: GatsbyNode["onPostBootstrap"] = ({ actions }) => {
+  const { createRedirect } = actions
+
+  supportedLanguages.forEach((lang) => {
+    createRedirect({
+      ...commonRedirectProps,
+      fromPath: `/${lang}/*`,
+      toPath: `/${lang}/404`,
+      statusCode: 404,
+      force: false,
+    })
+  })
+}
+
 export const createSchemaCustomization: GatsbyNode["createSchemaCustomization"] =
   ({ actions, schema }) => {
     const { createTypes } = actions

redirects.json

@@ -55,10 +55,6 @@
     "fromPath": "/build/",
     "toPath": "/en/developers/learning-tools/"
   },
-  {
-    "fromPath": "/enterprise/",
-    "toPath": "/en/enterprise/"
-  },
   {
     "fromPath": "/java/",
     "toPath": "/en/developers/docs/programming-languages/java/"
@@ -92,13 +88,21 @@
     "toPath": "/en/developers/docs/programming-languages/dart/"
   },
   {
-    "fromPath": "/nft/",
+    "fromPath": "/nfts/",
     "toPath": "/en/nft/"
   },
   {
     "fromPath": "/daos/",
     "toPath": "/en/dao/"
   },
+  {
+    "fromPath": "/layer2/",
+    "toPath": "/en/layer-2/"
+  },
+  {
+    "fromPath": "/*/layer2/",
+    "toPath": "/:splat/layer-2/"
+  },
   {
     "fromPath": "/grants/",
     "toPath": "/en/community/grants/"