glob@7.1.7

5 files changed, 11 insertions, 16 deletions

diff --git a/node_modules/glob/README.md b/node_modules/glob/README.md
index 0916a4825..2dde30a59 100644
--- a/node_modules/glob/README.md
+++ b/node_modules/glob/README.md
@@ -7,7 +7,7 @@ Match files using the patterns the shell uses, like stars and stuff.
 This is a glob implementation in JavaScript.  It uses the `minimatch`
 library to do its matching.
 
-![](logo/glob.png)
+![a fun cartoon logo made of glob characters](logo/glob.png)
 
 ## Usage
 
diff --git a/node_modules/glob/common.js b/node_modules/glob/common.js
index 66651bb3a..d14157a0a 100644
--- a/node_modules/glob/common.js
+++ b/node_modules/glob/common.js
@@ -1,5 +1,3 @@
-exports.alphasort = alphasort
-exports.alphasorti = alphasorti
 exports.setopts = setopts
 exports.ownProp = ownProp
 exports.makeAbs = makeAbs
@@ -17,12 +15,8 @@ var minimatch = require("minimatch")
 var isAbsolute = require("path-is-absolute")
 var Minimatch = minimatch.Minimatch
 
-function alphasorti (a, b) {
-  return a.toLowerCase().localeCompare(b.toLowerCase())
-}
-
 function alphasort (a, b) {
-  return a.localeCompare(b)
+  return a.localeCompare(b, 'en')
 }
 
 function setupIgnores (self, options) {
@@ -150,7 +144,7 @@ function finish (self) {
     all = Object.keys(all)
 
   if (!self.nosort)
-    all = all.sort(self.nocase ? alphasorti : alphasort)
+    all = all.sort(alphasort)
 
   // at *some* point we statted all of these
   if (self.mark) {
diff --git a/node_modules/glob/glob.js b/node_modules/glob/glob.js
index 58dec0f6c..dc27aef10 100644
--- a/node_modules/glob/glob.js
+++ b/node_modules/glob/glob.js
@@ -51,8 +51,6 @@ var assert = require('assert')
 var isAbsolute = require('path-is-absolute')
 var globSync = require('./sync.js')
 var common = require('./common.js')
-var alphasort = common.alphasort
-var alphasorti = common.alphasorti
 var setopts = common.setopts
 var ownProp = common.ownProp
 var inflight = require('inflight')
diff --git a/node_modules/glob/package.json b/node_modules/glob/package.json
index 6477c3070..b345ae1e9 100644
--- a/node_modules/glob/package.json
+++ b/node_modules/glob/package.json
@@ -2,7 +2,7 @@
   "author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)",
   "name": "glob",
   "description": "a little globber",
-  "version": "7.1.6",
+  "version": "7.1.7",
   "repository": {
     "type": "git",
     "url": "git://github.com/isaacs/node-glob.git"
@@ -27,13 +27,18 @@
   "devDependencies": {
     "mkdirp": "0",
     "rimraf": "^2.2.8",
-    "tap": "^12.0.1",
+    "tap": "^15.0.6",
     "tick": "0.0.6"
   },
+  "tap": {
+    "before": "test/00-setup.js",
+    "after": "test/zz-cleanup.js",
+    "jobs": 1
+  },
   "scripts": {
     "prepublish": "npm run benchclean",
     "profclean": "rm -f v8.log profile.txt",
-    "test": "tap test/*.js --cov",
+    "test": "tap",
     "test-regen": "npm run profclean && TEST_REGEN=1 node test/00-setup.js",
     "bench": "bash benchmark.sh",
     "prof": "bash prof.sh && cat profile.txt",
diff --git a/node_modules/glob/sync.js b/node_modules/glob/sync.js
index c952134ba..10b0ed2c0 100644
--- a/node_modules/glob/sync.js
+++ b/node_modules/glob/sync.js
@@ -11,8 +11,6 @@ var path = require('path')
 var assert = require('assert')
 var isAbsolute = require('path-is-absolute')
 var common = require('./common.js')
-var alphasort = common.alphasort
-var alphasorti = common.alphasorti
 var setopts = common.setopts
 var ownProp = common.ownProp
 var childrenIgnored = common.childrenIgnored