fix: support nuxt@2.9 (#6)

nuxt-community · Jul 23, 2019 · dc40609 · dc40609
1 parent 3ef9d89
commit dc40609
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ node_modules
 .DS_Store
 coverage
 dist
+package-lock.json
diff --git a/lib/amp/middleware.js b/lib/amp/middleware.js
@@ -1,13 +1,16 @@
+import VueMeta from 'vue-meta'
 import { stringify } from 'qs'
 import Middleware from '../middleware'
 
-function ensureKey(obj, key, d) {
+const [vueMetaMajor] = VueMeta.version.split('.')
+
+function ensureKey (obj, key, d) {
   if (!obj[key]) {
     obj[key] = d
   }
 }
 
-function stringifyQuery(query) {
+function stringifyQuery (query) {
   if (!Object.keys(query).length) {
     return ''
   }
@@ -32,7 +35,7 @@ Middleware.amp = function ({ route, req, app }) {
   }
 }
 
-const createCustomHead = originalHead => function customHead() {
+const createCustomHead = originalHead => function customHead () {
   let origin = process.server ? this.$req.url : window.location
   if (process.server) {
     const schema = 'http://'
@@ -73,7 +76,12 @@ const createCustomHead = originalHead => function customHead() {
    */
   if (this.$isAMP) {
     ensureKey(head, 'htmlAttrs', {})
-    head.htmlAttrs['⚡'] = undefined
+
+    if (vueMetaMajor >= 2) {
+      head.htmlAttrs.amp = true
+    } else {
+      head.htmlAttrs.amp = undefined
+    }
 
     ensureKey(head, 'bodyAttrs', {})
     ensureKey(head.bodyAttrs, 'class', '')
@@ -95,7 +103,7 @@ const createCustomHead = originalHead => function customHead() {
   return head
 }
 
-const createCustomLayout = originalLayout => function customLayout(ctx) {
+const createCustomLayout = originalLayout => function customLayout (ctx) {
   let layout
 
   switch (typeof originalLayout) {

diff --git a/lib/amp/plugin.js b/lib/amp/plugin.js
@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import './middleware'
 
-function pick(...args) {
+function pick (...args) {
   for (const arg of args) {
     if (arg !== undefined) {
       return arg
@@ -46,7 +46,7 @@ export default function ({ route, req }, inject) {
 // @vue/component
 const AMPMustache = {
   name: 'AmpMustache',
-  render(h) {
+  render (h) {
     return h('template', {
       props: {
         ...this.$props

diff --git a/lib/module.js b/lib/module.js
@@ -32,7 +32,7 @@ module.exports = function (moduleOptions) {
   })
 }
 
-function processRoutes(routes) {
+function processRoutes (routes) {
   for (const route of routes) {
     route.meta = route.meta || {}
     route.alias = route.alias || []
@@ -44,11 +44,11 @@ function processRoutes(routes) {
   }
 }
 
-async function registerValidator(options) {
+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('⚡')
+    const isAMP = html.includes('data-n-head="amp"')
 
     if (isAMP) {
       const result = validator.validateString(html)
@@ -73,11 +73,11 @@ async function registerValidator(options) {
   })
 }
 
-function registerSSRHook(options) {
+function registerSSRHook (options) {
   const tags = getTags({ cdnBase: options.cdnBase })
 
   this.nuxt.hook('vue-renderer:ssr:templateParams', (params) => {
-    const isAMP = params.HTML_ATTRS.includes('⚡')
+    const isAMP = params.HTML_ATTRS.includes('amp')
 
     if (!isAMP) {
       return
@@ -88,7 +88,7 @@ function registerSSRHook(options) {
 
     if (options.removeLayoutTags) {
       params.APP = params.APP
-        .replace('<div data-server-rendered="true" id="__nuxt"><!----><div id="__layout">', '')
+        .replace('<div data-server-rendered="true" id="__nuxt"><!----><!----><div id="__layout">', '')
         .replace(/<\/div><\/div>$/, '')
     }
 
@@ -108,15 +108,15 @@ function registerSSRHook(options) {
   })
 }
 
-function registerPlugin(options) {
+function registerPlugin (options) {
   this.addPlugin({
     src: resolve(__dirname, 'amp', 'plugin.js'),
     fileName: join('amp', 'plugin.js'),
     options
   })
 }
 
-function copyAMP(options) {
+function copyAMP (options) {
   const coreRoot = resolve(__dirname, 'amp')
 
   for (const file of readdirSync(coreRoot)) {
@@ -130,11 +130,11 @@ function copyAMP(options) {
   }
 }
 
-function find(arr, key, val) {
+function find (arr, key, val) {
   return arr.find(obj => val ? obj[key] === val : obj[key])
 }
 
-function ensureMeta() {
+function ensureMeta () {
   if (!this.options.head) {
     this.options.head = {}
   }

diff --git a/lib/tags.js b/lib/tags.js
@@ -1,4 +1,4 @@
-function getTags({
+function getTags ({
   cdnBase = 'https://cdn.ampproject.org/v0/'
 }) {
   const tags = [
@@ -130,7 +130,7 @@ function getTags({
   return tags
 }
 
-function detectTags(tags, html) {
+function detectTags (tags, html) {
   return tags.filter(t => t.isTemplate ? html.includes(`type="${t.tag}"`) : html.includes(`<${t.tag}`))
 }