Skip to content

Commit 8098ebd

Browse files
Siilwynrvagg
authored andcommitted
deps: replace osenv dependency with native os
Breaking change: needs Node.js version 6 or higher #1570 Reviewed-By: Refael Ackermann <[email protected]>
1 parent 92e8b52 commit 8098ebd

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

bin/node-gyp.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ process.title = 'node-gyp'
44

55
var gyp = require('../')
66
var log = require('npmlog')
7-
var osenv = require('osenv')
7+
var os = require('os')
88
var path = require('path')
99

1010
/**
@@ -16,7 +16,7 @@ var completed = false
1616
prog.parseArgv(process.argv)
1717
prog.devDir = prog.opts.devdir
1818

19-
var homeDir = osenv.home()
19+
var homeDir = os.homedir()
2020
if (prog.devDir) {
2121
prog.devDir = prog.devDir.replace(/^~/, homeDir)
2222
} else if (homeDir) {

lib/configure.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports.test = {
88
var fs = require('graceful-fs')
99
, path = require('path')
1010
, log = require('npmlog')
11-
, osenv = require('osenv')
11+
, os = require('os')
1212
, which = require('which')
1313
, semver = require('semver')
1414
, mkdirp = require('mkdirp')
@@ -46,7 +46,7 @@ function configure (gyp, argv, callback) {
4646

4747
if (gyp.opts.nodedir) {
4848
// --nodedir was specified. use that for the dev files
49-
nodeDir = gyp.opts.nodedir.replace(/^~/, osenv.home())
49+
nodeDir = gyp.opts.nodedir.replace(/^~/, os.homedir())
5050

5151
log.verbose('get node dir', 'compiling against specified --nodedir dev files: %s', nodeDir)
5252
createBuildDir()

lib/install.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ module.exports.test = {
1111
exports.usage = 'Install node development files for the specified node version.'
1212

1313
var fs = require('graceful-fs')
14-
, osenv = require('osenv')
14+
, os = require('os')
1515
, tar = require('tar')
1616
, path = require('path')
1717
, crypto = require('crypto')
@@ -400,9 +400,9 @@ function install (fs, gyp, argv, callback) {
400400
function eaccesFallback (err) {
401401
var noretry = '--node_gyp_internal_noretry'
402402
if (-1 !== argv.indexOf(noretry)) return cb(err)
403-
var tmpdir = osenv.tmpdir()
403+
var tmpdir = os.tmpdir()
404404
gyp.devDir = path.resolve(tmpdir, '.node-gyp')
405-
log.warn('EACCES', 'user "%s" does not have permission to access the dev dir "%s"', osenv.user(), devDir)
405+
log.warn('EACCES', 'user "%s" does not have permission to access the dev dir "%s"', os.userInfo().username, devDir)
406406
log.warn('EACCES', 'attempting to reinstall using temporary dev dir "%s"', gyp.devDir)
407407
if (process.cwd() == tmpdir) {
408408
log.verbose('tmpdir == cwd', 'automatically will remove dev files after to save disk space')

package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,14 @@
2727
"mkdirp": "^0.5.0",
2828
"nopt": "2 || 3",
2929
"npmlog": "0 || 1 || 2 || 3 || 4",
30-
"osenv": "0",
3130
"request": "^2.87.0",
3231
"rimraf": "2",
3332
"semver": "~5.3.0",
3433
"tar": "^4.4.8",
3534
"which": "1"
3635
},
3736
"engines": {
38-
"node": ">= 4.0.0"
37+
"node": ">= 6.0.0"
3938
},
4039
"devDependencies": {
4140
"babel-eslint": "^8.2.5",

0 commit comments

Comments
 (0)