fix(nuxt-generate): generate canonical link using module option

nuxt-community · Sep 12, 2019 · 0f5e5ad · 0f5e5ad
1 parent 9b3a168
commit 0f5e5ad
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/example/nuxt.config.js b/example/nuxt.config.js
@@ -10,6 +10,9 @@ module.exports = {
   modules: [
     { handler: require('../') }
   ],
+  amp: {
+    origin: 'http://localhost:3000'
+  },
   router: {
     middleware: [
       'amp'

diff --git a/lib/amp/middleware.js b/lib/amp/middleware.js
@@ -36,10 +36,9 @@ Middleware.amp = function ({ route, req, app }) {
 }
 
 const createCustomHead = originalHead => function customHead () {
-  let origin = process.server ? this.$req.url : window.location
+  let origin
   if (process.server) {
-    const schema = 'http://'
-    origin = schema + this.$req.headers.host
+    origin = '<%= options.origin %>'
   } else {
     origin = window.location.origin
   }
@@ -63,7 +62,7 @@ const createCustomHead = originalHead => function customHead () {
 
   const { amp, ...query } = this.$route.query
 
-  if (!head.link.find(l => l.rel === 'canonical' || l.hid === 'canonical')) {
+  if (origin && !head.link.find(l => l.rel === 'canonical' || l.hid === 'canonical')) {
     const path = this.$isAMP && this.$ampMode !== 'only'
       ? this.$route.path.replace(/^\/amp(\/.*)?/, '$1')
       : this.$route.path

diff --git a/lib/module.js b/lib/module.js
@@ -15,6 +15,8 @@ const ampBodyPattern = /<amp-body[^>]*>([.\S\s]*)<\/amp-body>/
 module.exports = function (moduleOptions) {
   const options = {
     cdnBase: undefined,
+    origin: '',
+    ...this.options.amp,
     ...moduleOptions
   }
 
@@ -141,7 +143,8 @@ function copyAMP (options) {
     }
     this.addTemplate({
       src: resolve(coreRoot, file),
-      fileName: join('amp', file)
+      fileName: join('amp', file),
+      options
     })
   }
 }