deps: [email protected]

Author: wraithgar

lib/commands/help-search.js

@@ -1,9 +1,7 @@
-const fs = require('fs')
+const { readFile } = require('fs/promises')
 const path = require('path')
 const chalk = require('chalk')
-const { promisify } = require('util')
-const glob = promisify(require('glob'))
-const readFile = promisify(fs.readFile)
+const glob = require('glob')
 const BaseCommand = require('../base-command.js')
 
 const globify = pattern => pattern.split('\\').join('/')
@@ -20,7 +18,9 @@ class HelpSearch extends BaseCommand {
     }
 
     const docPath = path.resolve(this.npm.npmRoot, 'docs/content')
-    const files = await glob(`${globify(docPath)}/*/*.md`)
+    let files = await glob(`${globify(docPath)}/*/*.md`)
+    // preserve glob@8 behavior
+    files = files.sort((a, b) => a.localeCompare(b, 'en'))
     const data = await this.readFiles(files)
     const results = await this.searchFiles(args, data, files)
     const formatted = this.formatResults(args, results)

lib/commands/help.js

@@ -1,8 +1,7 @@
 const spawn = require('@npmcli/promise-spawn')
 const path = require('path')
 const openUrl = require('../utils/open-url.js')
-const { promisify } = require('util')
-const glob = promisify(require('glob'))
+const glob = require('glob')
 const localeCompare = require('@isaacs/string-locale-compare')('en')
 
 const globify = pattern => pattern.split('\\').join('/')
@@ -34,7 +33,9 @@ class Help extends BaseCommand {
       return []
     }
     const g = path.resolve(this.npm.npmRoot, 'man/man[0-9]/*.[0-9]')
-    const files = await glob(globify(g))
+    let files = await glob(globify(g))
+    // preserve glob@8 behavior
+    files = files.sort((a, b) => a.localeCompare(b, 'en'))
 
     return Object.keys(files.reduce(function (acc, file) {
       file = path.basename(file).replace(/\.[0-9]+$/, '')
@@ -86,7 +87,9 @@ class Help extends BaseCommand {
         if (aManNumberMatch[1] !== bManNumberMatch[1]) {
           return aManNumberMatch[1] - bManNumberMatch[1]
         }
+        /* istanbul ignore next */
       } else if (bManNumberMatch) {
+        /* istanbul ignore next */
         return 1
       }
 

lib/utils/log-file.js

@@ -1,7 +1,7 @@
 const os = require('os')
 const { join, dirname, basename } = require('path')
-const { format, promisify } = require('util')
-const glob = promisify(require('glob'))
+const { format } = require('util')
+const glob = require('glob')
 const MiniPass = require('minipass')
 const fsMiniPass = require('fs-minipass')
 const fs = require('fs/promises')

node_modules/.gitignore

@@ -23,7 +23,6 @@
 !/@npmcli/map-workspaces
 !/@npmcli/map-workspaces/node_modules/
 /@npmcli/map-workspaces/node_modules/*
-!/@npmcli/map-workspaces/node_modules/glob
 !/@npmcli/map-workspaces/node_modules/minimatch
 !/@npmcli/metavuln-calculator
 !/@npmcli/move-file
@@ -60,10 +59,6 @@
 !/buffer
 !/builtins
 !/cacache
-!/cacache/node_modules/
-/cacache/node_modules/*
-!/cacache/node_modules/glob
-!/cacache/node_modules/minimatch
 !/chalk
 !/chownr
 !/ci-info
@@ -242,10 +237,6 @@
 !/read-cmd-shim
 !/read-package-json-fast
 !/read-package-json
-!/read-package-json/node_modules/
-/read-package-json/node_modules/*
-!/read-package-json/node_modules/glob
-!/read-package-json/node_modules/minimatch
 !/read
 !/readable-stream
 !/retry