Skip to content

Commit 60291f2

Browse files
yyx990803yyx990803
committed
[build] 2.3.2
1 parent 8dc4215 commit 60291f2

File tree

11 files changed

+83
-32
lines changed

11 files changed

+83
-32
lines changed

‎dist/vue.common.js‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.3.1
2+
* Vue.js v2.3.2
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -3302,6 +3302,7 @@ function createFunctionalComponent (
33023302
});
33033303
if (vnode instanceof VNode) {
33043304
vnode.functionalContext = context;
3305+
vnode.functionalOptions = Ctor.options;
33053306
if (data.slot) {
33063307
(vnode.data || (vnode.data = {})).slot = data.slot;
33073308
}
@@ -4390,7 +4391,13 @@ Object.defineProperty(Vue$3.prototype, '$isServer', {
43904391
get: isServerRendering
43914392
});
43924393

4393-
Vue$3.version = '2.3.1';
4394+
Object.defineProperty(Vue$3.prototype, '$ssrContext', {
4395+
get: function get () {
4396+
return this.$vnode.ssrContext
4397+
}
4398+
});
4399+
4400+
Vue$3.version = '2.3.2';
43944401

43954402
/* */
43964403

‎dist/vue.esm.js‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.3.1
2+
* Vue.js v2.3.2
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -3300,6 +3300,7 @@ function createFunctionalComponent (
33003300
});
33013301
if (vnode instanceof VNode) {
33023302
vnode.functionalContext = context;
3303+
vnode.functionalOptions = Ctor.options;
33033304
if (data.slot) {
33043305
(vnode.data || (vnode.data = {})).slot = data.slot;
33053306
}
@@ -4388,7 +4389,13 @@ Object.defineProperty(Vue$3.prototype, '$isServer', {
43884389
get: isServerRendering
43894390
});
43904391

4391-
Vue$3.version = '2.3.1';
4392+
Object.defineProperty(Vue$3.prototype, '$ssrContext', {
4393+
get: function get () {
4394+
return this.$vnode.ssrContext
4395+
}
4396+
});
4397+
4398+
Vue$3.version = '2.3.2';
43924399

43934400
/* */
43944401

‎dist/vue.js‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.3.1
2+
* Vue.js v2.3.2
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -3298,6 +3298,7 @@ function createFunctionalComponent (
32983298
});
32993299
if (vnode instanceof VNode) {
33003300
vnode.functionalContext = context;
3301+
vnode.functionalOptions = Ctor.options;
33013302
if (data.slot) {
33023303
(vnode.data || (vnode.data = {})).slot = data.slot;
33033304
}
@@ -4382,7 +4383,13 @@ Object.defineProperty(Vue$3.prototype, '$isServer', {
43824383
get: isServerRendering
43834384
});
43844385

4385-
Vue$3.version = '2.3.1';
4386+
Object.defineProperty(Vue$3.prototype, '$ssrContext', {
4387+
get: function get () {
4388+
return this.$vnode.ssrContext
4389+
}
4390+
});
4391+
4392+
Vue$3.version = '2.3.2';
43864393

43874394
/* */
43884395

‎dist/vue.min.js‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/vue.runtime.common.js‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.3.1
2+
* Vue.js v2.3.2
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -3298,6 +3298,7 @@ function createFunctionalComponent (
32983298
});
32993299
if (vnode instanceof VNode) {
33003300
vnode.functionalContext = context;
3301+
vnode.functionalOptions = Ctor.options;
33013302
if (data.slot) {
33023303
(vnode.data || (vnode.data = {})).slot = data.slot;
33033304
}
@@ -4386,7 +4387,13 @@ Object.defineProperty(Vue$3.prototype, '$isServer', {
43864387
get: isServerRendering
43874388
});
43884389

4389-
Vue$3.version = '2.3.1';
4390+
Object.defineProperty(Vue$3.prototype, '$ssrContext', {
4391+
get: function get () {
4392+
return this.$vnode.ssrContext
4393+
}
4394+
});
4395+
4396+
Vue$3.version = '2.3.2';
43904397

43914398
/* */
43924399

‎dist/vue.runtime.esm.js‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.3.1
2+
* Vue.js v2.3.2
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -3296,6 +3296,7 @@ function createFunctionalComponent (
32963296
});
32973297
if (vnode instanceof VNode) {
32983298
vnode.functionalContext = context;
3299+
vnode.functionalOptions = Ctor.options;
32993300
if (data.slot) {
33003301
(vnode.data || (vnode.data = {})).slot = data.slot;
33013302
}
@@ -4384,7 +4385,13 @@ Object.defineProperty(Vue$3.prototype, '$isServer', {
43844385
get: isServerRendering
43854386
});
43864387

4387-
Vue$3.version = '2.3.1';
4388+
Object.defineProperty(Vue$3.prototype, '$ssrContext', {
4389+
get: function get () {
4390+
return this.$vnode.ssrContext
4391+
}
4392+
});
4393+
4394+
Vue$3.version = '2.3.2';
43884395

43894396
/* */
43904397

‎dist/vue.runtime.js‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.3.1
2+
* Vue.js v2.3.2
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -3294,6 +3294,7 @@ function createFunctionalComponent (
32943294
});
32953295
if (vnode instanceof VNode) {
32963296
vnode.functionalContext = context;
3297+
vnode.functionalOptions = Ctor.options;
32973298
if (data.slot) {
32983299
(vnode.data || (vnode.data = {})).slot = data.slot;
32993300
}
@@ -4378,7 +4379,13 @@ Object.defineProperty(Vue$3.prototype, '$isServer', {
43784379
get: isServerRendering
43794380
});
43804381

4381-
Vue$3.version = '2.3.1';
4382+
Object.defineProperty(Vue$3.prototype, '$ssrContext', {
4383+
get: function get () {
4384+
return this.$vnode.ssrContext
4385+
}
4386+
});
4387+
4388+
Vue$3.version = '2.3.2';
43824389

43834390
/* */
43844391

‎dist/vue.runtime.min.js‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5417,6 +5417,16 @@ function renderNode (node, isRoot, context) {
54175417
}
54185418
}
54195419

5420+
function registerComponentForCache (options, write) {
5421+
// exposed by vue-loader, need to call this if cache hit because
5422+
// component lifecycle hooks will not be called.
5423+
var register = options._ssrRegister;
5424+
if (write.caching && isDef(register)) {
5425+
write.componentBuffer[write.componentBuffer.length - 1].add(register);
5426+
}
5427+
return register
5428+
}
5429+
54205430
function renderComponent (node, isRoot, context) {
54215431
var write = context.write;
54225432
var next = context.next;
@@ -5426,15 +5436,9 @@ function renderComponent (node, isRoot, context) {
54265436
var Ctor = node.componentOptions.Ctor;
54275437
var getKey = Ctor.options.serverCacheKey;
54285438
var name = Ctor.options.name;
5429-
5430-
// exposed by vue-loader, need to call this if cache hit because
5431-
// component lifecycle hooks will not be called.
5432-
var registerComponent = Ctor.options._ssrRegister;
5433-
if (write.caching && isDef(registerComponent)) {
5434-
write.componentBuffer[write.componentBuffer.length - 1].add(registerComponent);
5435-
}
5436-
54375439
var cache = context.cache;
5440+
var registerComponent = registerComponentForCache(Ctor.options, write);
5441+
54385442
if (isDef(getKey) && isDef(cache) && isDef(name)) {
54395443
var key = name + '::' + getKey(node.componentOptions.propsData);
54405444
var has = context.has;
@@ -5508,7 +5512,6 @@ function renderComponentInner (node, isRoot, context) {
55085512
node,
55095513
context.activeInstance
55105514
);
5511-
node.ssrContext = null;
55125515
normalizeRender(child);
55135516
var childNode = child._render();
55145517
childNode.parent = node;
@@ -5520,15 +5523,21 @@ function renderComponentInner (node, isRoot, context) {
55205523
}
55215524

55225525
function renderElement (el, isRoot, context) {
5526+
var write = context.write;
5527+
var next = context.next;
5528+
55235529
if (isTrue(isRoot)) {
55245530
if (!el.data) { el.data = {}; }
55255531
if (!el.data.attrs) { el.data.attrs = {}; }
55265532
el.data.attrs[SSR_ATTR] = 'true';
55275533
}
5534+
5535+
if (el.functionalOptions) {
5536+
registerComponentForCache(el.functionalOptions, write);
5537+
}
5538+
55285539
var startTag = renderStartingTag(el, context);
55295540
var endTag = "</" + (el.tag) + ">";
5530-
var write = context.write;
5531-
var next = context.next;
55325541
if (context.isUnaryTag(el.tag)) {
55335542
write(startTag, next);
55345543
} else if (isUndef(el.children) || el.children.length === 0) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-server-renderer",
3-
"version": "2.3.1",
3+
"version": "2.3.2",
44
"description": "server renderer for Vue 2.0",
55
"main": "index.js",
66
"repository": {

0 commit comments

Comments
 (0)