Skip to content

Commit 5213340

Browse files
ecl1psJan Novotnykeithamus
authoredNov 19, 2024··
fix: use locale-independent comparison for sorting of overrides (#327)
* fix: use locale-independent comparison for sorting of overrides * Update index.js Co-authored-by: Keith Cirkel <keithamus@users.noreply.github.com> --------- Co-authored-by: Jan Novotny <jan.novotny@oriflame.com> Co-authored-by: Keith Cirkel <keithamus@users.noreply.github.com>
1 parent 99a9760 commit 5213340

File tree

5 files changed

+556
-17
lines changed

5 files changed

+556
-17
lines changed
 

‎index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ const sortObjectBySemver = sortObjectBy((a, b) => {
7777
const { name: bName, range: bRange } = parseNameAndVersionRange(b)
7878

7979
if (aName !== bName) {
80-
return aName.localeCompare(bName)
80+
return aName.localeCompare(bName, 'en')
8181
}
8282
if (!aRange) {
8383
return -1

‎tests/_helpers.js

+10-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ function sortObjectAlphabetically(t, options = {}) {
5353
for (let depth = 1; depth < maxDepth + 1; depth++) {
5454
sortObject(t, {
5555
...options,
56-
value: keysToObject(['z', 'a'], depth),
57-
expect: expect || keysToObject(['a', 'z'], depth),
56+
value: keysToObject(['z', 'e', 'ch', 'a'], depth),
57+
expect: expect || keysToObject(['a', 'ch', 'e', 'z'], depth),
5858
})
5959
}
6060
}
@@ -73,6 +73,10 @@ function sortObjectWithRangeAlphabetically(t, options = {}) {
7373
'@a-package@1.2.3',
7474
'b-package@1.2.3',
7575
'@b-package',
76+
'@e-package@1.2.3',
77+
'@ch-package@1.2.3',
78+
'e-package@1.2.3',
79+
'ch-package@1.2.3',
7680
],
7781
depth,
7882
),
@@ -82,10 +86,14 @@ function sortObjectWithRangeAlphabetically(t, options = {}) {
8286
[
8387
'@a-package@1.2.3',
8488
'@b-package',
89+
'@ch-package@1.2.3',
90+
'@e-package@1.2.3',
8591
'@z-package@1.2.3',
8692
'b-package@1.2.3',
8793
'b-package-package@1.2.3',
8894
'c-package@1.2.3',
95+
'ch-package@1.2.3',
96+
'e-package@1.2.3',
8997
],
9098
depth,
9199
),

‎tests/deps.js

+7
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,10 @@ test('dependenciesMetaRange', macro.sortObjectWithRangeAlphabetically, {
4444
// TODO: don't use snapshot, find a esaier way for review
4545
expect: 'snapshot',
4646
})
47+
48+
test('pnpm.overrides', macro.sortObjectWithRangeAlphabetically, {
49+
path: 'pnpm.overrides',
50+
maxDepth: 2,
51+
// TODO: don't use snapshot, find a esaier way for review
52+
expect: 'snapshot',
53+
})

‎tests/snapshots/deps.js.md

+538-14
Large diffs are not rendered by default.

‎tests/snapshots/deps.js.snap

444 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)
Please sign in to comment.