From 4191f6f1c47a36b4f8cf13348e6448f7b26c4943 Mon Sep 17 00:00:00 2001 From: aminya Date: Mon, 19 Oct 2020 20:43:22 -0500 Subject: [PATCH 01/10] update minimist --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6ad4e50..726ea47 100644 --- a/package.json +++ b/package.json @@ -5,10 +5,10 @@ "main": "index.js", "dependencies": { "execspawn": "^1.0.1", - "minimist": "^1.2.0", "mkdirp": "^0.5.1", "node-abi": "^2.0.0", "npm-run-path": "^3.1.0", + "minimist": "^1.2.5", "pump": "^3.0.0", "tar-fs": "^2.1.0" }, From a81f2ba67a61aec08312161fb5af287e5a1f60d7 Mon Sep 17 00:00:00 2001 From: aminya Date: Mon, 19 Oct 2020 20:50:28 -0500 Subject: [PATCH 02/10] update mkdirp --- index.js | 9 ++++----- package.json | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/index.js b/index.js index 005d8ab..32785a8 100644 --- a/index.js +++ b/index.js @@ -63,15 +63,14 @@ function prebuildify (opts, cb) { // over the local .bin folder. Counter that by (again) adding .bin to PATH. opts.env = npmRunPath.env({ env: opts.env, cwd: opts.cwd }) - mkdirp(opts.builds, function (err) { - if (err) return cb(err) + mkdirp(opts.builds).then(function () { loop(opts, function (err) { if (err) return cb(err) if (opts.artifacts) return copyRecursive(opts.artifacts, opts.builds, cb) return cb() }) - }) + }).catch(function (err) { return cb(err) }) } function loop (opts, cb) { @@ -197,7 +196,7 @@ function build (target, runtime, opts, cb) { args.push('--release') } - mkdirp(cache, function () { + mkdirp(cache).then(function () { var child = proc.spawn(opts.nodeGyp, args, { cwd: opts.cwd, env: opts.env, @@ -216,7 +215,7 @@ function build (target, runtime, opts, cb) { }) }) }) - }) + }).catch(function (err) { return console.warn(err) }) } function findBuild (dir, cb) { diff --git a/package.json b/package.json index 726ea47..dc7662e 100644 --- a/package.json +++ b/package.json @@ -5,9 +5,9 @@ "main": "index.js", "dependencies": { "execspawn": "^1.0.1", - "mkdirp": "^0.5.1", "node-abi": "^2.0.0", "npm-run-path": "^3.1.0", + "mkdirp": "^1.0.4", "minimist": "^1.2.5", "pump": "^3.0.0", "tar-fs": "^2.1.0" From 4e16973b40d7a6076ec1e1c3792ddb20f776feb2 Mon Sep 17 00:00:00 2001 From: aminya Date: Mon, 19 Oct 2020 20:51:05 -0500 Subject: [PATCH 03/10] update node-abi --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dc7662e..bbb23f8 100644 --- a/package.json +++ b/package.json @@ -5,9 +5,9 @@ "main": "index.js", "dependencies": { "execspawn": "^1.0.1", - "node-abi": "^2.0.0", "npm-run-path": "^3.1.0", "mkdirp": "^1.0.4", + "node-abi": "^2.19.1", "minimist": "^1.2.5", "pump": "^3.0.0", "tar-fs": "^2.1.0" From a047e196481ff840bfede69403beb7c482614834 Mon Sep 17 00:00:00 2001 From: aminya Date: Mon, 19 Oct 2020 20:52:29 -0500 Subject: [PATCH 04/10] update npm-run-path --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bbb23f8..8bfb5d5 100644 --- a/package.json +++ b/package.json @@ -5,9 +5,9 @@ "main": "index.js", "dependencies": { "execspawn": "^1.0.1", - "npm-run-path": "^3.1.0", "mkdirp": "^1.0.4", "node-abi": "^2.19.1", + "npm-run-path": "^4.0.1", "minimist": "^1.2.5", "pump": "^3.0.0", "tar-fs": "^2.1.0" From afb936f5b0cab05983b916775269d2b08340a7aa Mon Sep 17 00:00:00 2001 From: aminya Date: Mon, 19 Oct 2020 20:58:29 -0500 Subject: [PATCH 05/10] update nan --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8bfb5d5..d2a370f 100644 --- a/package.json +++ b/package.json @@ -13,9 +13,9 @@ "tar-fs": "^2.1.0" }, "devDependencies": { - "nan": "^2.5.1", "standard": "^13.0.1", - "tape": "^4.6.3" + "tape": "^4.6.3", + "nan": "^2.14.2" }, "bin": { "prebuildify": "./bin.js" From 20d030b85336e55d52e8b50fa6a9e56ca3feeaee Mon Sep 17 00:00:00 2001 From: aminya Date: Tue, 20 Oct 2020 03:42:53 -0500 Subject: [PATCH 06/10] Revert "update mkdirp" This reverts commit a81f2ba67a61aec08312161fb5af287e5a1f60d7. --- index.js | 9 +++++---- package.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/index.js b/index.js index 32785a8..005d8ab 100644 --- a/index.js +++ b/index.js @@ -63,14 +63,15 @@ function prebuildify (opts, cb) { // over the local .bin folder. Counter that by (again) adding .bin to PATH. opts.env = npmRunPath.env({ env: opts.env, cwd: opts.cwd }) - mkdirp(opts.builds).then(function () { + mkdirp(opts.builds, function (err) { + if (err) return cb(err) loop(opts, function (err) { if (err) return cb(err) if (opts.artifacts) return copyRecursive(opts.artifacts, opts.builds, cb) return cb() }) - }).catch(function (err) { return cb(err) }) + }) } function loop (opts, cb) { @@ -196,7 +197,7 @@ function build (target, runtime, opts, cb) { args.push('--release') } - mkdirp(cache).then(function () { + mkdirp(cache, function () { var child = proc.spawn(opts.nodeGyp, args, { cwd: opts.cwd, env: opts.env, @@ -215,7 +216,7 @@ function build (target, runtime, opts, cb) { }) }) }) - }).catch(function (err) { return console.warn(err) }) + }) } function findBuild (dir, cb) { diff --git a/package.json b/package.json index d2a370f..92b0a73 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "index.js", "dependencies": { "execspawn": "^1.0.1", - "mkdirp": "^1.0.4", + "mkdirp": "^0.5.3", "node-abi": "^2.19.1", "npm-run-path": "^4.0.1", "minimist": "^1.2.5", From 75564f1be22aa70955a371e695079f834f3fa472 Mon Sep 17 00:00:00 2001 From: aminya Date: Tue, 20 Oct 2020 03:43:21 -0500 Subject: [PATCH 07/10] downgrade to mkdirp-classic This hides the deprecation warning. Requested by prebuild maintainers. --- index.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index 005d8ab..3d9b168 100644 --- a/index.js +++ b/index.js @@ -4,7 +4,7 @@ var os = require('os') var path = require('path') var fs = require('fs') var abi = require('node-abi') -var mkdirp = require('mkdirp') +var mkdirp = require('mkdirp-classic') var tar = require('tar-fs') var pump = require('pump') var npmRunPath = require('npm-run-path') diff --git a/package.json b/package.json index 92b0a73..9a176d8 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "index.js", "dependencies": { "execspawn": "^1.0.1", - "mkdirp": "^0.5.3", + "mkdirp-classic": "^0.5.3", "node-abi": "^2.19.1", "npm-run-path": "^4.0.1", "minimist": "^1.2.5", From 247acf53006c53a0f15606971a75d152fedb313a Mon Sep 17 00:00:00 2001 From: aminya Date: Tue, 20 Oct 2020 03:43:35 -0500 Subject: [PATCH 08/10] fix sorting of devDependencies --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 9a176d8..d51cccc 100644 --- a/package.json +++ b/package.json @@ -13,9 +13,9 @@ "tar-fs": "^2.1.0" }, "devDependencies": { + "nan": "^2.14.2", "standard": "^13.0.1", - "tape": "^4.6.3", - "nan": "^2.14.2" + "tape": "^4.6.3" }, "bin": { "prebuildify": "./bin.js" From 89708ea4fed14090e5a746239b5b380fc3349d4c Mon Sep 17 00:00:00 2001 From: aminya Date: Tue, 20 Oct 2020 03:46:13 -0500 Subject: [PATCH 09/10] downgrade npm-run-path --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d51cccc..7f53e50 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "execspawn": "^1.0.1", "mkdirp-classic": "^0.5.3", "node-abi": "^2.19.1", - "npm-run-path": "^4.0.1", + "npm-run-path": "^3", "minimist": "^1.2.5", "pump": "^3.0.0", "tar-fs": "^2.1.0" From 9a8a426155766d24f67ee64e85592ea872d3d13e Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Sun, 25 Oct 2020 07:36:39 -0500 Subject: [PATCH 10/10] do not install future 3.* patches for npm-run-path Co-authored-by: Vincent Weevers --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7f53e50..51d10fc 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "execspawn": "^1.0.1", "mkdirp-classic": "^0.5.3", "node-abi": "^2.19.1", - "npm-run-path": "^3", + "npm-run-path": "^3.1.0", "minimist": "^1.2.5", "pump": "^3.0.0", "tar-fs": "^2.1.0"