Skip to content

Commit a6f30fd

Browse files
Update dependency webpack-merge to v5
1 parent 51e018a commit a6f30fd

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,6 @@
136136
"webpack": "4.46.0",
137137
"webpack-cli": "4.9.1",
138138
"webpack-dev-server": "3.11.3",
139-
"webpack-merge": "4.2.2"
139+
"webpack-merge": "5.10.0"
140140
}
141141
}

yarn.lock

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5305,6 +5305,11 @@ flat-cache@^3.0.4:
53055305
flatted "^3.1.0"
53065306
rimraf "^3.0.2"
53075307

5308+
flat@^5.0.2:
5309+
version "5.0.2"
5310+
resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
5311+
integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
5312+
53085313
flatted@^3.1.0:
53095314
version "3.1.1"
53105315
resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469"
@@ -11820,12 +11825,14 @@ webpack-log@^2.0.0:
1182011825
ansi-colors "^3.0.0"
1182111826
uuid "^3.3.2"
1182211827

11823-
webpack-merge@4.2.2:
11824-
version "4.2.2"
11825-
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d"
11826-
integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==
11828+
webpack-merge@5.10.0:
11829+
version "5.10.0"
11830+
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.10.0.tgz#a3ad5d773241e9c682803abf628d4cd62b8a4177"
11831+
integrity sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==
1182711832
dependencies:
11828-
lodash "^4.17.15"
11833+
clone-deep "^4.0.1"
11834+
flat "^5.0.2"
11835+
wildcard "^2.0.0"
1182911836

1183011837
webpack-merge@^5.7.3:
1183111838
version "5.8.0"

0 commit comments

Comments
 (0)