Skip to content

Commit dbf1510

Browse files
yyx990803yyx990803
committed
build: build 2.5.17-beta.0
1 parent 950daca commit dbf1510

File tree

14 files changed

+842
-647
lines changed

14 files changed

+842
-647
lines changed

‎dist/vue.common.js

+131-100
Large diffs are not rendered by default.

‎dist/vue.esm.js

+131-100
Large diffs are not rendered by default.

‎dist/vue.js

+131-100
Large diffs are not rendered by default.

‎dist/vue.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/vue.runtime.common.js

+129-99
Large diffs are not rendered by default.

‎dist/vue.runtime.esm.js

+129-99
Large diffs are not rendered by default.

‎dist/vue.runtime.js

+129-99
Large diffs are not rendered by default.

‎dist/vue.runtime.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/vue-server-renderer/basic.js

+24-19
Original file line numberDiff line numberDiff line change
@@ -531,6 +531,7 @@ function cloneVNode (vnode) {
531531
cloned.fnContext = vnode.fnContext;
532532
cloned.fnOptions = vnode.fnOptions;
533533
cloned.fnScopeId = vnode.fnScopeId;
534+
cloned.asyncMeta = vnode.asyncMeta;
534535
cloned.isCloned = true;
535536
return cloned
536537
}
@@ -1119,10 +1120,10 @@ function defineReactive (
11191120

11201121
// cater for pre-defined getter/setters
11211122
var getter = property && property.get;
1122-
if (!getter && arguments.length === 2) {
1123+
var setter = property && property.set;
1124+
if ((!getter || setter) && arguments.length === 2) {
11231125
val = obj[key];
11241126
}
1125-
var setter = property && property.set;
11261127

11271128
var childOb = !shallow && observe(val);
11281129
Object.defineProperty(obj, key, {
@@ -4560,7 +4561,8 @@ var keyCodes = {
45604561

45614562
// KeyboardEvent.key aliases
45624563
var keyNames = {
4563-
esc: 'Escape',
4564+
// #7880: IE11 and Edge use `Esc` for Escape key name.
4565+
esc: ['Esc', 'Escape'],
45644566
tab: 'Tab',
45654567
enter: 'Enter',
45664568
space: ' ',
@@ -7400,12 +7402,7 @@ function mergeProps (to, from) {
74007402

74017403
// inline hooks to be invoked on component VNodes during patch
74027404
var componentVNodeHooks = {
7403-
init: function init (
7404-
vnode,
7405-
hydrating,
7406-
parentElm,
7407-
refElm
7408-
) {
7405+
init: function init (vnode, hydrating) {
74097406
if (
74107407
vnode.componentInstance &&
74117408
!vnode.componentInstance._isDestroyed &&
@@ -7417,9 +7414,7 @@ var componentVNodeHooks = {
74177414
} else {
74187415
var child = vnode.componentInstance = createComponentInstanceForVnode(
74197416
vnode,
7420-
activeInstance,
7421-
parentElm,
7422-
refElm
7417+
activeInstance
74237418
);
74247419
child.$mount(hydrating ? vnode.elm : undefined, hydrating);
74257420
}
@@ -7577,16 +7572,12 @@ function createComponent (
75777572

75787573
function createComponentInstanceForVnode (
75797574
vnode, // we know it's MountedComponentVNode but flow doesn't
7580-
parent, // activeInstance in lifecycle state
7581-
parentElm,
7582-
refElm
7575+
parent // activeInstance in lifecycle state
75837576
) {
75847577
var options = {
75857578
_isComponent: true,
7586-
parent: parent,
75877579
_parentVnode: vnode,
7588-
_parentElm: parentElm || null,
7589-
_refElm: refElm || null
7580+
parent: parent
75907581
};
75917582
// check inline-template render functions
75927583
var inlineTemplate = vnode.data.inlineTemplate;
@@ -7601,10 +7592,24 @@ function installComponentHooks (data) {
76017592
var hooks = data.hook || (data.hook = {});
76027593
for (var i = 0; i < hooksToMerge.length; i++) {
76037594
var key = hooksToMerge[i];
7604-
hooks[key] = componentVNodeHooks[key];
7595+
var existing = hooks[key];
7596+
var toMerge = componentVNodeHooks[key];
7597+
if (existing !== toMerge && !(existing && existing._merged)) {
7598+
hooks[key] = existing ? mergeHook$1(toMerge, existing) : toMerge;
7599+
}
76057600
}
76067601
}
76077602

7603+
function mergeHook$1 (f1, f2) {
7604+
var merged = function (a, b) {
7605+
// flow complains about extra args which is why we use any
7606+
f1(a, b);
7607+
f2(a, b);
7608+
};
7609+
merged._merged = true;
7610+
return merged
7611+
}
7612+
76087613
// transform component v-model info (value and callback) into
76097614
// prop and event handler respectively.
76107615
function transformModel (options, data) {

‎packages/vue-server-renderer/build.js

+24-19
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,7 @@ function cloneVNode (vnode) {
533533
cloned.fnContext = vnode.fnContext;
534534
cloned.fnOptions = vnode.fnOptions;
535535
cloned.fnScopeId = vnode.fnScopeId;
536+
cloned.asyncMeta = vnode.asyncMeta;
536537
cloned.isCloned = true;
537538
return cloned
538539
}
@@ -1121,10 +1122,10 @@ function defineReactive (
11211122

11221123
// cater for pre-defined getter/setters
11231124
var getter = property && property.get;
1124-
if (!getter && arguments.length === 2) {
1125+
var setter = property && property.set;
1126+
if ((!getter || setter) && arguments.length === 2) {
11251127
val = obj[key];
11261128
}
1127-
var setter = property && property.set;
11281129

11291130
var childOb = !shallow && observe(val);
11301131
Object.defineProperty(obj, key, {
@@ -4303,7 +4304,8 @@ var keyCodes = {
43034304

43044305
// KeyboardEvent.key aliases
43054306
var keyNames = {
4306-
esc: 'Escape',
4307+
// #7880: IE11 and Edge use `Esc` for Escape key name.
4308+
esc: ['Esc', 'Escape'],
43074309
tab: 'Tab',
43084310
enter: 'Enter',
43094311
space: ' ',
@@ -7145,12 +7147,7 @@ function mergeProps (to, from) {
71457147

71467148
// inline hooks to be invoked on component VNodes during patch
71477149
var componentVNodeHooks = {
7148-
init: function init (
7149-
vnode,
7150-
hydrating,
7151-
parentElm,
7152-
refElm
7153-
) {
7150+
init: function init (vnode, hydrating) {
71547151
if (
71557152
vnode.componentInstance &&
71567153
!vnode.componentInstance._isDestroyed &&
@@ -7162,9 +7159,7 @@ var componentVNodeHooks = {
71627159
} else {
71637160
var child = vnode.componentInstance = createComponentInstanceForVnode(
71647161
vnode,
7165-
activeInstance,
7166-
parentElm,
7167-
refElm
7162+
activeInstance
71687163
);
71697164
child.$mount(hydrating ? vnode.elm : undefined, hydrating);
71707165
}
@@ -7322,16 +7317,12 @@ function createComponent (
73227317

73237318
function createComponentInstanceForVnode (
73247319
vnode, // we know it's MountedComponentVNode but flow doesn't
7325-
parent, // activeInstance in lifecycle state
7326-
parentElm,
7327-
refElm
7320+
parent // activeInstance in lifecycle state
73287321
) {
73297322
var options = {
73307323
_isComponent: true,
7331-
parent: parent,
73327324
_parentVnode: vnode,
7333-
_parentElm: parentElm || null,
7334-
_refElm: refElm || null
7325+
parent: parent
73357326
};
73367327
// check inline-template render functions
73377328
var inlineTemplate = vnode.data.inlineTemplate;
@@ -7346,10 +7337,24 @@ function installComponentHooks (data) {
73467337
var hooks = data.hook || (data.hook = {});
73477338
for (var i = 0; i < hooksToMerge.length; i++) {
73487339
var key = hooksToMerge[i];
7349-
hooks[key] = componentVNodeHooks[key];
7340+
var existing = hooks[key];
7341+
var toMerge = componentVNodeHooks[key];
7342+
if (existing !== toMerge && !(existing && existing._merged)) {
7343+
hooks[key] = existing ? mergeHook$1(toMerge, existing) : toMerge;
7344+
}
73507345
}
73517346
}
73527347

7348+
function mergeHook$1 (f1, f2) {
7349+
var merged = function (a, b) {
7350+
// flow complains about extra args which is why we use any
7351+
f1(a, b);
7352+
f2(a, b);
7353+
};
7354+
merged._merged = true;
7355+
return merged
7356+
}
7357+
73537358
// transform component v-model info (value and callback) into
73547359
// prop and event handler respectively.
73557360
function transformModel (options, data) {

‎packages/vue-server-renderer/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-server-renderer",
3-
"version": "2.5.16",
3+
"version": "2.5.17-beta.0",
44
"description": "server renderer for Vue 2.0",
55
"main": "index.js",
66
"types": "types/index.d.ts",

‎packages/vue-template-compiler/browser.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -1299,10 +1299,10 @@ function defineReactive (
12991299

13001300
// cater for pre-defined getter/setters
13011301
var getter = property && property.get;
1302-
if (!getter && arguments.length === 2) {
1302+
var setter = property && property.set;
1303+
if ((!getter || setter) && arguments.length === 2) {
13031304
val = obj[key];
13041305
}
1305-
var setter = property && property.set;
13061306

13071307
var childOb = !shallow && observe(val);
13081308
Object.defineProperty(obj, key, {
@@ -3803,7 +3803,8 @@ var keyCodes = {
38033803

38043804
// KeyboardEvent.key aliases
38053805
var keyNames = {
3806-
esc: 'Escape',
3806+
// #7880: IE11 and Edge use `Esc` for Escape key name.
3807+
esc: ['Esc', 'Escape'],
38073808
tab: 'Tab',
38083809
enter: 'Enter',
38093810
space: ' ',

‎packages/vue-template-compiler/build.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -1256,10 +1256,10 @@ function defineReactive (
12561256

12571257
// cater for pre-defined getter/setters
12581258
var getter = property && property.get;
1259-
if (!getter && arguments.length === 2) {
1259+
var setter = property && property.set;
1260+
if ((!getter || setter) && arguments.length === 2) {
12601261
val = obj[key];
12611262
}
1262-
var setter = property && property.set;
12631263

12641264
var childOb = !shallow && observe(val);
12651265
Object.defineProperty(obj, key, {
@@ -3405,7 +3405,8 @@ var keyCodes = {
34053405

34063406
// KeyboardEvent.key aliases
34073407
var keyNames = {
3408-
esc: 'Escape',
3408+
// #7880: IE11 and Edge use `Esc` for Escape key name.
3409+
esc: ['Esc', 'Escape'],
34093410
tab: 'Tab',
34103411
enter: 'Enter',
34113412
space: ' ',

‎packages/vue-template-compiler/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-template-compiler",
3-
"version": "2.5.16",
3+
"version": "2.5.17-beta.0",
44
"description": "template compiler for Vue 2.0",
55
"main": "index.js",
66
"unpkg": "browser.js",

0 commit comments

Comments
 (0)