From cd98210acb881a47dd527d5c6d4899452b6b566e Mon Sep 17 00:00:00 2001 From: pimlie Date: Fri, 8 Mar 2019 13:11:13 +0100 Subject: [PATCH] refactor: make hasMetaInfo default export --- src/browser.js | 2 +- src/index.js | 2 +- src/shared/hasMetaInfo.js | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/browser.js b/src/browser.js index 2567240..885f415 100644 --- a/src/browser.js +++ b/src/browser.js @@ -3,7 +3,7 @@ import createMixin from './shared/mixin' import setOptions from './shared/options' import { isUndefined } from './shared/typeof' import $meta from './client/$meta' -import { hasMetaInfo } from './shared/hasMetaInfo' +import hasMetaInfo from './shared/hasMetaInfo' /** * Plugin install function. diff --git a/src/index.js b/src/index.js index 5ed7470..9e049d0 100644 --- a/src/index.js +++ b/src/index.js @@ -2,7 +2,7 @@ import { version } from '../package.json' import createMixin from './shared/mixin' import setOptions from './shared/options' import $meta from './server/$meta' -import { hasMetaInfo } from './shared/hasMetaInfo' +import hasMetaInfo from './shared/hasMetaInfo' /** * Plugin install function. diff --git a/src/shared/hasMetaInfo.js b/src/shared/hasMetaInfo.js index 975f762..7946896 100644 --- a/src/shared/hasMetaInfo.js +++ b/src/shared/hasMetaInfo.js @@ -1,3 +1,6 @@ -export function hasMetaInfo(vm = this) { - return vm && !!vm._vueMeta +import { isObject } from './typeof' + +// Vue $root instance has a _vueMeta object property, otherwise its a boolean true +export default function hasMetaInfo(vm = this) { + return vm && (vm._vueMeta === true || isObject(vm._vueMeta)) }