Skip to content
This repository was archived by the owner on Oct 18, 2018. It is now read-only.

Commit b9d7bf5

Browse files
committed
fix: Merge head properties using deepmerge
1 parent 5514260 commit b9d7bf5

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

lib/templates/plugin.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import Cookies from 'js-cookie';
22
import cookie from 'cookie';
3+
import merge from 'deepmerge';
34

45
export default (ctx, inject) => {
56
const {
@@ -86,10 +87,7 @@ export default (ctx, inject) => {
8687

8788
// Meta
8889
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);
9391
}
9492

9593
// Assets helper

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
},
3232
"dependencies": {
3333
"cookie": "^0.3.1",
34+
"deepmerge": "^2.1.1",
3435
"js-cookie": "^2.2.0"
3536
},
3637
"devDependencies": {

yarn.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -2469,7 +2469,7 @@ deep-is@~0.1.3:
24692469
version "0.1.3"
24702470
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
24712471

2472-
deepmerge@^2.0.0:
2472+
deepmerge@^2.0.0, deepmerge@^2.1.1:
24732473
version "2.1.1"
24742474
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.1.1.tgz#e862b4e45ea0555072bf51e7fd0d9845170ae768"
24752475

0 commit comments

Comments
 (0)