electron/node-gyp
1
0
Fork 0
mirror of https://github.com/electron/node-gyp.git synced 2025-08-15 12:58:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sync deps and engines with npm (#2770)

Browse source 
* feat!: update `engines.node` to `^14.17.0 || ^16.13.0 || >=18.0.0`

* deps: nopt@^7.0.0

* feat: replace npmlog with proc-log

* deps: standard@17.0.0 and fix linting errors

* deps: which@3.0.0
- this also promiisifies the build command

* deps: glob@8.0.3

* feat: drop rimraf dependency

* fix: use fs/promises in favor of fs.promises
This commit is contained in:
Luke Karrys 2023-06-20 06:44:18 -07:00 • committed by GitHub
parent 33391db3a0
commit 192eec2aca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 536 additions and 418 deletions
Download patch file Download diff file Expand all files Collapse all files

18
bin/node-gyp.js
View file

@ -6,7 +6,7 @@ process.title = 'node-gyp'
const envPaths = require('env-paths') const envPaths = require('env-paths')
const gyp = require('../') const gyp = require('../')
const log = require('npmlog') const log = require('../lib/log')
const os = require('os') const os = require('os')
/** /**
@ -14,11 +14,11 @@ const os = require('os')
*/ */
const prog = gyp() const prog = gyp()
var completed = false let completed = false
prog.parseArgv(process.argv) prog.parseArgv(process.argv)
prog.devDir = prog.opts.devdir prog.devDir = prog.opts.devdir
var homeDir = os.homedir() const homeDir = os.homedir()
if (prog.devDir) { if (prog.devDir) {
prog.devDir = prog.devDir.replace(/^~/, homeDir) prog.devDir = prog.devDir.replace(/^~/, homeDir)
} else if (homeDir) { } else if (homeDir) {
@ -48,11 +48,11 @@ log.info('using', 'node@%s | %s | %s', process.versions.node, process.platform,
* Change dir if -C/--directory was passed. * Change dir if -C/--directory was passed.
*/ */
var dir = prog.opts.directory const dir = prog.opts.directory
if (dir) { if (dir) {
var fs = require('fs') const fs = require('fs')
try { try {
var stat = fs.statSync(dir) const stat = fs.statSync(dir)
if (stat.isDirectory()) { if (stat.isDirectory()) {
log.info('chdir', dir) log.info('chdir', dir)
process.chdir(dir) process.chdir(dir)
@ -69,7 +69,7 @@ if (dir) {
} }
function run () { function run () {
var command = prog.todo.shift() const command = prog.todo.shift()
if (!command) { if (!command) {
// done! // done!
completed = true completed = true
@ -86,7 +86,7 @@ function run () {
return process.exit(1) return process.exit(1)
} }
if (command.name === 'list') { if (command.name === 'list') {
var versions = arguments[1] const versions = arguments[1]
if (versions.length > 0) { if (versions.length > 0) {
versions.forEach(function (version) { versions.forEach(function (version) {
console.log(version) console.log(version)
@ -120,7 +120,7 @@ process.on('uncaughtException', function (err) {
function errorMessage () { function errorMessage () {
// copied from npm's lib/utils/error-handler.js // copied from npm's lib/utils/error-handler.js
var os = require('os') const os = require('os')
log.error('System', os.type() + ' ' + os.release()) log.error('System', os.type() + ' ' + os.release())
log.error('command', process.argv log.error('command', process.argv
.map(JSON.stringify).join(' ')) .map(JSON.stringify).join(' '))

181
lib/build.js
View file

@ -1,14 +1,15 @@
'use strict' 'use strict'
const fs = require('graceful-fs') const fs = require('graceful-fs').promises
const { promisify } = require('util')
const path = require('path') const path = require('path')
const glob = require('glob') const glob = promisify(require('glob'))
const log = require('npmlog') const log = require('./log')
const which = require('which') const which = require('which')
const win = process.platform === 'win32' const win = process.platform === 'win32'
function build (gyp, argv, callback) { async function build (gyp, argv) {
var platformMake = 'make' let platformMake = 'make'
if (process.platform === 'aix') { if (process.platform === 'aix') {
platformMake = 'gmake' platformMake = 'gmake'
} else if (process.platform === 'os400') { } else if (process.platform === 'os400') {
@ -21,113 +22,103 @@ function build (gyp, argv, callback) {
}) })
} }
var makeCommand = gyp.opts.make || process.env.MAKE || platformMake const makeCommand = gyp.opts.make || process.env.MAKE || platformMake
var command = win ? 'msbuild' : makeCommand let command = win ? 'msbuild' : makeCommand
var jobs = gyp.opts.jobs || process.env.JOBS const jobs = gyp.opts.jobs || process.env.JOBS
var buildType let buildType
var config let config
var arch let arch
var nodeDir let nodeDir
var guessedSolution let guessedSolution
loadConfigGypi() await loadConfigGypi()
/** /**
* Load the "config.gypi" file that was generated during "configure". * Load the "config.gypi" file that was generated during "configure".
*/ */
function loadConfigGypi () { async function loadConfigGypi () {
var configPath = path.resolve('build', 'config.gypi') let data
try {
fs.readFile(configPath, 'utf8', function (err, data) { const configPath = path.resolve('build', 'config.gypi')
if (err) { data = await fs.readFile(configPath, 'utf8')
if (err.code === 'ENOENT') { } catch (err) {
callback(new Error('You must run `node-gyp configure` first!')) if (err.code === 'ENOENT') {
} else { throw new Error('You must run `node-gyp configure` first!')
callback(err)
}
return
}
config = JSON.parse(data.replace(/#.+\n/, ''))
// get the 'arch', 'buildType', and 'nodeDir' vars from the config
buildType = config.target_defaults.default_configuration
arch = config.variables.target_arch
nodeDir = config.variables.nodedir
if ('debug' in gyp.opts) {
buildType = gyp.opts.debug ? 'Debug' : 'Release'
}
if (!buildType) {
buildType = 'Release'
}
log.verbose('build type', buildType)
log.verbose('architecture', arch)
log.verbose('node dev dir', nodeDir)
if (win) {
findSolutionFile()
} else { } else {
doWhich() throw err
} }
}) }
config = JSON.parse(data.replace(/#.+\n/, ''))
// get the 'arch', 'buildType', and 'nodeDir' vars from the config
buildType = config.target_defaults.default_configuration
arch = config.variables.target_arch
nodeDir = config.variables.nodedir
if ('debug' in gyp.opts) {
buildType = gyp.opts.debug ? 'Debug' : 'Release'
}
if (!buildType) {
buildType = 'Release'
}
log.verbose('build type', buildType)
log.verbose('architecture', arch)
log.verbose('node dev dir', nodeDir)
if (win) {
await findSolutionFile()
} else {
await doWhich()
}
} }
/** /**
* On Windows, find the first build/*.sln file. * On Windows, find the first build/*.sln file.
*/ */
function findSolutionFile () { async function findSolutionFile () {
glob('build/*.sln', function (err, files) { const files = await glob('build/*.sln')
if (err) { if (files.length === 0) {
return callback(err) throw new Error('Could not find *.sln file. Did you run "configure"?')
} }
if (files.length === 0) { guessedSolution = files[0]
return callback(new Error('Could not find *.sln file. Did you run "configure"?')) log.verbose('found first Solution file', guessedSolution)
} await doWhich()
guessedSolution = files[0]
log.verbose('found first Solution file', guessedSolution)
doWhich()
})
} }
/** /**
* Uses node-which to locate the msbuild / make executable. * Uses node-which to locate the msbuild / make executable.
*/ */
function doWhich () { async function doWhich () {
// On Windows use msbuild provided by node-gyp configure // On Windows use msbuild provided by node-gyp configure
if (win) { if (win) {
if (!config.variables.msbuild_path) { if (!config.variables.msbuild_path) {
return callback(new Error( throw new Error('MSBuild is not set, please run `node-gyp configure`.')
'MSBuild is not set, please run `node-gyp configure`.'))
} }
command = config.variables.msbuild_path command = config.variables.msbuild_path
log.verbose('using MSBuild:', command) log.verbose('using MSBuild:', command)
doBuild() await doBuild()
return return
} }
// First make sure we have the build command in the PATH // First make sure we have the build command in the PATH
which(command, function (err, execPath) { const execPath = await which(command)
if (err) { log.verbose('`which` succeeded for `' + command + '`', execPath)
// Some other error or 'make' not found on Unix, report that to the user await doBuild()
callback(err)
return
}
log.verbose('`which` succeeded for `' + command + '`', execPath)
doBuild()
})
} }
/** /**
* Actually spawn the process and compile the module. * Actually spawn the process and compile the module.
*/ */
function doBuild () { async function doBuild () {
// Enable Verbose build // Enable Verbose build
var verbose = log.levels[log.level] <= log.levels.verbose const verbose = log.logger.isVisible('verbose')
var j let j
if (!win && verbose) { if (!win && verbose) {
argv.push('V=1') argv.push('V=1')
@ -147,10 +138,12 @@ function build (gyp, argv, callback) {
// Convert .gypi config target_arch to MSBuild /Platform // Convert .gypi config target_arch to MSBuild /Platform
// Since there are many ways to state '32-bit Intel', default to it. // Since there are many ways to state '32-bit Intel', default to it.
// N.B. msbuild's Condition string equality tests are case-insensitive. // N.B. msbuild's Condition string equality tests are case-insensitive.
var archLower = arch.toLowerCase() const archLower = arch.toLowerCase()
var p = archLower === 'x64' ? 'x64' const p = archLower === 'x64'
: (archLower === 'arm' ? 'ARM' ? 'x64'
: (archLower === 'arm64' ? 'ARM64' : 'Win32')) : (archLower === 'arm'
? 'ARM'
: (archLower === 'arm64' ? 'ARM64' : 'Win32'))
argv.push('/p:Configuration=' + buildType + ';Platform=' + p) argv.push('/p:Configuration=' + buildType + ';Platform=' + p)
if (jobs) { if (jobs) {
j = parseInt(jobs, 10) j = parseInt(jobs, 10)
@ -179,7 +172,7 @@ function build (gyp, argv, callback) {
if (win) { if (win) {
// did the user specify their own .sln file? // did the user specify their own .sln file?
var hasSln = argv.some(function (arg) { const hasSln = argv.some(function (arg) {
return path.extname(arg) === '.sln' return path.extname(arg) === '.sln'
}) })
if (!hasSln) { if (!hasSln) {
@ -194,20 +187,20 @@ function build (gyp, argv, callback) {
log.verbose('bin symlinks', `adding symlinks (such as Python), at "${buildBinsDir}", to PATH`) log.verbose('bin symlinks', `adding symlinks (such as Python), at "${buildBinsDir}", to PATH`)
} }
var proc = gyp.spawn(command, argv) const proc = gyp.spawn(command, argv)
proc.on('exit', onExit) await new Promise((resolve, reject) => proc.on('exit', (code, signal) => {
} if (code !== 0) {
return reject(new Error('`' + command + '` failed with exit code: ' + code))
function onExit (code, signal) { }
if (code !== 0) { if (signal) {
return callback(new Error('`' + command + '` failed with exit code: ' + code)) return reject(new Error('`' + command + '` got signal: ' + signal))
} }
if (signal) { resolve()
return callback(new Error('`' + command + '` got signal: ' + signal)) }))
}
callback()
} }
} }
module.exports = build module.exports = function (gyp, argv, callback) {
build(gyp, argv).then(callback.bind(undefined, null), callback)
}
module.exports.usage = 'Invokes `' + (win ? 'msbuild' : 'make') + '` and builds the module' module.exports.usage = 'Invokes `' + (win ? 'msbuild' : 'make') + '` and builds the module'

14
lib/clean.js
View file

@ -1,15 +1,17 @@
'use strict' 'use strict'
const rm = require('rimraf') const fs = require('fs/promises')
const log = require('npmlog') const log = require('./log')
function clean (gyp, argv, callback) { async function clean (gyp, argv) {
// Remove the 'build' dir // Remove the 'build' dir
var buildDir = 'build' const buildDir = 'build'
log.verbose('clean', 'removing "%s" directory', buildDir) log.verbose('clean', 'removing "%s" directory', buildDir)
rm(buildDir, callback) await fs.rm(buildDir, { recursive: true, force: true })
} }
module.exports = clean module.exports = function (gyp, argv, callback) {
clean(gyp, argv).then(callback.bind(undefined, null), callback)
}
module.exports.usage = 'Removes any generated build files and the "out" dir' module.exports.usage = 'Removes any generated build files and the "out" dir'

67
lib/configure.js
View file

@ -2,26 +2,27 @@
const fs = require('graceful-fs') const fs = require('graceful-fs')
const path = require('path') const path = require('path')
const log = require('npmlog') const log = require('./log')
const os = require('os') const os = require('os')
const processRelease = require('./process-release') const processRelease = require('./process-release')
const win = process.platform === 'win32' const win = process.platform === 'win32'
const findNodeDirectory = require('./find-node-directory') const findNodeDirectory = require('./find-node-directory')
const createConfigGypi = require('./create-config-gypi') const createConfigGypi = require('./create-config-gypi')
const msgFormat = require('util').format const msgFormat = require('util').format
var findPython = require('./find-python') const findPython = require('./find-python')
let findVisualStudio
if (win) { if (win) {
var findVisualStudio = require('./find-visualstudio') findVisualStudio = require('./find-visualstudio')
} }
function configure (gyp, argv, callback) { function configure (gyp, argv, callback) {
var python let python
var buildDir = path.resolve('build') const buildDir = path.resolve('build')
var buildBinsDir = path.join(buildDir, 'node_gyp_bins') const buildBinsDir = path.join(buildDir, 'node_gyp_bins')
var configNames = ['config.gypi', 'common.gypi'] const configNames = ['config.gypi', 'common.gypi']
var configs = [] const configs = []
var nodeDir let nodeDir
var release = processRelease(argv, gyp, process.version, process.release) const release = processRelease(argv, gyp, process.version, process.release)
findPython(gyp.opts.python, function (err, found) { findPython(gyp.opts.python, function (err, found) {
if (err) { if (err) {
@ -129,11 +130,11 @@ function configure (gyp, argv, callback) {
} }
function findConfigs () { function findConfigs () {
var name = configNames.shift() const name = configNames.shift()
if (!name) { if (!name) {
return runGyp() return runGyp()
} }
var fullPath = path.resolve(name) const fullPath = path.resolve(name)
log.verbose(name, 'checking for gypi file: %s', fullPath) log.verbose(name, 'checking for gypi file: %s', fullPath)
fs.stat(fullPath, function (err) { fs.stat(fullPath, function (err) {
@ -175,11 +176,13 @@ function configure (gyp, argv, callback) {
// For AIX and z/OS we need to set up the path to the exports file // For AIX and z/OS we need to set up the path to the exports file
// which contains the symbols needed for linking. // which contains the symbols needed for linking.
var nodeExpFile let nodeExpFile
let nodeRootDir
let candidates
let logprefix = 'find exports file'
if (process.platform === 'aix' || process.platform === 'os390' || process.platform === 'os400') { if (process.platform === 'aix' || process.platform === 'os390' || process.platform === 'os400') {
var ext = process.platform === 'os390' ? 'x' : 'exp' const ext = process.platform === 'os390' ? 'x' : 'exp'
var nodeRootDir = findNodeDirectory() nodeRootDir = findNodeDirectory()
var candidates
if (process.platform === 'aix' || process.platform === 'os400') { if (process.platform === 'aix' || process.platform === 'os400') {
candidates = [ candidates = [
@ -202,12 +205,11 @@ function configure (gyp, argv, callback) {
}) })
} }
var logprefix = 'find exports file'
nodeExpFile = findAccessibleSync(logprefix, nodeRootDir, candidates) nodeExpFile = findAccessibleSync(logprefix, nodeRootDir, candidates)
if (nodeExpFile !== undefined) { if (nodeExpFile !== undefined) {
log.verbose(logprefix, 'Found exports file: %s', nodeExpFile) log.verbose(logprefix, 'Found exports file: %s', nodeExpFile)
} else { } else {
var msg = msgFormat('Could not find node.%s file in %s', ext, nodeRootDir) const msg = msgFormat('Could not find node.%s file in %s', ext, nodeRootDir)
log.error(logprefix, 'Could not find exports file') log.error(logprefix, 'Could not find exports file')
return callback(new Error(msg)) return callback(new Error(msg))
} }
@ -215,11 +217,11 @@ function configure (gyp, argv, callback) {
// For z/OS we need to set up the path to zoslib include directory, // For z/OS we need to set up the path to zoslib include directory,
// which contains headers included in v8config.h. // which contains headers included in v8config.h.
var zoslibIncDir let zoslibIncDir
if (process.platform === 'os390') { if (process.platform === 'os390') {
logprefix = "find zoslib's zos-base.h:" logprefix = "find zoslib's zos-base.h:"
let msg let msg
var zoslibIncPath = process.env.ZOSLIB_INCLUDES let zoslibIncPath = process.env.ZOSLIB_INCLUDES
if (zoslibIncPath) { if (zoslibIncPath) {
zoslibIncPath = findAccessibleSync(logprefix, zoslibIncPath, ['zos-base.h']) zoslibIncPath = findAccessibleSync(logprefix, zoslibIncPath, ['zos-base.h'])
if (zoslibIncPath === undefined) { if (zoslibIncPath === undefined) {
@ -252,22 +254,22 @@ function configure (gyp, argv, callback) {
} }
// this logic ported from the old `gyp_addon` python file // this logic ported from the old `gyp_addon` python file
var gypScript = path.resolve(__dirname, '..', 'gyp', 'gyp_main.py') const gypScript = path.resolve(__dirname, '..', 'gyp', 'gyp_main.py')
var addonGypi = path.resolve(__dirname, '..', 'addon.gypi') const addonGypi = path.resolve(__dirname, '..', 'addon.gypi')
var commonGypi = path.resolve(nodeDir, 'include/node/common.gypi') let commonGypi = path.resolve(nodeDir, 'include/node/common.gypi')
fs.stat(commonGypi, function (err) { fs.stat(commonGypi, function (err) {
if (err) { if (err) {
commonGypi = path.resolve(nodeDir, 'common.gypi') commonGypi = path.resolve(nodeDir, 'common.gypi')
} }
var outputDir = 'build' let outputDir = 'build'
if (win) { if (win) {
// Windows expects an absolute path // Windows expects an absolute path
outputDir = buildDir outputDir = buildDir
} }
var nodeGypDir = path.resolve(__dirname, '..') const nodeGypDir = path.resolve(__dirname, '..')
var nodeLibFile = path.join(nodeDir, let nodeLibFile = path.join(nodeDir,
!gyp.opts.nodedir ? '<(target_arch)' : '$(Configuration)', !gyp.opts.nodedir ? '<(target_arch)' : '$(Configuration)',
release.name + '.lib') release.name + '.lib')
@ -309,13 +311,13 @@ function configure (gyp, argv, callback) {
argv.unshift(gypScript) argv.unshift(gypScript)
// make sure python uses files that came with this particular node package // make sure python uses files that came with this particular node package
var pypath = [path.join(__dirname, '..', 'gyp', 'pylib')] const pypath = [path.join(__dirname, '..', 'gyp', 'pylib')]
if (process.env.PYTHONPATH) { if (process.env.PYTHONPATH) {
pypath.push(process.env.PYTHONPATH) pypath.push(process.env.PYTHONPATH)
} }
process.env.PYTHONPATH = pypath.join(win ? ';' : ':') process.env.PYTHONPATH = pypath.join(win ? ';' : ':')
var cp = gyp.spawn(python, argv) const cp = gyp.spawn(python, argv)
cp.on('exit', onCpExit) cp.on('exit', onCpExit)
}) })
} }
@ -336,10 +338,11 @@ function configure (gyp, argv, callback) {
* readable. * readable.
*/ */
function findAccessibleSync (logprefix, dir, candidates) { function findAccessibleSync (logprefix, dir, candidates) {
for (var next = 0; next < candidates.length; next++) { for (let next = 0; next < candidates.length; next++) {
var candidate = path.resolve(dir, candidates[next]) const candidate = path.resolve(dir, candidates[next])
let fd
try { try {
var fd = fs.openSync(candidate, 'r') fd = fs.openSync(candidate, 'r')
} catch (e) { } catch (e) {
// this candidate was not found or not readable, do nothing // this candidate was not found or not readable, do nothing
log.silly(logprefix, 'Could not open %s: %s', candidate, e.message) log.silly(logprefix, 'Could not open %s: %s', candidate, e.message)
@ -355,6 +358,6 @@ function findAccessibleSync (logprefix, dir, candidates) {
module.exports = configure module.exports = configure
module.exports.test = { module.exports.test = {
findAccessibleSync: findAccessibleSync findAccessibleSync
} }
module.exports.usage = 'Generates ' + (win ? 'MSVC project files' : 'a Makefile') + ' for the current module' module.exports.usage = 'Generates ' + (win ? 'MSVC project files' : 'a Makefile') + ' for the current module'

6
lib/create-config-gypi.js
View file

@ -1,7 +1,7 @@
'use strict' 'use strict'
const fs = require('graceful-fs') const fs = require('graceful-fs')
const log = require('npmlog') const log = require('./log')
const path = require('path') const path = require('path')
function parseConfigGypi (config) { function parseConfigGypi (config) {
@ -142,6 +142,6 @@ async function createConfigGypi ({ gyp, buildDir, nodeDir, vsInfo }) {
module.exports = createConfigGypi module.exports = createConfigGypi
module.exports.test = { module.exports.test = {
parseConfigGypi: parseConfigGypi, parseConfigGypi,
getCurrentConfigGypi: getCurrentConfigGypi getCurrentConfigGypi
} }

10
lib/find-node-directory.js
View file

@ -1,7 +1,7 @@
'use strict' 'use strict'
const path = require('path') const path = require('path')
const log = require('npmlog') const log = require('./log')
function findNodeDirectory (scriptLocation, processObj) { function findNodeDirectory (scriptLocation, processObj) {
// set dirname and process if not passed in // set dirname and process if not passed in
@ -14,10 +14,10 @@ function findNodeDirectory (scriptLocation, processObj) {
} }
// Have a look to see what is above us, to try and work out where we are // Have a look to see what is above us, to try and work out where we are
var npmParentDirectory = path.join(scriptLocation, '../../../..') const npmParentDirectory = path.join(scriptLocation, '../../../..')
log.verbose('node-gyp root', 'npm_parent_directory is ' + log.verbose('node-gyp root', 'npm_parent_directory is ' +
path.basename(npmParentDirectory)) path.basename(npmParentDirectory))
var nodeRootDir = '' let nodeRootDir = ''
log.verbose('node-gyp root', 'Finding node root directory') log.verbose('node-gyp root', 'Finding node root directory')
if (path.basename(npmParentDirectory) === 'deps') { if (path.basename(npmParentDirectory) === 'deps') {
@ -41,8 +41,8 @@ function findNodeDirectory (scriptLocation, processObj) {
} else { } else {
// We don't know where we are, try working it out from the location // We don't know where we are, try working it out from the location
// of the node binary // of the node binary
var nodeDir = path.dirname(processObj.execPath) const nodeDir = path.dirname(processObj.execPath)
var directoryUp = path.basename(nodeDir) const directoryUp = path.basename(nodeDir)
if (directoryUp === 'bin') { if (directoryUp === 'bin') {
nodeRootDir = path.join(nodeDir, '..') nodeRootDir = path.join(nodeDir, '..')
} else if (directoryUp === 'Release' || directoryUp === 'Debug') { } else if (directoryUp === 'Release' || directoryUp === 'Debug') {

34
lib/find-python.js
View file

@ -1,11 +1,10 @@
'use strict' 'use strict'
const log = require('npmlog') const log = require('./log')
const semver = require('semver') const semver = require('semver')
const cp = require('child_process') const cp = require('child_process')
const extend = require('util')._extend // eslint-disable-line const extend = require('util')._extend // eslint-disable-line
const win = process.platform === 'win32' const win = process.platform === 'win32'
const logWithPrefix = require('./util').logWithPrefix
const systemDrive = process.env.SystemDrive || 'C:' const systemDrive = process.env.SystemDrive || 'C:'
const username = process.env.USERNAME || process.env.USER || getOsUserInfo() const username = process.env.USERNAME || process.env.USER || getOsUserInfo()
@ -46,7 +45,7 @@ function PythonFinder (configPython, callback) {
} }
PythonFinder.prototype = { PythonFinder.prototype = {
log: logWithPrefix(log, 'find Python'), log: log.withPrefix('find Python'),
argsExecutable: ['-c', 'import sys; print(sys.executable);'], argsExecutable: ['-c', 'import sys; print(sys.executable);'],
argsVersion: ['-c', 'import sys; print("%s.%s.%s" % sys.version_info[:3]);'], argsVersion: ['-c', 'import sys; print("%s.%s.%s" % sys.version_info[:3]);'],
semverRange: '>=3.6.0', semverRange: '>=3.6.0',
@ -54,7 +53,7 @@ PythonFinder.prototype = {
// These can be overridden for testing: // These can be overridden for testing:
execFile: cp.execFile, execFile: cp.execFile,
env: process.env, env: process.env,
win: win, win,
pyLauncher: 'py.exe', pyLauncher: 'py.exe',
winDefaultLocations: winDefaultLocationsArray, winDefaultLocations: winDefaultLocationsArray,
@ -69,7 +68,7 @@ PythonFinder.prototype = {
// Ignore errors, keep trying until Python is found. // Ignore errors, keep trying until Python is found.
findPython: function findPython () { findPython: function findPython () {
const SKIP = 0; const FAIL = 1 const SKIP = 0; const FAIL = 1
var toCheck = getChecks.apply(this) const toCheck = getChecks.apply(this)
function getChecks () { function getChecks () {
if (this.env.NODE_GYP_FORCE_PYTHON) { if (this.env.NODE_GYP_FORCE_PYTHON) {
@ -85,7 +84,7 @@ PythonFinder.prototype = {
}] }]
} }
var checks = [ const checks = [
{ {
before: () => { before: () => {
if (!this.configPython) { if (!this.configPython) {
@ -128,7 +127,7 @@ PythonFinder.prototype = {
] ]
if (this.win) { if (this.win) {
for (var i = 0; i < this.winDefaultLocations.length; ++i) { for (let i = 0; i < this.winDefaultLocations.length; ++i) {
const location = this.winDefaultLocations[i] const location = this.winDefaultLocations[i]
checks.push({ checks.push({
before: () => { before: () => {
@ -181,9 +180,9 @@ PythonFinder.prototype = {
// Will exit the Python finder on success. // Will exit the Python finder on success.
// If on Windows, run in a CMD shell to support BAT/CMD launchers. // If on Windows, run in a CMD shell to support BAT/CMD launchers.
checkCommand: function checkCommand (command, errorCallback) { checkCommand: function checkCommand (command, errorCallback) {
var exec = command let exec = command
var args = this.argsExecutable let args = this.argsExecutable
var shell = false let shell = false
if (this.win) { if (this.win) {
// Arguments have to be manually quoted // Arguments have to be manually quoted
exec = `"${exec}"` exec = `"${exec}"`
@ -250,7 +249,7 @@ PythonFinder.prototype = {
this.addLog(`- version is "${version}"`) this.addLog(`- version is "${version}"`)
const range = new semver.Range(this.semverRange) const range = new semver.Range(this.semverRange)
var valid = false let valid = false
try { try {
valid = range.test(version) valid = range.test(version)
} catch (err) { } catch (err) {
@ -272,9 +271,9 @@ PythonFinder.prototype = {
// Run an executable or shell command, trimming the output. // Run an executable or shell command, trimming the output.
run: function run (exec, args, shell, callback) { run: function run (exec, args, shell, callback) {
var env = extend({}, this.env) const env = extend({}, this.env)
env.TERM = 'dumb' env.TERM = 'dumb'
const opts = { env: env, shell: shell } const opts = { env, shell }
this.log.silly('execFile: exec = %j', exec) this.log.silly('execFile: exec = %j', exec)
this.log.silly('execFile: args = %j', args) this.log.silly('execFile: args = %j', args)
@ -306,7 +305,8 @@ PythonFinder.prototype = {
fail: function fail () { fail: function fail () {
const errorLog = this.errorLog.join('\n') const errorLog = this.errorLog.join('\n')
const pathExample = this.win ? 'C:\\Path\\To\\python.exe' const pathExample = this.win
? 'C:\\Path\\To\\python.exe'
: '/path/to/pythonexecutable' : '/path/to/pythonexecutable'
// For Windows 80 col console, use up to the column before the one marked // For Windows 80 col console, use up to the column before the one marked
// with X (total 79 chars including logger prefix, 58 chars usable here): // with X (total 79 chars including logger prefix, 58 chars usable here):
@ -333,12 +333,12 @@ PythonFinder.prototype = {
} }
function findPython (configPython, callback) { function findPython (configPython, callback) {
var finder = new PythonFinder(configPython, callback) const finder = new PythonFinder(configPython, callback)
finder.findPython() finder.findPython()
} }
module.exports = findPython module.exports = findPython
module.exports.test = { module.exports.test = {
PythonFinder: PythonFinder, PythonFinder,
findPython: findPython findPython
} }

29
lib/find-visualstudio.js
View file

@ -1,10 +1,9 @@
'use strict' 'use strict'
const log = require('npmlog') const log = require('./log')
const execFile = require('child_process').execFile const execFile = require('child_process').execFile
const fs = require('fs') const fs = require('fs')
const path = require('path').win32 const path = require('path').win32
const logWithPrefix = require('./util').logWithPrefix
const regSearchKeys = require('./util').regSearchKeys const regSearchKeys = require('./util').regSearchKeys
function findVisualStudio (nodeSemver, configMsvsVersion, callback) { function findVisualStudio (nodeSemver, configMsvsVersion, callback) {
@ -22,9 +21,9 @@ function VisualStudioFinder (nodeSemver, configMsvsVersion, callback) {
} }
VisualStudioFinder.prototype = { VisualStudioFinder.prototype = {
log: logWithPrefix(log, 'find VS'), log: log.withPrefix('find VS'),
regSearchKeys: regSearchKeys, regSearchKeys,
// Logs a message at verbose level, but also saves it to be displayed later // Logs a message at verbose level, but also saves it to be displayed later
// at error level if an error occurs. This should help diagnose the problem. // at error level if an error occurs. This should help diagnose the problem.
@ -126,10 +125,10 @@ VisualStudioFinder.prototype = {
// Invoke the PowerShell script to get information about Visual Studio 2017 // Invoke the PowerShell script to get information about Visual Studio 2017
// or newer installations // or newer installations
findVisualStudio2017OrNewer: function findVisualStudio2017OrNewer (cb) { findVisualStudio2017OrNewer: function findVisualStudio2017OrNewer (cb) {
var ps = path.join(process.env.SystemRoot, 'System32', const ps = path.join(process.env.SystemRoot, 'System32',
'WindowsPowerShell', 'v1.0', 'powershell.exe') 'WindowsPowerShell', 'v1.0', 'powershell.exe')
var csFile = path.join(__dirname, 'Find-VisualStudio.cs') const csFile = path.join(__dirname, 'Find-VisualStudio.cs')
var psArgs = [ const psArgs = [
'-ExecutionPolicy', '-ExecutionPolicy',
'Unrestricted', 'Unrestricted',
'-NoProfile', '-NoProfile',
@ -138,7 +137,7 @@ VisualStudioFinder.prototype = {
] ]
this.log.silly('Running', ps, psArgs) this.log.silly('Running', ps, psArgs)
var child = execFile(ps, psArgs, { encoding: 'utf8' }, const child = execFile(ps, psArgs, { encoding: 'utf8' },
(err, stdout, stderr) => { (err, stdout, stderr) => {
this.parseData(err, stdout, stderr, cb) this.parseData(err, stdout, stderr, cb)
}) })
@ -161,7 +160,7 @@ VisualStudioFinder.prototype = {
return failPowershell() return failPowershell()
} }
var vsInfo let vsInfo
try { try {
vsInfo = JSON.parse(stdout) vsInfo = JSON.parse(stdout)
} catch (e) { } catch (e) {
@ -178,7 +177,7 @@ VisualStudioFinder.prototype = {
vsInfo = vsInfo.map((info) => { vsInfo = vsInfo.map((info) => {
this.log.silly(`processing installation: "${info.path}"`) this.log.silly(`processing installation: "${info.path}"`)
info.path = path.resolve(info.path) info.path = path.resolve(info.path)
var ret = this.getVersionInfo(info) const ret = this.getVersionInfo(info)
ret.path = info.path ret.path = info.path
ret.msBuild = this.getMSBuild(info, ret.versionYear) ret.msBuild = this.getMSBuild(info, ret.versionYear)
ret.toolset = this.getToolset(info, ret.versionYear) ret.toolset = this.getToolset(info, ret.versionYear)
@ -199,7 +198,7 @@ VisualStudioFinder.prototype = {
// Sort to place newer versions first // Sort to place newer versions first
vsInfo.sort((a, b) => b.versionYear - a.versionYear) vsInfo.sort((a, b) => b.versionYear - a.versionYear)
for (var i = 0; i < vsInfo.length; ++i) { for (let i = 0; i < vsInfo.length; ++i) {
const info = vsInfo[i] const info = vsInfo[i]
this.addLog(`checking VS${info.versionYear} (${info.version}) found ` + this.addLog(`checking VS${info.versionYear} (${info.version}) found ` +
`at:\n"${info.path}"`) `at:\n"${info.path}"`)
@ -245,7 +244,7 @@ VisualStudioFinder.prototype = {
return {} return {}
} }
this.log.silly('- version match = %j', match) this.log.silly('- version match = %j', match)
var ret = { const ret = {
version: info.version, version: info.version,
versionMajor: parseInt(match[1], 10), versionMajor: parseInt(match[1], 10),
versionMinor: parseInt(match[2], 10) versionMinor: parseInt(match[2], 10)
@ -327,7 +326,7 @@ VisualStudioFinder.prototype = {
const win10SDKPrefix = 'Microsoft.VisualStudio.Component.Windows10SDK.' const win10SDKPrefix = 'Microsoft.VisualStudio.Component.Windows10SDK.'
const win11SDKPrefix = 'Microsoft.VisualStudio.Component.Windows11SDK.' const win11SDKPrefix = 'Microsoft.VisualStudio.Component.Windows11SDK.'
var Win10or11SDKVer = 0 let Win10or11SDKVer = 0
info.packages.forEach((pkg) => { info.packages.forEach((pkg) => {
if (!pkg.startsWith(win10SDKPrefix) && !pkg.startsWith(win11SDKPrefix)) { if (!pkg.startsWith(win10SDKPrefix) && !pkg.startsWith(win11SDKPrefix)) {
return return
@ -458,6 +457,6 @@ VisualStudioFinder.prototype = {
module.exports = findVisualStudio module.exports = findVisualStudio
module.exports.test = { module.exports.test = {
VisualStudioFinder: VisualStudioFinder, VisualStudioFinder,
findVisualStudio: findVisualStudio findVisualStudio
} }

2
lib/install.js
View file

@ -9,7 +9,7 @@ const path = require('path')
const util = require('util') const util = require('util')
const stream = require('stream') const stream = require('stream')
const crypto = require('crypto') const crypto = require('crypto')
const log = require('npmlog') const log = require('./log')
const semver = require('semver') const semver = require('semver')
const fetch = require('make-fetch-happen') const fetch = require('make-fetch-happen')
const processRelease = require('./process-release') const processRelease = require('./process-release')

4
lib/list.js
View file

@ -1,10 +1,10 @@
'use strict' 'use strict'
const fs = require('graceful-fs') const fs = require('graceful-fs')
const log = require('npmlog') const log = require('./log')
function list (gyp, args, callback) { function list (gyp, args, callback) {
var devDir = gyp.devDir const devDir = gyp.devDir
log.verbose('list', 'using node-gyp dir:', devDir) log.verbose('list', 'using node-gyp dir:', devDir)
fs.readdir(devDir, onreaddir) fs.readdir(devDir, onreaddir)

165
lib/log.js Normal file
View file

@ -0,0 +1,165 @@
'use strict'
const procLog = require('proc-log')
const { format } = require('util')
// helper to emit log messages with a predefined prefix
const logLevels = Object.keys(procLog).filter((k) => typeof procLog[k] === 'function')
const withPrefix = (prefix) => logLevels.reduce((acc, level) => {
acc[level] = (...args) => procLog[level](prefix, ...args)
return acc
}, {})
// very basic ansi color generator
const COLORS = {
wrap: (str, colors) => {
const codes = colors.filter(c => typeof c === 'number')
return `\x1b[${codes.join(';')}m${str}\x1b[0m`
},
inverse: 7,
fg: {
black: 30,
red: 31,
green: 32,
yellow: 33,
blue: 34,
magenta: 35,
cyan: 36,
white: 37
},
bg: {
black: 40,
red: 41,
green: 42,
yellow: 43,
blue: 44,
magenta: 45,
cyan: 46,
white: 47
}
}
class Logger {
#buffer = []
#paused = null
#level = null
#stream = null
// ordered from loudest to quietest
#levels = [{
id: 'silly',
display: 'sill',
style: { inverse: true }
}, {
id: 'verbose',
display: 'verb',
style: { fg: 'cyan', bg: 'black' }
}, {
id: 'info',
style: { fg: 'green' }
}, {
id: 'http',
style: { fg: 'green', bg: 'black' }
}, {
id: 'notice',
style: { fg: 'cyan', bg: 'black' }
}, {
id: 'warn',
display: 'WARN',
style: { fg: 'black', bg: 'yellow' }
}, {
id: 'error',
display: 'ERR!',
style: { fg: 'red', bg: 'black' }
}]
constructor () {
process.on('log', (...args) => this.#onLog(...args))
this.#levels = new Map(this.#levels.map((level, index) => [level.id, { ...level, index }]))
this.level = 'info'
this.stream = process.stderr
procLog.pause()
}
get stream () {
return this.#stream
}
set stream (stream) {
this.#stream = stream
}
get level () {
return this.#levels.get(this.#level) ?? null
}
set level (level) {
this.#level = this.#levels.get(level)?.id ?? null
}
isVisible (level) {
return this.level?.index <= this.#levels.get(level)?.index ?? -1
}
#onLog (...args) {
const [level] = args
if (level === 'pause') {
this.#paused = true
return
}
if (level === 'resume') {
this.#paused = false
this.#buffer.forEach((b) => this.#log(...b))
this.#buffer.length = 0
return
}
if (this.#paused) {
this.#buffer.push(args)
return
}
this.#log(...args)
}
#color (str, { fg, bg, inverse }) {
if (!this.#stream?.isTTY) {
return str
}
return COLORS.wrap(str, [
COLORS.fg[fg],
COLORS.bg[bg],
inverse && COLORS.inverse
])
}
#log (levelId, msgPrefix, ...args) {
if (!this.isVisible(levelId) || typeof this.#stream?.write !== 'function') {
return
}
const level = this.#levels.get(levelId)
const prefixParts = [
this.#color('gyp', { fg: 'white', bg: 'black' }),
this.#color(level.display ?? level.id, level.style)
]
if (msgPrefix) {
prefixParts.push(this.#color(msgPrefix, { fg: 'magenta' }))
}
const prefix = prefixParts.join(' ').trim() + ' '
const lines = format(...args).split(/\r?\n/).map(l => prefix + l.trim())
this.#stream.write(lines.join('\n') + '\n')
}
}
module.exports = {
logger: new Logger(),
withPrefix,
...procLog
}

25
lib/node-gyp.js
View file

@ -2,7 +2,7 @@
const path = require('path') const path = require('path')
const nopt = require('nopt') const nopt = require('nopt')
const log = require('npmlog') const log = require('./log')
const childProcess = require('child_process') const childProcess = require('child_process')
const EE = require('events').EventEmitter const EE = require('events').EventEmitter
const inherits = require('util').inherits const inherits = require('util').inherits
@ -22,15 +22,12 @@ const aliases = {
rm: 'remove' rm: 'remove'
} }
// differentiate node-gyp's logs from npm's
log.heading = 'gyp'
function gyp () { function gyp () {
return new Gyp() return new Gyp()
} }
function Gyp () { function Gyp () {
var self = this const self = this
this.devDir = '' this.devDir = ''
this.commands = {} this.commands = {}
@ -44,7 +41,7 @@ function Gyp () {
} }
inherits(Gyp, EE) inherits(Gyp, EE)
exports.Gyp = Gyp exports.Gyp = Gyp
var proto = Gyp.prototype const proto = Gyp.prototype
/** /**
* Export the contents of the package.json. * Export the contents of the package.json.
@ -108,7 +105,7 @@ proto.parseArgv = function parseOpts (argv) {
this.opts = nopt(this.configDefs, this.shorthands, argv) this.opts = nopt(this.configDefs, this.shorthands, argv)
this.argv = this.opts.argv.remain.slice() this.argv = this.opts.argv.remain.slice()
var commands = this.todo = [] const commands = this.todo = []
// create a copy of the argv array with aliases mapped // create a copy of the argv array with aliases mapped
argv = this.argv.map(function (arg) { argv = this.argv.map(function (arg) {
@ -122,7 +119,7 @@ proto.parseArgv = function parseOpts (argv) {
// process the mapped args into "command" objects ("name" and "args" props) // process the mapped args into "command" objects ("name" and "args" props)
argv.slice().forEach(function (arg) { argv.slice().forEach(function (arg) {
if (arg in this.commands) { if (arg in this.commands) {
var args = argv.splice(0, argv.indexOf(arg)) const args = argv.splice(0, argv.indexOf(arg))
argv.shift() argv.shift()
if (commands.length > 0) { if (commands.length > 0) {
commands[commands.length - 1].args = args commands[commands.length - 1].args = args
@ -135,14 +132,14 @@ proto.parseArgv = function parseOpts (argv) {
} }
// support for inheriting config env variables from npm // support for inheriting config env variables from npm
var npmConfigPrefix = 'npm_config_' const npmConfigPrefix = 'npm_config_'
Object.keys(process.env).forEach(function (name) { Object.keys(process.env).forEach(function (name) {
if (name.indexOf(npmConfigPrefix) !== 0) { if (name.indexOf(npmConfigPrefix) !== 0) {
return return
} }
var val = process.env[name] const val = process.env[name]
if (name === npmConfigPrefix + 'loglevel') { if (name === npmConfigPrefix + 'loglevel') {
log.level = val log.logger.level = val
} else { } else {
// add the user-defined options to the config // add the user-defined options to the config
name = name.substring(npmConfigPrefix.length) name = name.substring(npmConfigPrefix.length)
@ -159,7 +156,7 @@ proto.parseArgv = function parseOpts (argv) {
}, this) }, this)
if (this.opts.loglevel) { if (this.opts.loglevel) {
log.level = this.opts.loglevel log.logger.level = this.opts.loglevel
} }
log.resume() log.resume()
} }
@ -175,7 +172,7 @@ proto.spawn = function spawn (command, args, opts) {
if (!opts.silent && !opts.stdio) { if (!opts.silent && !opts.stdio) {
opts.stdio = [0, 1, 2] opts.stdio = [0, 1, 2]
} }
var cp = childProcess.spawn(command, args, opts) const cp = childProcess.spawn(command, args, opts)
log.info('spawn', command) log.info('spawn', command)
log.info('spawn args', args) log.info('spawn args', args)
return cp return cp
@ -186,7 +183,7 @@ proto.spawn = function spawn (command, args, opts) {
*/ */
proto.usage = function usage () { proto.usage = function usage () {
var str = [ const str = [
'', '',
' Usage: node-gyp <command> [options]', ' Usage: node-gyp <command> [options]',
'', '',

45
lib/process-release.js
View file

@ -1,11 +1,11 @@
/* eslint-disable node/no-deprecated-api */ /* eslint-disable n/no-deprecated-api */
'use strict' 'use strict'
const semver = require('semver') const semver = require('semver')
const url = require('url') const url = require('url')
const path = require('path') const path = require('path')
const log = require('npmlog') const log = require('./log')
// versions where -headers.tar.gz started shipping // versions where -headers.tar.gz started shipping
const headersTarballRange = '>= 3.0.0 || ~0.12.10 || ~0.10.42' const headersTarballRange = '>= 3.0.0 || ~0.12.10 || ~0.10.42'
@ -17,29 +17,28 @@ const bitsreV3 = /\/win-(x86|ia32|x64)\// // io.js v3.x.x shipped with "ia32" bu
// file names. Inputs come from command-line switches (--target, --dist-url), // file names. Inputs come from command-line switches (--target, --dist-url),
// `process.version` and `process.release` where it exists. // `process.version` and `process.release` where it exists.
function processRelease (argv, gyp, defaultVersion, defaultRelease) { function processRelease (argv, gyp, defaultVersion, defaultRelease) {
var version = (semver.valid(argv[0]) && argv[0]) || gyp.opts.target || defaultVersion let version = (semver.valid(argv[0]) && argv[0]) || gyp.opts.target || defaultVersion
var versionSemver = semver.parse(version) const versionSemver = semver.parse(version)
var overrideDistUrl = gyp.opts['dist-url'] || gyp.opts.disturl let overrideDistUrl = gyp.opts['dist-url'] || gyp.opts.disturl
var isDefaultVersion let isNamedForLegacyIojs
var isNamedForLegacyIojs let name
var name let distBaseUrl
var distBaseUrl let baseUrl
var baseUrl let libUrl32
var libUrl32 let libUrl64
var libUrl64 let libUrlArm64
var libUrlArm64 let tarballUrl
var tarballUrl let canGetHeaders
var canGetHeaders
if (!versionSemver) { if (!versionSemver) {
// not a valid semver string, nothing we can do // not a valid semver string, nothing we can do
return { version: version } return { version }
} }
// flatten version into String // flatten version into String
version = versionSemver.version version = versionSemver.version
// defaultVersion should come from process.version so ought to be valid semver // defaultVersion should come from process.version so ought to be valid semver
isDefaultVersion = version === semver.parse(defaultVersion).version const isDefaultVersion = version === semver.parse(defaultVersion).version
// can't use process.release if we're using --target=x.y.z // can't use process.release if we're using --target=x.y.z
if (!isDefaultVersion) { if (!isDefaultVersion) {
@ -101,11 +100,11 @@ function processRelease (argv, gyp, defaultVersion, defaultRelease) {
} }
return { return {
version: version, version,
semver: versionSemver, semver: versionSemver,
name: name, name,
baseUrl: baseUrl, baseUrl,
tarballUrl: tarballUrl, tarballUrl,
shasumsUrl: url.resolve(baseUrl, 'SHASUMS256.txt'), shasumsUrl: url.resolve(baseUrl, 'SHASUMS256.txt'),
versionDir: (name !== 'node' ? name + '-' : '') + version, versionDir: (name !== 'node' ? name + '-' : '') + version,
ia32: { ia32: {
@ -128,8 +127,8 @@ function normalizePath (p) {
} }
function resolveLibUrl (name, defaultUrl, arch, versionMajor) { function resolveLibUrl (name, defaultUrl, arch, versionMajor) {
var base = url.resolve(defaultUrl, './') const base = url.resolve(defaultUrl, './')
var hasLibUrl = bitsre.test(defaultUrl) || (versionMajor === 3 && bitsreV3.test(defaultUrl)) const hasLibUrl = bitsre.test(defaultUrl) || (versionMajor === 3 && bitsreV3.test(defaultUrl))
if (!hasLibUrl) { if (!hasLibUrl) {
// let's assume it's a baseUrl then // let's assume it's a baseUrl then

41
lib/remove.js
View file

@ -1,46 +1,45 @@
'use strict' 'use strict'
const fs = require('fs') const fs = require('fs/promises')
const rm = require('rimraf')
const path = require('path') const path = require('path')
const log = require('npmlog') const log = require('./log')
const semver = require('semver') const semver = require('semver')
function remove (gyp, argv, callback) { async function remove (gyp, argv) {
var devDir = gyp.devDir const devDir = gyp.devDir
log.verbose('remove', 'using node-gyp dir:', devDir) log.verbose('remove', 'using node-gyp dir:', devDir)
// get the user-specified version to remove // get the user-specified version to remove
var version = argv[0] || gyp.opts.target let version = argv[0] || gyp.opts.target
log.verbose('remove', 'removing target version:', version) log.verbose('remove', 'removing target version:', version)
if (!version) { if (!version) {
return callback(new Error('You must specify a version number to remove. Ex: "' + process.version + '"')) throw new Error('You must specify a version number to remove. Ex: "' + process.version + '"')
} }
var versionSemver = semver.parse(version) const versionSemver = semver.parse(version)
if (versionSemver) { if (versionSemver) {
// flatten the version Array into a String // flatten the version Array into a String
version = versionSemver.version version = versionSemver.version
} }
var versionPath = path.resolve(gyp.devDir, version) const versionPath = path.resolve(gyp.devDir, version)
log.verbose('remove', 'removing development files for version:', version) log.verbose('remove', 'removing development files for version:', version)
// first check if its even installed // first check if its even installed
fs.stat(versionPath, function (err) { try {
if (err) { await fs.stat(versionPath)
if (err.code === 'ENOENT') { } catch (err) {
callback(null, 'version was already uninstalled: ' + version) if (err.code === 'ENOENT') {
} else { return 'version was already uninstalled: ' + version
callback(err)
}
return
} }
// Go ahead and delete the dir throw err
rm(versionPath, callback) }
})
await fs.rm(versionPath, { recursive: true, force: true })
} }
module.exports = exports = remove module.exports = function (gyp, argv, callback) {
remove(gyp, argv).then(callback.bind(undefined, null), callback)
}
module.exports.usage = 'Removes the node development files for the specified version' module.exports.usage = 'Removes the node development files for the specified version'

22
lib/util.js
View file

@ -1,22 +1,9 @@
'use strict' 'use strict'
const log = require('npmlog') const log = require('./log')
const execFile = require('child_process').execFile const execFile = require('child_process').execFile
const path = require('path') const path = require('path')
function logWithPrefix (log, prefix) {
function setPrefix (logFunction) {
return (...args) => logFunction.apply(null, [ prefix, ...args ]) // eslint-disable-line
}
return {
silly: setPrefix(log.silly),
verbose: setPrefix(log.verbose),
info: setPrefix(log.info),
warn: setPrefix(log.warn),
error: setPrefix(log.error)
}
}
function regGetValue (key, value, addOpts, cb) { function regGetValue (key, value, addOpts, cb) {
const outReValue = value.replace(/\W/g, '.') const outReValue = value.replace(/\W/g, '.')
const outRe = new RegExp(`^\\s+${outReValue}\\s+REG_\\w+\\s+(\\S.*)$`, 'im') const outRe = new RegExp(`^\\s+${outReValue}\\s+REG_\\w+\\s+(\\S.*)$`, 'im')
@ -45,7 +32,7 @@ function regGetValue (key, value, addOpts, cb) {
} }
function regSearchKeys (keys, value, addOpts, cb) { function regSearchKeys (keys, value, addOpts, cb) {
var i = 0 let i = 0
const search = () => { const search = () => {
log.silly('reg-search', 'looking for %j in %j', value, keys[i]) log.silly('reg-search', 'looking for %j in %j', value, keys[i])
regGetValue(keys[i], value, addOpts, (err, res) => { regGetValue(keys[i], value, addOpts, (err, res) => {
@ -58,7 +45,6 @@ function regSearchKeys (keys, value, addOpts, cb) {
} }
module.exports = { module.exports = {
logWithPrefix: logWithPrefix, regGetValue,
regGetValue: regGetValue, regSearchKeys
regSearchKeys: regSearchKeys
} }

13
package.json
View file

@ -24,25 +24,24 @@
"dependencies": { "dependencies": {
"env-paths": "^2.2.0", "env-paths": "^2.2.0",
"exponential-backoff": "^3.1.1", "exponential-backoff": "^3.1.1",
"glob": "^7.1.4", "glob": "^8.0.3",
"graceful-fs": "^4.2.6", "graceful-fs": "^4.2.6",
"make-fetch-happen": "^11.0.3", "make-fetch-happen": "^11.0.3",
"nopt": "^6.0.0", "nopt": "^7.0.0",
"npmlog": "^6.0.0", "proc-log": "^3.0.0",
"rimraf": "^3.0.2",
"semver": "^7.3.5", "semver": "^7.3.5",
"tar": "^6.1.2", "tar": "^6.1.2",
"which": "^2.0.2" "which": "^3.0.0"
}, },
"engines": { "engines": {
"node": "^12.13 || ^14.13 || >=16" "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
}, },
"devDependencies": { "devDependencies": {
"bindings": "^1.5.0", "bindings": "^1.5.0",
"mocha": "^10.2.0", "mocha": "^10.2.0",
"nan": "^2.14.2", "nan": "^2.14.2",
"require-inject": "^1.4.4", "require-inject": "^1.4.4",
"standard": "^14.3.4" "standard": "^17.0.0"
}, },
"scripts": { "scripts": {
"lint": "standard */*.js test/**/*.js", "lint": "standard */*.js test/**/*.js",

26
test/process-exec-sync.js
View file

@ -12,7 +12,7 @@ function startsWith (str, search, pos) {
} }
function processExecSync (file, args, options) { function processExecSync (file, args, options) {
var child, error, timeout, tmpdir, command let error, command
command = makeCommand(file, args) command = makeCommand(file, args)
/* /*
@ -22,10 +22,10 @@ function processExecSync (file, args, options) {
options = options || {} options = options || {}
// init timeout // init timeout
timeout = Date.now() + options.timeout const timeout = Date.now() + options.timeout
// init tmpdir // init tmpdir
var osTempBase = '/tmp' let osTempBase = '/tmp'
var os = determineOS() const os = determineOS()
osTempBase = '/tmp' osTempBase = '/tmp'
if (process.env.TMP) { if (process.env.TMP) {
@ -36,7 +36,7 @@ function processExecSync (file, args, options) {
osTempBase += '/' osTempBase += '/'
} }
tmpdir = osTempBase + 'processExecSync.' + Date.now() + Math.random() const tmpdir = osTempBase + 'processExecSync.' + Date.now() + Math.random()
fs.mkdirSync(tmpdir) fs.mkdirSync(tmpdir)
// init command // init command
@ -49,13 +49,13 @@ function processExecSync (file, args, options) {
} }
// init child // init child
child = childProcess.exec(command, options) const child = childProcess.exec(command, options)
var maxTry = 100000 // increases the test time by 6 seconds on win-2016-node-0.10 const maxTry = 100000 // increases the test time by 6 seconds on win-2016-node-0.10
var tryCount = 0 let tryCount = 0
while (tryCount < maxTry) { while (tryCount < maxTry) {
try { try {
var x = fs.readFileSync(tmpdir + '/status') const x = fs.readFileSync(tmpdir + '/status')
if (x.toString() === '0') { if (x.toString() === '0') {
break break
} }
@ -87,10 +87,10 @@ function processExecSync (file, args, options) {
} }
function makeCommand (file, args) { function makeCommand (file, args) {
var command, quote let command, quote
command = file command = file
if (args.length > 0) { if (args.length > 0) {
for (var i in args) { for (const i in args) {
command = command + ' ' command = command + ' '
if (args[i][0] === '-') { if (args[i][0] === '-') {
command = command + args[i] command = command + args[i]
@ -112,8 +112,8 @@ function makeCommand (file, args) {
} }
function determineOS () { function determineOS () {
var os = '' let os = ''
var tmpVar = '' let tmpVar = ''
if (process.env.OSTYPE) { if (process.env.OSTYPE) {
tmpVar = process.env.OSTYPE tmpVar = process.env.OSTYPE
} else if (process.env.OS) { } else if (process.env.OS) {

4
test/simple-proxy.js
View file

@ -6,7 +6,7 @@ const server = http.createServer(handler)
const port = +process.argv[2] const port = +process.argv[2]
const prefix = process.argv[3] const prefix = process.argv[3]
const upstream = process.argv[4] const upstream = process.argv[4]
var calls = 0 let calls = 0
server.listen(port) server.listen(port)
@ -15,7 +15,7 @@ function handler (req, res) {
throw new Error('request url [' + req.url + '] does not start with [' + prefix + ']') throw new Error('request url [' + req.url + '] does not start with [' + prefix + ']')
} }
var upstreamUrl = upstream + req.url.substring(prefix.length) const upstreamUrl = upstream + req.url.substring(prefix.length)
https.get(upstreamUrl, function (ures) { https.get(upstreamUrl, function (ures) {
ures.on('end', function () { ures.on('end', function () {
if (++calls === 2) { if (++calls === 2) {

48
test/test-addon.js
View file

@ -15,24 +15,24 @@ function runHello (hostProcess) {
if (!hostProcess) { if (!hostProcess) {
hostProcess = process.execPath hostProcess = process.execPath
} }
var testCode = "console.log(require('hello_world').hello())" const testCode = "console.log(require('hello_world').hello())"
return execFileSync(hostProcess, ['-e', testCode], { cwd: __dirname }).toString() return execFileSync(hostProcess, ['-e', testCode], { cwd: __dirname }).toString()
} }
function getEncoding () { function getEncoding () {
var code = 'import locale;print(locale.getdefaultlocale()[1])' const code = 'import locale;print(locale.getdefaultlocale()[1])'
return execFileSync('python', ['-c', code]).toString().trim() return execFileSync('python', ['-c', code]).toString().trim()
} }
function checkCharmapValid () { function checkCharmapValid () {
var data let data
try { try {
data = execFileSync('python', ['fixtures/test-charmap.py'], data = execFileSync('python', ['fixtures/test-charmap.py'],
{ cwd: __dirname }) { cwd: __dirname })
} catch (err) { } catch (err) {
return false return false
} }
var lines = data.toString().trim().split('\n') const lines = data.toString().trim().split('\n')
return lines.pop() === 'True' return lines.pop() === 'True'
} }
@ -41,10 +41,10 @@ describe('addon', function () {
it('build simple addon', function (done) { it('build simple addon', function (done) {
// Set the loglevel otherwise the output disappears when run via 'npm test' // Set the loglevel otherwise the output disappears when run via 'npm test'
var cmd = [nodeGyp, 'rebuild', '-C', addonPath, '--loglevel=verbose'] const cmd = [nodeGyp, 'rebuild', '-C', addonPath, '--loglevel=verbose']
var proc = execFile(process.execPath, cmd, function (err, stdout, stderr) { const proc = execFile(process.execPath, cmd, function (err, stdout, stderr) {
var logLines = stderr.toString().trim().split(/\r?\n/) const logLines = stderr.toString().trim().split(/\r?\n/)
var lastLine = logLines[logLines.length - 1] const lastLine = logLines[logLines.length - 1]
assert.strictEqual(err, null) assert.strictEqual(err, null)
assert.strictEqual(lastLine, 'gyp info ok', 'should end in ok') assert.strictEqual(lastLine, 'gyp info ok', 'should end in ok')
assert.strictEqual(runHello().trim(), 'world') assert.strictEqual(runHello().trim(), 'world')
@ -59,13 +59,13 @@ describe('addon', function () {
return this.skip('python console app can\'t encode non-ascii character.') return this.skip('python console app can\'t encode non-ascii character.')
} }
var testDirNames = { const testDirNames = {
cp936: '文件夹', cp936: '文件夹',
cp1252: 'Latīna', cp1252: 'Latīna',
cp932: 'フォルダ' cp932: 'フォルダ'
} }
// Select non-ascii characters by current encoding // Select non-ascii characters by current encoding
var testDirName = testDirNames[getEncoding()] const testDirName = testDirNames[getEncoding()]
// If encoding is UTF-8 or other then no need to test // If encoding is UTF-8 or other then no need to test
if (!testDirName) { if (!testDirName) {
return this.skip('no need to test') return this.skip('no need to test')
@ -73,17 +73,17 @@ describe('addon', function () {
this.timeout(300000) this.timeout(300000)
var data let data
var configPath = path.join(addonPath, 'build', 'config.gypi') const configPath = path.join(addonPath, 'build', 'config.gypi')
try { try {
data = fs.readFileSync(configPath, 'utf8') data = fs.readFileSync(configPath, 'utf8')
} catch (err) { } catch (err) {
assert.fail(err) assert.fail(err)
return return
} }
var config = JSON.parse(data.replace(/#.+\n/, '')) const config = JSON.parse(data.replace(/#.+\n/, ''))
var nodeDir = config.variables.nodedir const nodeDir = config.variables.nodedir
var testNodeDir = path.join(addonPath, testDirName) const testNodeDir = path.join(addonPath, testDirName)
// Create symbol link to path with non-ascii characters // Create symbol link to path with non-ascii characters
try { try {
fs.symlinkSync(nodeDir, testNodeDir, 'dir') fs.symlinkSync(nodeDir, testNodeDir, 'dir')
@ -99,7 +99,7 @@ describe('addon', function () {
} }
} }
var cmd = [ const cmd = [
nodeGyp, nodeGyp,
'rebuild', 'rebuild',
'-C', '-C',
@ -107,15 +107,15 @@ describe('addon', function () {
'--loglevel=verbose', '--loglevel=verbose',
'-nodedir=' + testNodeDir '-nodedir=' + testNodeDir
] ]
var proc = execFile(process.execPath, cmd, function (err, stdout, stderr) { const proc = execFile(process.execPath, cmd, function (err, stdout, stderr) {
try { try {
fs.unlink(testNodeDir) fs.unlink(testNodeDir)
} catch (err) { } catch (err) {
assert.fail(err) assert.fail(err)
} }
var logLines = stderr.toString().trim().split(/\r?\n/) const logLines = stderr.toString().trim().split(/\r?\n/)
var lastLine = logLines[logLines.length - 1] const lastLine = logLines[logLines.length - 1]
assert.strictEqual(err, null) assert.strictEqual(err, null)
assert.strictEqual(lastLine, 'gyp info ok', 'should end in ok') assert.strictEqual(lastLine, 'gyp info ok', 'should end in ok')
assert.strictEqual(runHello().trim(), 'world') assert.strictEqual(runHello().trim(), 'world')
@ -133,13 +133,13 @@ describe('addon', function () {
this.timeout(300000) this.timeout(300000)
var notNodePath = path.join(os.tmpdir(), 'notnode' + path.extname(process.execPath)) const notNodePath = path.join(os.tmpdir(), 'notnode' + path.extname(process.execPath))
fs.copyFileSync(process.execPath, notNodePath) fs.copyFileSync(process.execPath, notNodePath)
var cmd = [nodeGyp, 'rebuild', '-C', addonPath, '--loglevel=verbose'] const cmd = [nodeGyp, 'rebuild', '-C', addonPath, '--loglevel=verbose']
var proc = execFile(process.execPath, cmd, function (err, stdout, stderr) { const proc = execFile(process.execPath, cmd, function (err, stdout, stderr) {
var logLines = stderr.toString().trim().split(/\r?\n/) const logLines = stderr.toString().trim().split(/\r?\n/)
var lastLine = logLines[logLines.length - 1] const lastLine = logLines[logLines.length - 1]
assert.strictEqual(err, null) assert.strictEqual(err, null)
assert.strictEqual(lastLine, 'gyp info ok', 'should end in ok') assert.strictEqual(lastLine, 'gyp info ok', 'should end in ok')
assert.strictEqual(runHello(notNodePath).trim(), 'world') assert.strictEqual(runHello(notNodePath).trim(), 'world')

23
test/test-configure-python.js
View file

@ -5,6 +5,7 @@ const assert = require('assert')
const path = require('path') const path = require('path')
const devDir = require('./common').devDir() const devDir = require('./common').devDir()
const gyp = require('../lib/node-gyp') const gyp = require('../lib/node-gyp')
const log = require('../lib/log')
const requireInject = require('require-inject') const requireInject = require('require-inject')
const configure = requireInject('../lib/configure', { const configure = requireInject('../lib/configure', {
'graceful-fs': { 'graceful-fs': {
@ -21,17 +22,17 @@ const configure = requireInject('../lib/configure', {
} }
}) })
log.logger.stream = null
const EXPECTED_PYPATH = path.join(__dirname, '..', 'gyp', 'pylib') const EXPECTED_PYPATH = path.join(__dirname, '..', 'gyp', 'pylib')
const SEPARATOR = process.platform === 'win32' ? ';' : ':' const SEPARATOR = process.platform === 'win32' ? ';' : ':'
const SPAWN_RESULT = cb => ({ on: function () { cb() } }) const SPAWN_RESULT = cb => ({ on: function () { cb() } })
require('npmlog').level = 'warn'
describe('configure-python', function () { describe('configure-python', function () {
it('configure PYTHONPATH with no existing env', function (done) { it('configure PYTHONPATH with no existing env', function (done) {
delete process.env.PYTHONPATH delete process.env.PYTHONPATH
var prog = gyp() const prog = gyp()
prog.parseArgv([]) prog.parseArgv([])
prog.spawn = function () { prog.spawn = function () {
assert.strictEqual(process.env.PYTHONPATH, EXPECTED_PYPATH) assert.strictEqual(process.env.PYTHONPATH, EXPECTED_PYPATH)
@ -42,15 +43,15 @@ describe('configure-python', function () {
}) })
it('configure PYTHONPATH with existing env of one dir', function (done) { it('configure PYTHONPATH with existing env of one dir', function (done) {
var existingPath = path.join('a', 'b') const existingPath = path.join('a', 'b')
process.env.PYTHONPATH = existingPath process.env.PYTHONPATH = existingPath
var prog = gyp() const prog = gyp()
prog.parseArgv([]) prog.parseArgv([])
prog.spawn = function () { prog.spawn = function () {
assert.strictEqual(process.env.PYTHONPATH, [EXPECTED_PYPATH, existingPath].join(SEPARATOR)) assert.strictEqual(process.env.PYTHONPATH, [EXPECTED_PYPATH, existingPath].join(SEPARATOR))
var dirs = process.env.PYTHONPATH.split(SEPARATOR) const dirs = process.env.PYTHONPATH.split(SEPARATOR)
assert.deepStrictEqual(dirs, [EXPECTED_PYPATH, existingPath]) assert.deepStrictEqual(dirs, [EXPECTED_PYPATH, existingPath])
return SPAWN_RESULT(done) return SPAWN_RESULT(done)
@ -60,17 +61,17 @@ describe('configure-python', function () {
}) })
it('configure PYTHONPATH with existing env of multiple dirs', function (done) { it('configure PYTHONPATH with existing env of multiple dirs', function (done) {
var pythonDir1 = path.join('a', 'b') const pythonDir1 = path.join('a', 'b')
var pythonDir2 = path.join('b', 'c') const pythonDir2 = path.join('b', 'c')
var existingPath = [pythonDir1, pythonDir2].join(SEPARATOR) const existingPath = [pythonDir1, pythonDir2].join(SEPARATOR)
process.env.PYTHONPATH = existingPath process.env.PYTHONPATH = existingPath
var prog = gyp() const prog = gyp()
prog.parseArgv([]) prog.parseArgv([])
prog.spawn = function () { prog.spawn = function () {
assert.strictEqual(process.env.PYTHONPATH, [EXPECTED_PYPATH, existingPath].join(SEPARATOR)) assert.strictEqual(process.env.PYTHONPATH, [EXPECTED_PYPATH, existingPath].join(SEPARATOR))
var dirs = process.env.PYTHONPATH.split(SEPARATOR) const dirs = process.env.PYTHONPATH.split(SEPARATOR)
assert.deepStrictEqual(dirs, [EXPECTED_PYPATH, pythonDir1, pythonDir2]) assert.deepStrictEqual(dirs, [EXPECTED_PYPATH, pythonDir1, pythonDir2])
return SPAWN_RESULT(done) return SPAWN_RESULT(done)

25
test/test-download.js
View file

@ -2,7 +2,7 @@
const { describe, it, after } = require('mocha') const { describe, it, after } = require('mocha')
const assert = require('assert') const assert = require('assert')
const fs = require('fs') const fs = require('fs/promises')
const path = require('path') const path = require('path')
const util = require('util') const util = require('util')
const http = require('http') const http = require('http')
@ -10,12 +10,11 @@ const https = require('https')
const install = require('../lib/install') const install = require('../lib/install')
const semver = require('semver') const semver = require('semver')
const devDir = require('./common').devDir() const devDir = require('./common').devDir()
const rimraf = require('rimraf')
const gyp = require('../lib/node-gyp') const gyp = require('../lib/node-gyp')
const log = require('npmlog') const log = require('../lib/log')
const certs = require('./fixtures/certs') const certs = require('./fixtures/certs')
log.level = 'warn' log.logger.stream = null
describe('download', function () { describe('download', function () {
it('download over http', async function () { it('download over http', async function () {
@ -43,12 +42,12 @@ describe('download', function () {
const cacontents = certs['ca.crt'] const cacontents = certs['ca.crt']
const cert = certs['server.crt'] const cert = certs['server.crt']
const key = certs['server.key'] const key = certs['server.key']
await fs.promises.writeFile(cafile, cacontents, 'utf8') await fs.writeFile(cafile, cacontents, 'utf8')
const ca = await install.test.readCAFile(cafile) const ca = await install.test.readCAFile(cafile)
assert.strictEqual(ca.length, 1) assert.strictEqual(ca.length, 1)
const options = { ca: ca, cert: cert, key: key } const options = { ca, cert, key }
const server = https.createServer(options, (req, res) => { const server = https.createServer(options, (req, res) => {
assert.strictEqual(req.headers['user-agent'], `node-gyp v42 (node ${process.version})`) assert.strictEqual(req.headers['user-agent'], `node-gyp v42 (node ${process.version})`)
res.end('ok') res.end('ok')
@ -56,7 +55,7 @@ describe('download', function () {
after(async () => { after(async () => {
await new Promise((resolve) => server.close(resolve)) await new Promise((resolve) => server.close(resolve))
await fs.promises.unlink(cafile) await fs.unlink(cafile)
}) })
server.on('clientError', (err) => { throw err }) server.on('clientError', (err) => { throw err })
@ -149,9 +148,9 @@ describe('download', function () {
it('check certificate splitting', async function () { it('check certificate splitting', async function () {
const cafile = path.join(__dirname, 'fixtures/ca-bundle.crt') const cafile = path.join(__dirname, 'fixtures/ca-bundle.crt')
const cacontents = certs['ca-bundle.crt'] const cacontents = certs['ca-bundle.crt']
await fs.promises.writeFile(cafile, cacontents, 'utf8') await fs.writeFile(cafile, cacontents, 'utf8')
after(async () => { after(async () => {
await fs.promises.unlink(cafile) await fs.unlink(cafile)
}) })
const cas = await install.test.readCAFile(path.join(__dirname, 'fixtures/ca-bundle.crt')) const cas = await install.test.readCAFile(path.join(__dirname, 'fixtures/ca-bundle.crt'))
assert.strictEqual(cas.length, 2) assert.strictEqual(cas.length, 2)
@ -171,7 +170,7 @@ describe('download', function () {
this.timeout(300000) this.timeout(300000)
const expectedDir = path.join(devDir, process.version.replace(/^v/, '')) const expectedDir = path.join(devDir, process.version.replace(/^v/, ''))
await util.promisify(rimraf)(expectedDir) await fs.rm(expectedDir, { recursive: true, force: true })
const prog = gyp() const prog = gyp()
prog.parseArgv([]) prog.parseArgv([])
@ -179,10 +178,10 @@ describe('download', function () {
log.level = 'warn' log.level = 'warn'
await util.promisify(install)(prog, []) await util.promisify(install)(prog, [])
const data = await fs.promises.readFile(path.join(expectedDir, 'installVersion'), 'utf8') const data = await fs.readFile(path.join(expectedDir, 'installVersion'), 'utf8')
assert.strictEqual(data, '11\n', 'correct installVersion') assert.strictEqual(data, '11\n', 'correct installVersion')
const list = await fs.promises.readdir(path.join(expectedDir, 'include/node')) const list = await fs.readdir(path.join(expectedDir, 'include/node'))
assert.ok(list.includes('common.gypi')) assert.ok(list.includes('common.gypi'))
assert.ok(list.includes('config.gypi')) assert.ok(list.includes('config.gypi'))
assert.ok(list.includes('node.h')) assert.ok(list.includes('node.h'))
@ -194,7 +193,7 @@ describe('download', function () {
assert.ok(list.includes('v8.h')) assert.ok(list.includes('v8.h'))
assert.ok(list.includes('zlib.h')) assert.ok(list.includes('zlib.h'))
const lines = (await fs.promises.readFile(path.join(expectedDir, 'include/node/node_version.h'), 'utf8')).split('\n') const lines = (await fs.readFile(path.join(expectedDir, 'include/node/node_version.h'), 'utf8')).split('\n')
// extract the 3 version parts from the defines to build a valid version string and // extract the 3 version parts from the defines to build a valid version string and
// and check them against our current env version // and check them against our current env version

30
test/test-find-accessible-sync.js
View file

@ -11,7 +11,7 @@ const configure = requireInject('../lib/configure', {
if (readableFiles.some(function (f) { return f === path })) { if (readableFiles.some(function (f) { return f === path })) {
return 0 return 0
} else { } else {
var error = new Error('ENOENT - not found') const error = new Error('ENOENT - not found')
throw error throw error
} }
} }
@ -30,44 +30,44 @@ const readableFiles = [
describe('find-accessible-sync', function () { describe('find-accessible-sync', function () {
it('find accessible - empty array', function () { it('find accessible - empty array', function () {
var candidates = [] const candidates = []
var found = configure.test.findAccessibleSync('test', dir, candidates) const found = configure.test.findAccessibleSync('test', dir, candidates)
assert.strictEqual(found, undefined) assert.strictEqual(found, undefined)
}) })
it('find accessible - single item array, readable', function () { it('find accessible - single item array, readable', function () {
var candidates = [readableFile] const candidates = [readableFile]
var found = configure.test.findAccessibleSync('test', dir, candidates) const found = configure.test.findAccessibleSync('test', dir, candidates)
assert.strictEqual(found, path.resolve(dir, readableFile)) assert.strictEqual(found, path.resolve(dir, readableFile))
}) })
it('find accessible - single item array, readable in subdir', function () { it('find accessible - single item array, readable in subdir', function () {
var candidates = [readableFileInDir] const candidates = [readableFileInDir]
var found = configure.test.findAccessibleSync('test', dir, candidates) const found = configure.test.findAccessibleSync('test', dir, candidates)
assert.strictEqual(found, path.resolve(dir, readableFileInDir)) assert.strictEqual(found, path.resolve(dir, readableFileInDir))
}) })
it('find accessible - single item array, unreadable', function () { it('find accessible - single item array, unreadable', function () {
var candidates = ['unreadable_file'] const candidates = ['unreadable_file']
var found = configure.test.findAccessibleSync('test', dir, candidates) const found = configure.test.findAccessibleSync('test', dir, candidates)
assert.strictEqual(found, undefined) assert.strictEqual(found, undefined)
}) })
it('find accessible - multi item array, no matches', function () { it('find accessible - multi item array, no matches', function () {
var candidates = ['non_existent_file', 'unreadable_file'] const candidates = ['non_existent_file', 'unreadable_file']
var found = configure.test.findAccessibleSync('test', dir, candidates) const found = configure.test.findAccessibleSync('test', dir, candidates)
assert.strictEqual(found, undefined) assert.strictEqual(found, undefined)
}) })
it('find accessible - multi item array, single match', function () { it('find accessible - multi item array, single match', function () {
var candidates = ['non_existent_file', readableFile] const candidates = ['non_existent_file', readableFile]
var found = configure.test.findAccessibleSync('test', dir, candidates) const found = configure.test.findAccessibleSync('test', dir, candidates)
assert.strictEqual(found, path.resolve(dir, readableFile)) assert.strictEqual(found, path.resolve(dir, readableFile))
}) })
it('find accessible - multi item array, return first match', function () { it('find accessible - multi item array, return first match', function () {
var candidates = ['non_existent_file', anotherReadableFile, readableFile] const candidates = ['non_existent_file', anotherReadableFile, readableFile]
var found = configure.test.findAccessibleSync('test', dir, candidates) const found = configure.test.findAccessibleSync('test', dir, candidates)
assert.strictEqual(found, path.resolve(dir, anotherReadableFile)) assert.strictEqual(found, path.resolve(dir, anotherReadableFile))
}) })
}) })

28
test/test-find-node-directory.js
View file

@ -13,8 +13,8 @@ describe('find-node-directory', function () {
// in a build tree where npm is installed in // in a build tree where npm is installed in
// .... /deps/npm // .... /deps/npm
it('test find-node-directory - node install', function () { it('test find-node-directory - node install', function () {
for (var next = 0; next < platforms.length; next++) { for (let next = 0; next < platforms.length; next++) {
var processObj = { execPath: '/x/y/bin/node', platform: platforms[next] } const processObj = { execPath: '/x/y/bin/node', platform: platforms[next] }
assert.strictEqual( assert.strictEqual(
findNodeDirectory('/x/deps/npm/node_modules/node-gyp/lib', processObj), findNodeDirectory('/x/deps/npm/node_modules/node-gyp/lib', processObj),
path.join('/x')) path.join('/x'))
@ -27,8 +27,8 @@ describe('find-node-directory', function () {
// .... /lib/node_modules/npm or .../node_modules/npm // .... /lib/node_modules/npm or .../node_modules/npm
// depending on the patform // depending on the patform
it('test find-node-directory - node build', function () { it('test find-node-directory - node build', function () {
for (var next = 0; next < platforms.length; next++) { for (let next = 0; next < platforms.length; next++) {
var processObj = { execPath: '/x/y/bin/node', platform: platforms[next] } const processObj = { execPath: '/x/y/bin/node', platform: platforms[next] }
if (platforms[next] === 'win32') { if (platforms[next] === 'win32') {
assert.strictEqual( assert.strictEqual(
findNodeDirectory('/y/node_modules/npm/node_modules/node-gyp/lib', findNodeDirectory('/y/node_modules/npm/node_modules/node-gyp/lib',
@ -44,8 +44,8 @@ describe('find-node-directory', function () {
// we should find the directory based on the execPath // we should find the directory based on the execPath
// for node and match because it was in the bin directory // for node and match because it was in the bin directory
it('test find-node-directory - node in bin directory', function () { it('test find-node-directory - node in bin directory', function () {
for (var next = 0; next < platforms.length; next++) { for (let next = 0; next < platforms.length; next++) {
var processObj = { execPath: '/x/y/bin/node', platform: platforms[next] } const processObj = { execPath: '/x/y/bin/node', platform: platforms[next] }
assert.strictEqual( assert.strictEqual(
findNodeDirectory('/nothere/npm/node_modules/node-gyp/lib', processObj), findNodeDirectory('/nothere/npm/node_modules/node-gyp/lib', processObj),
path.join('/x/y')) path.join('/x/y'))
@ -55,8 +55,8 @@ describe('find-node-directory', function () {
// we should find the directory based on the execPath // we should find the directory based on the execPath
// for node and match because it was in the Release directory // for node and match because it was in the Release directory
it('test find-node-directory - node in build release dir', function () { it('test find-node-directory - node in build release dir', function () {
for (var next = 0; next < platforms.length; next++) { for (let next = 0; next < platforms.length; next++) {
var processObj let processObj
if (platforms[next] === 'win32') { if (platforms[next] === 'win32') {
processObj = { execPath: '/x/y/Release/node', platform: platforms[next] } processObj = { execPath: '/x/y/Release/node', platform: platforms[next] }
} else { } else {
@ -75,8 +75,8 @@ describe('find-node-directory', function () {
// we should find the directory based on the execPath // we should find the directory based on the execPath
// for node and match because it was in the Debug directory // for node and match because it was in the Debug directory
it('test find-node-directory - node in Debug release dir', function () { it('test find-node-directory - node in Debug release dir', function () {
for (var next = 0; next < platforms.length; next++) { for (let next = 0; next < platforms.length; next++) {
var processObj let processObj
if (platforms[next] === 'win32') { if (platforms[next] === 'win32') {
processObj = { execPath: '/a/b/Debug/node', platform: platforms[next] } processObj = { execPath: '/a/b/Debug/node', platform: platforms[next] }
} else { } else {
@ -92,8 +92,8 @@ describe('find-node-directory', function () {
// we should not find it as it will not match based on the execPath nor // we should not find it as it will not match based on the execPath nor
// the directory from which the script is running // the directory from which the script is running
it('test find-node-directory - not found', function () { it('test find-node-directory - not found', function () {
for (var next = 0; next < platforms.length; next++) { for (let next = 0; next < platforms.length; next++) {
var processObj = { execPath: '/x/y/z/y', platform: next } const processObj = { execPath: '/x/y/z/y', platform: next }
assert.strictEqual(findNodeDirectory('/a/b/c/d', processObj), '') assert.strictEqual(findNodeDirectory('/a/b/c/d', processObj), '')
} }
}) })
@ -105,8 +105,8 @@ describe('find-node-directory', function () {
// same test as above but make sure additional directory entries // same test as above but make sure additional directory entries
// don't cause an issue // don't cause an issue
it('test find-node-directory - node install', function () { it('test find-node-directory - node install', function () {
for (var next = 0; next < platforms.length; next++) { for (let next = 0; next < platforms.length; next++) {
var processObj = { execPath: '/x/y/bin/node', platform: platforms[next] } const processObj = { execPath: '/x/y/bin/node', platform: platforms[next] }
assert.strictEqual( assert.strictEqual(
findNodeDirectory('/x/y/z/a/b/c/deps/npm/node_modules/node-gyp/lib', findNodeDirectory('/x/y/z/a/b/c/deps/npm/node_modules/node-gyp/lib',
processObj), path.join('/x/y/z/a/b/c')) processObj), path.join('/x/y/z/a/b/c'))

28
test/test-find-python.js
View file

@ -8,13 +8,11 @@ const findPython = require('../lib/find-python')
const execFile = require('child_process').execFile const execFile = require('child_process').execFile
const PythonFinder = findPython.test.PythonFinder const PythonFinder = findPython.test.PythonFinder
require('npmlog').level = 'warn'
describe('find-python', function () { describe('find-python', function () {
it('find python', function () { it('find python', function () {
findPython.test.findPython(null, function (err, found) { findPython.test.findPython(null, function (err, found) {
assert.strictEqual(err, null) assert.strictEqual(err, null)
var proc = execFile(found, ['-V'], function (err, stdout, stderr) { const proc = execFile(found, ['-V'], function (err, stdout, stderr) {
assert.strictEqual(err, null) assert.strictEqual(err, null)
assert.ok(/Python 3/.test(stdout)) assert.ok(/Python 3/.test(stdout))
assert.strictEqual(stderr, '') assert.strictEqual(stderr, '')
@ -29,7 +27,7 @@ describe('find-python', function () {
console.error(Error(`Property ${property} should not have been accessed.`)) console.error(Error(`Property ${property} should not have been accessed.`))
process.abort() process.abort()
} }
var descriptor = { const descriptor = {
configurable: false, configurable: false,
enumerable: false, enumerable: false,
get: fail, get: fail,
@ -42,18 +40,10 @@ describe('find-python', function () {
PythonFinder.apply(this, arguments) PythonFinder.apply(this, arguments)
} }
TestPythonFinder.prototype = Object.create(PythonFinder.prototype) TestPythonFinder.prototype = Object.create(PythonFinder.prototype)
// Silence npmlog - remove for debugging
TestPythonFinder.prototype.log = {
silly: () => {},
verbose: () => {},
info: () => {},
warn: () => {},
error: () => {}
}
delete TestPythonFinder.prototype.env.NODE_GYP_FORCE_PYTHON delete TestPythonFinder.prototype.env.NODE_GYP_FORCE_PYTHON
it('find python - python', function () { it('find python - python', function () {
var f = new TestPythonFinder('python', done) const f = new TestPythonFinder('python', done)
f.execFile = function (program, args, opts, cb) { f.execFile = function (program, args, opts, cb) {
f.execFile = function (program, args, opts, cb) { f.execFile = function (program, args, opts, cb) {
poison(f, 'execFile') poison(f, 'execFile')
@ -75,7 +65,7 @@ describe('find-python', function () {
}) })
it('find python - python too old', function () { it('find python - python too old', function () {
var f = new TestPythonFinder(null, done) const f = new TestPythonFinder(null, done)
f.execFile = function (program, args, opts, cb) { f.execFile = function (program, args, opts, cb) {
if (/sys\.executable/.test(args[args.length - 1])) { if (/sys\.executable/.test(args[args.length - 1])) {
cb(null, '/path/python') cb(null, '/path/python')
@ -94,7 +84,7 @@ describe('find-python', function () {
}) })
it('find python - no python', function () { it('find python - no python', function () {
var f = new TestPythonFinder(null, done) const f = new TestPythonFinder(null, done)
f.execFile = function (program, args, opts, cb) { f.execFile = function (program, args, opts, cb) {
if (/sys\.executable/.test(args[args.length - 1])) { if (/sys\.executable/.test(args[args.length - 1])) {
cb(new Error('not found')) cb(new Error('not found'))
@ -113,7 +103,7 @@ describe('find-python', function () {
}) })
it('find python - no python2, no python, unix', function () { it('find python - no python2, no python, unix', function () {
var f = new TestPythonFinder(null, done) const f = new TestPythonFinder(null, done)
f.checkPyLauncher = assert.fail f.checkPyLauncher = assert.fail
f.win = false f.win = false
@ -133,7 +123,7 @@ describe('find-python', function () {
}) })
it('find python - no python, use python launcher', function () { it('find python - no python, use python launcher', function () {
var f = new TestPythonFinder(null, done) const f = new TestPythonFinder(null, done)
f.win = true f.win = true
f.execFile = function (program, args, opts, cb) { f.execFile = function (program, args, opts, cb) {
@ -165,7 +155,7 @@ describe('find-python', function () {
}) })
it('find python - no python, no python launcher, good guess', function () { it('find python - no python, no python launcher, good guess', function () {
var f = new TestPythonFinder(null, done) const f = new TestPythonFinder(null, done)
f.win = true f.win = true
const expectedProgram = f.winDefaultLocations[0] const expectedProgram = f.winDefaultLocations[0]
@ -191,7 +181,7 @@ describe('find-python', function () {
}) })
it('find python - no python, no python launcher, bad guess', function () { it('find python - no python, no python launcher, bad guess', function () {
var f = new TestPythonFinder(null, done) const f = new TestPythonFinder(null, done)
f.win = true f.win = true
f.execFile = function (program, args, opts, cb) { f.execFile = function (program, args, opts, cb) {

18
test/test-find-visualstudio.js
View file

@ -16,7 +16,7 @@ function poison (object, property) {
console.error(Error(`Property ${property} should not have been accessed.`)) console.error(Error(`Property ${property} should not have been accessed.`))
process.abort() process.abort()
} }
var descriptor = { const descriptor = {
configurable: false, configurable: false,
enumerable: false, enumerable: false,
get: fail, get: fail,
@ -27,14 +27,6 @@ function poison (object, property) {
function TestVisualStudioFinder () { VisualStudioFinder.apply(this, arguments) } function TestVisualStudioFinder () { VisualStudioFinder.apply(this, arguments) }
TestVisualStudioFinder.prototype = Object.create(VisualStudioFinder.prototype) TestVisualStudioFinder.prototype = Object.create(VisualStudioFinder.prototype)
// Silence npmlog - remove for debugging
TestVisualStudioFinder.prototype.log = {
silly: () => {},
verbose: () => {},
info: () => {},
warn: () => {},
error: () => {}
}
describe('find-visualstudio', function () { describe('find-visualstudio', function () {
it('VS2013', function () { it('VS2013', function () {
@ -56,7 +48,7 @@ describe('find-visualstudio', function () {
finder.parseData(new Error(), '', '', cb) finder.parseData(new Error(), '', '', cb)
} }
finder.regSearchKeys = (keys, value, addOpts, cb) => { finder.regSearchKeys = (keys, value, addOpts, cb) => {
for (var i = 0; i < keys.length; ++i) { for (let i = 0; i < keys.length; ++i) {
const fullName = `${keys[i]}\\${value}` const fullName = `${keys[i]}\\${value}`
switch (fullName) { switch (fullName) {
case 'HKLM\\Software\\Microsoft\\VisualStudio\\SxS\\VC7\\14.0': case 'HKLM\\Software\\Microsoft\\VisualStudio\\SxS\\VC7\\14.0':
@ -93,7 +85,7 @@ describe('find-visualstudio', function () {
finder.parseData(null, data, '', cb) finder.parseData(null, data, '', cb)
} }
finder.regSearchKeys = (keys, value, addOpts, cb) => { finder.regSearchKeys = (keys, value, addOpts, cb) => {
for (var i = 0; i < keys.length; ++i) { for (let i = 0; i < keys.length; ++i) {
const fullName = `${keys[i]}\\${value}` const fullName = `${keys[i]}\\${value}`
switch (fullName) { switch (fullName) {
case 'HKLM\\Software\\Microsoft\\VisualStudio\\SxS\\VC7\\14.0': case 'HKLM\\Software\\Microsoft\\VisualStudio\\SxS\\VC7\\14.0':
@ -127,7 +119,7 @@ describe('find-visualstudio', function () {
finder.parseData(new Error(), '', '', cb) finder.parseData(new Error(), '', '', cb)
} }
finder.regSearchKeys = (keys, value, addOpts, cb) => { finder.regSearchKeys = (keys, value, addOpts, cb) => {
for (var i = 0; i < keys.length; ++i) { for (let i = 0; i < keys.length; ++i) {
const fullName = `${keys[i]}\\${value}` const fullName = `${keys[i]}\\${value}`
switch (fullName) { switch (fullName) {
case 'HKLM\\Software\\Microsoft\\VisualStudio\\SxS\\VC7\\14.0': case 'HKLM\\Software\\Microsoft\\VisualStudio\\SxS\\VC7\\14.0':
@ -439,7 +431,7 @@ describe('find-visualstudio', function () {
finder.parseData(null, data, '', cb) finder.parseData(null, data, '', cb)
} }
finder.regSearchKeys = (keys, value, addOpts, cb) => { finder.regSearchKeys = (keys, value, addOpts, cb) => {
for (var i = 0; i < keys.length; ++i) { for (let i = 0; i < keys.length; ++i) {
const fullName = `${keys[i]}\\${value}` const fullName = `${keys[i]}\\${value}`
switch (fullName) { switch (fullName) {
case 'HKLM\\Software\\Microsoft\\VisualStudio\\SxS\\VC7\\14.0': case 'HKLM\\Software\\Microsoft\\VisualStudio\\SxS\\VC7\\14.0':

12
test/test-install.js
View file

@ -1,20 +1,17 @@
'use strict' 'use strict'
const { describe, it, after } = require('mocha') const { describe, it, after } = require('mocha')
const { rm } = require('fs/promises')
const assert = require('assert') const assert = require('assert')
const path = require('path') const path = require('path')
const os = require('os') const os = require('os')
const util = require('util') const util = require('util')
const { test: { download, install } } = require('../lib/install') const { test: { download, install } } = require('../lib/install')
const rimraf = require('rimraf')
const gyp = require('../lib/node-gyp') const gyp = require('../lib/node-gyp')
const log = require('npmlog')
const semver = require('semver') const semver = require('semver')
const stream = require('stream') const stream = require('stream')
const streamPipeline = util.promisify(stream.pipeline) const streamPipeline = util.promisify(stream.pipeline)
log.level = 'error' // we expect a warning
describe('install', function () { describe('install', function () {
it('EACCES retry once', async () => { it('EACCES retry once', async () => {
const fs = { const fs = {
@ -65,11 +62,11 @@ describe('install', function () {
} }
after(async () => { after(async () => {
await util.promisify(rimraf)(devDir) await rm(devDir, { recursive: true, force: true })
}) })
const expectedDir = path.join(devDir, process.version.replace(/^v/, '')) const expectedDir = path.join(devDir, process.version.replace(/^v/, ''))
await util.promisify(rimraf)(expectedDir) await rm(expectedDir, { recursive: true, force: true })
await Promise.all([ await Promise.all([
install(fs, prog, []), install(fs, prog, []),
@ -95,7 +92,6 @@ describe('install', function () {
prog.parseArgv([]) prog.parseArgv([])
prog.devDir = devDir prog.devDir = devDir
prog.opts.ensure = true prog.opts.ensure = true
log.level = 'warn'
await parallelInstallsTest(this, fs, devDir, prog) await parallelInstallsTest(this, fs, devDir, prog)
}) })
@ -110,7 +106,6 @@ describe('install', function () {
prog.parseArgv([]) prog.parseArgv([])
prog.devDir = devDir prog.devDir = devDir
prog.opts.ensure = false prog.opts.ensure = false
log.level = 'warn'
await parallelInstallsTest(this, fs, devDir, prog) await parallelInstallsTest(this, fs, devDir, prog)
}) })
@ -125,7 +120,6 @@ describe('install', function () {
prog.parseArgv([]) prog.parseArgv([])
prog.devDir = devDir prog.devDir = devDir
prog.opts.tarball = path.join(devDir, 'node-headers.tar.gz') prog.opts.tarball = path.join(devDir, 'node-headers.tar.gz')
log.level = 'warn'
await streamPipeline( await streamPipeline(
(await download(prog, `https://nodejs.org/dist/${process.version}/node-${process.version}.tar.gz`)).body, (await download(prog, `https://nodejs.org/dist/${process.version}/node-${process.version}.tar.gz`)).body,

36
test/test-process-release.js
View file

@ -6,7 +6,7 @@ const processRelease = require('../lib/process-release')
describe('process-release', function () { describe('process-release', function () {
it('test process release - process.version = 0.8.20', function () { it('test process release - process.version = 0.8.20', function () {
var release = processRelease([], { opts: {} }, 'v0.8.20', null) const release = processRelease([], { opts: {} }, 'v0.8.20', null)
assert.strictEqual(release.semver.version, '0.8.20') assert.strictEqual(release.semver.version, '0.8.20')
delete release.semver delete release.semver
@ -25,7 +25,7 @@ describe('process-release', function () {
}) })
it('test process release - process.version = 0.10.21', function () { it('test process release - process.version = 0.10.21', function () {
var release = processRelease([], { opts: {} }, 'v0.10.21', null) const release = processRelease([], { opts: {} }, 'v0.10.21', null)
assert.strictEqual(release.semver.version, '0.10.21') assert.strictEqual(release.semver.version, '0.10.21')
delete release.semver delete release.semver
@ -45,7 +45,7 @@ describe('process-release', function () {
// prior to -headers.tar.gz // prior to -headers.tar.gz
it('test process release - process.version = 0.12.9', function () { it('test process release - process.version = 0.12.9', function () {
var release = processRelease([], { opts: {} }, 'v0.12.9', null) const release = processRelease([], { opts: {} }, 'v0.12.9', null)
assert.strictEqual(release.semver.version, '0.12.9') assert.strictEqual(release.semver.version, '0.12.9')
delete release.semver delete release.semver
@ -65,7 +65,7 @@ describe('process-release', function () {
// prior to -headers.tar.gz // prior to -headers.tar.gz
it('test process release - process.version = 0.10.41', function () { it('test process release - process.version = 0.10.41', function () {
var release = processRelease([], { opts: {} }, 'v0.10.41', null) const release = processRelease([], { opts: {} }, 'v0.10.41', null)
assert.strictEqual(release.semver.version, '0.10.41') assert.strictEqual(release.semver.version, '0.10.41')
delete release.semver delete release.semver
@ -85,7 +85,7 @@ describe('process-release', function () {
// has -headers.tar.gz // has -headers.tar.gz
it('test process release - process.release ~ node@0.10.42', function () { it('test process release - process.release ~ node@0.10.42', function () {
var release = processRelease([], { opts: {} }, 'v0.10.42', null) const release = processRelease([], { opts: {} }, 'v0.10.42', null)
assert.strictEqual(release.semver.version, '0.10.42') assert.strictEqual(release.semver.version, '0.10.42')
delete release.semver delete release.semver
@ -105,7 +105,7 @@ describe('process-release', function () {
// has -headers.tar.gz // has -headers.tar.gz
it('test process release - process.release ~ node@0.12.10', function () { it('test process release - process.release ~ node@0.12.10', function () {
var release = processRelease([], { opts: {} }, 'v0.12.10', null) const release = processRelease([], { opts: {} }, 'v0.12.10', null)
assert.strictEqual(release.semver.version, '0.12.10') assert.strictEqual(release.semver.version, '0.12.10')
delete release.semver delete release.semver
@ -124,7 +124,7 @@ describe('process-release', function () {
}) })
it('test process release - process.release ~ node@4.1.23', function () { it('test process release - process.release ~ node@4.1.23', function () {
var release = processRelease([], { opts: {} }, 'v4.1.23', { const release = processRelease([], { opts: {} }, 'v4.1.23', {
name: 'node', name: 'node',
headersUrl: 'https://nodejs.org/dist/v4.1.23/node-v4.1.23-headers.tar.gz' headersUrl: 'https://nodejs.org/dist/v4.1.23/node-v4.1.23-headers.tar.gz'
}) })
@ -146,7 +146,7 @@ describe('process-release', function () {
}) })
it('test process release - process.release ~ node@4.1.23 / corp build', function () { it('test process release - process.release ~ node@4.1.23 / corp build', function () {
var release = processRelease([], { opts: {} }, 'v4.1.23', { const release = processRelease([], { opts: {} }, 'v4.1.23', {
name: 'node', name: 'node',
headersUrl: 'https://some.custom.location/node-v4.1.23-headers.tar.gz' headersUrl: 'https://some.custom.location/node-v4.1.23-headers.tar.gz'
}) })
@ -168,7 +168,7 @@ describe('process-release', function () {
}) })
it('test process release - process.release ~ node@12.8.0 Windows', function () { it('test process release - process.release ~ node@12.8.0 Windows', function () {
var release = processRelease([], { opts: {} }, 'v12.8.0', { const release = processRelease([], { opts: {} }, 'v12.8.0', {
name: 'node', name: 'node',
sourceUrl: 'https://nodejs.org/download/release/v12.8.0/node-v12.8.0.tar.gz', sourceUrl: 'https://nodejs.org/download/release/v12.8.0/node-v12.8.0.tar.gz',
headersUrl: 'https://nodejs.org/download/release/v12.8.0/node-v12.8.0-headers.tar.gz', headersUrl: 'https://nodejs.org/download/release/v12.8.0/node-v12.8.0-headers.tar.gz',
@ -192,7 +192,7 @@ describe('process-release', function () {
}) })
it('test process release - process.release ~ node@12.8.0 Windows ARM64', function () { it('test process release - process.release ~ node@12.8.0 Windows ARM64', function () {
var release = processRelease([], { opts: {} }, 'v12.8.0', { const release = processRelease([], { opts: {} }, 'v12.8.0', {
name: 'node', name: 'node',
sourceUrl: 'https://unofficial-builds.nodejs.org/download/release/v12.8.0/node-v12.8.0.tar.gz', sourceUrl: 'https://unofficial-builds.nodejs.org/download/release/v12.8.0/node-v12.8.0.tar.gz',
headersUrl: 'https://unofficial-builds.nodejs.org/download/release/v12.8.0/node-v12.8.0-headers.tar.gz', headersUrl: 'https://unofficial-builds.nodejs.org/download/release/v12.8.0/node-v12.8.0-headers.tar.gz',
@ -216,7 +216,7 @@ describe('process-release', function () {
}) })
it('test process release - process.release ~ node@4.1.23 --target=0.10.40', function () { it('test process release - process.release ~ node@4.1.23 --target=0.10.40', function () {
var release = processRelease([], { opts: { target: '0.10.40' } }, 'v4.1.23', { const release = processRelease([], { opts: { target: '0.10.40' } }, 'v4.1.23', {
name: 'node', name: 'node',
headersUrl: 'https://nodejs.org/dist/v4.1.23/node-v4.1.23-headers.tar.gz' headersUrl: 'https://nodejs.org/dist/v4.1.23/node-v4.1.23-headers.tar.gz'
}) })
@ -238,7 +238,7 @@ describe('process-release', function () {
}) })
it('test process release - process.release ~ node@4.1.23 --dist-url=https://foo.bar/baz', function () { it('test process release - process.release ~ node@4.1.23 --dist-url=https://foo.bar/baz', function () {
var release = processRelease([], { opts: { 'dist-url': 'https://foo.bar/baz' } }, 'v4.1.23', { const release = processRelease([], { opts: { 'dist-url': 'https://foo.bar/baz' } }, 'v4.1.23', {
name: 'node', name: 'node',
headersUrl: 'https://nodejs.org/dist/v4.1.23/node-v4.1.23-headers.tar.gz' headersUrl: 'https://nodejs.org/dist/v4.1.23/node-v4.1.23-headers.tar.gz'
}) })
@ -260,7 +260,7 @@ describe('process-release', function () {
}) })
it('test process release - process.release ~ frankenstein@4.1.23', function () { it('test process release - process.release ~ frankenstein@4.1.23', function () {
var release = processRelease([], { opts: {} }, 'v4.1.23', { const release = processRelease([], { opts: {} }, 'v4.1.23', {
name: 'frankenstein', name: 'frankenstein',
headersUrl: 'https://frankensteinjs.org/dist/v4.1.23/frankenstein-v4.1.23-headers.tar.gz' headersUrl: 'https://frankensteinjs.org/dist/v4.1.23/frankenstein-v4.1.23-headers.tar.gz'
}) })
@ -282,7 +282,7 @@ describe('process-release', function () {
}) })
it('test process release - process.release ~ frankenstein@4.1.23 --dist-url=http://foo.bar/baz/', function () { it('test process release - process.release ~ frankenstein@4.1.23 --dist-url=http://foo.bar/baz/', function () {
var release = processRelease([], { opts: { 'dist-url': 'http://foo.bar/baz/' } }, 'v4.1.23', { const release = processRelease([], { opts: { 'dist-url': 'http://foo.bar/baz/' } }, 'v4.1.23', {
name: 'frankenstein', name: 'frankenstein',
headersUrl: 'https://frankensteinjs.org/dist/v4.1.23/frankenstein-v4.1.23.tar.gz' headersUrl: 'https://frankensteinjs.org/dist/v4.1.23/frankenstein-v4.1.23.tar.gz'
}) })
@ -304,7 +304,7 @@ describe('process-release', function () {
}) })
it('test process release - process.release ~ node@4.0.0-rc.4', function () { it('test process release - process.release ~ node@4.0.0-rc.4', function () {
var release = processRelease([], { opts: {} }, 'v4.0.0-rc.4', { const release = processRelease([], { opts: {} }, 'v4.0.0-rc.4', {
name: 'node', name: 'node',
headersUrl: 'https://nodejs.org/download/rc/v4.0.0-rc.4/node-v4.0.0-rc.4-headers.tar.gz' headersUrl: 'https://nodejs.org/download/rc/v4.0.0-rc.4/node-v4.0.0-rc.4-headers.tar.gz'
}) })
@ -328,7 +328,7 @@ describe('process-release', function () {
it('test process release - process.release ~ node@4.0.0-rc.4 passed as argv[0]', function () { it('test process release - process.release ~ node@4.0.0-rc.4 passed as argv[0]', function () {
// note the missing 'v' on the arg, it should normalise when checking // note the missing 'v' on the arg, it should normalise when checking
// whether we're on the default or not // whether we're on the default or not
var release = processRelease(['4.0.0-rc.4'], { opts: {} }, 'v4.0.0-rc.4', { const release = processRelease(['4.0.0-rc.4'], { opts: {} }, 'v4.0.0-rc.4', {
name: 'node', name: 'node',
headersUrl: 'https://nodejs.org/download/rc/v4.0.0-rc.4/node-v4.0.0-rc.4-headers.tar.gz' headersUrl: 'https://nodejs.org/download/rc/v4.0.0-rc.4/node-v4.0.0-rc.4-headers.tar.gz'
}) })
@ -352,7 +352,7 @@ describe('process-release', function () {
it('test process release - process.release ~ node@4.0.0-rc.4 - bogus string passed as argv[0]', function () { it('test process release - process.release ~ node@4.0.0-rc.4 - bogus string passed as argv[0]', function () {
// additional arguments can be passed in on the commandline that should be ignored if they // additional arguments can be passed in on the commandline that should be ignored if they
// are not specifying a valid version @ position 0 // are not specifying a valid version @ position 0
var release = processRelease(['this is no version!'], { opts: {} }, 'v4.0.0-rc.4', { const release = processRelease(['this is no version!'], { opts: {} }, 'v4.0.0-rc.4', {
name: 'node', name: 'node',
headersUrl: 'https://nodejs.org/download/rc/v4.0.0-rc.4/node-v4.0.0-rc.4-headers.tar.gz' headersUrl: 'https://nodejs.org/download/rc/v4.0.0-rc.4/node-v4.0.0-rc.4-headers.tar.gz'
}) })
@ -376,7 +376,7 @@ describe('process-release', function () {
it('test process release - NODEJS_ORG_MIRROR', function () { it('test process release - NODEJS_ORG_MIRROR', function () {
process.env.NODEJS_ORG_MIRROR = 'http://foo.bar' process.env.NODEJS_ORG_MIRROR = 'http://foo.bar'
var release = processRelease([], { opts: {} }, 'v4.1.23', { const release = processRelease([], { opts: {} }, 'v4.1.23', {
name: 'node', name: 'node',
headersUrl: 'https://nodejs.org/dist/v4.1.23/node-v4.1.23-headers.tar.gz' headersUrl: 'https://nodejs.org/dist/v4.1.23/node-v4.1.23-headers.tar.gz'
}) })