Skip to content

Commit

Permalink
chore(release): 2.3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@pimlie
pimlie committed Jan 12, 2020
1 parent f872dad commit 4b80129
Show file tree
Hide file tree
Showing 8 changed files with 242 additions and 74 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
91 changes: 75 additions & 16 deletions dist/vue-meta.common.js
View file
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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") {
Expand Down Expand Up @@ -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();
}
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
}
});
});
}

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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;
}
};
Expand Down Expand Up @@ -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]) {
Expand All @@ -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);
}
};
Expand Down
33 changes: 18 additions & 15 deletions dist/vue-meta.esm.browser.js
View file
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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") {
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
}
});
});
}

Expand Down Expand Up @@ -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]) {
Expand All @@ -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);
}
};
Expand Down
Loading

0 comments on commit 4b80129

Please sign in to comment.