Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .yarn/install-state.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"webpack": "^5.94.0",
"webpack-cli": "^5.0.2",
"webpack-dev-server": "^4.13.3",
"webpack-merge": "^5.8.0"
"webpack-merge": "^6.0.1"
},
"dependencies": {
"path": "^0.12.7"
Expand Down
26 changes: 23 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3736,6 +3736,15 @@ __metadata:
languageName: node
linkType: hard

"flat@npm:^5.0.2":
version: 5.0.2
resolution: "flat@npm:5.0.2"
bin:
flat: cli.js
checksum: 12a1536ac746db74881316a181499a78ef953632ddd28050b7a3a43c62ef5462e3357c8c29d76072bb635f147f7a9a1f0c02efef6b4be28f8db62ceb3d5c7f5d
languageName: node
linkType: hard

"follow-redirects@npm:^1.0.0":
version: 1.15.2
resolution: "follow-redirects@npm:1.15.2"
Expand Down Expand Up @@ -7116,7 +7125,7 @@ __metadata:
languageName: node
linkType: hard

"webpack-merge@npm:*, webpack-merge@npm:^5.7.3, webpack-merge@npm:^5.8.0":
"webpack-merge@npm:*, webpack-merge@npm:^5.7.3":
version: 5.8.0
resolution: "webpack-merge@npm:5.8.0"
dependencies:
Expand All @@ -7126,6 +7135,17 @@ __metadata:
languageName: node
linkType: hard

"webpack-merge@npm:^6.0.1":
version: 6.0.1
resolution: "webpack-merge@npm:6.0.1"
dependencies:
clone-deep: ^4.0.1
flat: ^5.0.2
wildcard: ^2.0.1
checksum: e8a604c686b944605a1c57cc7b75e886ab902dc5ffdd15259a092c5c2dd5f58868fe39f995ea4bad4f189e38843b061c4ae1eb22822d7169813f4adab571dc3d
languageName: node
linkType: hard

"webpack-setup-demo@workspace:.":
version: 0.0.0-use.local
resolution: "webpack-setup-demo@workspace:."
Expand Down Expand Up @@ -7157,7 +7177,7 @@ __metadata:
webpack: ^5.94.0
webpack-cli: ^5.0.2
webpack-dev-server: ^4.13.3
webpack-merge: ^5.8.0
webpack-merge: ^6.0.1
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -7300,7 +7320,7 @@ __metadata:
languageName: node
linkType: hard

"wildcard@npm:^2.0.0":
"wildcard@npm:^2.0.0, wildcard@npm:^2.0.1":
version: 2.0.1
resolution: "wildcard@npm:2.0.1"
checksum: e0c60a12a219e4b12065d1199802d81c27b841ed6ad6d9d28240980c73ceec6f856771d575af367cbec2982d9ae7838759168b551776577f155044f5a5ba843c
Expand Down