mirrors/vue-meta
2
0
Fork 0
mirror of https://github.com/tenrok/vue-meta.git synced 2026-05-17 04:29:37 +03:00
Code Activity

chore(release): 2.3.4

Browse Source
This commit is contained in:
pimlie
2020-05-26 21:03:45 +00:00
parent 9b631c09c0
commit 92350d5f7d
8 changed files with 759 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+16
View File
@@ -2,6 +2,22 @@
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.4](https://github.com/nuxt/vue-meta/compare/v2.3.3...v2.3.4) (2020-05-26)
### Features
* add amp-boilerplate as boolean attribute (resolves: [#530](https://github.com/nuxt/vue-meta/issues/530)) ([#531](https://github.com/nuxt/vue-meta/issues/531)) ([bb45319](https://github.com/nuxt/vue-meta/commit/bb453195747058d90862d2db20d6a538ef04811f))
### Bug Fixes
* also set ssrAppId for first Vue app when ssrAttribute exists ([4cb5724](https://github.com/nuxt/vue-meta/commit/4cb57240da0fc486e63997d03d78b0639f9c2aa1))
* also set ssrAppId for first Vue app when ssrAttribute exists ([#563](https://github.com/nuxt/vue-meta/issues/563)) ([4664df2](https://github.com/nuxt/vue-meta/commit/4664df2b1f4c972f883aa6f217a110243c8bc0c6))
* auto install plugin in browser ([32fdb20](https://github.com/nuxt/vue-meta/commit/32fdb2001a5cb0b595c9db67d1b5a75da7f85902))
* improve ssr detection when 1st metaInfo component isnt root ([a41b9a7](https://github.com/nuxt/vue-meta/commit/a41b9a73c0b90cf39d9c93fa66fe3e7d59494f77))
* support falsy values in eg body attributes (fix: [#535](https://github.com/nuxt/vue-meta/issues/535)) ([1ef4108](https://github.com/nuxt/vue-meta/commit/1ef41080e72f6a3c745199ff2be1c20e69ba1157))
### [2.3.3](https://github.com/nuxt/vue-meta/compare/v2.3.2...v2.3.3) (2020-02-26)
dist/vue-meta.common.js
Vendored
+183 -103
View File
@@ -1,5 +1,5 @@
/**
* vue-meta v2.3.3
* vue-meta v2.3.4
* (c) 2020
* - Declan de Wet
* - Sébastien Chopin (@Atinux)
@@ -14,7 +14,7 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
var deepmerge = _interopDefault(require('deepmerge'));
var version = "2.3.3";
var version = "2.3.4";
function _typeof(obj) {
"@babel/helpers - typeof";
@@ -82,23 +82,91 @@ function _objectSpread2(target) {
}
function _toConsumableArray(arr) {
return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread();
return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
}
function _arrayWithoutHoles(arr) {
if (Array.isArray(arr)) {
for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) arr2[i] = arr[i];
return arr2;
}
if (Array.isArray(arr)) return _arrayLikeToArray(arr);
}
function _iterableToArray(iter) {
if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter);
if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter);
}
function _unsupportedIterableToArray(o, minLen) {
if (!o) return;
if (typeof o === "string") return _arrayLikeToArray(o, minLen);
var n = Object.prototype.toString.call(o).slice(8, -1);
if (n === "Object" && o.constructor) n = o.constructor.name;
if (n === "Map" || n === "Set") return Array.from(o);
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
}
function _arrayLikeToArray(arr, len) {
if (len == null || len > arr.length) len = arr.length;
for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
return arr2;
}
function _nonIterableSpread() {
throw new TypeError("Invalid attempt to spread non-iterable instance");
throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
}
function _createForOfIteratorHelper(o) {
if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) {
if (Array.isArray(o) || (o = _unsupportedIterableToArray(o))) {
var i = 0;
var F = function () {};
return {
s: F,
n: function () {
if (i >= o.length) return {
done: true
};
return {
done: false,
value: o[i++]
};
},
e: function (e) {
throw e;
},
f: F
};
}
throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
}
var it,
normalCompletion = true,
didErr = false,
err;
return {
s: function () {
it = o[Symbol.iterator]();
},
n: function () {
var step = it.next();
normalCompletion = step.done;
return step;
},
e: function (e) {
didErr = true;
err = e;
},
f: function () {
try {
if (!normalCompletion && it.return != null) it.return();
} finally {
if (didErr) throw err;
}
}
};
}
/**
@@ -226,7 +294,7 @@ var tagProperties = ['once', 'skip', 'template']; // Attributes which should be
var commonDataAttributes = ['body', 'pbody']; // from: https://github.com/kangax/html-minifier/blob/gh-pages/src/htmlminifier.js#L202
var booleanHtmlAttributes = ['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'];
var booleanHtmlAttributes = ['allowfullscreen', 'amp', 'amp-boilerplate', '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'];
var batchId = null;
function triggerUpdate(_ref, rootVm, hookName) {
@@ -327,6 +395,48 @@ function includes(array, value) {
return array.includes(value);
}
var querySelector = function querySelector(arg, el) {
return (el || document).querySelectorAll(arg);
};
function getTag(tags, tag) {
if (!tags[tag]) {
tags[tag] = document.getElementsByTagName(tag)[0];
}
return tags[tag];
}
function getElementsKey(_ref) {
var body = _ref.body,
pbody = _ref.pbody;
return body ? 'body' : pbody ? 'pbody' : 'head';
}
function queryElements(parentNode, _ref2, attributes) {
var appId = _ref2.appId,
attribute = _ref2.attribute,
type = _ref2.type,
tagIDKeyName = _ref2.tagIDKeyName;
attributes = attributes || {};
var queries = ["".concat(type, "[").concat(attribute, "=\"").concat(appId, "\"]"), "".concat(type, "[data-").concat(tagIDKeyName, "]")].map(function (query) {
for (var key in attributes) {
var val = attributes[key];
var attributeValue = val && val !== true ? "=\"".concat(val, "\"") : '';
query += "[data-".concat(key).concat(attributeValue, "]");
}
return query;
});
return toArray(querySelector(queries.join(', '), parentNode));
}
function removeElementsByAppId(_ref3, appId) {
var attribute = _ref3.attribute;
toArray(querySelector("[".concat(attribute, "=\"").concat(appId, "\"]"))).map(function (el) {
return el.remove();
});
}
function removeAttribute(el, attributeName) {
el.removeAttribute(attributeName);
}
function hasMetaInfo(vm) {
vm = vm || this;
return vm && (vm[rootConfigKey] === true || isObject(vm[rootConfigKey]));
@@ -379,7 +489,8 @@ function addNavGuards(rootVm) {
var appId = 1;
function createMixin(Vue, options) {
// for which Vue lifecycle hooks should the metaInfo be refreshed
var updateOnLifecycleHook = ['activated', 'deactivated', 'beforeMount']; // watch for client side component updates
var updateOnLifecycleHook = ['activated', 'deactivated', 'beforeMount'];
var wasServerRendered = false; // watch for client side component updates
return {
beforeCreate: function beforeCreate() {
@@ -400,10 +511,26 @@ function createMixin(Vue, options) {
return hasMetaInfo(this);
}
}); // Add a marker to know if it uses metaInfo
});
if (this === $root) {
$root.$once('hook:beforeMount', function () {
wasServerRendered = this.$el && this.$el.nodeType === 1 && this.$el.hasAttribute('data-server-rendered'); // In most cases when you have a SSR app it will be the first app thats gonna be
// initiated, if we cant detect the data-server-rendered attribute from Vue but we
// do see our own ssrAttribute then _assume_ the Vue app with appId 1 is the ssr app
// attempted fix for #404 & #562, but we rly need to refactor how we pass appIds from
// ssr to the client
if (!wasServerRendered && $root[rootConfigKey] && $root[rootConfigKey].appId === 1) {
var htmlTag = getTag({}, 'html');
wasServerRendered = htmlTag && htmlTag.hasAttribute(options.ssrAttribute);
}
});
} // Add a marker to know if it uses metaInfo
// _vnode is used to know that it's attached to a real component
// useful if we use some mixin to add some meta tags (like nuxt-i18n)
if (isUndefined($options[options.keyName]) || $options[options.keyName] === null) {
return;
}
@@ -473,10 +600,10 @@ function createMixin(Vue, options) {
if (!$root[rootConfigKey].initializedSsr) {
$root[rootConfigKey].initializedSsr = true;
this.$on('hook:beforeMount', function () {
var $root = this; // if this Vue-app was server rendered, set the appId to 'ssr'
var $root = this[rootKey]; // if this Vue-app was server rendered, set the appId to 'ssr'
// only one SSR app per page is supported
if ($root.$el && $root.$el.nodeType === 1 && $root.$el.hasAttribute('data-server-rendered')) {
if (wasServerRendered) {
$root[rootConfigKey].appId = options.ssrAppId;
}
});
@@ -486,37 +613,39 @@ function createMixin(Vue, options) {
this.$on('hook:mounted', function () {
var $root = this[rootKey];
if (!$root[rootConfigKey].initialized) {
// used in triggerUpdate to check if a change was triggered
// during initialization
$root[rootConfigKey].initializing = true; // refresh meta in nextTick so all child components have loaded
this.$nextTick(function () {
var _$root$$meta$refresh = $root.$meta().refresh(),
tags = _$root$$meta$refresh.tags,
metaInfo = _$root$$meta$refresh.metaInfo; // After ssr hydration (identifier by tags === false) check
// if initialized was set to null in triggerUpdate. That'd mean
// that during initilazation changes where triggered which need
// to be applied OR a metaInfo watcher was triggered before the
// current hook was called
// (during initialization all changes are blocked)
if ($root[rootConfigKey].initialized) {
return;
} // used in triggerUpdate to check if a change was triggered
// during initialization
if (tags === false && $root[rootConfigKey].initialized === null) {
this.$nextTick(function () {
return triggerUpdate(options, $root, 'init');
});
}
$root[rootConfigKey].initializing = true; // refresh meta in nextTick so all child components have loaded
$root[rootConfigKey].initialized = true;
delete $root[rootConfigKey].initializing; // add the navigation guards if they havent been added yet
// they are needed for the afterNavigation callback
this.$nextTick(function () {
var _$root$$meta$refresh = $root.$meta().refresh(),
tags = _$root$$meta$refresh.tags,
metaInfo = _$root$$meta$refresh.metaInfo; // After ssr hydration (identifier by tags === false) check
// if initialized was set to null in triggerUpdate. That'd mean
// that during initilazation changes where triggered which need
// to be applied OR a metaInfo watcher was triggered before the
// current hook was called
// (during initialization all changes are blocked)
if (!options.refreshOnceOnNavigation && metaInfo.afterNavigation) {
addNavGuards($root);
}
});
}
if (tags === false && $root[rootConfigKey].initialized === null) {
this.$nextTick(function () {
return triggerUpdate(options, $root, 'init');
});
}
$root[rootConfigKey].initialized = true;
delete $root[rootConfigKey].initializing; // add the navigation guards if they havent been added yet
// they are needed for the afterNavigation callback
if (!options.refreshOnceOnNavigation && metaInfo.afterNavigation) {
addNavGuards($root);
}
});
}); // add the navigation guards if requested
if (options.refreshOnceOnNavigation) {
@@ -916,48 +1045,6 @@ function getComponentOption(options, component, result) {
return result;
}
var querySelector = function querySelector(arg, el) {
return (el || document).querySelectorAll(arg);
};
function getTag(tags, tag) {
if (!tags[tag]) {
tags[tag] = document.getElementsByTagName(tag)[0];
}
return tags[tag];
}
function getElementsKey(_ref) {
var body = _ref.body,
pbody = _ref.pbody;
return body ? 'body' : pbody ? 'pbody' : 'head';
}
function queryElements(parentNode, _ref2, attributes) {
var appId = _ref2.appId,
attribute = _ref2.attribute,
type = _ref2.type,
tagIDKeyName = _ref2.tagIDKeyName;
attributes = attributes || {};
var queries = ["".concat(type, "[").concat(attribute, "=\"").concat(appId, "\"]"), "".concat(type, "[data-").concat(tagIDKeyName, "]")].map(function (query) {
for (var key in attributes) {
var val = attributes[key];
var attributeValue = val && val !== true ? "=\"".concat(val, "\"") : '';
query += "[data-".concat(key).concat(attributeValue, "]");
}
return query;
});
return toArray(querySelector(queries.join(', '), parentNode));
}
function removeElementsByAppId(_ref3, appId) {
var attribute = _ref3.attribute;
toArray(querySelector("[".concat(attribute, "=\"").concat(appId, "\"]"))).map(function (el) {
return el.remove();
});
}
function removeAttribute(el, attributeName) {
el.removeAttribute(attributeName);
}
var callbacks = [];
function isDOMComplete(d) {
return (d || document).readyState === 'complete';
@@ -1088,7 +1175,7 @@ function updateAttribute(appId, options, type, attrs, tag) {
// which have been removed for this appId
for (var attr in data) {
if (data[attr] && appId in data[attr]) {
if (data[attr] !== undefined && appId in data[attr]) {
toUpdate.push(attr);
if (!attrs[attr]) {
@@ -1103,7 +1190,7 @@ function updateAttribute(appId, options, type, attrs, tag) {
if (!attrData || attrData[appId] !== attrs[_attr]) {
toUpdate.push(_attr);
if (attrs[_attr]) {
if (attrs[_attr] !== undefined) {
data[_attr] = data[_attr] || {};
data[_attr][appId] = attrs[_attr];
}
@@ -1120,7 +1207,9 @@ function updateAttribute(appId, options, type, attrs, tag) {
}
if (attrValues.length) {
var attrValue = includes(booleanHtmlAttributes, _attr2) && attrValues.some(Boolean) ? '' : attrValues.filter(Boolean).join(' ');
var attrValue = includes(booleanHtmlAttributes, _attr2) && attrValues.some(Boolean) ? '' : attrValues.filter(function (v) {
return v !== undefined;
}).join(' ');
tag.setAttribute(_attr2, attrValue);
} else {
removeAttribute(tag, _attr2);
@@ -1391,29 +1480,20 @@ function setMetaInfo(rootVm, appId, options, metaInfo) {
function removeMetaInfo(rootVm, appId, options) {
if (rootVm && rootVm.$el) {
var tags = {};
var _iteratorNormalCompletion = true;
var _didIteratorError = false;
var _iteratorError = undefined;
var _iterator = _createForOfIteratorHelper(metaInfoAttributeKeys),
_step;
try {
for (var _iterator = metaInfoAttributeKeys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
for (_iterator.s(); !(_step = _iterator.n()).done;) {
var type = _step.value;
var tagName = type.substr(0, 4);
updateAttribute(appId, options, type, {}, getTag(tags, tagName));
}
} catch (err) {
_didIteratorError = true;
_iteratorError = err;
_iterator.e(err);
} finally {
try {
if (!_iteratorNormalCompletion && _iterator.return != null) {
_iterator.return();
}
} finally {
if (_didIteratorError) {
throw _iteratorError;
}
}
_iterator.f();
}
return removeElementsByAppId(options, appId);
@@ -1760,7 +1840,7 @@ function generateServerInjector(options, metaInfo) {
if (_data) {
for (var _attr in _data) {
attributeData[_attr] = _objectSpread2({}, attributeData[_attr], _defineProperty({}, appId, _data[_attr]));
attributeData[_attr] = _objectSpread2(_objectSpread2({}, attributeData[_attr]), {}, _defineProperty({}, appId, _data[_attr]));
}
}
}
dist/vue-meta.esm.browser.js
Vendored
+186 -94
View File
@@ -1,5 +1,5 @@
/**
* vue-meta v2.3.3
* vue-meta v2.3.4
* (c) 2020
* - Declan de Wet
* - Sébastien Chopin (@Atinux)
@@ -10,7 +10,7 @@
import deepmerge from 'deepmerge';
var version = "2.3.3";
var version = "2.3.4";
function _typeof(obj) {
"@babel/helpers - typeof";
@@ -28,6 +28,78 @@ function _typeof(obj) {
return _typeof(obj);
}
function _unsupportedIterableToArray(o, minLen) {
if (!o) return;
if (typeof o === "string") return _arrayLikeToArray(o, minLen);
var n = Object.prototype.toString.call(o).slice(8, -1);
if (n === "Object" && o.constructor) n = o.constructor.name;
if (n === "Map" || n === "Set") return Array.from(o);
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
}
function _arrayLikeToArray(arr, len) {
if (len == null || len > arr.length) len = arr.length;
for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
return arr2;
}
function _createForOfIteratorHelper(o) {
if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) {
if (Array.isArray(o) || (o = _unsupportedIterableToArray(o))) {
var i = 0;
var F = function () {};
return {
s: F,
n: function () {
if (i >= o.length) return {
done: true
};
return {
done: false,
value: o[i++]
};
},
e: function (e) {
throw e;
},
f: F
};
}
throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
}
var it,
normalCompletion = true,
didErr = false,
err;
return {
s: function () {
it = o[Symbol.iterator]();
},
n: function () {
var step = it.next();
normalCompletion = step.done;
return step;
},
e: function (e) {
didErr = true;
err = e;
},
f: function () {
try {
if (!normalCompletion && it.return != null) it.return();
} finally {
if (didErr) throw err;
}
}
};
}
/**
* checks if passed argument is an array
* @param {any} arg - the object to check
@@ -149,7 +221,7 @@ var tagProperties = ['once', 'skip', 'template']; // Attributes which should be
var commonDataAttributes = ['body', 'pbody']; // from: https://github.com/kangax/html-minifier/blob/gh-pages/src/htmlminifier.js#L202
var booleanHtmlAttributes = ['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'];
var booleanHtmlAttributes = ['allowfullscreen', 'amp', 'amp-boilerplate', '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'];
var batchId = null;
function triggerUpdate(_ref, rootVm, hookName) {
@@ -250,6 +322,48 @@ function includes(array, value) {
return array.includes(value);
}
var querySelector = function querySelector(arg, el) {
return (el || document).querySelectorAll(arg);
};
function getTag(tags, tag) {
if (!tags[tag]) {
tags[tag] = document.getElementsByTagName(tag)[0];
}
return tags[tag];
}
function getElementsKey(_ref) {
var body = _ref.body,
pbody = _ref.pbody;
return body ? 'body' : pbody ? 'pbody' : 'head';
}
function queryElements(parentNode, _ref2, attributes) {
var appId = _ref2.appId,
attribute = _ref2.attribute,
type = _ref2.type,
tagIDKeyName = _ref2.tagIDKeyName;
attributes = attributes || {};
var queries = ["".concat(type, "[").concat(attribute, "=\"").concat(appId, "\"]"), "".concat(type, "[data-").concat(tagIDKeyName, "]")].map(function (query) {
for (var key in attributes) {
var val = attributes[key];
var attributeValue = val && val !== true ? "=\"".concat(val, "\"") : '';
query += "[data-".concat(key).concat(attributeValue, "]");
}
return query;
});
return toArray(querySelector(queries.join(', '), parentNode));
}
function removeElementsByAppId(_ref3, appId) {
var attribute = _ref3.attribute;
toArray(querySelector("[".concat(attribute, "=\"").concat(appId, "\"]"))).map(function (el) {
return el.remove();
});
}
function removeAttribute(el, attributeName) {
el.removeAttribute(attributeName);
}
function hasMetaInfo(vm) {
vm = vm || this;
return vm && (vm[rootConfigKey] === true || isObject(vm[rootConfigKey]));
@@ -302,7 +416,8 @@ function addNavGuards(rootVm) {
var appId = 1;
function createMixin(Vue, options) {
// for which Vue lifecycle hooks should the metaInfo be refreshed
var updateOnLifecycleHook = ['activated', 'deactivated', 'beforeMount']; // watch for client side component updates
var updateOnLifecycleHook = ['activated', 'deactivated', 'beforeMount'];
var wasServerRendered = false; // watch for client side component updates
return {
beforeCreate: function beforeCreate() {
@@ -323,10 +438,26 @@ function createMixin(Vue, options) {
return hasMetaInfo(this);
}
}); // Add a marker to know if it uses metaInfo
});
if (this === $root) {
$root.$once('hook:beforeMount', function () {
wasServerRendered = this.$el && this.$el.nodeType === 1 && this.$el.hasAttribute('data-server-rendered'); // In most cases when you have a SSR app it will be the first app thats gonna be
// initiated, if we cant detect the data-server-rendered attribute from Vue but we
// do see our own ssrAttribute then _assume_ the Vue app with appId 1 is the ssr app
// attempted fix for #404 & #562, but we rly need to refactor how we pass appIds from
// ssr to the client
if (!wasServerRendered && $root[rootConfigKey] && $root[rootConfigKey].appId === 1) {
var htmlTag = getTag({}, 'html');
wasServerRendered = htmlTag && htmlTag.hasAttribute(options.ssrAttribute);
}
});
} // Add a marker to know if it uses metaInfo
// _vnode is used to know that it's attached to a real component
// useful if we use some mixin to add some meta tags (like nuxt-i18n)
if (isUndefined($options[options.keyName]) || $options[options.keyName] === null) {
return;
}
@@ -396,10 +527,10 @@ function createMixin(Vue, options) {
if (!$root[rootConfigKey].initializedSsr) {
$root[rootConfigKey].initializedSsr = true;
this.$on('hook:beforeMount', function () {
var $root = this; // if this Vue-app was server rendered, set the appId to 'ssr'
var $root = this[rootKey]; // if this Vue-app was server rendered, set the appId to 'ssr'
// only one SSR app per page is supported
if ($root.$el && $root.$el.nodeType === 1 && $root.$el.hasAttribute('data-server-rendered')) {
if (wasServerRendered) {
$root[rootConfigKey].appId = options.ssrAppId;
}
});
@@ -409,37 +540,39 @@ function createMixin(Vue, options) {
this.$on('hook:mounted', function () {
var $root = this[rootKey];
if (!$root[rootConfigKey].initialized) {
// used in triggerUpdate to check if a change was triggered
// during initialization
$root[rootConfigKey].initializing = true; // refresh meta in nextTick so all child components have loaded
this.$nextTick(function () {
var _$root$$meta$refresh = $root.$meta().refresh(),
tags = _$root$$meta$refresh.tags,
metaInfo = _$root$$meta$refresh.metaInfo; // After ssr hydration (identifier by tags === false) check
// if initialized was set to null in triggerUpdate. That'd mean
// that during initilazation changes where triggered which need
// to be applied OR a metaInfo watcher was triggered before the
// current hook was called
// (during initialization all changes are blocked)
if ($root[rootConfigKey].initialized) {
return;
} // used in triggerUpdate to check if a change was triggered
// during initialization
if (tags === false && $root[rootConfigKey].initialized === null) {
this.$nextTick(function () {
return triggerUpdate(options, $root, 'init');
});
}
$root[rootConfigKey].initializing = true; // refresh meta in nextTick so all child components have loaded
$root[rootConfigKey].initialized = true;
delete $root[rootConfigKey].initializing; // add the navigation guards if they havent been added yet
// they are needed for the afterNavigation callback
this.$nextTick(function () {
var _$root$$meta$refresh = $root.$meta().refresh(),
tags = _$root$$meta$refresh.tags,
metaInfo = _$root$$meta$refresh.metaInfo; // After ssr hydration (identifier by tags === false) check
// if initialized was set to null in triggerUpdate. That'd mean
// that during initilazation changes where triggered which need
// to be applied OR a metaInfo watcher was triggered before the
// current hook was called
// (during initialization all changes are blocked)
if (!options.refreshOnceOnNavigation && metaInfo.afterNavigation) {
addNavGuards($root);
}
});
}
if (tags === false && $root[rootConfigKey].initialized === null) {
this.$nextTick(function () {
return triggerUpdate(options, $root, 'init');
});
}
$root[rootConfigKey].initialized = true;
delete $root[rootConfigKey].initializing; // add the navigation guards if they havent been added yet
// they are needed for the afterNavigation callback
if (!options.refreshOnceOnNavigation && metaInfo.afterNavigation) {
addNavGuards($root);
}
});
}); // add the navigation guards if requested
if (options.refreshOnceOnNavigation) {
@@ -838,48 +971,6 @@ function getComponentOption(options, component, result) {
return result;
}
var querySelector = function querySelector(arg, el) {
return (el || document).querySelectorAll(arg);
};
function getTag(tags, tag) {
if (!tags[tag]) {
tags[tag] = document.getElementsByTagName(tag)[0];
}
return tags[tag];
}
function getElementsKey(_ref) {
var body = _ref.body,
pbody = _ref.pbody;
return body ? 'body' : pbody ? 'pbody' : 'head';
}
function queryElements(parentNode, _ref2, attributes) {
var appId = _ref2.appId,
attribute = _ref2.attribute,
type = _ref2.type,
tagIDKeyName = _ref2.tagIDKeyName;
attributes = attributes || {};
var queries = ["".concat(type, "[").concat(attribute, "=\"").concat(appId, "\"]"), "".concat(type, "[data-").concat(tagIDKeyName, "]")].map(function (query) {
for (var key in attributes) {
var val = attributes[key];
var attributeValue = val && val !== true ? "=\"".concat(val, "\"") : '';
query += "[data-".concat(key).concat(attributeValue, "]");
}
return query;
});
return toArray(querySelector(queries.join(', '), parentNode));
}
function removeElementsByAppId(_ref3, appId) {
var attribute = _ref3.attribute;
toArray(querySelector("[".concat(attribute, "=\"").concat(appId, "\"]"))).map(function (el) {
return el.remove();
});
}
function removeAttribute(el, attributeName) {
el.removeAttribute(attributeName);
}
var callbacks = [];
function isDOMComplete(d) {
return (d || document).readyState === 'complete';
@@ -1010,7 +1101,7 @@ function updateAttribute(appId, options, type, attrs, tag) {
// which have been removed for this appId
for (var attr in data) {
if (data[attr] && appId in data[attr]) {
if (data[attr] !== undefined && appId in data[attr]) {
toUpdate.push(attr);
if (!attrs[attr]) {
@@ -1025,7 +1116,7 @@ function updateAttribute(appId, options, type, attrs, tag) {
if (!attrData || attrData[appId] !== attrs[_attr]) {
toUpdate.push(_attr);
if (attrs[_attr]) {
if (attrs[_attr] !== undefined) {
data[_attr] = data[_attr] || {};
data[_attr][appId] = attrs[_attr];
}
@@ -1042,7 +1133,9 @@ function updateAttribute(appId, options, type, attrs, tag) {
}
if (attrValues.length) {
var attrValue = includes(booleanHtmlAttributes, _attr2) && attrValues.some(Boolean) ? '' : attrValues.filter(Boolean).join(' ');
var attrValue = includes(booleanHtmlAttributes, _attr2) && attrValues.some(Boolean) ? '' : attrValues.filter(function (v) {
return v !== undefined;
}).join(' ');
tag.setAttribute(_attr2, attrValue);
} else {
removeAttribute(tag, _attr2);
@@ -1313,29 +1406,20 @@ function setMetaInfo(rootVm, appId, options, metaInfo) {
function removeMetaInfo(rootVm, appId, options) {
if (rootVm && rootVm.$el) {
var tags = {};
var _iteratorNormalCompletion = true;
var _didIteratorError = false;
var _iteratorError = undefined;
var _iterator = _createForOfIteratorHelper(metaInfoAttributeKeys),
_step;
try {
for (var _iterator = metaInfoAttributeKeys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
for (_iterator.s(); !(_step = _iterator.n()).done;) {
var type = _step.value;
var tagName = type.substr(0, 4);
updateAttribute(appId, options, type, {}, getTag(tags, tagName));
}
} catch (err) {
_didIteratorError = true;
_iteratorError = err;
_iterator.e(err);
} finally {
try {
if (!_iteratorNormalCompletion && _iterator.return != null) {
_iterator.return();
}
} finally {
if (_didIteratorError) {
throw _iteratorError;
}
}
_iterator.f();
}
return removeElementsByAppId(options, appId);
@@ -1538,6 +1622,14 @@ function install(Vue, options) {
Vue.mixin(createMixin(Vue, options));
}
{
// automatic install
if (!isUndefined(window) && !isUndefined(window.Vue)) {
/* istanbul ignore next */
install(window.Vue);
}
}
var index = {
version: version,
install: install,
dist/vue-meta.esm.browser.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
dist/vue-meta.esm.js
Vendored
+183 -103
View File
@@ -1,5 +1,5 @@
/**
* vue-meta v2.3.3
* vue-meta v2.3.4
* (c) 2020
* - Declan de Wet
* - Sébastien Chopin (@Atinux)
@@ -10,7 +10,7 @@
import deepmerge from 'deepmerge';
var version = "2.3.3";
var version = "2.3.4";
function _typeof(obj) {
"@babel/helpers - typeof";
@@ -78,23 +78,91 @@ function _objectSpread2(target) {
}
function _toConsumableArray(arr) {
return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread();
return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
}
function _arrayWithoutHoles(arr) {
if (Array.isArray(arr)) {
for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) arr2[i] = arr[i];
return arr2;
}
if (Array.isArray(arr)) return _arrayLikeToArray(arr);
}
function _iterableToArray(iter) {
if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter);
if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter);
}
function _unsupportedIterableToArray(o, minLen) {
if (!o) return;
if (typeof o === "string") return _arrayLikeToArray(o, minLen);
var n = Object.prototype.toString.call(o).slice(8, -1);
if (n === "Object" && o.constructor) n = o.constructor.name;
if (n === "Map" || n === "Set") return Array.from(o);
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
}
function _arrayLikeToArray(arr, len) {
if (len == null || len > arr.length) len = arr.length;
for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
return arr2;
}
function _nonIterableSpread() {
throw new TypeError("Invalid attempt to spread non-iterable instance");
throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
}
function _createForOfIteratorHelper(o) {
if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) {
if (Array.isArray(o) || (o = _unsupportedIterableToArray(o))) {
var i = 0;
var F = function () {};
return {
s: F,
n: function () {
if (i >= o.length) return {
done: true
};
return {
done: false,
value: o[i++]
};
},
e: function (e) {
throw e;
},
f: F
};
}
throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
}
var it,
normalCompletion = true,
didErr = false,
err;
return {
s: function () {
it = o[Symbol.iterator]();
},
n: function () {
var step = it.next();
normalCompletion = step.done;
return step;
},
e: function (e) {
didErr = true;
err = e;
},
f: function () {
try {
if (!normalCompletion && it.return != null) it.return();
} finally {
if (didErr) throw err;
}
}
};
}
/**
@@ -222,7 +290,7 @@ var tagProperties = ['once', 'skip', 'template']; // Attributes which should be
var commonDataAttributes = ['body', 'pbody']; // from: https://github.com/kangax/html-minifier/blob/gh-pages/src/htmlminifier.js#L202
var booleanHtmlAttributes = ['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'];
var booleanHtmlAttributes = ['allowfullscreen', 'amp', 'amp-boilerplate', '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'];
var batchId = null;
function triggerUpdate(_ref, rootVm, hookName) {
@@ -323,6 +391,48 @@ function includes(array, value) {
return array.includes(value);
}
var querySelector = function querySelector(arg, el) {
return (el || document).querySelectorAll(arg);
};
function getTag(tags, tag) {
if (!tags[tag]) {
tags[tag] = document.getElementsByTagName(tag)[0];
}
return tags[tag];
}
function getElementsKey(_ref) {
var body = _ref.body,
pbody = _ref.pbody;
return body ? 'body' : pbody ? 'pbody' : 'head';
}
function queryElements(parentNode, _ref2, attributes) {
var appId = _ref2.appId,
attribute = _ref2.attribute,
type = _ref2.type,
tagIDKeyName = _ref2.tagIDKeyName;
attributes = attributes || {};
var queries = ["".concat(type, "[").concat(attribute, "=\"").concat(appId, "\"]"), "".concat(type, "[data-").concat(tagIDKeyName, "]")].map(function (query) {
for (var key in attributes) {
var val = attributes[key];
var attributeValue = val && val !== true ? "=\"".concat(val, "\"") : '';
query += "[data-".concat(key).concat(attributeValue, "]");
}
return query;
});
return toArray(querySelector(queries.join(', '), parentNode));
}
function removeElementsByAppId(_ref3, appId) {
var attribute = _ref3.attribute;
toArray(querySelector("[".concat(attribute, "=\"").concat(appId, "\"]"))).map(function (el) {
return el.remove();
});
}
function removeAttribute(el, attributeName) {
el.removeAttribute(attributeName);
}
function hasMetaInfo(vm) {
vm = vm || this;
return vm && (vm[rootConfigKey] === true || isObject(vm[rootConfigKey]));
@@ -375,7 +485,8 @@ function addNavGuards(rootVm) {
var appId = 1;
function createMixin(Vue, options) {
// for which Vue lifecycle hooks should the metaInfo be refreshed
var updateOnLifecycleHook = ['activated', 'deactivated', 'beforeMount']; // watch for client side component updates
var updateOnLifecycleHook = ['activated', 'deactivated', 'beforeMount'];
var wasServerRendered = false; // watch for client side component updates
return {
beforeCreate: function beforeCreate() {
@@ -396,10 +507,26 @@ function createMixin(Vue, options) {
return hasMetaInfo(this);
}
}); // Add a marker to know if it uses metaInfo
});
if (this === $root) {
$root.$once('hook:beforeMount', function () {
wasServerRendered = this.$el && this.$el.nodeType === 1 && this.$el.hasAttribute('data-server-rendered'); // In most cases when you have a SSR app it will be the first app thats gonna be
// initiated, if we cant detect the data-server-rendered attribute from Vue but we
// do see our own ssrAttribute then _assume_ the Vue app with appId 1 is the ssr app
// attempted fix for #404 & #562, but we rly need to refactor how we pass appIds from
// ssr to the client
if (!wasServerRendered && $root[rootConfigKey] && $root[rootConfigKey].appId === 1) {
var htmlTag = getTag({}, 'html');
wasServerRendered = htmlTag && htmlTag.hasAttribute(options.ssrAttribute);
}
});
} // Add a marker to know if it uses metaInfo
// _vnode is used to know that it's attached to a real component
// useful if we use some mixin to add some meta tags (like nuxt-i18n)
if (isUndefined($options[options.keyName]) || $options[options.keyName] === null) {
return;
}
@@ -469,10 +596,10 @@ function createMixin(Vue, options) {
if (!$root[rootConfigKey].initializedSsr) {
$root[rootConfigKey].initializedSsr = true;
this.$on('hook:beforeMount', function () {
var $root = this; // if this Vue-app was server rendered, set the appId to 'ssr'
var $root = this[rootKey]; // if this Vue-app was server rendered, set the appId to 'ssr'
// only one SSR app per page is supported
if ($root.$el && $root.$el.nodeType === 1 && $root.$el.hasAttribute('data-server-rendered')) {
if (wasServerRendered) {
$root[rootConfigKey].appId = options.ssrAppId;
}
});
@@ -482,37 +609,39 @@ function createMixin(Vue, options) {
this.$on('hook:mounted', function () {
var $root = this[rootKey];
if (!$root[rootConfigKey].initialized) {
// used in triggerUpdate to check if a change was triggered
// during initialization
$root[rootConfigKey].initializing = true; // refresh meta in nextTick so all child components have loaded
this.$nextTick(function () {
var _$root$$meta$refresh = $root.$meta().refresh(),
tags = _$root$$meta$refresh.tags,
metaInfo = _$root$$meta$refresh.metaInfo; // After ssr hydration (identifier by tags === false) check
// if initialized was set to null in triggerUpdate. That'd mean
// that during initilazation changes where triggered which need
// to be applied OR a metaInfo watcher was triggered before the
// current hook was called
// (during initialization all changes are blocked)
if ($root[rootConfigKey].initialized) {
return;
} // used in triggerUpdate to check if a change was triggered
// during initialization
if (tags === false && $root[rootConfigKey].initialized === null) {
this.$nextTick(function () {
return triggerUpdate(options, $root, 'init');
});
}
$root[rootConfigKey].initializing = true; // refresh meta in nextTick so all child components have loaded
$root[rootConfigKey].initialized = true;
delete $root[rootConfigKey].initializing; // add the navigation guards if they havent been added yet
// they are needed for the afterNavigation callback
this.$nextTick(function () {
var _$root$$meta$refresh = $root.$meta().refresh(),
tags = _$root$$meta$refresh.tags,
metaInfo = _$root$$meta$refresh.metaInfo; // After ssr hydration (identifier by tags === false) check
// if initialized was set to null in triggerUpdate. That'd mean
// that during initilazation changes where triggered which need
// to be applied OR a metaInfo watcher was triggered before the
// current hook was called
// (during initialization all changes are blocked)
if (!options.refreshOnceOnNavigation && metaInfo.afterNavigation) {
addNavGuards($root);
}
});
}
if (tags === false && $root[rootConfigKey].initialized === null) {
this.$nextTick(function () {
return triggerUpdate(options, $root, 'init');
});
}
$root[rootConfigKey].initialized = true;
delete $root[rootConfigKey].initializing; // add the navigation guards if they havent been added yet
// they are needed for the afterNavigation callback
if (!options.refreshOnceOnNavigation && metaInfo.afterNavigation) {
addNavGuards($root);
}
});
}); // add the navigation guards if requested
if (options.refreshOnceOnNavigation) {
@@ -912,48 +1041,6 @@ function getComponentOption(options, component, result) {
return result;
}
var querySelector = function querySelector(arg, el) {
return (el || document).querySelectorAll(arg);
};
function getTag(tags, tag) {
if (!tags[tag]) {
tags[tag] = document.getElementsByTagName(tag)[0];
}
return tags[tag];
}
function getElementsKey(_ref) {
var body = _ref.body,
pbody = _ref.pbody;
return body ? 'body' : pbody ? 'pbody' : 'head';
}
function queryElements(parentNode, _ref2, attributes) {
var appId = _ref2.appId,
attribute = _ref2.attribute,
type = _ref2.type,
tagIDKeyName = _ref2.tagIDKeyName;
attributes = attributes || {};
var queries = ["".concat(type, "[").concat(attribute, "=\"").concat(appId, "\"]"), "".concat(type, "[data-").concat(tagIDKeyName, "]")].map(function (query) {
for (var key in attributes) {
var val = attributes[key];
var attributeValue = val && val !== true ? "=\"".concat(val, "\"") : '';
query += "[data-".concat(key).concat(attributeValue, "]");
}
return query;
});
return toArray(querySelector(queries.join(', '), parentNode));
}
function removeElementsByAppId(_ref3, appId) {
var attribute = _ref3.attribute;
toArray(querySelector("[".concat(attribute, "=\"").concat(appId, "\"]"))).map(function (el) {
return el.remove();
});
}
function removeAttribute(el, attributeName) {
el.removeAttribute(attributeName);
}
var callbacks = [];
function isDOMComplete(d) {
return (d || document).readyState === 'complete';
@@ -1084,7 +1171,7 @@ function updateAttribute(appId, options, type, attrs, tag) {
// which have been removed for this appId
for (var attr in data) {
if (data[attr] && appId in data[attr]) {
if (data[attr] !== undefined && appId in data[attr]) {
toUpdate.push(attr);
if (!attrs[attr]) {
@@ -1099,7 +1186,7 @@ function updateAttribute(appId, options, type, attrs, tag) {
if (!attrData || attrData[appId] !== attrs[_attr]) {
toUpdate.push(_attr);
if (attrs[_attr]) {
if (attrs[_attr] !== undefined) {
data[_attr] = data[_attr] || {};
data[_attr][appId] = attrs[_attr];
}
@@ -1116,7 +1203,9 @@ function updateAttribute(appId, options, type, attrs, tag) {
}
if (attrValues.length) {
var attrValue = includes(booleanHtmlAttributes, _attr2) && attrValues.some(Boolean) ? '' : attrValues.filter(Boolean).join(' ');
var attrValue = includes(booleanHtmlAttributes, _attr2) && attrValues.some(Boolean) ? '' : attrValues.filter(function (v) {
return v !== undefined;
}).join(' ');
tag.setAttribute(_attr2, attrValue);
} else {
removeAttribute(tag, _attr2);
@@ -1387,29 +1476,20 @@ function setMetaInfo(rootVm, appId, options, metaInfo) {
function removeMetaInfo(rootVm, appId, options) {
if (rootVm && rootVm.$el) {
var tags = {};
var _iteratorNormalCompletion = true;
var _didIteratorError = false;
var _iteratorError = undefined;
var _iterator = _createForOfIteratorHelper(metaInfoAttributeKeys),
_step;
try {
for (var _iterator = metaInfoAttributeKeys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
for (_iterator.s(); !(_step = _iterator.n()).done;) {
var type = _step.value;
var tagName = type.substr(0, 4);
updateAttribute(appId, options, type, {}, getTag(tags, tagName));
}
} catch (err) {
_didIteratorError = true;
_iteratorError = err;
_iterator.e(err);
} finally {
try {
if (!_iteratorNormalCompletion && _iterator.return != null) {
_iterator.return();
}
} finally {
if (_didIteratorError) {
throw _iteratorError;
}
}
_iterator.f();
}
return removeElementsByAppId(options, appId);
@@ -1756,7 +1836,7 @@ function generateServerInjector(options, metaInfo) {
if (_data) {
for (var _attr in _data) {
attributeData[_attr] = _objectSpread2({}, attributeData[_attr], _defineProperty({}, appId, _data[_attr]));
attributeData[_attr] = _objectSpread2(_objectSpread2({}, attributeData[_attr]), {}, _defineProperty({}, appId, _data[_attr]));
}
}
}
dist/vue-meta.js
Vendored
+186 -94
View File
@@ -1,5 +1,5 @@
/**
* vue-meta v2.3.3
* vue-meta v2.3.4
* (c) 2020
* - Declan de Wet
* - Sébastien Chopin (@Atinux)
@@ -14,7 +14,7 @@
(global = global || self, global.VueMeta = factory());
}(this, (function () { 'use strict';
var version = "2.3.3";
var version = "2.3.4";
function _typeof(obj) {
"@babel/helpers - typeof";
@@ -32,6 +32,78 @@
return _typeof(obj);
}
function _unsupportedIterableToArray(o, minLen) {
if (!o) return;
if (typeof o === "string") return _arrayLikeToArray(o, minLen);
var n = Object.prototype.toString.call(o).slice(8, -1);
if (n === "Object" && o.constructor) n = o.constructor.name;
if (n === "Map" || n === "Set") return Array.from(o);
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
}
function _arrayLikeToArray(arr, len) {
if (len == null || len > arr.length) len = arr.length;
for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
return arr2;
}
function _createForOfIteratorHelper(o) {
if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) {
if (Array.isArray(o) || (o = _unsupportedIterableToArray(o))) {
var i = 0;
var F = function () {};
return {
s: F,
n: function () {
if (i >= o.length) return {
done: true
};
return {
done: false,
value: o[i++]
};
},
e: function (e) {
throw e;
},
f: F
};
}
throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
}
var it,
normalCompletion = true,
didErr = false,
err;
return {
s: function () {
it = o[Symbol.iterator]();
},
n: function () {
var step = it.next();
normalCompletion = step.done;
return step;
},
e: function (e) {
didErr = true;
err = e;
},
f: function () {
try {
if (!normalCompletion && it.return != null) it.return();
} finally {
if (didErr) throw err;
}
}
};
}
/**
* checks if passed argument is an array
* @param {any} arg - the object to check
@@ -153,7 +225,7 @@
var commonDataAttributes = ['body', 'pbody']; // from: https://github.com/kangax/html-minifier/blob/gh-pages/src/htmlminifier.js#L202
var booleanHtmlAttributes = ['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'];
var booleanHtmlAttributes = ['allowfullscreen', 'amp', 'amp-boilerplate', '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'];
var batchId = null;
function triggerUpdate(_ref, rootVm, hookName) {
@@ -254,6 +326,48 @@
return array.includes(value);
}
var querySelector = function querySelector(arg, el) {
return (el || document).querySelectorAll(arg);
};
function getTag(tags, tag) {
if (!tags[tag]) {
tags[tag] = document.getElementsByTagName(tag)[0];
}
return tags[tag];
}
function getElementsKey(_ref) {
var body = _ref.body,
pbody = _ref.pbody;
return body ? 'body' : pbody ? 'pbody' : 'head';
}
function queryElements(parentNode, _ref2, attributes) {
var appId = _ref2.appId,
attribute = _ref2.attribute,
type = _ref2.type,
tagIDKeyName = _ref2.tagIDKeyName;
attributes = attributes || {};
var queries = ["".concat(type, "[").concat(attribute, "=\"").concat(appId, "\"]"), "".concat(type, "[data-").concat(tagIDKeyName, "]")].map(function (query) {
for (var key in attributes) {
var val = attributes[key];
var attributeValue = val && val !== true ? "=\"".concat(val, "\"") : '';
query += "[data-".concat(key).concat(attributeValue, "]");
}
return query;
});
return toArray(querySelector(queries.join(', '), parentNode));
}
function removeElementsByAppId(_ref3, appId) {
var attribute = _ref3.attribute;
toArray(querySelector("[".concat(attribute, "=\"").concat(appId, "\"]"))).map(function (el) {
return el.remove();
});
}
function removeAttribute(el, attributeName) {
el.removeAttribute(attributeName);
}
function hasMetaInfo(vm) {
vm = vm || this;
return vm && (vm[rootConfigKey] === true || isObject(vm[rootConfigKey]));
@@ -306,7 +420,8 @@
var appId = 1;
function createMixin(Vue, options) {
// for which Vue lifecycle hooks should the metaInfo be refreshed
var updateOnLifecycleHook = ['activated', 'deactivated', 'beforeMount']; // watch for client side component updates
var updateOnLifecycleHook = ['activated', 'deactivated', 'beforeMount'];
var wasServerRendered = false; // watch for client side component updates
return {
beforeCreate: function beforeCreate() {
@@ -327,10 +442,26 @@
return hasMetaInfo(this);
}
}); // Add a marker to know if it uses metaInfo
});
if (this === $root) {
$root.$once('hook:beforeMount', function () {
wasServerRendered = this.$el && this.$el.nodeType === 1 && this.$el.hasAttribute('data-server-rendered'); // In most cases when you have a SSR app it will be the first app thats gonna be
// initiated, if we cant detect the data-server-rendered attribute from Vue but we
// do see our own ssrAttribute then _assume_ the Vue app with appId 1 is the ssr app
// attempted fix for #404 & #562, but we rly need to refactor how we pass appIds from
// ssr to the client
if (!wasServerRendered && $root[rootConfigKey] && $root[rootConfigKey].appId === 1) {
var htmlTag = getTag({}, 'html');
wasServerRendered = htmlTag && htmlTag.hasAttribute(options.ssrAttribute);
}
});
} // Add a marker to know if it uses metaInfo
// _vnode is used to know that it's attached to a real component
// useful if we use some mixin to add some meta tags (like nuxt-i18n)
if (isUndefined($options[options.keyName]) || $options[options.keyName] === null) {
return;
}
@@ -400,10 +531,10 @@
if (!$root[rootConfigKey].initializedSsr) {
$root[rootConfigKey].initializedSsr = true;
this.$on('hook:beforeMount', function () {
var $root = this; // if this Vue-app was server rendered, set the appId to 'ssr'
var $root = this[rootKey]; // if this Vue-app was server rendered, set the appId to 'ssr'
// only one SSR app per page is supported
if ($root.$el && $root.$el.nodeType === 1 && $root.$el.hasAttribute('data-server-rendered')) {
if (wasServerRendered) {
$root[rootConfigKey].appId = options.ssrAppId;
}
});
@@ -413,37 +544,39 @@
this.$on('hook:mounted', function () {
var $root = this[rootKey];
if (!$root[rootConfigKey].initialized) {
// used in triggerUpdate to check if a change was triggered
// during initialization
$root[rootConfigKey].initializing = true; // refresh meta in nextTick so all child components have loaded
this.$nextTick(function () {
var _$root$$meta$refresh = $root.$meta().refresh(),
tags = _$root$$meta$refresh.tags,
metaInfo = _$root$$meta$refresh.metaInfo; // After ssr hydration (identifier by tags === false) check
// if initialized was set to null in triggerUpdate. That'd mean
// that during initilazation changes where triggered which need
// to be applied OR a metaInfo watcher was triggered before the
// current hook was called
// (during initialization all changes are blocked)
if ($root[rootConfigKey].initialized) {
return;
} // used in triggerUpdate to check if a change was triggered
// during initialization
if (tags === false && $root[rootConfigKey].initialized === null) {
this.$nextTick(function () {
return triggerUpdate(options, $root, 'init');
});
}
$root[rootConfigKey].initializing = true; // refresh meta in nextTick so all child components have loaded
$root[rootConfigKey].initialized = true;
delete $root[rootConfigKey].initializing; // add the navigation guards if they havent been added yet
// they are needed for the afterNavigation callback
this.$nextTick(function () {
var _$root$$meta$refresh = $root.$meta().refresh(),
tags = _$root$$meta$refresh.tags,
metaInfo = _$root$$meta$refresh.metaInfo; // After ssr hydration (identifier by tags === false) check
// if initialized was set to null in triggerUpdate. That'd mean
// that during initilazation changes where triggered which need
// to be applied OR a metaInfo watcher was triggered before the
// current hook was called
// (during initialization all changes are blocked)
if (!options.refreshOnceOnNavigation && metaInfo.afterNavigation) {
addNavGuards($root);
}
});
}
if (tags === false && $root[rootConfigKey].initialized === null) {
this.$nextTick(function () {
return triggerUpdate(options, $root, 'init');
});
}
$root[rootConfigKey].initialized = true;
delete $root[rootConfigKey].initializing; // add the navigation guards if they havent been added yet
// they are needed for the afterNavigation callback
if (!options.refreshOnceOnNavigation && metaInfo.afterNavigation) {
addNavGuards($root);
}
});
}); // add the navigation guards if requested
if (options.refreshOnceOnNavigation) {
@@ -929,48 +1062,6 @@
return result;
}
var querySelector = function querySelector(arg, el) {
return (el || document).querySelectorAll(arg);
};
function getTag(tags, tag) {
if (!tags[tag]) {
tags[tag] = document.getElementsByTagName(tag)[0];
}
return tags[tag];
}
function getElementsKey(_ref) {
var body = _ref.body,
pbody = _ref.pbody;
return body ? 'body' : pbody ? 'pbody' : 'head';
}
function queryElements(parentNode, _ref2, attributes) {
var appId = _ref2.appId,
attribute = _ref2.attribute,
type = _ref2.type,
tagIDKeyName = _ref2.tagIDKeyName;
attributes = attributes || {};
var queries = ["".concat(type, "[").concat(attribute, "=\"").concat(appId, "\"]"), "".concat(type, "[data-").concat(tagIDKeyName, "]")].map(function (query) {
for (var key in attributes) {
var val = attributes[key];
var attributeValue = val && val !== true ? "=\"".concat(val, "\"") : '';
query += "[data-".concat(key).concat(attributeValue, "]");
}
return query;
});
return toArray(querySelector(queries.join(', '), parentNode));
}
function removeElementsByAppId(_ref3, appId) {
var attribute = _ref3.attribute;
toArray(querySelector("[".concat(attribute, "=\"").concat(appId, "\"]"))).map(function (el) {
return el.remove();
});
}
function removeAttribute(el, attributeName) {
el.removeAttribute(attributeName);
}
var callbacks = [];
function isDOMComplete(d) {
return (d || document).readyState === 'complete';
@@ -1101,7 +1192,7 @@
// which have been removed for this appId
for (var attr in data) {
if (data[attr] && appId in data[attr]) {
if (data[attr] !== undefined && appId in data[attr]) {
toUpdate.push(attr);
if (!attrs[attr]) {
@@ -1116,7 +1207,7 @@
if (!attrData || attrData[appId] !== attrs[_attr]) {
toUpdate.push(_attr);
if (attrs[_attr]) {
if (attrs[_attr] !== undefined) {
data[_attr] = data[_attr] || {};
data[_attr][appId] = attrs[_attr];
}
@@ -1133,7 +1224,9 @@
}
if (attrValues.length) {
var attrValue = includes(booleanHtmlAttributes, _attr2) && attrValues.some(Boolean) ? '' : attrValues.filter(Boolean).join(' ');
var attrValue = includes(booleanHtmlAttributes, _attr2) && attrValues.some(Boolean) ? '' : attrValues.filter(function (v) {
return v !== undefined;
}).join(' ');
tag.setAttribute(_attr2, attrValue);
} else {
removeAttribute(tag, _attr2);
@@ -1404,29 +1497,20 @@
function removeMetaInfo(rootVm, appId, options) {
if (rootVm && rootVm.$el) {
var tags = {};
var _iteratorNormalCompletion = true;
var _didIteratorError = false;
var _iteratorError = undefined;
var _iterator = _createForOfIteratorHelper(metaInfoAttributeKeys),
_step;
try {
for (var _iterator = metaInfoAttributeKeys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
for (_iterator.s(); !(_step = _iterator.n()).done;) {
var type = _step.value;
var tagName = type.substr(0, 4);
updateAttribute(appId, options, type, {}, getTag(tags, tagName));
}
} catch (err) {
_didIteratorError = true;
_iteratorError = err;
_iterator.e(err);
} finally {
try {
if (!_iteratorNormalCompletion && _iterator.return != null) {
_iterator.return();
}
} finally {
if (_didIteratorError) {
throw _iteratorError;
}
}
_iterator.f();
}
return removeElementsByAppId(options, appId);
@@ -1629,6 +1713,14 @@
Vue.mixin(createMixin(Vue, options));
}
{
// automatic install
if (!isUndefined(window) && !isUndefined(window.Vue)) {
/* istanbul ignore next */
install(window.Vue);
}
}
var index = {
version: version,
install: install,
dist/vue-meta.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "vue-meta",
"version": "2.3.3",
"version": "2.3.4",
"description": "Manage HTML metadata in Vue.js components with ssr support",
"keywords": [
"attribute",