@vercel/static-build 1.3.20 → 1.3.22

package/dist/index.js

@@ -3288,7 +3288,7 @@ exports.libFiles = libFiles;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 
 var ts = __webpack_require__(11);
-var minimatch = __webpack_require__(7767);
+var minimatch = __webpack_require__(7345);
 var fastGlob = __webpack_require__(4910);
 var fs$1 = __webpack_require__(5747);
 var mkdirp = __webpack_require__(7981);
@@ -196366,16 +196366,16 @@ module.exports = micromatch;
 
 /***/ }),
 
-/***/ 7767:
+/***/ 7345:
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
 module.exports = minimatch
 minimatch.Minimatch = Minimatch
 
-var path = { sep: '/' }
-try {
-  path = __webpack_require__(5622)
-} catch (er) {}
+var path = (function () { try { return __webpack_require__(5622) } catch (e) {}}()) || {
+  sep: '/'
+}
+minimatch.sep = path.sep
 
 var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}
 var expand = __webpack_require__(490)
@@ -196427,43 +196427,64 @@ function filter (pattern, options) {
 }
 
 function ext (a, b) {
-  a = a || {}
   b = b || {}
   var t = {}
-  Object.keys(b).forEach(function (k) {
-    t[k] = b[k]
-  })
   Object.keys(a).forEach(function (k) {
     t[k] = a[k]
   })
+  Object.keys(b).forEach(function (k) {
+    t[k] = b[k]
+  })
   return t
 }
 
 minimatch.defaults = function (def) {
-  if (!def || !Object.keys(def).length) return minimatch
+  if (!def || typeof def !== 'object' || !Object.keys(def).length) {
+    return minimatch
+  }
 
   var orig = minimatch
 
   var m = function minimatch (p, pattern, options) {
-    return orig.minimatch(p, pattern, ext(def, options))
+    return orig(p, pattern, ext(def, options))
   }
 
   m.Minimatch = function Minimatch (pattern, options) {
     return new orig.Minimatch(pattern, ext(def, options))
   }
+  m.Minimatch.defaults = function defaults (options) {
+    return orig.defaults(ext(def, options)).Minimatch
+  }
+
+  m.filter = function filter (pattern, options) {
+    return orig.filter(pattern, ext(def, options))
+  }
+
+  m.defaults = function defaults (options) {
+    return orig.defaults(ext(def, options))
+  }
+
+  m.makeRe = function makeRe (pattern, options) {
+    return orig.makeRe(pattern, ext(def, options))
+  }
+
+  m.braceExpand = function braceExpand (pattern, options) {
+    return orig.braceExpand(pattern, ext(def, options))
+  }
+
+  m.match = function (list, pattern, options) {
+    return orig.match(list, pattern, ext(def, options))
+  }
 
   return m
 }
 
 Minimatch.defaults = function (def) {
-  if (!def || !Object.keys(def).length) return Minimatch
   return minimatch.defaults(def).Minimatch
 }
 
 function minimatch (p, pattern, options) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('glob pattern string required')
-  }
+  assertValidPattern(pattern)
 
   if (!options) options = {}
 
@@ -196472,9 +196493,6 @@ function minimatch (p, pattern, options) {
     return false
   }
 
-  // "" only matches ""
-  if (pattern.trim() === '') return p === ''
-
   return new Minimatch(pattern, options).match(p)
 }
 
@@ -196483,15 +196501,14 @@ function Minimatch (pattern, options) {
     return new Minimatch(pattern, options)
   }
 
-  if (typeof pattern !== 'string') {
-    throw new TypeError('glob pattern string required')
-  }
+  assertValidPattern(pattern)
 
   if (!options) options = {}
+
   pattern = pattern.trim()
 
   // windows support: need to use /, not \
-  if (path.sep !== '/') {
+  if (!options.allowWindowsEscape && path.sep !== '/') {
     pattern = pattern.split(path.sep).join('/')
   }
 
@@ -196502,6 +196519,7 @@ function Minimatch (pattern, options) {
   this.negate = false
   this.comment = false
   this.empty = false
+  this.partial = !!options.partial
 
   // make the set of regexps etc.
   this.make()
@@ -196511,9 +196529,6 @@ Minimatch.prototype.debug = function () {}
 
 Minimatch.prototype.make = make
 function make () {
-  // don't do it more than once.
-  if (this._made) return
-
   var pattern = this.pattern
   var options = this.options
 
@@ -196533,7 +196548,7 @@ function make () {
   // step 2: expand braces
   var set = this.globSet = this.braceExpand()
 
-  if (options.debug) this.debug = console.error
+  if (options.debug) this.debug = function debug() { console.error.apply(console, arguments) }
 
   this.debug(this.pattern, set)
 
@@ -196613,12 +196628,11 @@ function braceExpand (pattern, options) {
   pattern = typeof pattern === 'undefined'
     ? this.pattern : pattern
 
-  if (typeof pattern === 'undefined') {
-    throw new TypeError('undefined pattern')
-  }
+  assertValidPattern(pattern)
 
-  if (options.nobrace ||
-    !pattern.match(/\{.*\}/)) {
+  // Thanks to Yeting Li <https://github.com/yetingli> for
+  // improving this regexp to avoid a ReDOS vulnerability.
+  if (options.nobrace || !/\{(?:(?!\{).)*\}/.test(pattern)) {
     // shortcut. no need to expand.
     return [pattern]
   }
@@ -196626,6 +196640,17 @@ function braceExpand (pattern, options) {
   return expand(pattern)
 }
 
+var MAX_PATTERN_LENGTH = 1024 * 64
+var assertValidPattern = function (pattern) {
+  if (typeof pattern !== 'string') {
+    throw new TypeError('invalid pattern')
+  }
+
+  if (pattern.length > MAX_PATTERN_LENGTH) {
+    throw new TypeError('pattern is too long')
+  }
+}
+
 // parse a component of the expanded set.
 // At this point, no pattern may contain "/" in it
 // so we're going to return a 2d array, where each entry is the full
@@ -196640,14 +196665,17 @@ function braceExpand (pattern, options) {
 Minimatch.prototype.parse = parse
 var SUBPARSE = {}
 function parse (pattern, isSub) {
-  if (pattern.length > 1024 * 64) {
-    throw new TypeError('pattern is too long')
-  }
+  assertValidPattern(pattern)
 
   var options = this.options
 
   // shortcuts
-  if (!options.noglobstar && pattern === '**') return GLOBSTAR
+  if (pattern === '**') {
+    if (!options.noglobstar)
+      return GLOBSTAR
+    else
+      pattern = '*'
+  }
   if (pattern === '') return ''
 
   var re = ''
@@ -196703,10 +196731,12 @@ function parse (pattern, isSub) {
     }
 
     switch (c) {
-      case '/':
+      /* istanbul ignore next */
+      case '/': {
         // completely not allowed, even escaped.
         // Should already be path-split by now.
         return false
+      }
 
       case '\\':
         clearStateChar()
@@ -196825,25 +196855,23 @@ function parse (pattern, isSub) {
 
         // handle the case where we left a class open.
         // "[z-a]" is valid, equivalent to "\[z-a\]"
-        if (inClass) {
-          // split where the last [ was, make sure we don't have
-          // an invalid re. if so, re-walk the contents of the
-          // would-be class to re-translate any characters that
-          // were passed through as-is
-          // TODO: It would probably be faster to determine this
-          // without a try/catch and a new RegExp, but it's tricky
-          // to do safely.  For now, this is safe and works.
-          var cs = pattern.substring(classStart + 1, i)
-          try {
-            RegExp('[' + cs + ']')
-          } catch (er) {
-            // not a valid class!
-            var sp = this.parse(cs, SUBPARSE)
-            re = re.substr(0, reClassStart) + '\\[' + sp[0] + '\\]'
-            hasMagic = hasMagic || sp[1]
-            inClass = false
-            continue
-          }
+        // split where the last [ was, make sure we don't have
+        // an invalid re. if so, re-walk the contents of the
+        // would-be class to re-translate any characters that
+        // were passed through as-is
+        // TODO: It would probably be faster to determine this
+        // without a try/catch and a new RegExp, but it's tricky
+        // to do safely.  For now, this is safe and works.
+        var cs = pattern.substring(classStart + 1, i)
+        try {
+          RegExp('[' + cs + ']')
+        } catch (er) {
+          // not a valid class!
+          var sp = this.parse(cs, SUBPARSE)
+          re = re.substr(0, reClassStart) + '\\[' + sp[0] + '\\]'
+          hasMagic = hasMagic || sp[1]
+          inClass = false
+          continue
         }
 
         // finish up the class.
@@ -196927,9 +196955,7 @@ function parse (pattern, isSub) {
   // something that could conceivably capture a dot
   var addPatternStart = false
   switch (re.charAt(0)) {
-    case '.':
-    case '[':
-    case '(': addPatternStart = true
+    case '[': case '.': case '(': addPatternStart = true
   }
 
   // Hack to work around lack of negative lookbehind in JS
@@ -196991,7 +197017,7 @@ function parse (pattern, isSub) {
   var flags = options.nocase ? 'i' : ''
   try {
     var regExp = new RegExp('^' + re + '$', flags)
-  } catch (er) {
+  } catch (er) /* istanbul ignore next - should be impossible */ {
     // If it was an invalid regular expression, then it can't match
     // anything.  This trick looks for a character after the end of
     // the string, which is of course impossible, except in multi-line
@@ -197049,7 +197075,7 @@ function makeRe () {
 
   try {
     this.regexp = new RegExp(re, flags)
-  } catch (ex) {
+  } catch (ex) /* istanbul ignore next - should be impossible */ {
     this.regexp = false
   }
   return this.regexp
@@ -197067,8 +197093,8 @@ minimatch.match = function (list, pattern, options) {
   return list
 }
 
-Minimatch.prototype.match = match
-function match (f, partial) {
+Minimatch.prototype.match = function match (f, partial) {
+  if (typeof partial === 'undefined') partial = this.partial
   this.debug('match', f, this.pattern)
   // short-circuit in the case of busted things.
   // comments, etc.
@@ -197150,6 +197176,7 @@ Minimatch.prototype.matchOne = function (file, pattern, partial) {
 
     // should be impossible.
     // some invalid regexp stuff in the set.
+    /* istanbul ignore if */
     if (p === false) return false
 
     if (p === GLOBSTAR) {
@@ -197223,6 +197250,7 @@ Minimatch.prototype.matchOne = function (file, pattern, partial) {
       // no match was found.
       // However, in partial mode, we can't say this is necessarily over.
       // If there's more *pattern* left, then
+      /* istanbul ignore if */
       if (partial) {
         // ran out of file
         this.debug('\n>>> no match, partial?', file, fr, pattern, pr)
@@ -197236,11 +197264,7 @@ Minimatch.prototype.matchOne = function (file, pattern, partial) {
     // patterns with magic have been turned into regexps.
     var hit
     if (typeof p === 'string') {
-      if (options.nocase) {
-        hit = f.toLowerCase() === p.toLowerCase()
-      } else {
-        hit = f === p
-      }
+      hit = f === p
       this.debug('string match', p, f, hit)
     } else {
       hit = f.match(p)
@@ -197271,16 +197295,16 @@ Minimatch.prototype.matchOne = function (file, pattern, partial) {
     // this is ok if we're doing the match as part of
     // a glob fs traversal.
     return partial
-  } else if (pi === pl) {
+  } else /* istanbul ignore else */ if (pi === pl) {
     // ran out of pattern, still have file left.
     // this is only acceptable if we're on the very last
     // empty segment of a file with a trailing slash.
     // a/* should match a/b/
-    var emptyFileEnd = (fi === fl - 1) && (file[fi] === '')
-    return emptyFileEnd
+    return (fi === fl - 1) && (file[fi] === '')
   }
 
   // should be unreachable.
+  /* istanbul ignore next */
   throw new Error('wtf?')
 }
 
@@ -238273,7 +238297,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.detectBuilders = exports.detectOutputDirectory = exports.detectApiDirectory = exports.detectApiExtensions = exports.sortFiles = void 0;
-const minimatch_1 = __importDefault(__webpack_require__(7767));
+const minimatch_1 = __importDefault(__webpack_require__(7345));
 const semver_1 = __webpack_require__(1039);
 const path_1 = __webpack_require__(5622);
 const frameworks_1 = __importDefault(__webpack_require__(6678));
@@ -239730,6 +239754,7 @@ const monorepo_managers_1 = __webpack_require__(3315);
 const package_managers_1 = __webpack_require__(4501);
 const detect_framework_1 = __webpack_require__(7244);
 const json5_1 = __importDefault(__webpack_require__(3406));
+const semver_1 = __importDefault(__webpack_require__(1039));
 class MissingBuildPipeline extends Error {
     constructor() {
         super('Missing required `build` pipeline in turbo.json or package.json Turbo configuration.');
@@ -239759,17 +239784,22 @@ async function getMonorepoDefaultSettings(projectName, projectPath, relativeToRo
             detectorFilesystem.readFile('package.json').catch(() => null),
         ]);
         let hasBuildPipeline = false;
+        let turboSemVer = null;
         if (turboJSONBuf !== null) {
             const turboJSON = json5_1.default.parse(turboJSONBuf.toString('utf-8'));
             if (turboJSON?.pipeline?.build) {
                 hasBuildPipeline = true;
             }
         }
-        else if (packageJSONBuf !== null) {
+        if (packageJSONBuf !== null) {
             const packageJSON = JSON.parse(packageJSONBuf.toString('utf-8'));
             if (packageJSON?.turbo?.pipeline?.build) {
                 hasBuildPipeline = true;
             }
+            turboSemVer =
+                packageJSON?.dependencies?.turbo ||
+                    packageJSON?.devDependencies?.turbo ||
+                    null;
         }
         if (!hasBuildPipeline) {
             throw new MissingBuildPipeline();
@@ -239777,16 +239807,24 @@ async function getMonorepoDefaultSettings(projectName, projectPath, relativeToRo
         if (projectPath === '/') {
             return {
                 monorepoManager: 'turbo',
-                buildCommand: 'npx turbo run build',
+                buildCommand: 'turbo run build',
                 installCommand: packageManager ? `${packageManager} install` : null,
                 commandForIgnoringBuildStep: 'npx turbo-ignore',
             };
         }
+        let buildCommand = null;
+        if (projectPath) {
+            if (turboSemVer && !semver_1.default.intersects(turboSemVer, '<1.8.0')) {
+                buildCommand = `turbo run build`;
+            }
+            else {
+                // We don't know for sure if the local `turbo` supports inference.
+                buildCommand = `cd ${relativeToRoot} && turbo run build --filter={${projectPath}}...`;
+            }
+        }
         return {
             monorepoManager: 'turbo',
-            buildCommand: projectPath
-                ? `cd ${relativeToRoot} && npx turbo run build --filter={${projectPath}}...`
-                : null,
+            buildCommand,
             installCommand: packageManager === 'npm'
                 ? `${packageManager} install --prefix=${relativeToRoot}`
                 : packageManager
@@ -241626,7 +241664,7 @@ const PLUGIN_PATHS = {
 };
 async function injectPlugins(detectedVersion, dir) {
     const plugins = new Set();
-    if (process.env.VERCEL_GATSBY_BUILDER_PLUGIN === '1' && detectedVersion) {
+    if (detectedVersion) {
         const version = semver_1.default.coerce(detectedVersion);
         if (version && semver_1.default.satisfies(version, '>=4.0.0')) {
             plugins.add('@vercel/gatsby-plugin-vercel-builder');

package/dist/utils/gatsby.js

@@ -39,7 +39,7 @@ const PLUGIN_PATHS = {
 };
 async function injectPlugins(detectedVersion, dir) {
     const plugins = new Set();
-    if (process.env.VERCEL_GATSBY_BUILDER_PLUGIN === '1' && detectedVersion) {
+    if (detectedVersion) {
         const version = semver_1.default.coerce(detectedVersion);
         if (version && semver_1.default.satisfies(version, '>=4.0.0')) {
             plugins.add('@vercel/gatsby-plugin-vercel-builder');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vercel/static-build",
-  "version": "1.3.20",
-  "license": "MIT",
+  "version": "1.3.22",
+  "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/build-step",
   "files": [
@@ -29,8 +29,8 @@
     }
   },
   "dependencies": {
-    "@vercel/gatsby-plugin-vercel-analytics": "1.0.8",
-    "@vercel/gatsby-plugin-vercel-builder": "1.2.5"
+    "@vercel/gatsby-plugin-vercel-analytics": "1.0.9",
+    "@vercel/gatsby-plugin-vercel-builder": "1.2.7"
   },
   "devDependencies": {
     "@types/aws-lambda": "8.10.64",
@@ -42,12 +42,12 @@
     "@types/node-fetch": "2.5.4",
     "@types/promise-timeout": "1.3.0",
     "@types/semver": "7.3.13",
-    "@vercel/build-utils": "6.6.0",
-    "@vercel/frameworks": "1.3.3",
-    "@vercel/fs-detectors": "3.8.7",
+    "@vercel/build-utils": "6.7.1",
+    "@vercel/frameworks": "1.3.4",
+    "@vercel/fs-detectors": "3.8.9",
     "@vercel/ncc": "0.24.0",
-    "@vercel/routing-utils": "2.1.11",
-    "@vercel/static-config": "2.0.14",
+    "@vercel/routing-utils": "2.2.0",
+    "@vercel/static-config": "2.0.15",
     "execa": "3.2.0",
     "fs-extra": "10.0.0",
     "get-port": "5.0.0",
@@ -60,5 +60,5 @@
     "ts-morph": "12.0.0",
     "typescript": "4.3.4"
   },
-  "gitHead": "54514a44afef48726220bc8be8d20f4fda8e8b4f"
+  "gitHead": "925c8ba18ceec80174d9440cd2cad0e725ed4f56"
 }