@@ -156,7 +156,7 @@ function unescape(str) {
156156 return str ;
157157}
158158
159- } , { "glob-base" :4 , "is-dotfile" :7 , "is-extglob" :8 , "is-glob" :9 } ] , 2 :[ function ( require , module , exports ) {
159+ } , { "glob-base" :4 , "is-dotfile" :6 , "is-extglob" :7 , "is-glob" :8 } ] , 2 :[ function ( require , module , exports ) {
160160( function ( process ) {
161161// Copyright Joyent, Inc. and other Node contributors.
162162//
@@ -456,6 +456,7 @@ process.umask = function() { return 0; };
456456
457457var path = require ( 'path' ) ;
458458var parent = require ( 'glob-parent' ) ;
459+ var isGlob = require ( 'is-glob' ) ;
459460
460461module . exports = function globBase ( pattern ) {
461462 if ( typeof pattern !== 'string' ) {
@@ -464,7 +465,7 @@ module.exports = function globBase(pattern) {
464465
465466 var res = { } ;
466467 res . base = parent ( pattern ) ;
467- res . isGlob = res . base !== pattern ;
468+ res . isGlob = isGlob ( pattern ) ;
468469
469470 if ( res . base !== '.' ) {
470471 res . glob = pattern . substr ( res . base . length ) ;
@@ -496,31 +497,19 @@ function dirname(glob) {
496497 return path . dirname ( glob ) ;
497498}
498499
499- } , { "glob-parent" :5 , "path" :2 } ] , 5 :[ function ( require , module , exports ) {
500+ } , { "glob-parent" :5 , "is-glob" : 8 , " path" :2 } ] , 5 :[ function ( require , module , exports ) {
500501'use strict' ;
501502
502503var path = require ( 'path' ) ;
503504var isglob = require ( 'is-glob' ) ;
504505
505506module . exports = function globParent ( str ) {
506- while ( isglob ( str ) ) str = path . dirname ( str ) ;
507+ str += 'a' ; // preserves full path in case of trailing path separator
508+ do { str = path . dirname ( str ) } while ( isglob ( str ) ) ;
507509 return str ;
508510} ;
509511
510- } , { "is-glob" :6 , "path" :2 } ] , 6 :[ function ( require , module , exports ) {
511- /*!
512- * is-glob <https://github.com/jonschlinkert/is-glob>
513- *
514- * Copyright (c) 2014-2015, Jon Schlinkert.
515- * Licensed under the MIT License.
516- */
517-
518- module . exports = function isGlob ( str ) {
519- return typeof str === 'string'
520- && / [ ! * { } ? ( | ) [ \] ] / . test ( str ) ;
521- } ;
522-
523- } , { } ] , 7 :[ function ( require , module , exports ) {
512+ } , { "is-glob" :8 , "path" :2 } ] , 6 :[ function ( require , module , exports ) {
524513/*!
525514 * is-dotfile <https://github.com/regexps/is-dotfile>
526515 *
@@ -537,7 +526,7 @@ module.exports = function(str) {
537526 return last !== - 1 ? str . charCodeAt ( last + 1 ) === 46 /* . */ : false ;
538527} ;
539528
540- } , { } ] , 8 :[ function ( require , module , exports ) {
529+ } , { } ] , 7 :[ function ( require , module , exports ) {
541530/*!
542531 * is-extglob <https://github.com/jonschlinkert/is-extglob>
543532 *
@@ -550,6 +539,16 @@ module.exports = function isExtglob(str) {
550539 && / [ @ ? ! + * ] \( / . test ( str ) ;
551540} ;
552541
553- } , { } ] , 9 :[ function ( require , module , exports ) {
554- arguments [ 4 ] [ 6 ] [ 0 ] . apply ( exports , arguments )
555- } , { "dup" :6 } ] } , { } , [ 1 ] ) ;
542+ } , { } ] , 8 :[ function ( require , module , exports ) {
543+ /*!
544+ * is-glob <https://github.com/jonschlinkert/is-glob>
545+ *
546+ * Copyright (c) 2014-2015, Jon Schlinkert.
547+ * Licensed under the MIT License.
548+ */
549+
550+ module . exports = function isGlob ( str ) {
551+ return typeof str === 'string'
552+ && / [ @ ! * + { } ? ( | ) [ \] ] / . test ( str ) ;
553+ } ;
554+ } , { } ] } , { } , [ 1 ] ) ;
0 commit comments