Skip to content

Commit 5b9688c

Browse files
ruyadornoruyadorno
authored
1 parent fb4cc24 commit 5b9688c

13 files changed

Lines changed: 104 additions & 83 deletions

File tree

‎node_modules/glob/common.js‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ function ownProp (obj, field) {
1313
var fs = require("fs")
1414
var path = require("path")
1515
var minimatch = require("minimatch")
16-
var isAbsolute = require("path-is-absolute")
16+
var isAbsolute = require("path").isAbsolute
1717
var Minimatch = minimatch.Minimatch
1818

1919
function alphasort (a, b) {
@@ -88,24 +88,26 @@ function setopts (self, pattern, options) {
8888
self.changedCwd = false
8989
var cwd = process.cwd()
9090
if (!ownProp(options, "cwd"))
91-
self.cwd = cwd
91+
self.cwd = path.resolve(cwd)
9292
else {
9393
self.cwd = path.resolve(options.cwd)
9494
self.changedCwd = self.cwd !== cwd
9595
}
9696

9797
self.root = options.root || path.resolve(self.cwd, "/")
9898
self.root = path.resolve(self.root)
99-
if (process.platform === "win32")
100-
self.root = self.root.replace(/\\/g, "/")
10199

102100
// TODO: is an absolute `cwd` supposed to be resolved against `root`?
103101
// e.g. { cwd: '/test', root: __dirname } === path.join(__dirname, '/test')
104102
self.cwdAbs = isAbsolute(self.cwd) ? self.cwd : makeAbs(self, self.cwd)
105-
if (process.platform === "win32")
106-
self.cwdAbs = self.cwdAbs.replace(/\\/g, "/")
107103
self.nomount = !!options.nomount
108104

105+
if (process.platform === "win32") {
106+
self.root = self.root.replace(/\\/g, "/")
107+
self.cwd = self.cwd.replace(/\\/g, "/")
108+
self.cwdAbs = self.cwdAbs.replace(/\\/g, "/")
109+
}
110+
109111
// disable comments and negation in Minimatch.
110112
// Note that they are not supported in Glob itself anyway.
111113
options.nonegate = true

‎node_modules/glob/glob.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ var inherits = require('inherits')
4747
var EE = require('events').EventEmitter
4848
var path = require('path')
4949
var assert = require('assert')
50-
var isAbsolute = require('path-is-absolute')
50+
var isAbsolute = require('path').isAbsolute
5151
var globSync = require('./sync.js')
5252
var common = require('./common.js')
5353
var setopts = common.setopts

‎node_modules/glob/package.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"author": "Isaac Z. Schlueter <[email protected]> (http://blog.izs.me/)",
33
"name": "glob",
44
"description": "a little globber",
5-
"version": "8.0.1",
5+
"version": "8.0.3",
66
"repository": {
77
"type": "git",
88
"url": "git://github.com/isaacs/node-glob.git"
@@ -21,8 +21,7 @@
2121
"inflight": "^1.0.4",
2222
"inherits": "2",
2323
"minimatch": "^5.0.1",
24-
"once": "^1.3.0",
25-
"path-is-absolute": "^1.0.0"
24+
"once": "^1.3.0"
2625
},
2726
"devDependencies": {
2827
"memfs": "^3.2.0",

‎node_modules/glob/sync.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ var Glob = require('./glob.js').Glob
88
var util = require('util')
99
var path = require('path')
1010
var assert = require('assert')
11-
var isAbsolute = require('path-is-absolute')
11+
var isAbsolute = require('path').isAbsolute
1212
var common = require('./common.js')
1313
var setopts = common.setopts
1414
var ownProp = common.ownProp
@@ -48,7 +48,7 @@ function GlobSync (pattern, options) {
4848
}
4949

5050
GlobSync.prototype._finish = function () {
51-
assert(this instanceof GlobSync)
51+
assert.ok(this instanceof GlobSync)
5252
if (this.realpath) {
5353
var self = this
5454
this.matches.forEach(function (matchset, index) {
@@ -72,7 +72,7 @@ GlobSync.prototype._finish = function () {
7272

7373

7474
GlobSync.prototype._process = function (pattern, index, inGlobStar) {
75-
assert(this instanceof GlobSync)
75+
assert.ok(this instanceof GlobSync)
7676

7777
// Get the first [n] parts of pattern that are all strings.
7878
var n = 0

‎node_modules/node-gyp/node_modules/glob/common.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ function setopts (self, pattern, options) {
110110
// Note that they are not supported in Glob itself anyway.
111111
options.nonegate = true
112112
options.nocomment = true
113+
// always treat \ in patterns as escapes, not path separators
114+
options.allowWindowsEscape = false
113115

114116
self.minimatch = new Minimatch(pattern, options)
115117
self.options = self.minimatch.options

‎node_modules/node-gyp/node_modules/glob/glob.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,10 @@ Glob.prototype._process = function (pattern, index, inGlobStar, cb) {
342342
var read
343343
if (prefix === null)
344344
read = '.'
345-
else if (isAbsolute(prefix) || isAbsolute(pattern.join('/'))) {
345+
else if (isAbsolute(prefix) ||
346+
isAbsolute(pattern.map(function (p) {
347+
return typeof p === 'string' ? p : '[*]'
348+
}).join('/'))) {
346349
if (!prefix || !isAbsolute(prefix))
347350
prefix = '/' + prefix
348351
read = prefix

‎node_modules/node-gyp/node_modules/glob/package.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
"author": "Isaac Z. Schlueter <[email protected]> (http://blog.izs.me/)",
33
"name": "glob",
44
"description": "a little globber",
5-
"version": "7.2.0",
5+
"version": "7.2.3",
6+
"publishConfig": {
7+
"tag": "v7-legacy"
8+
},
69
"repository": {
710
"type": "git",
811
"url": "git://github.com/isaacs/node-glob.git"
@@ -20,7 +23,7 @@
2023
"fs.realpath": "^1.0.0",
2124
"inflight": "^1.0.4",
2225
"inherits": "2",
23-
"minimatch": "^3.0.4",
26+
"minimatch": "^3.1.1",
2427
"once": "^1.3.0",
2528
"path-is-absolute": "^1.0.0"
2629
},

‎node_modules/node-gyp/node_modules/glob/sync.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function GlobSync (pattern, options) {
4848
}
4949

5050
GlobSync.prototype._finish = function () {
51-
assert(this instanceof GlobSync)
51+
assert.ok(this instanceof GlobSync)
5252
if (this.realpath) {
5353
var self = this
5454
this.matches.forEach(function (matchset, index) {
@@ -72,7 +72,7 @@ GlobSync.prototype._finish = function () {
7272

7373

7474
GlobSync.prototype._process = function (pattern, index, inGlobStar) {
75-
assert(this instanceof GlobSync)
75+
assert.ok(this instanceof GlobSync)
7676

7777
// Get the first [n] parts of pattern that are all strings.
7878
var n = 0
@@ -109,7 +109,10 @@ GlobSync.prototype._process = function (pattern, index, inGlobStar) {
109109
var read
110110
if (prefix === null)
111111
read = '.'
112-
else if (isAbsolute(prefix) || isAbsolute(pattern.join('/'))) {
112+
else if (isAbsolute(prefix) ||
113+
isAbsolute(pattern.map(function (p) {
114+
return typeof p === 'string' ? p : '[*]'
115+
}).join('/'))) {
113116
if (!prefix || !isAbsolute(prefix))
114117
prefix = '/' + prefix
115118
read = prefix

‎node_modules/rimraf/node_modules/glob/common.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ function setopts (self, pattern, options) {
110110
// Note that they are not supported in Glob itself anyway.
111111
options.nonegate = true
112112
options.nocomment = true
113+
// always treat \ in patterns as escapes, not path separators
114+
options.allowWindowsEscape = false
113115

114116
self.minimatch = new Minimatch(pattern, options)
115117
self.options = self.minimatch.options

‎node_modules/rimraf/node_modules/glob/glob.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,10 @@ Glob.prototype._process = function (pattern, index, inGlobStar, cb) {
342342
var read
343343
if (prefix === null)
344344
read = '.'
345-
else if (isAbsolute(prefix) || isAbsolute(pattern.join('/'))) {
345+
else if (isAbsolute(prefix) ||
346+
isAbsolute(pattern.map(function (p) {
347+
return typeof p === 'string' ? p : '[*]'
348+
}).join('/'))) {
346349
if (!prefix || !isAbsolute(prefix))
347350
prefix = '/' + prefix
348351
read = prefix

0 commit comments

Comments
 (0)