This repository was archived by the owner on Oct 18, 2018. It is now read-only.
File tree 3 files changed +4
-5
lines changed
3 files changed +4
-5
lines changed Original file line number Diff line number Diff line change 1
1
import Cookies from 'js-cookie' ;
2
2
import cookie from 'cookie' ;
3
+ import merge from 'deepmerge' ;
3
4
4
5
export default ( ctx , inject ) => {
5
6
const {
@@ -86,10 +87,7 @@ export default (ctx, inject) => {
86
87
87
88
// Meta
88
89
if ( typeof currentSite . head !== 'undefined' ) {
89
- ctx . app . head = {
90
- ...ctx . app . head ,
91
- ...currentSite . head ,
92
- } ;
90
+ ctx . app . head = merge ( ctx . app . head , currentSite . head ) ;
93
91
}
94
92
95
93
// Assets helper
Original file line number Diff line number Diff line change 31
31
},
32
32
"dependencies" : {
33
33
"cookie" : " ^0.3.1" ,
34
+ "deepmerge" : " ^2.1.1" ,
34
35
"js-cookie" : " ^2.2.0"
35
36
},
36
37
"devDependencies" : {
Original file line number Diff line number Diff line change @@ -2469,7 +2469,7 @@ deep-is@~0.1.3:
2469
2469
version "0.1.3"
2470
2470
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
2471
2471
2472
- deepmerge@^2.0.0 :
2472
+ deepmerge@^2.0.0, deepmerge@^2.1.1 :
2473
2473
version "2.1.1"
2474
2474
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.1.1.tgz#e862b4e45ea0555072bf51e7fd0d9845170ae768"
2475
2475
You can’t perform that action at this time.
0 commit comments