From 279d409d51dc1203e31e9846b27d247520792a88 Mon Sep 17 00:00:00 2001 From: doowb Date: Mon, 27 Mar 2017 19:44:19 -0400 Subject: [PATCH 1/2] use micromatch.isMatch --- lib/install.js | 5 ++--- package.json | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/install.js b/lib/install.js index fa2e1c5430..58a9fa9cd2 100644 --- a/lib/install.js +++ b/lib/install.js @@ -20,7 +20,7 @@ var fs = require('graceful-fs') , semver = require('semver') , fstream = require('fstream') , request = require('request') - , minimatch = require('minimatch') + , micromatch = require('micromatch') , mkdir = require('mkdirp') , processRelease = require('./process-release') , win = process.platform == 'win32' @@ -396,8 +396,7 @@ function install (gyp, argv, callback) { function valid (file) { // header files - return minimatch(file, '*.h', { matchBase: true }) || - minimatch(file, '*.gypi', { matchBase: true }) + return micromatch.isMatch(file, '*.{h,gypi}', { matchBase: true }); } /** diff --git a/package.json b/package.json index 3b5071d6ac..9782dbac6f 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "fstream": "^1.0.0", "glob": "^7.0.3", "graceful-fs": "^4.1.2", - "minimatch": "^3.0.2", + "micromatch": "^2.3.11", "mkdirp": "^0.5.0", "nopt": "2 || 3", "npmlog": "0 || 1 || 2 || 3 || 4", From 5dc15473e8dc07de71226bdcbe80c8df46bdd907 Mon Sep 17 00:00:00 2001 From: doowb Date: Fri, 30 Jun 2017 16:35:09 -0400 Subject: [PATCH 2/2] check extname directly --- lib/install.js | 4 ++-- package.json | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/install.js b/lib/install.js index 5b7a771fc8..830bc8de56 100644 --- a/lib/install.js +++ b/lib/install.js @@ -18,7 +18,6 @@ var fs = require('graceful-fs') , log = require('npmlog') , semver = require('semver') , request = require('request') - , micromatch = require('micromatch') , mkdir = require('mkdirp') , processRelease = require('./process-release') , win = process.platform == 'win32' @@ -390,7 +389,8 @@ function install (gyp, argv, callback) { function valid (file) { // header files - return micromatch.isMatch(file, '*.{h,gypi}', { matchBase: true }); + var extname = path.extname(file); + return extname === '.h' || extname === '.gypi'; } /** diff --git a/package.json b/package.json index de0fe85de7..a8e5fe9f27 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,6 @@ "dependencies": { "glob": "^7.0.3", "graceful-fs": "^4.1.2", - "micromatch": "^2.3.11", "mkdirp": "^0.5.0", "nopt": "2 || 3", "npmlog": "0 || 1 || 2 || 3 || 4",