fix(amp-validator): fix amp detection in render hook

nuxt-community · Sep 10, 2019 · 9b3a168 · 9b3a168
1 parent 3705201
commit 9b3a168
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/lib/amp/plugin.js b/lib/amp/plugin.js
@@ -38,7 +38,13 @@ export default function ({ route, req }, inject) {
       break
   }
 
-  inject('req', req || {})
+  const $request = req || {}
+  /**
+   * This will use to detect amp request on render hook
+   */
+  $request.isAMP = isAMP
+
+  inject('req', $request)
   inject('isAMP', isAMP)
   inject('ampMode', ampMode)
 }

diff --git a/lib/module.js b/lib/module.js
@@ -47,8 +47,8 @@ function processRoutes (routes) {
 async function registerValidator (options) {
   const amphtmlValidator = require('amphtml-validator')
   const validator = await amphtmlValidator.getInstance()
-  this.nuxt.hook('render:route', (url, { html }) => {
-    const isAMP = html.includes('data-n-head="amp"')
+  this.nuxt.hook('render:route', (url, { html }, { req }) => {
+    const isAMP = req.isAMP
 
     if (isAMP) {
       const result = validator.validateString(html)