Skip to content

Commit

Permalink
Merge pull request Meituan-Dianping#104 from Meituan-Dianping/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
anchengjian authored Mar 15, 2018
2 parents 004eed9 + 5c24878 commit 57bec44
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion packages/mpvue-template-compiler/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mpvue-template-compiler",
"version": "1.0.3",
"version": "1.0.5",
"description": "mpvue template compiler for Vue",
"main": "index.js",
"repository": {
Expand Down
8 changes: 4 additions & 4 deletions packages/mpvue/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2139,7 +2139,7 @@ function mountComponent (
vm.$el = el;
if (!vm.$options.render) {
vm.$options.render = createEmptyVNode;

}
callHook(vm, 'beforeMount');

Expand Down Expand Up @@ -2234,7 +2234,7 @@ function updateChildComponent (
vm.$forceUpdate();
}


}

function isInInactiveTree (vm) {
Expand Down Expand Up @@ -2845,7 +2845,7 @@ function initMethods (vm, methods) {
var props = vm.$options.props;
for (var key in methods) {
vm[key] = methods[key] == null ? noop : bind(methods[key], vm);

}
}

Expand Down Expand Up @@ -4145,7 +4145,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
});

Vue$3.version = '2.4.1';
Vue$3.mpvueVersion = '1.0.3';
Vue$3.mpvueVersion = '1.0.5';

/* globals renderer */

Expand Down
2 changes: 1 addition & 1 deletion packages/mpvue/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mpvue",
"version": "1.0.3",
"version": "1.0.5",
"description": "Vue Runtime for mini program",
"main": "index.js",
"repository": {
Expand Down

0 comments on commit 57bec44

Please sign in to comment.