Skip to content

Commit 461da26

Browse files
authored
Use lodash.mergewith for now
1 parent cc81ae6 commit 461da26

File tree

5 files changed

+22
-1
lines changed

5 files changed

+22
-1
lines changed

Diff for: .pnp.cjs

+10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

Diff for: packages/yarnpkg-core/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"es-toolkit": "^1.18.0",
2727
"fast-glob": "^3.2.2",
2828
"got": "^11.7.0",
29+
"lodash.mergewith": "^4.5.0",
2930
"micromatch": "^4.0.2",
3031
"p-limit": "^2.2.0",
3132
"semver": "^7.1.2",

Diff for: packages/yarnpkg-core/sources/miscUtils.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import {PortablePath, npath, xfs} from '@yarnpkg/fslib';
22
import {UsageError} from 'clipanion';
3-
import {isEqual, mergeWith} from 'es-toolkit/compat';
3+
import {isEqual} from 'es-toolkit/compat';
4+
// TODO: Replace with es-toolkit/compat
5+
import mergeWith from 'lodash.mergewith';
46
import micromatch from 'micromatch';
57
import pLimit, {Limit} from 'p-limit';
68
import semver from 'semver';

Diff for: yarn.lock

+8
Original file line numberDiff line numberDiff line change
@@ -5518,6 +5518,7 @@ __metadata:
55185518
esbuild: "npm:esbuild-wasm@^0.23.0"
55195519
fast-glob: "npm:^3.2.2"
55205520
got: "npm:^11.7.0"
5521+
lodash.mergewith: "npm:^4.5.0"
55215522
micromatch: "npm:^4.0.2"
55225523
p-limit: "npm:^2.2.0"
55235524
rollup: "npm:^2.59.0"
@@ -14103,6 +14104,13 @@ __metadata:
1410314104
languageName: node
1410414105
linkType: hard
1410514106

14107+
"lodash.mergewith@npm:^4.5.0":
14108+
version: 4.5.0
14109+
resolution: "lodash.mergewith@npm:4.5.0"
14110+
checksum: 10/9737806ac3f035f94cacd9c54b32a8ff62cf7ba164b65e7d939ad2959f4ccf50a15c4d9179b7f60ec5ac345a2d637cc4bd7da855e1c3baba9cd881378c393371
14111+
languageName: node
14112+
linkType: hard
14113+
1410614114
"lodash.set@npm:^4.3.2":
1410714115
version: 4.3.2
1410814116
resolution: "lodash.set@npm:4.3.2"

0 commit comments

Comments
 (0)