fix: always reformat lastmod for google

Relates to #214
nuxt-modules · Jan 15, 2024 · 397d553 · 397d553
1 parent 0b65cf8
commit 397d553
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 18 deletions.
diff --git a/src/runtime/nitro/sitemap/urlset/normalise.ts b/src/runtime/nitro/sitemap/urlset/normalise.ts
@@ -112,9 +112,6 @@ export function normaliseDate(date: string | Date): string
 export function normaliseDate(d: Date | string) {
   // lastmod must adhere to W3C Datetime encoding rules
   if (typeof d === 'string') {
-    // use as if if it's already valid
-    if (isValidW3CDate(d))
-      return d
     // correct a time component without a timezone
     if (d.includes('T')) {
       const t = d.split('T')[1]
@@ -123,6 +120,9 @@ export function normaliseDate(d: Date | string) {
         d += 'Z'
       }
     }
+    // skip invalid w3c date
+    if (!isValidW3CDate(d))
+      return false
     // otherwise we need to parse it
     d = new Date(d)
     d.setMilliseconds(0)
@@ -131,18 +131,24 @@ export function normaliseDate(d: Date | string) {
       return false
   }
   const z = (n: number) => (`0${n}`).slice(-2)
-  return (
-    `${d.getUTCFullYear()
+  // need to normalise for google sitemap spec
+  const date = `${d.getUTCFullYear()
     }-${
       z(d.getUTCMonth() + 1)
     }-${
       z(d.getUTCDate())
-    }T${
-      z(d.getUTCHours())
-    }:${
-      z(d.getUTCMinutes())
-    }:${
-      z(d.getUTCSeconds())
-    }Z`
-  )
+    }`
+  // check if we have a time set
+  if (d.getUTCHours() > 0 || d.getUTCMinutes() > 0 || d.getUTCSeconds() > 0) {
+    return (
+      `${date}T${
+        z(d.getUTCHours())
+      }:${
+        z(d.getUTCMinutes())
+      }:${
+        z(d.getUTCSeconds())
+      }Z`
+    )
+  }
+  return date
 }
diff --git a/test/integration/content/default.test.ts b/test/integration/content/default.test.ts
@@ -29,11 +29,11 @@ describe('nuxt/content default', () => {
       <urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:video="http://www.google.com/schemas/sitemap-video/1.1" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1" xmlns:news="http://www.google.com/schemas/sitemap-news/0.9" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd http://www.google.com/schemas/sitemap-image/1.1 http://www.google.com/schemas/sitemap-image/1.1/sitemap-image.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
           <url>
               <loc>https://nuxtseo.com/blog/posts/bar</loc>
-              <lastmod>2021-10-20T00:00:00.000Z</lastmod>
+              <lastmod>2021-10-20</lastmod>
           </url>
           <url>
               <loc>https://nuxtseo.com/blog/posts/fallback</loc>
-              <lastmod>2021-10-20T00:00:00.000Z</lastmod>
+              <lastmod>2021-10-20</lastmod>
           </url>
       </urlset>"
     `)

diff --git a/test/integration/content/documentDriven.test.ts b/test/integration/content/documentDriven.test.ts
@@ -32,11 +32,11 @@ describe('nuxt/content documentDriven', () => {
       <urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:video="http://www.google.com/schemas/sitemap-video/1.1" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1" xmlns:news="http://www.google.com/schemas/sitemap-news/0.9" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd http://www.google.com/schemas/sitemap-image/1.1 http://www.google.com/schemas/sitemap-image/1.1/sitemap-image.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
           <url>
               <loc>https://nuxtseo.com/blog/posts/bar</loc>
-              <lastmod>2021-10-20T00:00:00.000Z</lastmod>
+              <lastmod>2021-10-20</lastmod>
           </url>
           <url>
               <loc>https://nuxtseo.com/blog/posts/fallback</loc>
-              <lastmod>2021-10-20T00:00:00.000Z</lastmod>
+              <lastmod>2021-10-20</lastmod>
           </url>
       </urlset>"
     `)

diff --git a/test/integration/single/lastmod.test.ts b/test/integration/single/lastmod.test.ts
@@ -75,7 +75,7 @@ describe('lastmod', () => {
           </url>
           <url>
               <loc>https://nuxtseo.com/issue/206</loc>
-              <lastmod>2023-12-21T22:46:58.441+00:00</lastmod>
+              <lastmod>2023-12-21T22:46:58Z</lastmod>
           </url>
           <url>
               <loc>https://nuxtseo.com/sub/page</loc>