Skip to content

Commit 906bb31

Browse files
authored
Merge pull request #12 from sumcumo/depfu/update/yarn/webpack-merge-4.2.1
Update webpack-merge: 4.1.5 → 4.2.1 (minor)
2 parents f9cfdc1 + 7702cca commit 906bb31

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"serve-favicon": "^2.5.0",
4646
"webpack-dev-middleware": "^3.4.0",
4747
"webpack-hot-middleware": "^2.24.3",
48-
"webpack-merge": "^4.1.4",
48+
"webpack-merge": "^4.2.1",
4949
"webpack-node-externals": "^1.7.2",
5050
"webpackbar": "^2.6.3"
5151
},

yarn.lock

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8198,13 +8198,20 @@ webpack-log@^2.0.0:
81988198
ansi-colors "^3.0.0"
81998199
uuid "^3.3.2"
82008200

8201-
webpack-merge@^4.1.2, webpack-merge@^4.1.4:
8201+
webpack-merge@^4.1.2:
82028202
version "4.1.5"
82038203
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.5.tgz#2be31e846c20767d1bef56bdca64c328a681190a"
82048204
integrity sha512-sVcM+MMJv6DO0C0GLLltx8mUlGMKXE0zBsuMqZ9jz2X9gsekALw6Rs0cAfTWc97VuWS6NpVUa78959zANnMMLQ==
82058205
dependencies:
82068206
lodash "^4.17.5"
82078207

8208+
webpack-merge@^4.2.1:
8209+
version "4.2.1"
8210+
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.1.tgz#5e923cf802ea2ace4fd5af1d3247368a633489b4"
8211+
integrity sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==
8212+
dependencies:
8213+
lodash "^4.17.5"
8214+
82088215
webpack-node-externals@^1.7.2:
82098216
version "1.7.2"
82108217
resolved "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-1.7.2.tgz#6e1ee79ac67c070402ba700ef033a9b8d52ac4e3"

0 commit comments

Comments
 (0)