diff --git a/CHANGELOG.md b/CHANGELOG.md index d71adbc3..eaa31327 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [2.3.2](https://github.com/nuxt/vue-meta/compare/v2.3.1...v2.3.2) (2020-01-12) + + +### Bug Fixes + +* call afterNavigation after nextTick ([#478](https://github.com/nuxt/vue-meta/issues/478)) ([fa12530](https://github.com/nuxt/vue-meta/commit/fa12530b3ec450338c52dea2873f6913ee3abaf0)) + ### [2.3.1](https://github.com/nuxt/vue-meta/compare/v2.3.0...v2.3.1) (2019-10-09) diff --git a/dist/vue-meta.common.js b/dist/vue-meta.common.js index a8000121..6c56dafb 100644 --- a/dist/vue-meta.common.js +++ b/dist/vue-meta.common.js @@ -1,6 +1,6 @@ /** - * vue-meta v2.3.1 - * (c) 2019 + * vue-meta v2.3.2 + * (c) 2020 * - Declan de Wet * - Sébastien Chopin (@Atinux) * - Pim (@pimlie) @@ -14,7 +14,7 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau var deepmerge = _interopDefault(require('deepmerge')); -var version = "2.3.1"; +var version = "2.3.2"; function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { @@ -45,6 +45,40 @@ function _defineProperty(obj, key, value) { return obj; } +function ownKeys(object, enumerableOnly) { + var keys = Object.keys(object); + + if (Object.getOwnPropertySymbols) { + var symbols = Object.getOwnPropertySymbols(object); + if (enumerableOnly) symbols = symbols.filter(function (sym) { + return Object.getOwnPropertyDescriptor(object, sym).enumerable; + }); + keys.push.apply(keys, symbols); + } + + return keys; +} + +function _objectSpread2(target) { + for (var i = 1; i < arguments.length; i++) { + var source = arguments[i] != null ? arguments[i] : {}; + + if (i % 2) { + ownKeys(Object(source), true).forEach(function (key) { + _defineProperty(target, key, source[key]); + }); + } else if (Object.getOwnPropertyDescriptors) { + Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); + } else { + ownKeys(Object(source)).forEach(function (key) { + Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); + }); + } + } + + return target; +} + function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread(); } @@ -205,6 +239,7 @@ function triggerUpdate(_ref, rootVm, hookName) { if (rootVm[rootConfigKey].initialized && !rootVm[rootConfigKey].pausing) { // batch potential DOM updates to prevent extraneous re-rendering + // eslint-disable-next-line no-void batchUpdate(function () { return void rootVm.$meta().refresh(); }, debounceWait); @@ -344,12 +379,14 @@ function addNavGuards(rootVm) { next(); }); router.afterEach(function () { - var _resume = resume(rootVm), - metaInfo = _resume.metaInfo; + rootVm.$nextTick(function () { + var _resume = resume(rootVm), + metaInfo = _resume.metaInfo; - if (metaInfo && isFunction(metaInfo.afterNavigation)) { - metaInfo.afterNavigation(metaInfo); - } + if (metaInfo && isFunction(metaInfo.afterNavigation)) { + metaInfo.afterNavigation(metaInfo); + } + }); }); } @@ -1613,7 +1650,7 @@ function tagGenerator(options, type, tags, generatorOptions) { } if (attr === 'callback') { - attrs += " onload=\"this.__vm_l=1\""; + attrs += ' onload="this.__vm_l=1"'; continue; } // these form the attribute list for this tag @@ -1714,11 +1751,33 @@ function generateServerInjector(options, metaInfo) { } } + if (serverInjector.extraData) { + for (var appId in serverInjector.extraData) { + var _data = serverInjector.extraData[appId][type]; + + if (_data) { + for (var _attr in _data) { + attributeData[_attr] = _objectSpread2({}, attributeData[_attr], _defineProperty({}, appId, _data[_attr])); + } + } + } + } + return attributeGenerator(options, type, attributeData, arg); } var str = tagGenerator(options, type, serverInjector.data[type], arg); + if (serverInjector.extraData) { + for (var _appId in serverInjector.extraData) { + var _data2 = serverInjector.extraData[_appId][type]; + var extraStr = tagGenerator(options, type, _data2, _objectSpread2({ + appId: _appId + }, arg)); + str = "".concat(str).concat(extraStr); + } + } + return str; } }; @@ -1778,10 +1837,10 @@ function $meta(options) { var $root = this.$root; return { - 'getOptions': function getOptions$1() { + getOptions: function getOptions$1() { return getOptions(options); }, - 'setOptions': function setOptions(newOptions) { + setOptions: function setOptions(newOptions) { var refreshNavKey = 'refreshOnceOnNavigation'; if (newOptions && newOptions[refreshNavKey]) { @@ -1805,19 +1864,19 @@ function $meta(options) { options.waitOnDestroyed = !!newOptions[waitOnDestroyedKey]; } }, - 'refresh': function refresh$1() { + refresh: function refresh$1() { return refresh($root, options); }, - 'inject': function inject$1() { + inject: function inject$1() { return inject($root, options) ; }, - 'pause': function pause$1() { + pause: function pause$1() { return pause($root); }, - 'resume': function resume$1() { + resume: function resume$1() { return resume($root); }, - 'addApp': function addApp$1(appId) { + addApp: function addApp$1(appId) { return addApp($root, appId, options); } }; diff --git a/dist/vue-meta.esm.browser.js b/dist/vue-meta.esm.browser.js index 5a00648a..b6c04aec 100644 --- a/dist/vue-meta.esm.browser.js +++ b/dist/vue-meta.esm.browser.js @@ -1,6 +1,6 @@ /** - * vue-meta v2.3.1 - * (c) 2019 + * vue-meta v2.3.2 + * (c) 2020 * - Declan de Wet * - Sébastien Chopin (@Atinux) * - Pim (@pimlie) @@ -10,7 +10,7 @@ import deepmerge from 'deepmerge'; -var version = "2.3.1"; +var version = "2.3.2"; function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { @@ -162,6 +162,7 @@ function triggerUpdate(_ref, rootVm, hookName) { if (rootVm[rootConfigKey].initialized && !rootVm[rootConfigKey].pausing) { // batch potential DOM updates to prevent extraneous re-rendering + // eslint-disable-next-line no-void batchUpdate(function () { return void rootVm.$meta().refresh(); }, debounceWait); @@ -301,12 +302,14 @@ function addNavGuards(rootVm) { next(); }); router.afterEach(function () { - var _resume = resume(rootVm), - metaInfo = _resume.metaInfo; + rootVm.$nextTick(function () { + var _resume = resume(rootVm), + metaInfo = _resume.metaInfo; - if (metaInfo && isFunction(metaInfo.afterNavigation)) { - metaInfo.afterNavigation(metaInfo); - } + if (metaInfo && isFunction(metaInfo.afterNavigation)) { + metaInfo.afterNavigation(metaInfo); + } + }); }); } @@ -1467,10 +1470,10 @@ function $meta(options) { var $root = this.$root; return { - 'getOptions': function getOptions$1() { + getOptions: function getOptions$1() { return getOptions(options); }, - 'setOptions': function setOptions(newOptions) { + setOptions: function setOptions(newOptions) { var refreshNavKey = 'refreshOnceOnNavigation'; if (newOptions && newOptions[refreshNavKey]) { @@ -1494,19 +1497,19 @@ function $meta(options) { options.waitOnDestroyed = !!newOptions[waitOnDestroyedKey]; } }, - 'refresh': function refresh$1() { + refresh: function refresh$1() { return refresh($root, options); }, - 'inject': function inject() { + inject: function inject() { return showWarningNotSupportedInBrowserBundle('inject'); }, - 'pause': function pause$1() { + pause: function pause$1() { return pause($root); }, - 'resume': function resume$1() { + resume: function resume$1() { return resume($root); }, - 'addApp': function addApp$1(appId) { + addApp: function addApp$1(appId) { return addApp($root, appId, options); } }; diff --git a/dist/vue-meta.esm.browser.min.js b/dist/vue-meta.esm.browser.min.js index 43428cd8..d7212ba0 100644 --- a/dist/vue-meta.esm.browser.min.js +++ b/dist/vue-meta.esm.browser.min.js @@ -1 +1,10 @@ -import e from"deepmerge";function n(e){return(n="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function t(e){return Array.isArray(e)}function r(e){return void 0===e}function i(e){return"object"===n(e)}function o(e){return"object"===n(e)&&null!==e}function a(e){return"function"==typeof e}var u=(function(){try{return!r(window)}catch(e){return!1}}()?window:global).console||{};function f(e){u&&u.warn&&u.warn(e)}var c=function(e){return f("".concat(e," is not supported in browser builds"))},s=function(){return f("This vue app/component has no vue-meta configuration")},d={title:void 0,titleChunk:"",titleTemplate:"%s",htmlAttrs:{},bodyAttrs:{},headAttrs:{},base:[],link:[],meta:[],style:[],script:[],noscript:[],__dangerouslyDisableSanitizers:[],__dangerouslyDisableSanitizersByTagID:{}},l="_vueMeta",v={t:"metaInfo",i:"data-vue-meta",o:"data-vue-meta-server-rendered",u:"vmid",s:"content",l:"template",v:!0,m:10,p:"ssr"},m=Object.keys(d),p=[m[12],m[13]],y=[m[1],m[2],"changed"].concat(p),h=[m[3],m[4],m[5]],b=["link","style","script"],g=["once","template"],I=["body","pbody"],N=["allowfullscreen","amp","async","autofocus","autoplay","checked","compact","controls","declare","default","defaultchecked","defaultmuted","defaultselected","defer","disabled","enabled","formnovalidate","hidden","indeterminate","inert","ismap","itemscope","loop","multiple","muted","nohref","noresize","noshade","novalidate","nowrap","open","pauseonexit","readonly","required","reversed","scoped","seamless","selected","sortable","truespeed","typemustmatch","visible"],A=null;function T(e,n,t){var r=e.m;n[l].h||!n[l].g&&"watcher"!==t||(n[l].h=null),n[l].h&&!n[l].I&&function(e,n){if(!(n=void 0===n?10:n))return void e();clearTimeout(A),A=setTimeout((function(){e()}),n)}((function(){n.$meta().refresh()}),r)}function w(e,n,t){if(!Array.prototype.findIndex){for(var r=0;r/g,">"],[/"/g,'"'],[/'/g,"'"]];function z(e,n,r){r=r||[];var i={M:function(e){return r.reduce((function(e,n){return e.replace(n[0],n[1])}),e)}};return p.forEach((function(e,t){if(0===t)K(n,e);else if(1===t)for(var r in n[e])K(n[e],r);i[e]=n[e]})),function e(n,r,i,a){var u=r.u,f=i.M,c=void 0===f?function(e){return e}:f,s={};for(var d in n){var l=n[d];if(M(y,d))s[d]=l;else{var v=p[0];if(i[v]&&M(i[v],d))s[d]=l;else{var m=n[u];if(m&&(v=p[1],i[v]&&i[v][m]&&M(i[v][m],d)))s[d]=l;else if("string"==typeof l?s[d]=c(l):t(l)?s[d]=l.map((function(n){return o(n)?e(n,r,i,!0):c(n)})):o(l)?s[d]=e(l,r,i,!0):s[d]=l,a){var h=c(d);d!==h&&(s[h]=s[d],delete s[d])}}}}return s}(n,e,i)}function B(e,n,t,i){var o=e.component,u=e.l,f=e.s;return!0!==t&&!0!==n[u]&&(r(t)&&n[u]&&(t=n[u],n[u]=!0),t?(r(i)&&(i=n[f]),n[f]=a(t)?t.call(o,i):t.replace(/%s/g,i),!0):(delete n[u],!1))}var J=!1;function C(n,t,r){return r=r||{},void 0===t.title&&delete t.title,h.forEach((function(e){if(t[e])for(var n in t[e])n in t[e]&&void 0===t[e][n]&&(M(N,n)&&!J&&(f("VueMeta: Please note that since v2 the value undefined is not used to indicate boolean attributes anymore, see migration guide for details"),J=!0),delete t[e][n])})),e(n,t,{K:function(e,n){return function(e,n,t){var r=e.component,i=e.u,o=e.l,a=e.s,u=[];return n.length||t.length?(n.forEach((function(e,n){if(e[i]){var f=w(t,(function(n){return n[i]===e[i]})),c=t[f];if(-1!==f){if(a in c&&void 0===c[a]||"innerHTML"in c&&void 0===c.innerHTML)return u.push(e),void t.splice(f,1);if(null!==c[a]&&null!==c.innerHTML){var s=e[o];if(s){if(!c[o])return B({component:r,l:o,s:a},c,s),void(c.template=!0);c[a]||B({component:r,l:o,s:a},c,void 0,e[a])}}else t.splice(f,1)}else u.push(e)}else u.push(e)})),u.concat(t)):u}(r,e,n)}})}function H(e,n){return function e(n,t,o){o=o||{};if(t._inactive)return o;n=n||{};var a=n,u=a.t;var f=t.$metaInfo,c=t.$options,s=t.$children;if(c[u]){var d=f||c[u];i(d)&&(o=C(o,d,n))}s.length&&s.forEach((function(t){(function(e){return(e=e||this)&&!r(e[l])})(t)&&(o=e(n,t,o))}));return o}(e||{},n,d)}var L=function(e,n){return(n||document).querySelectorAll(e)};function P(e,n){return e[n]||(e[n]=document.getElementsByTagName(n)[0]),e[n]}function R(e,n,t){var r=n.T,i=n.i,o=n.type,a=n.u;t=t||{};var u=["".concat(o,"[").concat(i,'="').concat(r,'"]'),"".concat(o,"[data-").concat(a,"]")].map((function(e){for(var n in t){var r=t[n],i=r&&!0!==r?'="'.concat(r,'"'):"";e+="[data-".concat(n).concat(i,"]")}return e}));return O(L(u.join(", "),e))}function $(e,n){e.removeAttribute(n)}var q=[];function E(e,n,t,r){var i=e.u,o=!1;return t.forEach((function(e){e[i]&&e.callback&&(o=!0,function(e,n){1===arguments.length&&(n=e,e=""),q.push([e,n])}("".concat(n,"[data-").concat(i,'="').concat(e[i],'"]'),e.callback))})),r&&o?U():o}function U(){var e;"complete"!==(e||document).readyState?document.onreadystatechange=function(){F()}:F()}function F(e){q.forEach((function(n){var t=n[0],r=n[1],i="".concat(t,'[onload="this.__vm_l=1"]'),o=[];e||(o=O(L(i))),e&&e.matches(i)&&(o=[e]),o.forEach((function(e){if(!e.__vm_cb){var n=function(){e.__vm_cb=!0,$(e,"onload"),r(e)};e.__vm_l?n():e.__vm_ev||(e.__vm_ev=!0,e.addEventListener("load",n))}}))}))}var G,Q={};function X(e,n,t,r,i){var o=(n||{}).i,a=i.getAttribute(o);a&&(Q[t]=JSON.parse(decodeURI(a)),$(i,o));var u=Q[t]||{},f=[];for(var c in u)u[c]&&e in u[c]&&(f.push(c),r[c]||delete u[c][e]);for(var s in r){var d=u[s];d&&d[e]===r[s]||(f.push(s),r[s]&&(u[s]=u[s]||{},u[s][e]=r[s]))}for(var l=0,v=f;l1){var v=[];r=r.filter((function(e){var n=JSON.stringify(e),t=!M(v,n);return v.push(n),t}))}r.forEach((function(n){if(!n.skip){var r=document.createElement(t);r.setAttribute(u,e),Object.keys(n).forEach((function(e){if(!M(g,e))if("innerHTML"!==e)if("json"!==e)if("cssText"!==e)if("callback"!==e){var t=M(c,e)?"data-".concat(e):e,i=M(N,e);if(!i||n[e]){var o=i?"":n[e];r.setAttribute(t,o)}}else r.onload=function(){return n[e](r)};else r.styleSheet?r.styleSheet.cssText=n.cssText:r.appendChild(document.createTextNode(n.cssText));else r.innerHTML=JSON.stringify(n.json);else r.innerHTML=n.innerHTML}));var i,o=l[function(e){var n=e.body,t=e.pbody;return n?"body":t?"pbody":"head"}(n)];o.some((function(e,n){return i=n,r.isEqualNode(e)}))&&(i||0===i)?o.splice(i,1):s.push(r)}}));var m=[];for(var p in l)Array.prototype.push.apply(m,l[p]);return m.forEach((function(e){e.parentNode.removeChild(e)})),s.forEach((function(e){e.hasAttribute("data-body")?o.appendChild(e):e.hasAttribute("data-pbody")?o.insertBefore(e,o.firstChild):i.appendChild(e)})),{oldTags:m,newTags:s}}function Z(e,n,r){var i=n=n||{},o=i.o,a=i.p,u={},f=P(u,"html");if(e===a&&f.hasAttribute(o)){$(f,o);var c=!1;return b.forEach((function(e){r[e]&&E(n,e,r[e])&&(c=!0)})),c&&U(),!1}var s,d={},l={};for(var v in r)if(!M(y,v))if("title"!==v){if(M(h,v)){var m=v.substr(0,4);X(e,n,v,r[v],P(u,m))}else if(t(r[v])){var p=Y(e,n,v,r[v],P(u,"head"),P(u,"body")),g=p.oldTags,I=p.newTags;I.length&&(d[v]=I,l[v]=g)}}else((s=r.title)||""===s)&&(document.title=s);return{S:d,j:l}}function ee(e,n,t){return{set:function(r){return function(e,n,t,r){if(e&&e.$el)return Z(n,t,r);(G=G||{})[n]=r}(e,n,t,r)},remove:function(){return function(e,n,t){if(e&&e.$el){var r={},i=!0,o=!1,a=void 0;try{for(var u,f=h[Symbol.iterator]();!(i=(u=f.next()).done);i=!0){var c=u.value,s=c.substr(0,4);X(n,t,c,{},P(r,s))}}catch(e){o=!0,a=e}finally{try{i||null==f.return||f.return()}finally{if(o)throw a}}return function(e,n){var t=e.i;O(L("[".concat(t,'="').concat(n,'"]'))).map((function(e){return e.remove()}))}(t,n)}G[n]&&(delete G[n],te())}(e,n,t)}}}function ne(){return G}function te(e){!e&&Object.keys(G).length||(G=void 0)}function re(e,n){if(n=n||{},!e[l])return s(),{};var t=function(e,n,t,r){t=t||[];var i=(e=e||{}).u;return n.title&&(n.titleChunk=n.title),n.titleTemplate&&"%s"!==n.titleTemplate&&B({component:r,s:"title"},n,n.titleTemplate,n.titleChunk||""),n.base&&(n.base=Object.keys(n.base).length?[n.base]:[]),n.meta&&(n.meta=n.meta.filter((function(e,n,t){return!e[i]||n===w(t,(function(n){return n[i]===e[i]}))})),n.meta.forEach((function(n){return B(e,n)}))),z(e,n,t)}(n,H(n,e),W,e),r=Z(e[l].T,n,t);r&&a(t.changed)&&(t.changed(t,r.S,r.j),r={addedTags:r.S,removedTags:r.j});var i=ne();if(i){for(var o in i)Z(o,n,i[o]),delete i[o];te(!0)}return{vm:e,metaInfo:t,tags:r}}function ie(e){e=e||{};var n=this.$root;return{getOptions:function(){return function(e){var n={};for(var t in e)n[t]=e[t];return n}(e)},setOptions:function(t){t&&t.O&&(e.O=!!t.O,k(n));if(t&&"debounceWait"in t){var r=parseInt(t.m);isNaN(r)||(e.m=r)}t&&"waitOnDestroyed"in t&&(e.v=!!t.v)},refresh:function(){return re(n,e)},inject:function(){return c("inject")},pause:function(){return D(n)},resume:function(){return _(n)},addApp:function(t){return ee(n,t,e)}}}var oe={version:"2.3.1",install:function(e,n){e.__vuemeta_installed||(e.__vuemeta_installed=!0,n=function(e){return{t:(e=i(e)?e:{}).keyName||v.t,i:e.attribute||v.i,o:e.ssrAttribute||v.o,u:e.tagIDKeyName||v.u,s:e.contentKeyName||v.s,l:e.metaTemplateKeyName||v.l,m:r(e.debounceWait)?v.m:e.debounceWait,v:r(e.waitOnDestroyed)?v.v:e.waitOnDestroyed,p:e.ssrAppId||v.p,O:!!e.refreshOnceOnNavigation}}(n),e.prototype.$meta=function(){return ie.call(this,n)},e.mixin(V(e,n)))},generate:function(e,n){return c("generate")},hasMetaInfo:j};export default oe; +/** + * vue-meta v2.3.2 + * (c) 2020 + * - Declan de Wet + * - Sébastien Chopin (@Atinux) + * - Pim (@pimlie) + * - All the amazing contributors + * @license MIT + */ +import n from"deepmerge";function e(n){return(e="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(n){return typeof n}:function(n){return n&&"function"==typeof Symbol&&n.constructor===Symbol&&n!==Symbol.prototype?"symbol":typeof n})(n)}function t(n){return Array.isArray(n)}function r(n){return void 0===n}function i(n){return"object"===e(n)}function o(n){return"object"===e(n)&&null!==n}function a(n){return"function"==typeof n}var u=(function(){try{return!r(window)}catch(n){return!1}}()?window:global).console||{};function f(n){u&&u.warn&&u.warn(n)}var c=function(n){return f("".concat(n," is not supported in browser builds"))},s={title:void 0,titleChunk:"",titleTemplate:"%s",htmlAttrs:{},bodyAttrs:{},headAttrs:{},base:[],link:[],meta:[],style:[],script:[],noscript:[],__dangerouslyDisableSanitizers:[],__dangerouslyDisableSanitizersByTagID:{}},d="metaInfo",l="data-vue-meta",v="data-vue-meta-server-rendered",m="vmid",p="content",y="template",h=!0,b=10,g="ssr",I=Object.keys(s),A=[I[12],I[13]],N=[I[1],I[2],"changed"].concat(A),T=[I[3],I[4],I[5]],w=["link","style","script"],O=["once","template"],M=["body","pbody"],S=["allowfullscreen","amp","async","autofocus","autoplay","checked","compact","controls","declare","default","defaultchecked","defaultmuted","defaultselected","defer","disabled","enabled","formnovalidate","hidden","indeterminate","inert","ismap","itemscope","loop","multiple","muted","nohref","noresize","noshade","novalidate","nowrap","open","pauseonexit","readonly","required","reversed","scoped","seamless","selected","sortable","truespeed","typemustmatch","visible"],j=null;function K(n,e,t){var r=n.t;e._vueMeta.i||!e._vueMeta.o&&"watcher"!==t||(e._vueMeta.i=null),e._vueMeta.i&&!e._vueMeta.u&&function(n,e){if(!(e=void 0===e?10:e))return void n();clearTimeout(j),j=setTimeout((function(){n()}),e)}((function(){e.$meta().refresh()}),r)}function _(n,e,t){if(!Array.prototype.findIndex){for(var r=0;r/g,">"],[/"/g,'"'],[/'/g,"'"]];function P(n,e,r){r=r||[];var i={A:function(n){return r.reduce((function(n,e){return n.replace(e[0],e[1])}),n)}};return A.forEach((function(n,t){if(0===t)x(e,n);else if(1===t)for(var r in e[n])x(e[n],r);i[n]=e[n]})),function n(e,r,i,a){var u=r.j,f=i.A,c=void 0===f?function(n){return n}:f,s={};for(var d in e){var l=e[d];if(k(N,d))s[d]=l;else{var v=A[0];if(i[v]&&k(i[v],d))s[d]=l;else{var m=e[u];if(m&&(v=A[1],i[v]&&i[v][m]&&k(i[v][m],d)))s[d]=l;else if("string"==typeof l?s[d]=c(l):t(l)?s[d]=l.map((function(e){return o(e)?n(e,r,i,!0):c(e)})):o(l)?s[d]=n(l,r,i,!0):s[d]=l,a){var p=c(d);d!==p&&(s[p]=s[d],delete s[d])}}}}return s}(e,n,i)}function R(n,e,t,i){var o=n.component,u=n.N,f=n.T;return!0!==t&&!0!==e[u]&&(r(t)&&e[u]&&(t=e[u],e[u]=!0),t?(r(i)&&(i=e[f]),e[f]=a(t)?t.call(o,i):t.replace(/%s/g,i),!0):(delete e[u],!1))}var $=!1;function q(e,t,r){return r=r||{},void 0===t.title&&delete t.title,T.forEach((function(n){if(t[n])for(var e in t[n])e in t[n]&&void 0===t[n][e]&&(k(S,e)&&!$&&(f("VueMeta: Please note that since v2 the value undefined is not used to indicate boolean attributes anymore, see migration guide for details"),$=!0),delete t[n][e])})),n(e,t,{O:function(n,e){return function(n,e,t){var r=n.component,i=n.j,o=n.N,a=n.T,u=[];return e.length||t.length?(e.forEach((function(n,e){if(n[i]){var f=_(t,(function(e){return e[i]===n[i]})),c=t[f];if(-1!==f){if(a in c&&void 0===c[a]||"innerHTML"in c&&void 0===c.innerHTML)return u.push(n),void t.splice(f,1);if(null!==c[a]&&null!==c.innerHTML){var s=n[o];if(s){if(!c[o])return R({component:r,N:o,T:a},c,s),void(c.template=!0);c[a]||R({component:r,N:o,T:a},c,void 0,n[a])}}else t.splice(f,1)}else u.push(n)}else u.push(n)})),u.concat(t)):u}(r,n,e)}})}function E(n,e){return function n(e,t,o){if(o=o||{},t._inactive)return o;var a=(e=e||{}).v,u=t.$metaInfo,f=t.$options,c=t.$children;if(f[a]){var s=u||f[a];i(s)&&(o=q(o,s,e))}c.length&&c.forEach((function(t){(function(n){return(n=n||this)&&!r(n._vueMeta)})(t)&&(o=n(e,t,o))}));return o}(n||{},e,s)}var U=function(n,e){return(e||document).querySelectorAll(n)};function F(n,e){return n[e]||(n[e]=document.getElementsByTagName(e)[0]),n[e]}function G(n,e,t){var r=e.m,i=e.M,o=e.type,a=e.j;t=t||{};var u=["".concat(o,"[").concat(i,'="').concat(r,'"]'),"".concat(o,"[data-").concat(a,"]")].map((function(n){for(var e in t){var r=t[e],i=r&&!0!==r?'="'.concat(r,'"'):"";n+="[data-".concat(e).concat(i,"]")}return n}));return D(U(u.join(", "),n))}function Q(n,e){n.removeAttribute(e)}var X=[];function Y(n,e,t,r){var i=n.j,o=!1;return t.forEach((function(n){n[i]&&n.callback&&(o=!0,function(n,e){1===arguments.length&&(e=n,n=""),X.push([n,e])}("".concat(e,"[data-").concat(i,'="').concat(n[i],'"]'),n.callback))})),r&&o?Z():o}function Z(){var n;"complete"!==(n||document).readyState?document.onreadystatechange=function(){nn()}:nn()}function nn(n){X.forEach((function(e){var t=e[0],r=e[1],i="".concat(t,'[onload="this.__vm_l=1"]'),o=[];n||(o=D(U(i))),n&&n.matches(i)&&(o=[n]),o.forEach((function(n){if(!n.__vm_cb){var e=function(){n.__vm_cb=!0,Q(n,"onload"),r(n)};n.__vm_l?e():n.__vm_ev||(n.__vm_ev=!0,n.addEventListener("load",e))}}))}))}var en,tn={};function rn(n,e,t,r,i){var o=(e||{}).M,a=i.getAttribute(o);a&&(tn[t]=JSON.parse(decodeURI(a)),Q(i,o));var u=tn[t]||{},f=[];for(var c in u)u[c]&&n in u[c]&&(f.push(c),r[c]||delete u[c][n]);for(var s in r){var d=u[s];d&&d[n]===r[s]||(f.push(s),r[s]&&(u[s]=u[s]||{},u[s][n]=r[s]))}for(var l=0,v=f;l1){var v=[];r=r.filter((function(n){var e=JSON.stringify(n),t=!k(v,e);return v.push(e),t}))}r.forEach((function(e){if(!e.skip){var r=document.createElement(t);r.setAttribute(u,n),Object.keys(e).forEach((function(n){if(!k(O,n))if("innerHTML"!==n)if("json"!==n)if("cssText"!==n)if("callback"!==n){var t=k(c,n)?"data-".concat(n):n,i=k(S,n);if(!i||e[n]){var o=i?"":e[n];r.setAttribute(t,o)}}else r.onload=function(){return e[n](r)};else r.styleSheet?r.styleSheet.cssText=e.cssText:r.appendChild(document.createTextNode(e.cssText));else r.innerHTML=JSON.stringify(e.json);else r.innerHTML=e.innerHTML}));var i,o=l[function(n){var e=n.body,t=n.pbody;return e?"body":t?"pbody":"head"}(e)];o.some((function(n,e){return i=e,r.isEqualNode(n)}))&&(i||0===i)?o.splice(i,1):s.push(r)}}));var m=[];for(var p in l)Array.prototype.push.apply(m,l[p]);return m.forEach((function(n){n.parentNode.removeChild(n)})),s.forEach((function(n){n.hasAttribute("data-body")?o.appendChild(n):n.hasAttribute("data-pbody")?o.insertBefore(n,o.firstChild):i.appendChild(n)})),{oldTags:m,newTags:s}}function an(n,e,r){var i=e=e||{},o=i.S,a=i.p,u={},f=F(u,"html");if(n===a&&f.hasAttribute(o)){Q(f,o);var c=!1;return w.forEach((function(n){r[n]&&Y(e,n,r[n])&&(c=!0)})),c&&Z(),!1}var s,d={},l={};for(var v in r)if(!k(N,v))if("title"!==v){if(k(T,v)){var m=v.substr(0,4);rn(n,e,v,r[v],F(u,m))}else if(t(r[v])){var p=on(n,e,v,r[v],F(u,"head"),F(u,"body")),y=p.oldTags,h=p.newTags;h.length&&(d[v]=h,l[v]=y)}}else((s=r.title)||""===s)&&(document.title=s);return{D:d,K:l}}function un(n,e,t){return{set:function(r){return function(n,e,t,r){if(n&&n.$el)return an(e,t,r);(en=en||{})[e]=r}(n,e,t,r)},remove:function(){return function(n,e,t){if(n&&n.$el){var r={},i=!0,o=!1,a=void 0;try{for(var u,f=T[Symbol.iterator]();!(i=(u=f.next()).done);i=!0){var c=u.value,s=c.substr(0,4);rn(e,t,c,{},F(r,s))}}catch(n){o=!0,a=n}finally{try{i||null==f.return||f.return()}finally{if(o)throw a}}return function(n,e){var t=n.M;D(U("[".concat(t,'="').concat(e,'"]'))).map((function(n){return n.remove()}))}(t,e)}en[e]&&(delete en[e],cn())}(n,e,t)}}}function fn(){return en}function cn(n){!n&&Object.keys(en).length||(en=void 0)}function sn(n,e){if(e=e||{},!n._vueMeta)return f("This vue app/component has no vue-meta configuration"),{};var t=function(n,e,t,r){t=t||[];var i=(n=n||{}).j;return e.title&&(e.titleChunk=e.title),e.titleTemplate&&"%s"!==e.titleTemplate&&R({component:r,T:"title"},e,e.titleTemplate,e.titleChunk||""),e.base&&(e.base=Object.keys(e.base).length?[e.base]:[]),e.meta&&(e.meta=e.meta.filter((function(n,e,t){return!n[i]||e===_(t,(function(e){return e[i]===n[i]}))})),e.meta.forEach((function(e){return R(n,e)}))),P(n,e,t)}(e,E(e,n),L,n),r=an(n._vueMeta.m,e,t);r&&a(t.changed)&&(t.changed(t,r.D,r.K),r={addedTags:r.D,removedTags:r.K});var i=fn();if(i){for(var o in i)an(o,e,i[o]),delete i[o];cn(!0)}return{vm:n,metaInfo:t,tags:r}}function dn(n){n=n||{};var e=this.$root;return{getOptions:function(){return function(n){var e={};for(var t in n)e[t]=n[t];return e}(n)},setOptions:function(t){t&&t.h&&(n.h=!!t.h,W(e));if(t&&"debounceWait"in t){var r=parseInt(t.t);isNaN(r)||(n.t=r)}t&&"waitOnDestroyed"in t&&(n.g=!!t.g)},refresh:function(){return sn(e,n)},inject:function(){return c("inject")},pause:function(){return B(e)},resume:function(){return J(e)},addApp:function(t){return un(e,t,n)}}}var ln={version:"2.3.2",install:function(n,e){n.__vuemeta_installed||(n.__vuemeta_installed=!0,e=function(n){return{v:(n=i(n)?n:{}).keyName||d,M:n.attribute||l,S:n.ssrAttribute||v,j:n.tagIDKeyName||m,T:n.contentKeyName||p,N:n.metaTemplateKeyName||y,t:r(n.debounceWait)?b:n.debounceWait,g:r(n.waitOnDestroyed)?h:n.waitOnDestroyed,p:n.ssrAppId||g,h:!!n.refreshOnceOnNavigation}}(e),n.prototype.$meta=function(){return dn.call(this,e)},n.mixin(H(n,e)))},generate:function(n,e){return c("generate")},hasMetaInfo:z};export default ln; diff --git a/dist/vue-meta.esm.js b/dist/vue-meta.esm.js index f1164980..3a336f46 100644 --- a/dist/vue-meta.esm.js +++ b/dist/vue-meta.esm.js @@ -1,6 +1,6 @@ /** - * vue-meta v2.3.1 - * (c) 2019 + * vue-meta v2.3.2 + * (c) 2020 * - Declan de Wet * - Sébastien Chopin (@Atinux) * - Pim (@pimlie) @@ -10,7 +10,7 @@ import deepmerge from 'deepmerge'; -var version = "2.3.1"; +var version = "2.3.2"; function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { @@ -41,6 +41,40 @@ function _defineProperty(obj, key, value) { return obj; } +function ownKeys(object, enumerableOnly) { + var keys = Object.keys(object); + + if (Object.getOwnPropertySymbols) { + var symbols = Object.getOwnPropertySymbols(object); + if (enumerableOnly) symbols = symbols.filter(function (sym) { + return Object.getOwnPropertyDescriptor(object, sym).enumerable; + }); + keys.push.apply(keys, symbols); + } + + return keys; +} + +function _objectSpread2(target) { + for (var i = 1; i < arguments.length; i++) { + var source = arguments[i] != null ? arguments[i] : {}; + + if (i % 2) { + ownKeys(Object(source), true).forEach(function (key) { + _defineProperty(target, key, source[key]); + }); + } else if (Object.getOwnPropertyDescriptors) { + Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); + } else { + ownKeys(Object(source)).forEach(function (key) { + Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); + }); + } + } + + return target; +} + function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread(); } @@ -201,6 +235,7 @@ function triggerUpdate(_ref, rootVm, hookName) { if (rootVm[rootConfigKey].initialized && !rootVm[rootConfigKey].pausing) { // batch potential DOM updates to prevent extraneous re-rendering + // eslint-disable-next-line no-void batchUpdate(function () { return void rootVm.$meta().refresh(); }, debounceWait); @@ -340,12 +375,14 @@ function addNavGuards(rootVm) { next(); }); router.afterEach(function () { - var _resume = resume(rootVm), - metaInfo = _resume.metaInfo; + rootVm.$nextTick(function () { + var _resume = resume(rootVm), + metaInfo = _resume.metaInfo; - if (metaInfo && isFunction(metaInfo.afterNavigation)) { - metaInfo.afterNavigation(metaInfo); - } + if (metaInfo && isFunction(metaInfo.afterNavigation)) { + metaInfo.afterNavigation(metaInfo); + } + }); }); } @@ -1609,7 +1646,7 @@ function tagGenerator(options, type, tags, generatorOptions) { } if (attr === 'callback') { - attrs += " onload=\"this.__vm_l=1\""; + attrs += ' onload="this.__vm_l=1"'; continue; } // these form the attribute list for this tag @@ -1710,11 +1747,33 @@ function generateServerInjector(options, metaInfo) { } } + if (serverInjector.extraData) { + for (var appId in serverInjector.extraData) { + var _data = serverInjector.extraData[appId][type]; + + if (_data) { + for (var _attr in _data) { + attributeData[_attr] = _objectSpread2({}, attributeData[_attr], _defineProperty({}, appId, _data[_attr])); + } + } + } + } + return attributeGenerator(options, type, attributeData, arg); } var str = tagGenerator(options, type, serverInjector.data[type], arg); + if (serverInjector.extraData) { + for (var _appId in serverInjector.extraData) { + var _data2 = serverInjector.extraData[_appId][type]; + var extraStr = tagGenerator(options, type, _data2, _objectSpread2({ + appId: _appId + }, arg)); + str = "".concat(str).concat(extraStr); + } + } + return str; } }; @@ -1774,10 +1833,10 @@ function $meta(options) { var $root = this.$root; return { - 'getOptions': function getOptions$1() { + getOptions: function getOptions$1() { return getOptions(options); }, - 'setOptions': function setOptions(newOptions) { + setOptions: function setOptions(newOptions) { var refreshNavKey = 'refreshOnceOnNavigation'; if (newOptions && newOptions[refreshNavKey]) { @@ -1801,19 +1860,19 @@ function $meta(options) { options.waitOnDestroyed = !!newOptions[waitOnDestroyedKey]; } }, - 'refresh': function refresh$1() { + refresh: function refresh$1() { return refresh($root, options); }, - 'inject': function inject$1() { + inject: function inject$1() { return inject($root, options) ; }, - 'pause': function pause$1() { + pause: function pause$1() { return pause($root); }, - 'resume': function resume$1() { + resume: function resume$1() { return resume($root); }, - 'addApp': function addApp$1(appId) { + addApp: function addApp$1(appId) { return addApp($root, appId, options); } }; diff --git a/dist/vue-meta.js b/dist/vue-meta.js index b42d3594..a8199f08 100644 --- a/dist/vue-meta.js +++ b/dist/vue-meta.js @@ -1,6 +1,6 @@ /** - * vue-meta v2.3.1 - * (c) 2019 + * vue-meta v2.3.2 + * (c) 2020 * - Declan de Wet * - Sébastien Chopin (@Atinux) * - Pim (@pimlie) @@ -12,9 +12,9 @@ typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() : typeof define === 'function' && define.amd ? define(factory) : (global = global || self, global.VueMeta = factory()); -}(this, function () { 'use strict'; +}(this, (function () { 'use strict'; - var version = "2.3.1"; + var version = "2.3.2"; function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { @@ -166,6 +166,7 @@ if (rootVm[rootConfigKey].initialized && !rootVm[rootConfigKey].pausing) { // batch potential DOM updates to prevent extraneous re-rendering + // eslint-disable-next-line no-void batchUpdate(function () { return void rootVm.$meta().refresh(); }, debounceWait); @@ -305,12 +306,14 @@ next(); }); router.afterEach(function () { - var _resume = resume(rootVm), - metaInfo = _resume.metaInfo; + rootVm.$nextTick(function () { + var _resume = resume(rootVm), + metaInfo = _resume.metaInfo; - if (metaInfo && isFunction(metaInfo.afterNavigation)) { - metaInfo.afterNavigation(metaInfo); - } + if (metaInfo && isFunction(metaInfo.afterNavigation)) { + metaInfo.afterNavigation(metaInfo); + } + }); }); } @@ -655,15 +658,27 @@ { return deepmerge; } - - var customMerge = false(key); - return typeof customMerge === 'function' ? customMerge : deepmerge; } function getKeys(target) { return Object.keys(target); } + function propertyIsOnObject(object, property) { + try { + return property in object; + } catch (_) { + return false; + } + } // Protects from prototype poisoning and unexpected merging up the prototype chain. + + + function propertyIsUnsafe(target, key) { + return propertyIsOnObject(target, key) // Properties are safe to merge if they don't exist in the target yet, + && !(Object.hasOwnProperty.call(target, key) // unsafe if they exist up the prototype chain, + && Object.propertyIsEnumerable.call(target, key)); // and also unsafe if they're nonenumerable. + } + function mergeObject(target, source, options) { var destination = {}; @@ -674,10 +689,14 @@ } getKeys(source).forEach(function (key) { - if (!options.isMergeableObject(source[key]) || !target[key]) { - destination[key] = cloneUnlessOtherwiseSpecified(source[key]); + if (propertyIsUnsafe(target, key)) { + return; + } + + if (propertyIsOnObject(target, key) && options.isMergeableObject(source[key])) { + destination[key] = getMergeFunction()(target[key], source[key], options); } else { - destination[key] = getMergeFunction(key)(target[key], source[key], options); + destination[key] = cloneUnlessOtherwiseSpecified(source[key]); } }); return destination; @@ -686,7 +705,10 @@ function deepmerge(target, source, options) { options = options || {}; options.arrayMerge = options.arrayMerge; - options.isMergeableObject = options.isMergeableObject || isMergeableObject; + options.isMergeableObject = options.isMergeableObject || isMergeableObject; // cloneUnlessOtherwiseSpecified is added to `options` so that custom arrayMerge() + // implementations can use it. The caller may not replace it. + + options.cloneUnlessOtherwiseSpecified = cloneUnlessOtherwiseSpecified; var sourceIsArray = Array.isArray(source); var targetIsArray = Array.isArray(target); var sourceAndTargetTypesMatch = sourceIsArray === targetIsArray; @@ -1539,10 +1561,10 @@ var $root = this.$root; return { - 'getOptions': function getOptions$1() { + getOptions: function getOptions$1() { return getOptions(options); }, - 'setOptions': function setOptions(newOptions) { + setOptions: function setOptions(newOptions) { var refreshNavKey = 'refreshOnceOnNavigation'; if (newOptions && newOptions[refreshNavKey]) { @@ -1566,19 +1588,19 @@ options.waitOnDestroyed = !!newOptions[waitOnDestroyedKey]; } }, - 'refresh': function refresh$1() { + refresh: function refresh$1() { return refresh($root, options); }, - 'inject': function inject() { + inject: function inject() { return showWarningNotSupportedInBrowserBundle('inject'); }, - 'pause': function pause$1() { + pause: function pause$1() { return pause($root); }, - 'resume': function resume$1() { + resume: function resume$1() { return resume($root); }, - 'addApp': function addApp$1(appId) { + addApp: function addApp$1(appId) { return addApp($root, appId, options); } }; @@ -1615,4 +1637,4 @@ return index; -})); +}))); diff --git a/dist/vue-meta.min.js b/dist/vue-meta.min.js index 0574fae7..3073febe 100644 --- a/dist/vue-meta.min.js +++ b/dist/vue-meta.min.js @@ -1 +1,10 @@ -!function(n,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(n=n||self).VueMeta=e()}(this,(function(){"use strict";function n(e){return(n="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(n){return typeof n}:function(n){return n&&"function"==typeof Symbol&&n.constructor===Symbol&&n!==Symbol.prototype?"symbol":typeof n})(e)}function e(n){return Array.isArray(n)}function t(n){return void 0===n}function r(e){return"object"===n(e)}function i(e){return"object"===n(e)&&null!==e}function o(n){return"function"==typeof n}var u=(function(){try{return!t(window)}catch(n){return!1}}()?window:global).console||{};function a(n){u&&u.warn&&u.warn(n)}var f=function(n){return a("".concat(n," is not supported in browser builds"))},c=function(){return a("This vue app/component has no vue-meta configuration")},s={title:void 0,titleChunk:"",titleTemplate:"%s",htmlAttrs:{},bodyAttrs:{},headAttrs:{},base:[],link:[],meta:[],style:[],script:[],noscript:[],__dangerouslyDisableSanitizers:[],__dangerouslyDisableSanitizersByTagID:{}},d="_vueMeta",l={t:"metaInfo",i:"data-vue-meta",o:"data-vue-meta-server-rendered",u:"vmid",s:"content",l:"template",v:!0,m:10,p:"ssr"},v=Object.keys(s),m=[v[12],v[13]],y=[v[1],v[2],"changed"].concat(m),p=[v[3],v[4],v[5]],h=["link","style","script"],b=["once","template"],g=["body","pbody"],A=["allowfullscreen","amp","async","autofocus","autoplay","checked","compact","controls","declare","default","defaultchecked","defaultmuted","defaultselected","defer","disabled","enabled","formnovalidate","hidden","indeterminate","inert","ismap","itemscope","loop","multiple","muted","nohref","noresize","noshade","novalidate","nowrap","open","pauseonexit","readonly","required","reversed","scoped","seamless","selected","sortable","truespeed","typemustmatch","visible"],I=null;function N(n,e,t){var r=n.m;e[d].h||!e[d].g&&"watcher"!==t||(e[d].h=null),e[d].h&&!e[d].A&&function(n,e){if(!(e=void 0===e?10:e))return void n();clearTimeout(I),I=setTimeout((function(){n()}),e)}((function(){e.$meta().refresh()}),r)}function O(n,e,t){if(!Array.prototype.findIndex){for(var r=0;r/g,">"],[/"/g,'"'],[/'/g,"'"]];function W(n,t,r){r=r||[];var o={j:function(n){return r.reduce((function(n,e){return n.replace(e[0],e[1])}),n)}};return m.forEach((function(n,e){if(0===e)w(t,n);else if(1===e)for(var r in t[n])w(t[n],r);o[n]=t[n]})),function n(t,r,o,u){var a=r.u,f=o.j,c=void 0===f?function(n){return n}:f,s={};for(var d in t){var l=t[d];if(j(y,d))s[d]=l;else{var v=m[0];if(o[v]&&j(o[v],d))s[d]=l;else{var p=t[a];if(p&&(v=m[1],o[v]&&o[v][p]&&j(o[v][p],d)))s[d]=l;else if("string"==typeof l?s[d]=c(l):e(l)?s[d]=l.map((function(e){return i(e)?n(e,r,o,!0):c(e)})):i(l)?s[d]=n(l,r,o,!0):s[d]=l,u){var h=c(d);d!==h&&(s[h]=s[d],delete s[d])}}}}return s}(t,n,o)}var z=function(e){return function(e){return!!e&&"object"===n(e)}(e)&&!function(n){var e=Object.prototype.toString.call(n);return"[object RegExp]"===e||"[object Date]"===e||!1}(e)};function B(n,e){return n}function J(n){return Object.keys(n)}function R(n,e,t){var r={};return t.M(n)&&J(n).forEach((function(e){r[e]=B(n[e])})),J(e).forEach((function(i){t.M(e[i])&&n[i]?r[i]=C(n[i],e[i],t):r[i]=B(e[i])})),r}function C(n,e,t){(t=t||{}).K=t.K,t.M=t.M||z;var r=Array.isArray(e);return r===Array.isArray(n)?r?t.K(n,e,t):R(n,e,t):B(e)}var E=C;function H(n,e,r,i){var u=n.component,a=n.l,f=n.s;return!0!==r&&!0!==e[a]&&(t(r)&&e[a]&&(r=e[a],e[a]=!0),r?(t(i)&&(i=e[f]),e[f]=o(r)?r.call(u,i):r.replace(/%s/g,i),!0):(delete e[a],!1))}var L=!1;function P(n,e,t){return t=t||{},void 0===e.title&&delete e.title,p.forEach((function(n){if(e[n])for(var t in e[n])t in e[n]&&void 0===e[n][t]&&(j(A,t)&&!L&&(a("VueMeta: Please note that since v2 the value undefined is not used to indicate boolean attributes anymore, see migration guide for details"),L=!0),delete e[n][t])})),E(n,e,{K:function(n,e){return function(n,e,t){var r=n.component,i=n.u,o=n.l,u=n.s,a=[];return e.length||t.length?(e.forEach((function(n,e){if(n[i]){var f=O(t,(function(e){return e[i]===n[i]})),c=t[f];if(-1!==f){if(u in c&&void 0===c[u]||"innerHTML"in c&&void 0===c.innerHTML)return a.push(n),void t.splice(f,1);if(null!==c[u]&&null!==c.innerHTML){var s=n[o];if(s){if(!c[o])return H({component:r,l:o,s:u},c,s),void(c.template=!0);c[u]||H({component:r,l:o,s:u},c,void 0,n[u])}}else t.splice(f,1)}else a.push(n)}else a.push(n)})),a.concat(t)):a}(t,n,e)}})}function $(n,e){return function n(e,i,o){o=o||{};if(i._inactive)return o;e=e||{};var u=e,a=u.t;var f=i.$metaInfo,c=i.$options,s=i.$children;if(c[a]){var l=f||c[a];r(l)&&(o=P(o,l,e))}s.length&&s.forEach((function(r){(function(n){return(n=n||this)&&!t(n[d])})(r)&&(o=n(e,r,o))}));return o}(n||{},e,s)}var q=function(n,e){return(e||document).querySelectorAll(n)};function U(n,e){return n[e]||(n[e]=document.getElementsByTagName(e)[0]),n[e]}function F(n,e,t){var r=e.O,i=e.i,o=e.type,u=e.u;t=t||{};var a=["".concat(o,"[").concat(i,'="').concat(r,'"]'),"".concat(o,"[data-").concat(u,"]")].map((function(n){for(var e in t){var r=t[e],i=r&&!0!==r?'="'.concat(r,'"'):"";n+="[data-".concat(e).concat(i,"]")}return n}));return T(q(a.join(", "),n))}function G(n,e){n.removeAttribute(e)}var Q=[];function X(n,e,t,r){var i=n.u,o=!1;return t.forEach((function(n){n[i]&&n.callback&&(o=!0,function(n,e){1===arguments.length&&(e=n,n=""),Q.push([n,e])}("".concat(e,"[data-").concat(i,'="').concat(n[i],'"]'),n.callback))})),r&&o?Y():o}function Y(){var n;"complete"!==(n||document).readyState?document.onreadystatechange=function(){Z()}:Z()}function Z(n){Q.forEach((function(e){var t=e[0],r=e[1],i="".concat(t,'[onload="this.__vm_l=1"]'),o=[];n||(o=T(q(i))),n&&n.matches(i)&&(o=[n]),o.forEach((function(n){if(!n.__vm_cb){var e=function(){n.__vm_cb=!0,G(n,"onload"),r(n)};n.__vm_l?e():n.__vm_ev||(n.__vm_ev=!0,n.addEventListener("load",e))}}))}))}var nn,en={};function tn(n,e,t,r,i){var o=(e||{}).i,u=i.getAttribute(o);u&&(en[t]=JSON.parse(decodeURI(u)),G(i,o));var a=en[t]||{},f=[];for(var c in a)a[c]&&n in a[c]&&(f.push(c),r[c]||delete a[c][n]);for(var s in r){var d=a[s];d&&d[n]===r[s]||(f.push(s),r[s]&&(a[s]=a[s]||{},a[s][n]=r[s]))}for(var l=0,v=f;l1){var v=[];r=r.filter((function(n){var e=JSON.stringify(n),t=!j(v,e);return v.push(e),t}))}r.forEach((function(e){if(!e.skip){var r=document.createElement(t);r.setAttribute(a,n),Object.keys(e).forEach((function(n){if(!j(b,n))if("innerHTML"!==n)if("json"!==n)if("cssText"!==n)if("callback"!==n){var t=j(c,n)?"data-".concat(n):n,i=j(A,n);if(!i||e[n]){var o=i?"":e[n];r.setAttribute(t,o)}}else r.onload=function(){return e[n](r)};else r.styleSheet?r.styleSheet.cssText=e.cssText:r.appendChild(document.createTextNode(e.cssText));else r.innerHTML=JSON.stringify(e.json);else r.innerHTML=e.innerHTML}));var i,o=l[function(n){var e=n.body,t=n.pbody;return e?"body":t?"pbody":"head"}(e)];o.some((function(n,e){return i=e,r.isEqualNode(n)}))&&(i||0===i)?o.splice(i,1):s.push(r)}}));var m=[];for(var y in l)Array.prototype.push.apply(m,l[y]);return m.forEach((function(n){n.parentNode.removeChild(n)})),s.forEach((function(n){n.hasAttribute("data-body")?o.appendChild(n):n.hasAttribute("data-pbody")?o.insertBefore(n,o.firstChild):i.appendChild(n)})),{oldTags:m,newTags:s}}function on(n,t,r){var i=t=t||{},o=i.o,u=i.p,a={},f=U(a,"html");if(n===u&&f.hasAttribute(o)){G(f,o);var c=!1;return h.forEach((function(n){r[n]&&X(t,n,r[n])&&(c=!0)})),c&&Y(),!1}var s,d={},l={};for(var v in r)if(!j(y,v))if("title"!==v){if(j(p,v)){var m=v.substr(0,4);tn(n,t,v,r[v],U(a,m))}else if(e(r[v])){var b=rn(n,t,v,r[v],U(a,"head"),U(a,"body")),g=b.oldTags,A=b.newTags;A.length&&(d[v]=A,l[v]=g)}}else((s=r.title)||""===s)&&(document.title=s);return{D:d,S:l}}function un(n,e,t){return{set:function(r){return function(n,e,t,r){if(n&&n.$el)return on(e,t,r);(nn=nn||{})[e]=r}(n,e,t,r)},remove:function(){return function(n,e,t){if(n&&n.$el){var r={},i=!0,o=!1,u=void 0;try{for(var a,f=p[Symbol.iterator]();!(i=(a=f.next()).done);i=!0){var c=a.value,s=c.substr(0,4);tn(e,t,c,{},U(r,s))}}catch(n){o=!0,u=n}finally{try{i||null==f.return||f.return()}finally{if(o)throw u}}return function(n,e){var t=n.i;T(q("[".concat(t,'="').concat(e,'"]'))).map((function(n){return n.remove()}))}(t,e)}nn[e]&&(delete nn[e],fn())}(n,e,t)}}}function an(){return nn}function fn(n){!n&&Object.keys(nn).length||(nn=void 0)}function cn(n,e){if(e=e||{},!n[d])return c(),{};var t=function(n,e,t,r){t=t||[];var i=(n=n||{}).u;return e.title&&(e.titleChunk=e.title),e.titleTemplate&&"%s"!==e.titleTemplate&&H({component:r,s:"title"},e,e.titleTemplate,e.titleChunk||""),e.base&&(e.base=Object.keys(e.base).length?[e.base]:[]),e.meta&&(e.meta=e.meta.filter((function(n,e,t){return!n[i]||e===O(t,(function(e){return e[i]===n[i]}))})),e.meta.forEach((function(e){return H(n,e)}))),W(n,e,t)}(e,$(e,n),V,n),r=on(n[d].O,e,t);r&&o(t.changed)&&(t.changed(t,r.D,r.S),r={addedTags:r.D,removedTags:r.S});var i=an();if(i){for(var u in i)on(u,e,i[u]),delete i[u];fn(!0)}return{vm:n,metaInfo:t,tags:r}}function sn(n){n=n||{};var e=this.$root;return{getOptions:function(){return function(n){var e={};for(var t in n)e[t]=n[t];return e}(n)},setOptions:function(t){t&&t.T&&(n.T=!!t.T,_(e));if(t&&"debounceWait"in t){var r=parseInt(t.m);isNaN(r)||(n.m=r)}t&&"waitOnDestroyed"in t&&(n.v=!!t.v)},refresh:function(){return cn(e,n)},inject:function(){return f("inject")},pause:function(){return D(e)},resume:function(){return S(e)},addApp:function(t){return un(e,t,n)}}}return{version:"2.3.1",install:function(n,e){n.__vuemeta_installed||(n.__vuemeta_installed=!0,e=function(n){return{t:(n=r(n)?n:{}).keyName||l.t,i:n.attribute||l.i,o:n.ssrAttribute||l.o,u:n.tagIDKeyName||l.u,s:n.contentKeyName||l.s,l:n.metaTemplateKeyName||l.l,m:t(n.debounceWait)?l.m:n.debounceWait,v:t(n.waitOnDestroyed)?l.v:n.waitOnDestroyed,p:n.ssrAppId||l.p,T:!!n.refreshOnceOnNavigation}}(e),n.prototype.$meta=function(){return sn.call(this,e)},n.mixin(x(n,e)))},generate:function(n,e){return f("generate")},hasMetaInfo:K}})); +/** + * vue-meta v2.3.2 + * (c) 2020 + * - Declan de Wet + * - Sébastien Chopin (@Atinux) + * - Pim (@pimlie) + * - All the amazing contributors + * @license MIT + */ +!function(n,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(n=n||self).VueMeta=t()}(this,(function(){"use strict";function n(t){return(n="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(n){return typeof n}:function(n){return n&&"function"==typeof Symbol&&n.constructor===Symbol&&n!==Symbol.prototype?"symbol":typeof n})(t)}function t(n){return Array.isArray(n)}function e(n){return void 0===n}function r(t){return"object"===n(t)}function i(t){return"object"===n(t)&&null!==t}function o(n){return"function"==typeof n}var u=(function(){try{return!e(window)}catch(n){return!1}}()?window:global).console||{};function a(n){u&&u.warn&&u.warn(n)}var f=function(n){return a("".concat(n," is not supported in browser builds"))},c={title:void 0,titleChunk:"",titleTemplate:"%s",htmlAttrs:{},bodyAttrs:{},headAttrs:{},base:[],link:[],meta:[],style:[],script:[],noscript:[],__dangerouslyDisableSanitizers:[],__dangerouslyDisableSanitizersByTagID:{}},s="metaInfo",d="data-vue-meta",l="data-vue-meta-server-rendered",v="vmid",m="content",y="template",p=!0,h=10,b="ssr",g=Object.keys(c),A=[g[12],g[13]],j=[g[1],g[2],"changed"].concat(A),I=[g[3],g[4],g[5]],O=["link","style","script"],N=["once","template"],T=["body","pbody"],w=["allowfullscreen","amp","async","autofocus","autoplay","checked","compact","controls","declare","default","defaultchecked","defaultmuted","defaultselected","defer","disabled","enabled","formnovalidate","hidden","indeterminate","inert","ismap","itemscope","loop","multiple","muted","nohref","noresize","noshade","novalidate","nowrap","open","pauseonexit","readonly","required","reversed","scoped","seamless","selected","sortable","truespeed","typemustmatch","visible"],M=null;function S(n,t,e){var r=n.t;t._vueMeta.i||!t._vueMeta.o&&"watcher"!==e||(t._vueMeta.i=null),t._vueMeta.i&&!t._vueMeta.u&&function(n,t){if(!(t=void 0===t?10:t))return void n();clearTimeout(M),M=setTimeout((function(){n()}),t)}((function(){t.$meta().refresh()}),r)}function D(n,t,e){if(!Array.prototype.findIndex){for(var r=0;r/g,">"],[/"/g,'"'],[/'/g,"'"]];function E(n,e,r){r=r||[];var o={A:function(n){return r.reduce((function(n,t){return n.replace(t[0],t[1])}),n)}};return A.forEach((function(n,t){if(0===t)k(e,n);else if(1===t)for(var r in e[n])k(e[n],r);o[n]=e[n]})),function n(e,r,o,u){var a=r.j,f=o.A,c=void 0===f?function(n){return n}:f,s={};for(var d in e){var l=e[d];if(_(j,d))s[d]=l;else{var v=A[0];if(o[v]&&_(o[v],d))s[d]=l;else{var m=e[a];if(m&&(v=A[1],o[v]&&o[v][m]&&_(o[v][m],d)))s[d]=l;else if("string"==typeof l?s[d]=c(l):t(l)?s[d]=l.map((function(t){return i(t)?n(t,r,o,!0):c(t)})):i(l)?s[d]=n(l,r,o,!0):s[d]=l,u){var y=c(d);d!==y&&(s[y]=s[d],delete s[d])}}}}return s}(e,n,o)}var H=function(t){return function(t){return!!t&&"object"===n(t)}(t)&&!function(n){var t=Object.prototype.toString.call(n);return"[object RegExp]"===t||"[object Date]"===t||!1}(t)};function L(n,t){return n}function P(n){return Object.keys(n)}function $(n,t){try{return t in n}catch(n){return!1}}function q(n,t,e){var r={};return e.I(n)&&P(n).forEach((function(t){r[t]=L(n[t])})),P(t).forEach((function(i){(function(n,t){return $(n,t)&&!(Object.hasOwnProperty.call(n,t)&&Object.propertyIsEnumerable.call(n,t))})(n,i)||($(n,i)&&e.I(t[i])?r[i]=U(n[i],t[i],e):r[i]=L(t[i]))})),r}function U(n,t,e){(e=e||{}).O=e.O,e.I=e.I||H,e.cloneUnlessOtherwiseSpecified=L;var r=Array.isArray(t);return r===Array.isArray(n)?r?e.O(n,t,e):q(n,t,e):L(t)}var F=U;function G(n,t,r,i){var u=n.component,a=n.N,f=n.T;return!0!==r&&!0!==t[a]&&(e(r)&&t[a]&&(r=t[a],t[a]=!0),r?(e(i)&&(i=t[f]),t[f]=o(r)?r.call(u,i):r.replace(/%s/g,i),!0):(delete t[a],!1))}var Q=!1;function X(n,t,e){return e=e||{},void 0===t.title&&delete t.title,I.forEach((function(n){if(t[n])for(var e in t[n])e in t[n]&&void 0===t[n][e]&&(_(w,e)&&!Q&&(a("VueMeta: Please note that since v2 the value undefined is not used to indicate boolean attributes anymore, see migration guide for details"),Q=!0),delete t[n][e])})),F(n,t,{O:function(n,t){return function(n,t,e){var r=n.component,i=n.j,o=n.N,u=n.T,a=[];return t.length||e.length?(t.forEach((function(n,t){if(n[i]){var f=D(e,(function(t){return t[i]===n[i]})),c=e[f];if(-1!==f){if(u in c&&void 0===c[u]||"innerHTML"in c&&void 0===c.innerHTML)return a.push(n),void e.splice(f,1);if(null!==c[u]&&null!==c.innerHTML){var s=n[o];if(s){if(!c[o])return G({component:r,N:o,T:u},c,s),void(c.template=!0);c[u]||G({component:r,N:o,T:u},c,void 0,n[u])}}else e.splice(f,1)}else a.push(n)}else a.push(n)})),a.concat(e)):a}(e,n,t)}})}function Y(n,t){return function n(t,i,o){if(o=o||{},i._inactive)return o;var u=(t=t||{}).v,a=i.$metaInfo,f=i.$options,c=i.$children;if(f[u]){var s=a||f[u];r(s)&&(o=X(o,s,t))}c.length&&c.forEach((function(r){(function(n){return(n=n||this)&&!e(n._vueMeta)})(r)&&(o=n(t,r,o))}));return o}(n||{},t,c)}var Z=function(n,t){return(t||document).querySelectorAll(n)};function nn(n,t){return n[t]||(n[t]=document.getElementsByTagName(t)[0]),n[t]}function tn(n,t,e){var r=t.m,i=t.M,o=t.type,u=t.j;e=e||{};var a=["".concat(o,"[").concat(i,'="').concat(r,'"]'),"".concat(o,"[data-").concat(u,"]")].map((function(n){for(var t in e){var r=e[t],i=r&&!0!==r?'="'.concat(r,'"'):"";n+="[data-".concat(t).concat(i,"]")}return n}));return K(Z(a.join(", "),n))}function en(n,t){n.removeAttribute(t)}var rn=[];function on(n,t,e,r){var i=n.j,o=!1;return e.forEach((function(n){n[i]&&n.callback&&(o=!0,function(n,t){1===arguments.length&&(t=n,n=""),rn.push([n,t])}("".concat(t,"[data-").concat(i,'="').concat(n[i],'"]'),n.callback))})),r&&o?un():o}function un(){var n;"complete"!==(n||document).readyState?document.onreadystatechange=function(){an()}:an()}function an(n){rn.forEach((function(t){var e=t[0],r=t[1],i="".concat(e,'[onload="this.__vm_l=1"]'),o=[];n||(o=K(Z(i))),n&&n.matches(i)&&(o=[n]),o.forEach((function(n){if(!n.__vm_cb){var t=function(){n.__vm_cb=!0,en(n,"onload"),r(n)};n.__vm_l?t():n.__vm_ev||(n.__vm_ev=!0,n.addEventListener("load",t))}}))}))}var fn,cn={};function sn(n,t,e,r,i){var o=(t||{}).M,u=i.getAttribute(o);u&&(cn[e]=JSON.parse(decodeURI(u)),en(i,o));var a=cn[e]||{},f=[];for(var c in a)a[c]&&n in a[c]&&(f.push(c),r[c]||delete a[c][n]);for(var s in r){var d=a[s];d&&d[n]===r[s]||(f.push(s),r[s]&&(a[s]=a[s]||{},a[s][n]=r[s]))}for(var l=0,v=f;l1){var v=[];r=r.filter((function(n){var t=JSON.stringify(n),e=!_(v,t);return v.push(t),e}))}r.forEach((function(t){if(!t.skip){var r=document.createElement(e);r.setAttribute(a,n),Object.keys(t).forEach((function(n){if(!_(N,n))if("innerHTML"!==n)if("json"!==n)if("cssText"!==n)if("callback"!==n){var e=_(c,n)?"data-".concat(n):n,i=_(w,n);if(!i||t[n]){var o=i?"":t[n];r.setAttribute(e,o)}}else r.onload=function(){return t[n](r)};else r.styleSheet?r.styleSheet.cssText=t.cssText:r.appendChild(document.createTextNode(t.cssText));else r.innerHTML=JSON.stringify(t.json);else r.innerHTML=t.innerHTML}));var i,o=l[function(n){var t=n.body,e=n.pbody;return t?"body":e?"pbody":"head"}(t)];o.some((function(n,t){return i=t,r.isEqualNode(n)}))&&(i||0===i)?o.splice(i,1):s.push(r)}}));var m=[];for(var y in l)Array.prototype.push.apply(m,l[y]);return m.forEach((function(n){n.parentNode.removeChild(n)})),s.forEach((function(n){n.hasAttribute("data-body")?o.appendChild(n):n.hasAttribute("data-pbody")?o.insertBefore(n,o.firstChild):i.appendChild(n)})),{oldTags:m,newTags:s}}function ln(n,e,r){var i=e=e||{},o=i.S,u=i.p,a={},f=nn(a,"html");if(n===u&&f.hasAttribute(o)){en(f,o);var c=!1;return O.forEach((function(n){r[n]&&on(e,n,r[n])&&(c=!0)})),c&&un(),!1}var s,d={},l={};for(var v in r)if(!_(j,v))if("title"!==v){if(_(I,v)){var m=v.substr(0,4);sn(n,e,v,r[v],nn(a,m))}else if(t(r[v])){var y=dn(n,e,v,r[v],nn(a,"head"),nn(a,"body")),p=y.oldTags,h=y.newTags;h.length&&(d[v]=h,l[v]=p)}}else((s=r.title)||""===s)&&(document.title=s);return{D:d,K:l}}function vn(n,t,e){return{set:function(r){return function(n,t,e,r){if(n&&n.$el)return ln(t,e,r);(fn=fn||{})[t]=r}(n,t,e,r)},remove:function(){return function(n,t,e){if(n&&n.$el){var r={},i=!0,o=!1,u=void 0;try{for(var a,f=I[Symbol.iterator]();!(i=(a=f.next()).done);i=!0){var c=a.value,s=c.substr(0,4);sn(t,e,c,{},nn(r,s))}}catch(n){o=!0,u=n}finally{try{i||null==f.return||f.return()}finally{if(o)throw u}}return function(n,t){var e=n.M;K(Z("[".concat(e,'="').concat(t,'"]'))).map((function(n){return n.remove()}))}(e,t)}fn[t]&&(delete fn[t],yn())}(n,t,e)}}}function mn(){return fn}function yn(n){!n&&Object.keys(fn).length||(fn=void 0)}function pn(n,t){if(t=t||{},!n._vueMeta)return a("This vue app/component has no vue-meta configuration"),{};var e=function(n,t,e,r){e=e||[];var i=(n=n||{}).j;return t.title&&(t.titleChunk=t.title),t.titleTemplate&&"%s"!==t.titleTemplate&&G({component:r,T:"title"},t,t.titleTemplate,t.titleChunk||""),t.base&&(t.base=Object.keys(t.base).length?[t.base]:[]),t.meta&&(t.meta=t.meta.filter((function(n,t,e){return!n[i]||t===D(e,(function(t){return t[i]===n[i]}))})),t.meta.forEach((function(t){return G(n,t)}))),E(n,t,e)}(t,Y(t,n),C,n),r=ln(n._vueMeta.m,t,e);r&&o(e.changed)&&(e.changed(e,r.D,r.K),r={addedTags:r.D,removedTags:r.K});var i=mn();if(i){for(var u in i)ln(u,t,i[u]),delete i[u];yn(!0)}return{vm:n,metaInfo:e,tags:r}}function hn(n){n=n||{};var t=this.$root;return{getOptions:function(){return function(n){var t={};for(var e in n)t[e]=n[e];return t}(n)},setOptions:function(e){e&&e.h&&(n.h=!!e.h,J(t));if(e&&"debounceWait"in e){var r=parseInt(e.t);isNaN(r)||(n.t=r)}e&&"waitOnDestroyed"in e&&(n.g=!!e.g)},refresh:function(){return pn(t,n)},inject:function(){return f("inject")},pause:function(){return z(t)},resume:function(){return B(t)},addApp:function(e){return vn(t,e,n)}}}return{version:"2.3.2",install:function(n,t){n.__vuemeta_installed||(n.__vuemeta_installed=!0,t=function(n){return{v:(n=r(n)?n:{}).keyName||s,M:n.attribute||d,S:n.ssrAttribute||l,j:n.tagIDKeyName||v,T:n.contentKeyName||m,N:n.metaTemplateKeyName||y,t:e(n.debounceWait)?h:n.debounceWait,g:e(n.waitOnDestroyed)?p:n.waitOnDestroyed,p:n.ssrAppId||b,h:!!n.refreshOnceOnNavigation}}(t),n.prototype.$meta=function(){return hn.call(this,t)},n.mixin(W(n,t)))},generate:function(n,t){return f("generate")},hasMetaInfo:V}})); diff --git a/package.json b/package.json index 66ac41b5..a7cacc02 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-meta", - "version": "2.3.1", + "version": "2.3.2", "description": "Manage HTML metadata in Vue.js components with ssr support", "keywords": [ "attribute",