Avoid locale-dependent sorting issues

Force all uses of String.localeCompare to use the 'en' locale. Re: npm/cli#2829
npm · May 6, 2021 · 36c7668 · 36c7668
1 parent 0a64e2d
commit 36c7668
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/index.js b/index.js
@@ -448,9 +448,9 @@ const sort = (a, b) => {
   const basea = path.basename(a).toLowerCase()
   const baseb = path.basename(b).toLowerCase()
 
-  return exta.localeCompare(extb) ||
-    basea.localeCompare(baseb) ||
-    a.localeCompare(b)
+  return exta.localeCompare(extb, 'en') ||
+    basea.localeCompare(baseb, 'en') ||
+    a.localeCompare(b, 'en')
 }
 
 module.exports = walk

diff --git a/package.json b/package.json
@@ -44,6 +44,9 @@
     "url": "git+https://github.com/npm/npm-packlist.git"
   },
   "tap": {
+    "test-env": [
+      "LC_ALL=sk"
+    ],
     "check-coverage": true,
     "nyc-arg": [
       "--include=index.js",

diff --git a/tap-snapshots/test/sorting.js.test.cjs b/tap-snapshots/test/sorting.js.test.cjs
@@ -10,6 +10,9 @@ Array [
   "a/b/1",
   "node_modules/a/b/c",
   "node_modules/b/c",
+  "cat",
+  "chai",
+  "dog",
   "a/b/c/d/e/f/g",
   "a/b/x/y",
   "asdf.js",

diff --git a/test/sorting.js b/test/sorting.js
@@ -5,6 +5,9 @@ const sort = Walker.prototype.sort
 
 t.matchSnapshot([
   'a/b/1',
+  'cat',
+  'dog',
+  'chai',
   'package.json',
   'node_modules/b/c',
   'asdf.js',