deps: @npmcli/git@4.0.4

npm · Mar 23, 2023 · 9a7b8e8 · 9a7b8e8
1 parent 57c0a55
commit 9a7b8e8
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 29 deletions.
diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md
@@ -653,7 +653,6 @@ graph LR;
   npmcli-docs-->yaml;
   npmcli-fs-->semver;
   npmcli-git-->lru-cache;
-  npmcli-git-->mkdirp;
   npmcli-git-->npm-pick-manifest;
   npmcli-git-->npmcli-promise-spawn["@npmcli/promise-spawn"];
   npmcli-git-->proc-log;

diff --git a/node_modules/@npmcli/git/lib/clone.js b/node_modules/@npmcli/git/lib/clone.js
@@ -27,8 +27,7 @@ const spawn = require('./spawn.js')
 const { isWindows } = require('./utils.js')
 
 const pickManifest = require('npm-pick-manifest')
-const fs = require('fs')
-const mkdirp = require('mkdirp')
+const fs = require('fs/promises')
 
 module.exports = (repo, ref = 'HEAD', target = null, opts = {}) =>
   getRevs(repo, opts).then(revs => clone(
@@ -93,7 +92,7 @@ const other = (repo, revDoc, target, opts) => {
     .concat(shallow ? ['--depth=1'] : [])
 
   const git = (args) => spawn(args, { ...opts, cwd: target })
-  return mkdirp(target)
+  return fs.mkdir(target, { recursive: true })
     .then(() => git(['init']))
     .then(() => isWindows(opts)
       ? git(['config', '--local', '--add', 'core.longpaths', 'true'])
@@ -141,27 +140,29 @@ const plain = (repo, revDoc, target, opts) => {
   return spawn(args, opts).then(() => revDoc.sha)
 }
 
-const updateSubmodules = (target, opts) => new Promise(resolve =>
-  fs.stat(target + '/.gitmodules', er => {
-    if (er) {
-      return resolve(null)
-    }
-    return resolve(spawn([
-      'submodule',
-      'update',
-      '-q',
-      '--init',
-      '--recursive',
-    ], { ...opts, cwd: target }))
-  }))
+const updateSubmodules = async (target, opts) => {
+  const hasSubmodules = await fs.stat(`${target}/.gitmodules`)
+    .then(() => true)
+    .catch(() => false)
+  if (!hasSubmodules) {
+    return null
+  }
+  return spawn([
+    'submodule',
+    'update',
+    '-q',
+    '--init',
+    '--recursive',
+  ], { ...opts, cwd: target })
+}
 
 const unresolved = (repo, ref, target, opts) => {
   // can't do this one shallowly, because the ref isn't advertised
   // but we can avoid checking out the working dir twice, at least
   const lp = isWindows(opts) ? ['--config', 'core.longpaths=true'] : []
   const cloneArgs = ['clone', '--mirror', '-q', repo, target + '/.git']
   const git = (args) => spawn(args, { ...opts, cwd: target })
-  return mkdirp(target)
+  return fs.mkdir(target, { recursive: true })
     .then(() => git(cloneArgs.concat(lp)))
     .then(() => git(['init']))
     .then(() => git(['checkout', ref]))

diff --git a/node_modules/@npmcli/git/package.json b/node_modules/@npmcli/git/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/git",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "main": "lib/index.js",
   "files": [
     "bin/",
@@ -32,16 +32,14 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.0",
-    "@npmcli/template-oss": "4.8.0",
+    "@npmcli/template-oss": "4.12.0",
     "npm-package-arg": "^10.0.0",
-    "rimraf": "^3.0.2",
     "slash": "^3.0.0",
     "tap": "^16.0.1"
   },
   "dependencies": {
     "@npmcli/promise-spawn": "^6.0.0",
     "lru-cache": "^7.4.4",
-    "mkdirp": "^1.0.4",
     "npm-pick-manifest": "^8.0.0",
     "proc-log": "^3.0.0",
     "promise-inflight": "^1.0.1",
@@ -55,6 +53,6 @@
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
     "windowsCI": false,
-    "version": "4.8.0"
+    "version": "4.12.0"
   }
 }
diff --git a/package-lock.json b/package-lock.json
@@ -158,7 +158,7 @@
         "@npmcli/docs": "^1.0.0",
         "@npmcli/eslint-config": "^4.0.0",
         "@npmcli/fs": "^3.1.0",
-        "@npmcli/git": "^4.0.1",
+        "@npmcli/git": "^4.0.4",
         "@npmcli/mock-registry": "^1.0.0",
         "@npmcli/promise-spawn": "^6.0.2",
         "@npmcli/template-oss": "4.12.0",
@@ -2100,14 +2100,13 @@
       }
     },
     "node_modules/@npmcli/git": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.0.3.tgz",
-      "integrity": "sha512-8cXNkDIbnXPVbhXMmQ7/bklCAjtmPaXfI9aEM4iH+xSuEHINLMHhlfESvVwdqmHJRJkR48vNJTSUvoF6GRPSFA==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.0.4.tgz",
+      "integrity": "sha512-5yZghx+u5M47LghaybLCkdSyFzV/w4OuH12d96HO389Ik9CDsLaDZJVynSGGVJOLn6gy/k7Dz5XYcplM3uxXRg==",
       "inBundle": true,
       "dependencies": {
         "@npmcli/promise-spawn": "^6.0.0",
         "lru-cache": "^7.4.4",
-        "mkdirp": "^1.0.4",
         "npm-pick-manifest": "^8.0.0",
         "proc-log": "^3.0.0",
         "promise-inflight": "^1.0.1",

diff --git a/package.json b/package.json
@@ -191,7 +191,7 @@
     "@npmcli/docs": "^1.0.0",
     "@npmcli/eslint-config": "^4.0.0",
     "@npmcli/fs": "^3.1.0",
-    "@npmcli/git": "^4.0.1",
+    "@npmcli/git": "^4.0.4",
     "@npmcli/mock-registry": "^1.0.0",
     "@npmcli/promise-spawn": "^6.0.2",
     "@npmcli/template-oss": "4.12.0",