final fixes

Author: gdams

.gitignore

@@ -74,3 +74,6 @@ dist/
 
 **/.yalc
 **/yalc.lock
+
+# Package-lock.json
+**/*/package-lock.json

example/gatsby-config.js

@@ -68,43 +68,43 @@ module.exports = {
       options: {
         excludes: ['/**/404', '/**/404.html'],
         query: `
-          {
-            allSitePage(filter: {context: {i18n: {routed: {eq: false}}}}) {
-              edges {
-                node {
-                  context {
-                    i18n {
-                      defaultLanguage
-                      languages
-                      originalPath
-                    }
-                  }
-                  path
+        {
+          site {
+            siteMetadata {
+              siteUrl
+            }
+          }
+          allSitePage(filter: {context: {i18n: {routed: {eq: false}}}}) {
+            nodes {
+              context {
+                i18n {
+                  defaultLanguage
+                  languages
+                  originalPath
                 }
               }
+              path
             }
           }
+        }
         `,
-        resolveSiteUrl: () => siteUrl,
-        serialize: ({allSitePage}) => {
-          return allSitePage.edges.map((edge) => {
-            const {languages, originalPath, defaultLanguage} = edge.node.context.i18n;
-            const url = siteUrl + originalPath;
-            const links = [
-              {lang: defaultLanguage, url},
-              {lang: 'x-default', url}
-            ];
-            languages.forEach((lang) => {
-              if (lang === defaultLanguage) return;
-              links.push({lang, url: `${siteUrl}/${lang}${originalPath}`});
-            });
-            return {
-              url,
-              changefreq: 'daily',
-              priority: originalPath === '/' ? 1.0 : 0.7,
-              links
-            };
+        serialize: (node) => {
+          const {languages, originalPath, defaultLanguage} = node.context.i18n;
+          const url = siteUrl + originalPath;
+          const links = [
+            {lang: defaultLanguage, url},
+            {lang: 'x-default', url}
+          ];
+          languages.forEach((lang) => {
+            if (lang === defaultLanguage) return;
+            links.push({lang, url: `${siteUrl}/${lang}${originalPath}`});
           });
+          return {
+            url,
+            changefreq: 'daily',
+            priority: originalPath === '/' ? 1.0 : 0.7,
+            links
+          };
         }
       }
     }

example/gatsby-node.js

@@ -0,0 +1,23 @@
+/**
+ * Workaround for missing sitePage.context:
+ * Used for generating sitemap with `gatsby-plugin-react-i18next` and `gatsby-plugin-sitemap` plugins
+ * https://www.gatsbyjs.com/docs/reference/release-notes/migrating-from-v3-to-v4/#field-sitepagecontext-is-no-longer-available-in-graphql-queries
+ */
+exports.createSchemaCustomization = ({actions}) => {
+  const {createTypes} = actions;
+  createTypes(`
+    type SitePage implements Node {
+      context: SitePageContext
+    }
+    type SitePageContext {
+      i18n: i18nContext
+    }
+    type i18nContext {
+        language: String,
+        languages: [String],
+        defaultLanguage: String,
+        originalPath: String
+        routed: Boolean
+    }
+  `);
+};

example/yarn.lock

@@ -2960,6 +2960,11 @@
   dependencies:
     "fill-range" "^7.0.1"
 
+"browser-lang@^0.2.1":
+  "integrity" "sha512-+xmtsTxVZKWrKHoNUQp4Tm7BEXlnMwOMAHZAh1SSot1+n04qHLFIH0K5anX52k5BkcauggbaNlWT8f3bVwDh/Q=="
+  "resolved" "https://registry.npmjs.org/browser-lang/-/browser-lang-0.2.1.tgz"
+  "version" "0.2.1"
+
 "browserslist@^4.0.0", "browserslist@^4.14.5", "browserslist@^4.16.3", "browserslist@^4.16.6", "browserslist@^4.17.5", "browserslist@^4.18.1", "browserslist@^4.20.3", "browserslist@^4.21.3", "browserslist@^4.6.6", "browserslist@>= 4.21.0":
   "integrity" "sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ=="
   "resolved" "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz"
@@ -3700,15 +3705,7 @@
     "domutils" "^3.0.1"
     "nth-check" "^2.0.1"
 
-"css-tree@^1.1.2":
-  "integrity" "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q=="
-  "resolved" "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz"
-  "version" "1.1.3"
-  dependencies:
-    "mdn-data" "2.0.14"
-    "source-map" "^0.6.1"
-
-"css-tree@^1.1.3":
+"css-tree@^1.1.2", "css-tree@^1.1.3":
   "integrity" "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q=="
   "resolved" "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz"
   "version" "1.1.3"
@@ -7430,6 +7427,11 @@
   "resolved" "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"
   "version" "1.0.2"
 
+"outdent@^0.8.0":
+  "integrity" "sha512-KiOAIsdpUTcAXuykya5fnVVT+/5uS0Q1mrkRHcF89tpieSmY33O/tmc54CqwA+bfhbtEfZUNLHaPUiB9X3jt1A=="
+  "resolved" "https://registry.npmjs.org/outdent/-/outdent-0.8.0.tgz"
+  "version" "0.8.0"
+
 "p-cancelable@^2.0.0":
   "integrity" "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg=="
   "resolved" "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz"
@@ -7675,6 +7677,11 @@
   dependencies:
     "path-root-regex" "^0.1.0"
 
+"path-to-regexp@^6.2.1":
+  "integrity" "sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw=="
+  "resolved" "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz"
+  "version" "6.2.1"
+
 "[email protected]":
   "integrity" "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
   "resolved" "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"
@@ -8266,7 +8273,7 @@
     "loose-envify" "^1.1.0"
     "neo-async" "^2.6.1"
 
-"react@^18.0.0 || ^0.0.0", "react@^18.2.0", "react@>= 16.8.0", "[email protected]", "[email protected]":
+"react@^18.0.0 || ^0.0.0", "react@^18.2.0", "react@^18.x", "react@>= 16.8.0", "[email protected]", "[email protected]":
   "integrity" "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ=="
   "resolved" "https://registry.npmjs.org/react/-/react-18.2.0.tgz"
   "version" "18.2.0"

src/plugin/wrapPageElement.tsx

@@ -119,7 +119,7 @@ export const wrapPageElement = (
   // We want to set default namespace to a page namespace if it exists
   // and use other namespaces as fallback
   // this way you dont need to specify namespaces in pages
-  let defaultNS = i18nextOptions.defaultNS || 'translation';
+  let defaultNS = i18nextOptions.defaultNS?.toString() || 'translation';
   defaultNS = namespaces.find((ns) => ns !== defaultNS) || defaultNS;
   const fallbackNS = namespaces.filter((ns) => ns !== defaultNS);
 
@@ -129,7 +129,7 @@ export const wrapPageElement = (
 
     if (!(node.language in res)) res[node.language] = {};
 
-    res[node.language][node.ns] = parsedData;
+    res[node.language][node.ns || defaultNS] = parsedData;
 
     return res;
   }, {});