deps: replace mkdirp with {recursive} mkdir

rvagg · rvagg · commit 4937722cf597 · 2020-06-03T12:56:39.000+10:00
only supported on Node.js 10+ Closes: #2084 PR-URL: #2123 Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
diff --git a/lib/configure.js b/lib/configure.js
@@ -4,7 +4,6 @@ const fs = require('graceful-fs')
 const path = require('path')
 const log = require('npmlog')
 const os = require('os')
-const mkdirp = require('mkdirp')
 const processRelease = require('./process-release')
 const win = process.platform === 'win32'
 const findNodeDirectory = require('./find-node-directory')
@@ -73,7 +72,7 @@ function configure (gyp, argv, callback) {
 
   function createBuildDir () {
     log.verbose('build dir', 'attempting to create "build" dir: %s', buildDir)
-    mkdirp(buildDir, function (err, isNew) {
+    fs.mkdir(buildDir, { recursive: true }, function (err, isNew) {
       if (err) {
         return callback(err)
       }
diff --git a/lib/install.js b/lib/install.js
@@ -8,7 +8,6 @@ const crypto = require('crypto')
 const log = require('npmlog')
 const semver = require('semver')
 const request = require('request')
-const mkdir = require('mkdirp')
 const processRelease = require('./process-release')
 const win = process.platform === 'win32'
 const getProxyFromURI = require('./proxy')
@@ -114,7 +113,7 @@ function install (fs, gyp, argv, callback) {
     log.verbose('ensuring nodedir is created', devDir)
 
     // first create the dir for the node dev files
-    mkdir(devDir, function (err, created) {
+    fs.mkdir(devDir, { recursive: true }, function (err, created) {
       if (err) {
         if (err.code === 'EACCES') {
           eaccesFallback(err)
@@ -310,7 +309,7 @@ function install (fs, gyp, argv, callback) {
           log.verbose(name, 'dir', dir)
           log.verbose(name, 'url', libUrl)
 
-          mkdir(dir, function (err) {
+          fs.mkdir(dir, { recursive: true }, function (err) {
             if (err) {
               return done(err)
             }
diff --git a/package.json b/package.json
@@ -25,7 +25,6 @@
     "env-paths": "^2.2.0",
     "glob": "^7.1.4",
     "graceful-fs": "^4.2.3",
-    "mkdirp": "^0.5.1",
     "nopt": "^4.0.3",
     "npmlog": "^4.1.2",
     "request": "^2.88.2",
diff --git a/test/test-configure-python.js b/test/test-configure-python.js
@@ -10,7 +10,8 @@ const configure = requireInject('../lib/configure', {
     openSync: function () { return 0 },
     closeSync: function () { },
     writeFile: function (file, data, cb) { cb() },
-    stat: function (file, cb) { cb(null, {}) }
+    stat: function (file, cb) { cb(null, {}) },
+    mkdir: function (dir, options, cb) { cb() }
   }
 })
 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,8 @@ const configure = requireInject('../lib/configure', {`
`10`	`10`	`openSync: function () { return 0 },`
`11`	`11`	`closeSync: function () { },`
`12`	`12`	`writeFile: function (file, data, cb) { cb() },`
`13`		`- stat: function (file, cb) { cb(null, {}) }`
	`13`	`+ stat: function (file, cb) { cb(null, {}) },`
	`14`	`+ mkdir: function (dir, options, cb) { cb() }`
`14`	`15`	`}`
`15`	`16`	`})`
`16`	`17`