fix: fixed route processing, added condition on meta tags

lib/amp/plugin.js

@@ -94,16 +94,19 @@ const createCustomHead = originalHead => function customHead () {
    */
   ensureKey(head, 'link', [])
 
-  if (origin && !head.link.find(l => l.rel === 'canonical' || l.hid === 'canonical')) {
-    const path = this.$isAMP && this.$ampMode !== 'only'
-      ? this.$route.fullPath.replace(/^\/amp(\/.*)?/, '$1')
-      : this.$route.fullPath
-
-    head.link.push({
-      rel: 'canonical',
-      hid: 'canonical',
-      href: origin + path
-    })
+  // Add canonical meta only if page is served as AMP
+  if (this.$ampMode !== false && this.$isAMP === true) {
+    if (origin && !head.link.find(l => l.rel === 'canonical' || l.hid === 'canonical')) {
+      const path = this.$isAMP && this.$ampMode !== 'only'
+        ? this.$route.fullPath.replace(/^\/amp(\/.*)?/, '$1')
+        : this.$route.fullPath
+
+      head.link.push({
+        rel: 'canonical',
+        hid: 'canonical',
+        href: origin + path
+      })
+    }
   }
 
   /**
@@ -123,7 +126,7 @@ const createCustomHead = originalHead => function customHead () {
     head.bodyAttrs.class += ' __amp'
   }
 
-  // check if amp is disabled for this page
+  // Add amphtml meta only if page has amp counterpart
   if (this.$ampMode !== false && this.$isAMP === false) {
     if (!head.link.find(l => l.rel === 'amphtml' || l.hid === 'amphtml')) {
       const ampPrefix = this.$ampMode === 'only' ? '' : '/amp'

lib/module.js

@@ -30,21 +30,22 @@ module.exports = function (moduleOptions) {
     registerValidator.call(this, options)
   }
 
-  this.nuxt.hook('build:extendRoutes', (routes) => {
-    processRoutes(routes)
-  })
+  processRoutes()
 }
 
-function processRoutes (routes) {
-  for (const route of routes) {
-    route.meta = route.meta || {}
-    route.alias = route.alias || []
-    if (route.path === '/amp' || route.path.indexOf('/amp/') === 0) {
-      route.meta.amp = true
-    } else {
-      route.alias = '/amp' + route.path
+function processRoutes () {
+  this.extendRoutes((routes) => {
+    for (const route of routes) {
+      route.meta = route.meta || {}
+      route.alias = route.alias || []
+
+      if (route.path === '/amp' || route.path.indexOf('/amp/') === 0) {
+        route.meta.amp = true
+      } else {
+        route.alias = '/amp' + route.path
+      }
     }
-  }
+  })
 }
 
 async function registerValidator (options) {