Skip to content

Commit 424f26d

Browse files
committed
chore: Downgrade deepmerge
1 parent c23e71b commit 424f26d

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

packages/multisite/lib/templates/plugin.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Cookies from 'js-cookie';
22
import cookie from 'cookie';
3-
import * as deepmerge from 'deepmerge';
3+
import deepmerge from 'deepmerge';
44

55
export default (ctx, inject) => {
66
const {

packages/multisite/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
],
2020
"dependencies": {
2121
"cookie": "^0.3.1",
22-
"deepmerge": "^3.0.0",
22+
"deepmerge": "2.2.1",
2323
"js-cookie": "^2.2.0"
2424
},
2525
"devDependencies": {

yarn.lock

+9-3
Original file line numberDiff line numberDiff line change
@@ -3734,6 +3734,11 @@ deep-is@~0.1.3:
37343734
version "0.1.3"
37353735
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
37363736

3737+
3738+
version "2.2.1"
3739+
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170"
3740+
integrity sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==
3741+
37373742
[email protected], deepmerge@^3.0.0:
37383743
version "3.1.0"
37393744
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-3.1.0.tgz#a612626ce4803da410d77554bfd80361599c034d"
@@ -6500,9 +6505,10 @@ jsbn@~0.1.0:
65006505
version "0.1.1"
65016506
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
65026507

6503-
6504-
version "13.2.0"
6505-
resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-13.2.0.tgz#b1a0dbdadc255435262be8ea3723d2dba0d7eb3a"
6508+
6509+
version "14.0.0"
6510+
resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-14.0.0.tgz#c7f1441ebcc57902d08d5fb2f6ba2baf746da7c6"
6511+
integrity sha512-/VkyPmdtbwqpJSkwDx3YyJ3U1oawYNB/h5z8vTUZGAzjtu2OHTeFRfnJqyMHsJ5Cyes23trOmvUpM1GfHH1leA==
65066512
dependencies:
65076513
abab "^2.0.0"
65086514
acorn "^6.0.4"

0 commit comments

Comments
 (0)