Fixes #154: Inline no longer maintained noop-logger (#155)

prebuild · Jun 3, 2021 · e08d75a · e08d75a
1 parent 5ee1a2f
commit e08d75a
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 16 deletions.
diff --git a/asset.js b/asset.js
@@ -1,15 +1,11 @@
 var get = require('simple-get')
 var util = require('./util')
 var proxy = require('./proxy')
-var noop = Object.assign({
-  http: function () {},
-  silly: function () {}
-}, require('noop-logger'))
 
 function findAssetId (opts, cb) {
   var downloadUrl = util.getDownloadUrl(opts)
   var apiUrl = util.getApiUrl(opts)
-  var log = opts.log || noop
+  var log = opts.log || util.noopLogger
 
   log.http('request', 'GET ' + apiUrl)
   var reqOpts = proxy({

diff --git a/download.js b/download.js
@@ -3,10 +3,6 @@ var fs = require('fs')
 var get = require('simple-get')
 var pump = require('pump')
 var tfs = require('tar-fs')
-var noop = Object.assign({
-  http: function () {},
-  silly: function () {}
-}, require('noop-logger'))
 var zlib = require('zlib')
 var util = require('./util')
 var error = require('./error')
@@ -17,7 +13,7 @@ function downloadPrebuild (downloadUrl, opts, cb) {
   var cachedPrebuild = util.cachedPrebuild(downloadUrl)
   var localPrebuild = util.localPrebuild(downloadUrl, opts)
   var tempFile = util.tempFile(cachedPrebuild)
-  var log = opts.log || noop
+  var log = opts.log || util.noopLogger
 
   if (opts.nolocal) return download()
 

diff --git a/package.json b/package.json
@@ -27,7 +27,6 @@
     "mkdirp-classic": "^0.5.3",
     "napi-build-utils": "^1.0.1",
     "node-abi": "^2.21.0",
-    "noop-logger": "^0.1.1",
     "npmlog": "^4.0.1",
     "pump": "^3.0.0",
     "rc": "^1.2.7",

diff --git a/proxy.js b/proxy.js
@@ -1,12 +1,9 @@
 var url = require('url')
 var tunnel = require('tunnel-agent')
-var noop = Object.assign({
-  http: function () {},
-  silly: function () {}
-}, require('noop-logger'))
+var util = require('./util')
 
 function applyProxy (reqOpts, opts) {
-  var log = opts.log || noop
+  var log = opts.log || util.noopLogger
 
   var proxy = opts['https-proxy'] || opts.proxy
 

diff --git a/util.js b/util.js
@@ -115,6 +115,21 @@ function localPrebuild (url, opts) {
   return path.join(prefix, path.basename(url))
 }
 
+var noopLogger = {
+  http: function () {},
+  silly: function () {},
+  debug: function () {},
+  info: function () {},
+  warn: function () {},
+  error: function () {},
+  critical: function () {},
+  alert: function () {},
+  emergency: function () {},
+  notice: function () {},
+  verbose: function () {},
+  fatal: function () {}
+}
+
 exports.getDownloadUrl = getDownloadUrl
 exports.getApiUrl = getApiUrl
 exports.getAssetUrl = getAssetUrl
@@ -125,3 +140,4 @@ exports.prebuildCache = prebuildCache
 exports.npmCache = npmCache
 exports.tempFile = tempFile
 exports.packageOrigin = packageOrigin
+exports.noopLogger = noopLogger