@vercel/build-utils 5.9.0 → 6.0.0

package/dist/fs/run-user-scripts.d.ts

@@ -56,11 +56,6 @@ export interface SpawnOptionsExtended extends SpawnOptions {
     ignoreNon0Exit?: boolean;
 }
 export declare function spawnAsync(command: string, args: string[], opts?: SpawnOptionsExtended): Promise<void>;
-export declare function execAsync(command: string, args: string[], opts?: SpawnOptionsExtended): Promise<{
-    stdout: string;
-    stderr: string;
-    code: number;
-}>;
 export declare function spawnCommand(command: string, options?: SpawnOptions): import("child_process").ChildProcess;
 export declare function execCommand(command: string, options?: SpawnOptions): Promise<boolean>;
 export declare function getNodeBinPath({ cwd, }: {

package/dist/fs/run-user-scripts.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.installDependencies = exports.getScriptName = exports.runPipInstall = exports.runBundleInstall = exports.runPackageJsonScript = exports.runCustomInstallCommand = exports.getEnvForPackageManager = exports.runNpmInstall = exports.walkParentDirs = exports.scanParentDirs = exports.getNodeVersion = exports.getSpawnOptions = exports.runShellScript = exports.getNodeBinPath = exports.execCommand = exports.spawnCommand = exports.execAsync = exports.spawnAsync = void 0;
+exports.installDependencies = exports.getScriptName = exports.runPipInstall = exports.runBundleInstall = exports.runPackageJsonScript = exports.runCustomInstallCommand = exports.getEnvForPackageManager = exports.runNpmInstall = exports.walkParentDirs = exports.scanParentDirs = exports.getNodeVersion = exports.getSpawnOptions = exports.runShellScript = exports.getNodeBinPath = exports.execCommand = exports.spawnCommand = exports.spawnAsync = void 0;
 const assert_1 = __importDefault(require("assert"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
@@ -44,41 +44,6 @@ function spawnAsync(command, args, opts = {}) {
     });
 }
 exports.spawnAsync = spawnAsync;
-function execAsync(command, args, opts = {}) {
-    return new Promise((resolve, reject) => {
-        opts.stdio = 'pipe';
-        const stdoutList = [];
-        const stderrList = [];
-        const child = cross_spawn_1.default(command, args, opts);
-        child.stderr.on('data', data => {
-            stderrList.push(data);
-        });
-        child.stdout.on('data', data => {
-            stdoutList.push(data);
-        });
-        child.on('error', reject);
-        child.on('close', (code, signal) => {
-            if (code === 0 || opts.ignoreNon0Exit) {
-                return resolve({
-                    // ignoring the next line due to do some Node.js type issue when we removed hoisting of dependencies in https://github.com/vercel/vercel/pull/9198
-                    // should eventually be fixed when this method is remove by https://github.com/vercel/vercel/pull/9200 or we update to Node 16
-                    // @ts-ignore
-                    code,
-                    stdout: Buffer.concat(stdoutList).toString(),
-                    stderr: Buffer.concat(stderrList).toString(),
-                });
-            }
-            const cmd = opts.prettyCommand
-                ? `Command "${opts.prettyCommand}"`
-                : 'Command';
-            return reject(new errors_1.NowBuildError({
-                code: `BUILD_UTILS_EXEC_${code || signal}`,
-                message: `${cmd} exited with ${code || signal}`,
-            }));
-        });
-    });
-}
-exports.execAsync = execAsync;
 function spawnCommand(command, options = {}) {
     const opts = { ...options, prettyCommand: command };
     if (process.platform === 'win32') {

package/dist/index.d.ts

@@ -8,7 +8,7 @@ import download, { downloadFile, DownloadedFiles, isSymbolicLink, isDirectory }
 import getWriteableDirectory from './fs/get-writable-directory';
 import glob, { GlobOptions } from './fs/glob';
 import rename from './fs/rename';
-import { execAsync, spawnAsync, execCommand, spawnCommand, walkParentDirs, getScriptName, installDependencies, runPackageJsonScript, runNpmInstall, runBundleInstall, runPipInstall, runShellScript, runCustomInstallCommand, getEnvForPackageManager, getNodeVersion, getSpawnOptions, getNodeBinPath, scanParentDirs } from './fs/run-user-scripts';
+import { spawnAsync, execCommand, spawnCommand, walkParentDirs, getScriptName, installDependencies, runPackageJsonScript, runNpmInstall, runBundleInstall, runPipInstall, runShellScript, runCustomInstallCommand, getEnvForPackageManager, getNodeVersion, getSpawnOptions, getNodeBinPath, scanParentDirs } from './fs/run-user-scripts';
 import { getLatestNodeVersion, getDiscontinuedNodeVersions } from './fs/node-version';
 import streamToBuffer from './fs/stream-to-buffer';
 import debug from './debug';
@@ -16,7 +16,7 @@ import getIgnoreFilter from './get-ignore-filter';
 import { getPlatformEnv } from './get-platform-env';
 import { getPrefixedEnvVars } from './get-prefixed-env-vars';
 import { cloneEnv } from './clone-env';
-export { FileBlob, FileFsRef, FileRef, Lambda, NodejsLambda, createLambda, Prerender, download, downloadFile, DownloadedFiles, getWriteableDirectory, glob, GlobOptions, rename, execAsync, spawnAsync, getScriptName, installDependencies, runPackageJsonScript, execCommand, spawnCommand, walkParentDirs, getNodeBinPath, runNpmInstall, runBundleInstall, runPipInstall, runShellScript, runCustomInstallCommand, getEnvForPackageManager, getNodeVersion, getLatestNodeVersion, getDiscontinuedNodeVersions, getSpawnOptions, getPlatformEnv, getPrefixedEnvVars, streamToBuffer, debug, isSymbolicLink, isDirectory, getLambdaOptionsFromFunction, scanParentDirs, getIgnoreFilter, cloneEnv, };
+export { FileBlob, FileFsRef, FileRef, Lambda, NodejsLambda, createLambda, Prerender, download, downloadFile, DownloadedFiles, getWriteableDirectory, glob, GlobOptions, rename, spawnAsync, getScriptName, installDependencies, runPackageJsonScript, execCommand, spawnCommand, walkParentDirs, getNodeBinPath, runNpmInstall, runBundleInstall, runPipInstall, runShellScript, runCustomInstallCommand, getEnvForPackageManager, getNodeVersion, getLatestNodeVersion, getDiscontinuedNodeVersions, getSpawnOptions, getPlatformEnv, getPrefixedEnvVars, streamToBuffer, debug, isSymbolicLink, isDirectory, getLambdaOptionsFromFunction, scanParentDirs, getIgnoreFilter, cloneEnv, };
 export { EdgeFunction } from './edge-function';
 export { readConfigFile } from './fs/read-config-file';
 export { normalizePath } from './fs/normalize-path';

package/dist/index.js

@@ -2323,7 +2323,7 @@ module.exports = Sema
 
 /***/ }),
 
-/***/ 971:
+/***/ 2309:
 /***/ ((module) => {
 
 "use strict";
@@ -2357,6 +2357,9 @@ function range(a, b, str) {
   var i = ai;
 
   if (ai >= 0 && bi > 0) {
+    if(a===b) {
+      return [ai, bi];
+    }
     begs = [];
     left = str.length;
 
@@ -2394,7 +2397,7 @@ function range(a, b, str) {
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
 var concatMap = __webpack_require__(464);
-var balanced = __webpack_require__(971);
+var balanced = __webpack_require__(2309);
 
 module.exports = expandTop;
 
@@ -2601,7 +2604,7 @@ function expand(str, isTop) {
 /***/ 1602:
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
-var balanced = __webpack_require__(971);
+var balanced = __webpack_require__(2309);
 
 module.exports = expandTop;
 
@@ -2946,8 +2949,8 @@ var isArray = Array.isArray || function (xs) {
 
 /***/ }),
 
-/***/ 8742:
-/***/ ((__unused_webpack_module, exports) => {
+/***/ 6488:
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 // Copyright Joyent, Inc. and other Node contributors.
 //
@@ -3051,7 +3054,7 @@ function isPrimitive(arg) {
 }
 exports.isPrimitive = isPrimitive;
 
-exports.isBuffer = Buffer.isBuffer;
+exports.isBuffer = __webpack_require__(4293).Buffer.isBuffer;
 
 function objectToString(o) {
   return Object.prototype.toString.call(o);
@@ -6433,7 +6436,7 @@ function ownProp (obj, field) {
 
 var fs = __webpack_require__(5747)
 var path = __webpack_require__(5622)
-var minimatch = __webpack_require__(5774)
+var minimatch = __webpack_require__(8423)
 var isAbsolute = __webpack_require__(5622).isAbsolute
 var Minimatch = minimatch.Minimatch
 
@@ -6709,7 +6712,7 @@ function childrenIgnored (self, path) {
 module.exports = glob
 
 var rp = __webpack_require__(1915)
-var minimatch = __webpack_require__(5774)
+var minimatch = __webpack_require__(8423)
 var Minimatch = minimatch.Minimatch
 var inherits = __webpack_require__(834)
 var EE = __webpack_require__(8614).EventEmitter
@@ -7467,7 +7470,7 @@ module.exports = globSync
 globSync.GlobSync = GlobSync
 
 var rp = __webpack_require__(1915)
-var minimatch = __webpack_require__(5774)
+var minimatch = __webpack_require__(8423)
 var Minimatch = minimatch.Minimatch
 var Glob = __webpack_require__(2054).Glob
 var util = __webpack_require__(1669)
@@ -17921,7 +17924,7 @@ function regExpEscape (s) {
 
 /***/ }),
 
-/***/ 4164:
+/***/ 5314:
 /***/ ((module) => {
 
 const isWindows = typeof process === 'object' &&
@@ -17932,7 +17935,7 @@ module.exports = isWindows ? { sep: '\\' } : { sep: '/' }
 
 /***/ }),
 
-/***/ 5774:
+/***/ 8423:
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
 const minimatch = module.exports = (p, pattern, options = {}) => {
@@ -17948,7 +17951,7 @@ const minimatch = module.exports = (p, pattern, options = {}) => {
 
 module.exports = minimatch
 
-const path = __webpack_require__(4164)
+const path = __webpack_require__(5314)
 minimatch.sep = path.sep
 
 const GLOBSTAR = Symbol('globstar **')
@@ -18094,7 +18097,9 @@ minimatch.match = (list, pattern, options = {}) => {
 
 // replace stuff like \* with *
 const globUnescape = s => s.replace(/\\(.)/g, '$1')
+const charUnescape = s => s.replace(/\\([^-\]])/g, '$1')
 const regExpEscape = s => s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&')
+const braExpEscape = s => s.replace(/[[\]\\]/g, '\\$&')
 
 class Minimatch {
   constructor (pattern, options) {
@@ -18180,7 +18185,7 @@ class Minimatch {
       negateOffset++
     }
 
-    if (negateOffset) this.pattern = pattern.substr(negateOffset)
+    if (negateOffset) this.pattern = pattern.slice(negateOffset)
     this.negate = negate
   }
 
@@ -18429,6 +18434,11 @@ class Minimatch {
         }
 
         case '\\':
+          if (inClass && pattern.charAt(i + 1) === '-') {
+            re += c
+            continue
+          }
+
           clearStateChar()
           escaping = true
         continue
@@ -18541,8 +18551,6 @@ class Minimatch {
             continue
           }
 
-          // handle the case where we left a class open.
-          // "[z-a]" is valid, equivalent to "\[z-a\]"
           // 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
@@ -18552,20 +18560,16 @@ class Minimatch {
           // to do safely.  For now, this is safe and works.
           cs = pattern.substring(classStart + 1, i)
           try {
-            RegExp('[' + cs + ']')
+            RegExp('[' + braExpEscape(charUnescape(cs)) + ']')
+            // looks good, finish up the class.
+            re += c
           } catch (er) {
-            // not a valid class!
-            sp = this.parse(cs, SUBPARSE)
-            re = re.substr(0, reClassStart) + '\\[' + sp[0] + '\\]'
-            hasMagic = hasMagic || sp[1]
-            inClass = false
-            continue
+            // out of order ranges in JS are errors, but in glob syntax,
+            // they're just a range that matches nothing.
+            re = re.substring(0, reClassStart) + '(?:$.)' // match nothing ever
           }
-
-          // finish up the class.
           hasMagic = true
           inClass = false
-          re += c
         continue
 
         default:
@@ -18589,9 +18593,9 @@ class Minimatch {
       // this is a huge pita.  We now have to re-walk
       // the contents of the would-be class to re-translate
       // any characters that were passed through as-is
-      cs = pattern.substr(classStart + 1)
+      cs = pattern.slice(classStart + 1)
       sp = this.parse(cs, SUBPARSE)
-      re = re.substr(0, reClassStart) + '\\[' + sp[0]
+      re = re.substring(0, reClassStart) + '\\[' + sp[0]
       hasMagic = hasMagic || sp[1]
     }
 
@@ -20923,7 +20927,7 @@ var objectKeys = Object.keys || function (obj) {
 module.exports = Duplex;
 
 /*<replacement>*/
-var util = Object.create(__webpack_require__(8742));
+var util = Object.create(__webpack_require__(6488));
 util.inherits = __webpack_require__(834);
 /*</replacement>*/
 
@@ -21048,7 +21052,7 @@ module.exports = PassThrough;
 var Transform = __webpack_require__(2255);
 
 /*<replacement>*/
-var util = Object.create(__webpack_require__(8742));
+var util = Object.create(__webpack_require__(6488));
 util.inherits = __webpack_require__(834);
 /*</replacement>*/
 
@@ -21136,7 +21140,7 @@ function _isUint8Array(obj) {
 /*</replacement>*/
 
 /*<replacement>*/
-var util = Object.create(__webpack_require__(8742));
+var util = Object.create(__webpack_require__(6488));
 util.inherits = __webpack_require__(834);
 /*</replacement>*/
 
@@ -22166,7 +22170,7 @@ module.exports = Transform;
 var Duplex = __webpack_require__(4501);
 
 /*<replacement>*/
-var util = Object.create(__webpack_require__(8742));
+var util = Object.create(__webpack_require__(6488));
 util.inherits = __webpack_require__(834);
 /*</replacement>*/
 
@@ -22383,7 +22387,7 @@ var Duplex;
 Writable.WritableState = WritableState;
 
 /*<replacement>*/
-var util = Object.create(__webpack_require__(8742));
+var util = Object.create(__webpack_require__(6488));
 util.inherits = __webpack_require__(834);
 /*</replacement>*/
 
@@ -30971,7 +30975,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.installDependencies = exports.getScriptName = exports.runPipInstall = exports.runBundleInstall = exports.runPackageJsonScript = exports.runCustomInstallCommand = exports.getEnvForPackageManager = exports.runNpmInstall = exports.walkParentDirs = exports.scanParentDirs = exports.getNodeVersion = exports.getSpawnOptions = exports.runShellScript = exports.getNodeBinPath = exports.execCommand = exports.spawnCommand = exports.execAsync = exports.spawnAsync = void 0;
+exports.installDependencies = exports.getScriptName = exports.runPipInstall = exports.runBundleInstall = exports.runPackageJsonScript = exports.runCustomInstallCommand = exports.getEnvForPackageManager = exports.runNpmInstall = exports.walkParentDirs = exports.scanParentDirs = exports.getNodeVersion = exports.getSpawnOptions = exports.runShellScript = exports.getNodeBinPath = exports.execCommand = exports.spawnCommand = exports.spawnAsync = void 0;
 const assert_1 = __importDefault(__webpack_require__(2357));
 const fs_extra_1 = __importDefault(__webpack_require__(6365));
 const path_1 = __importDefault(__webpack_require__(5622));
@@ -31012,41 +31016,6 @@ function spawnAsync(command, args, opts = {}) {
     });
 }
 exports.spawnAsync = spawnAsync;
-function execAsync(command, args, opts = {}) {
-    return new Promise((resolve, reject) => {
-        opts.stdio = 'pipe';
-        const stdoutList = [];
-        const stderrList = [];
-        const child = cross_spawn_1.default(command, args, opts);
-        child.stderr.on('data', data => {
-            stderrList.push(data);
-        });
-        child.stdout.on('data', data => {
-            stdoutList.push(data);
-        });
-        child.on('error', reject);
-        child.on('close', (code, signal) => {
-            if (code === 0 || opts.ignoreNon0Exit) {
-                return resolve({
-                    // ignoring the next line due to do some Node.js type issue when we removed hoisting of dependencies in https://github.com/vercel/vercel/pull/9198
-                    // should eventually be fixed when this method is remove by https://github.com/vercel/vercel/pull/9200 or we update to Node 16
-                    // @ts-ignore
-                    code,
-                    stdout: Buffer.concat(stdoutList).toString(),
-                    stderr: Buffer.concat(stderrList).toString(),
-                });
-            }
-            const cmd = opts.prettyCommand
-                ? `Command "${opts.prettyCommand}"`
-                : 'Command';
-            return reject(new errors_1.NowBuildError({
-                code: `BUILD_UTILS_EXEC_${code || signal}`,
-                message: `${cmd} exited with ${code || signal}`,
-            }));
-        });
-    });
-}
-exports.execAsync = execAsync;
 function spawnCommand(command, options = {}) {
     const opts = { ...options, prettyCommand: command };
     if (process.platform === 'win32') {
@@ -31661,7 +31630,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.normalizePath = exports.readConfigFile = exports.EdgeFunction = exports.cloneEnv = exports.getIgnoreFilter = exports.scanParentDirs = exports.getLambdaOptionsFromFunction = exports.isDirectory = exports.isSymbolicLink = exports.debug = exports.streamToBuffer = exports.getPrefixedEnvVars = exports.getPlatformEnv = exports.getSpawnOptions = exports.getDiscontinuedNodeVersions = exports.getLatestNodeVersion = exports.getNodeVersion = exports.getEnvForPackageManager = exports.runCustomInstallCommand = exports.runShellScript = exports.runPipInstall = exports.runBundleInstall = exports.runNpmInstall = exports.getNodeBinPath = exports.walkParentDirs = exports.spawnCommand = exports.execCommand = exports.runPackageJsonScript = exports.installDependencies = exports.getScriptName = exports.spawnAsync = exports.execAsync = exports.rename = exports.glob = exports.getWriteableDirectory = exports.downloadFile = exports.download = exports.Prerender = exports.createLambda = exports.NodejsLambda = exports.Lambda = exports.FileRef = exports.FileFsRef = exports.FileBlob = void 0;
+exports.normalizePath = exports.readConfigFile = exports.EdgeFunction = exports.cloneEnv = exports.getIgnoreFilter = exports.scanParentDirs = exports.getLambdaOptionsFromFunction = exports.isDirectory = exports.isSymbolicLink = exports.debug = exports.streamToBuffer = exports.getPrefixedEnvVars = exports.getPlatformEnv = exports.getSpawnOptions = exports.getDiscontinuedNodeVersions = exports.getLatestNodeVersion = exports.getNodeVersion = exports.getEnvForPackageManager = exports.runCustomInstallCommand = exports.runShellScript = exports.runPipInstall = exports.runBundleInstall = exports.runNpmInstall = exports.getNodeBinPath = exports.walkParentDirs = exports.spawnCommand = exports.execCommand = exports.runPackageJsonScript = exports.installDependencies = exports.getScriptName = exports.spawnAsync = exports.rename = exports.glob = exports.getWriteableDirectory = exports.downloadFile = exports.download = exports.Prerender = exports.createLambda = exports.NodejsLambda = exports.Lambda = exports.FileRef = exports.FileFsRef = exports.FileBlob = void 0;
 const file_blob_1 = __importDefault(__webpack_require__(8361));
 exports.FileBlob = file_blob_1.default;
 const file_fs_ref_1 = __importDefault(__webpack_require__(6274));
@@ -31688,7 +31657,6 @@ exports.glob = glob_1.default;
 const rename_1 = __importDefault(__webpack_require__(8430));
 exports.rename = rename_1.default;
 const run_user_scripts_1 = __webpack_require__(5357);
-Object.defineProperty(exports, "execAsync", ({ enumerable: true, get: function () { return run_user_scripts_1.execAsync; } }));
 Object.defineProperty(exports, "spawnAsync", ({ enumerable: true, get: function () { return run_user_scripts_1.spawnAsync; } }));
 Object.defineProperty(exports, "execCommand", ({ enumerable: true, get: function () { return run_user_scripts_1.execCommand; } }));
 Object.defineProperty(exports, "spawnCommand", ({ enumerable: true, get: function () { return run_user_scripts_1.spawnCommand; } }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "5.9.0",
+  "version": "6.0.0",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -51,5 +51,5 @@
     "typescript": "4.3.4",
     "yazl": "2.5.1"
   },
-  "gitHead": "4ccdcde463560dc44da89edf52523419fc56ab62"
+  "gitHead": "25f6595d3698546ba69c7fe9f601a906167fef3f"
 }