@vercel/build-utils 2.15.2-canary.5 → 2.16.1-canary.0

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

@@ -186,15 +186,20 @@ async function scanParentDirs(destPath, readPackageJson = false) {
                 fs_extra_1.default.pathExists(path_1.default.join(currentDestPath, 'yarn.lock')),
                 read_config_file_1.readConfigFile(path_1.default.join(currentDestPath, 'pnpm-lock.yaml')),
             ]);
-            if (packageLockJson && !hasYarnLock && !pnpmLockYaml) {
-                cliType = 'npm';
-                lockfileVersion = packageLockJson.lockfileVersion;
+            // Priority order is Yarn > pnpm > npm
+            // - find highest priority lock file and use that
+            if (hasYarnLock) {
+                cliType = 'yarn';
             }
-            if (!packageLockJson && !hasYarnLock && pnpmLockYaml) {
+            else if (pnpmLockYaml) {
                 cliType = 'pnpm';
                 // just ensure that it is read as a number and not a string
                 lockfileVersion = Number(pnpmLockYaml.lockfileVersion);
             }
+            else if (packageLockJson) {
+                cliType = 'npm';
+                lockfileVersion = packageLockJson.lockfileVersion;
+            }
             // Only stop iterating if a lockfile was found, because it's possible
             // that the lockfile is in a higher path than where the `package.json`
             // file was found.
@@ -381,7 +386,7 @@ async function runBundleInstall(destPath, args = [], spawnOpts, meta) {
 exports.runBundleInstall = runBundleInstall;
 async function runPipInstall(destPath, args = [], spawnOpts, meta) {
     if (meta && meta.isDev) {
-        debug_1.default('Skipping dependency installation because dev mode is enabled');
+        debug_1.default('Skipping dependency installation because dev mode is enabled');
         return;
     }
     assert_1.default(path_1.default.isAbsolute(destPath));

package/dist/index.js

@@ -14791,6 +14791,8 @@ ZipFile.prototype.addEmptyDirectory = function(metadataPath, options) {
   pumpEntries(self);
 };
 
+var eocdrSignatureBuffer = bufferFrom([0x50, 0x4b, 0x05, 0x06]);
+
 ZipFile.prototype.end = function(options, finalSizeCallback) {
   if (typeof options === "function") {
     finalSizeCallback = options;
@@ -14801,6 +14803,20 @@ ZipFile.prototype.end = function(options, finalSizeCallback) {
   this.ended = true;
   this.finalSizeCallback = finalSizeCallback;
   this.forceZip64Eocd = !!options.forceZip64Format;
+  if (options.comment) {
+    if (typeof options.comment === "string") {
+      this.comment = encodeCp437(options.comment);
+    } else {
+      // It should be a Buffer
+      this.comment = options.comment;
+    }
+    if (this.comment.length > 0xffff) throw new Error("comment is too large");
+    // gotta check for this, because the zipfile format is actually ambiguous.
+    if (bufferIncludes(this.comment, eocdrSignatureBuffer)) throw new Error("comment contains end of central directory record signature");
+  } else {
+    // no comment.
+    this.comment = EMPTY_BUFFER;
+  }
   pumpEntries(this);
 };
 
@@ -14909,7 +14925,7 @@ function calculateFinalSize(self) {
       }
     }
 
-    centralDirectorySize += CENTRAL_DIRECTORY_RECORD_FIXED_SIZE + entry.utf8FileName.length;
+    centralDirectorySize += CENTRAL_DIRECTORY_RECORD_FIXED_SIZE + entry.utf8FileName.length + entry.fileComment.length;
     if (useZip64Format) {
       centralDirectorySize += ZIP64_EXTENDED_INFORMATION_EXTRA_FIELD_SIZE;
     }
@@ -14923,7 +14939,7 @@ function calculateFinalSize(self) {
     // use zip64 end of central directory stuff
     endOfCentralDirectorySize += ZIP64_END_OF_CENTRAL_DIRECTORY_RECORD_SIZE + ZIP64_END_OF_CENTRAL_DIRECTORY_LOCATOR_SIZE;
   }
-  endOfCentralDirectorySize += END_OF_CENTRAL_DIRECTORY_RECORD_SIZE;
+  endOfCentralDirectorySize += END_OF_CENTRAL_DIRECTORY_RECORD_SIZE + self.comment.length;
   return pretendOutputCursor + centralDirectorySize + endOfCentralDirectorySize;
 }
 
@@ -14960,7 +14976,7 @@ function getEndOfCentralDirectoryRecord(self, actuallyJustTellMeHowLongItWouldBe
     }
   }
 
-  var eocdrBuffer = new Buffer(END_OF_CENTRAL_DIRECTORY_RECORD_SIZE);
+  var eocdrBuffer = bufferAlloc(END_OF_CENTRAL_DIRECTORY_RECORD_SIZE + self.comment.length);
   // end of central dir signature                       4 bytes  (0x06054b50)
   eocdrBuffer.writeUInt32LE(0x06054b50, 0);
   // number of this disk                                2 bytes
@@ -14976,15 +14992,15 @@ function getEndOfCentralDirectoryRecord(self, actuallyJustTellMeHowLongItWouldBe
   // offset of start of central directory with respect to the starting disk number  4 bytes
   eocdrBuffer.writeUInt32LE(normalOffsetOfStartOfCentralDirectory, 16);
   // .ZIP file comment length                           2 bytes
-  eocdrBuffer.writeUInt16LE(0, 20);
+  eocdrBuffer.writeUInt16LE(self.comment.length, 20);
   // .ZIP file comment                                  (variable size)
-  // no comment
+  self.comment.copy(eocdrBuffer, 22);
 
   if (!needZip64Format) return eocdrBuffer;
 
   // ZIP64 format
   // ZIP64 End of Central Directory Record
-  var zip64EocdrBuffer = new Buffer(ZIP64_END_OF_CENTRAL_DIRECTORY_RECORD_SIZE);
+  var zip64EocdrBuffer = bufferAlloc(ZIP64_END_OF_CENTRAL_DIRECTORY_RECORD_SIZE);
   // zip64 end of central dir signature                                             4 bytes  (0x06064b50)
   zip64EocdrBuffer.writeUInt32LE(0x06064b50, 0);
   // size of zip64 end of central directory record                                  8 bytes
@@ -15010,7 +15026,7 @@ function getEndOfCentralDirectoryRecord(self, actuallyJustTellMeHowLongItWouldBe
 
 
   // ZIP64 End of Central Directory Locator
-  var zip64EocdlBuffer = new Buffer(ZIP64_END_OF_CENTRAL_DIRECTORY_LOCATOR_SIZE);
+  var zip64EocdlBuffer = bufferAlloc(ZIP64_END_OF_CENTRAL_DIRECTORY_LOCATOR_SIZE);
   // zip64 end of central dir locator signature                               4 bytes  (0x07064b50)
   zip64EocdlBuffer.writeUInt32LE(0x07064b50, 0);
   // number of the disk with the start of the zip64 end of central directory  4 bytes
@@ -15043,12 +15059,11 @@ function validateMetadataPath(metadataPath, isDirectory) {
   return metadataPath;
 }
 
-var defaultFileMode = parseInt("0100664", 8);
-var defaultDirectoryMode = parseInt("040775", 8);
+var EMPTY_BUFFER = bufferAlloc(0);
 
 // this class is not part of the public API
 function Entry(metadataPath, isDirectory, options) {
-  this.utf8FileName = new Buffer(metadataPath);
+  this.utf8FileName = bufferFrom(metadataPath);
   if (this.utf8FileName.length > 0xffff) throw new Error("utf8 file name too long. " + utf8FileName.length + " > " + 0xffff);
   this.isDirectory = isDirectory;
   this.state = Entry.WAITING_FOR_METADATA;
@@ -15056,7 +15071,7 @@ function Entry(metadataPath, isDirectory, options) {
   if (options.mode != null) {
     this.setFileAttributesMode(options.mode);
   } else {
-    this.setFileAttributesMode(isDirectory ? defaultDirectoryMode : defaultFileMode);
+    this.setFileAttributesMode(isDirectory ? 0o40775 : 0o100664);
   }
   if (isDirectory) {
     this.crcAndFileSizeKnown = true;
@@ -15078,6 +15093,18 @@ function Entry(metadataPath, isDirectory, options) {
     if (options.compress != null) this.compress = !!options.compress;
   }
   this.forceZip64Format = !!options.forceZip64Format;
+  if (options.fileComment) {
+    if (typeof options.fileComment === "string") {
+      this.fileComment = bufferFrom(options.fileComment, "utf-8");
+    } else {
+      // It should be a Buffer
+      this.fileComment = options.fileComment;
+    }
+    if (this.fileComment.length > 0xffff) throw new Error("fileComment is too large");
+  } else {
+    // no comment.
+    this.fileComment = EMPTY_BUFFER;
+  }
 }
 Entry.WAITING_FOR_METADATA = 0;
 Entry.READY_TO_PUMP_FILE_DATA = 1;
@@ -15123,7 +15150,7 @@ Entry.prototype.getLocalFileHeader = function() {
     uncompressedSize = this.uncompressedSize;
   }
 
-  var fixedSizeStuff = new Buffer(LOCAL_FILE_HEADER_FIXED_SIZE);
+  var fixedSizeStuff = bufferAlloc(LOCAL_FILE_HEADER_FIXED_SIZE);
   var generalPurposeBitFlag = FILE_NAME_IS_UTF8;
   if (!this.crcAndFileSizeKnown) generalPurposeBitFlag |= UNKNOWN_CRC32_AND_FILE_SIZES;
 
@@ -15162,10 +15189,10 @@ var ZIP64_DATA_DESCRIPTOR_SIZE = 24;
 Entry.prototype.getDataDescriptor = function() {
   if (this.crcAndFileSizeKnown) {
     // the Mac Archive Utility requires this not be present unless we set general purpose bit 3
-    return new Buffer(0);
+    return EMPTY_BUFFER;
   }
   if (!this.useZip64Format()) {
-    var buffer = new Buffer(DATA_DESCRIPTOR_SIZE);
+    var buffer = bufferAlloc(DATA_DESCRIPTOR_SIZE);
     // optional signature (required according to Archive Utility)
     buffer.writeUInt32LE(0x08074b50, 0);
     // crc-32                          4 bytes
@@ -15177,7 +15204,7 @@ Entry.prototype.getDataDescriptor = function() {
     return buffer;
   } else {
     // ZIP64 format
-    var buffer = new Buffer(ZIP64_DATA_DESCRIPTOR_SIZE);
+    var buffer = bufferAlloc(ZIP64_DATA_DESCRIPTOR_SIZE);
     // optional signature (unknown if anyone cares about this)
     buffer.writeUInt32LE(0x08074b50, 0);
     // crc-32                          4 bytes
@@ -15192,7 +15219,7 @@ Entry.prototype.getDataDescriptor = function() {
 var CENTRAL_DIRECTORY_RECORD_FIXED_SIZE = 46;
 var ZIP64_EXTENDED_INFORMATION_EXTRA_FIELD_SIZE = 28;
 Entry.prototype.getCentralDirectoryRecord = function() {
-  var fixedSizeStuff = new Buffer(CENTRAL_DIRECTORY_RECORD_FIXED_SIZE);
+  var fixedSizeStuff = bufferAlloc(CENTRAL_DIRECTORY_RECORD_FIXED_SIZE);
   var generalPurposeBitFlag = FILE_NAME_IS_UTF8;
   if (!this.crcAndFileSizeKnown) generalPurposeBitFlag |= UNKNOWN_CRC32_AND_FILE_SIZES;
 
@@ -15208,7 +15235,7 @@ Entry.prototype.getCentralDirectoryRecord = function() {
     versionNeededToExtract = VERSION_NEEDED_TO_EXTRACT_ZIP64;
 
     // ZIP64 extended information extra field
-    zeiefBuffer = new Buffer(ZIP64_EXTENDED_INFORMATION_EXTRA_FIELD_SIZE);
+    zeiefBuffer = bufferAlloc(ZIP64_EXTENDED_INFORMATION_EXTRA_FIELD_SIZE);
     // 0x0001                  2 bytes    Tag for this "extra" block type
     zeiefBuffer.writeUInt16LE(0x0001, 0);
     // Size                    2 bytes    Size of this "extra" block
@@ -15223,7 +15250,7 @@ Entry.prototype.getCentralDirectoryRecord = function() {
     // (omit)
   } else {
     versionNeededToExtract = VERSION_NEEDED_TO_EXTRACT_UTF8;
-    zeiefBuffer = new Buffer(0);
+    zeiefBuffer = EMPTY_BUFFER;
   }
 
   // central file header signature   4 bytes  (0x02014b50)
@@ -15251,7 +15278,7 @@ Entry.prototype.getCentralDirectoryRecord = function() {
   // extra field length              2 bytes
   fixedSizeStuff.writeUInt16LE(zeiefBuffer.length, 30);
   // file comment length             2 bytes
-  fixedSizeStuff.writeUInt16LE(0, 32);
+  fixedSizeStuff.writeUInt16LE(this.fileComment.length, 32);
   // disk number start               2 bytes
   fixedSizeStuff.writeUInt16LE(0, 34);
   // internal file attributes        2 bytes
@@ -15268,7 +15295,7 @@ Entry.prototype.getCentralDirectoryRecord = function() {
     // extra field (variable size)
     zeiefBuffer,
     // file comment (variable size)
-    // empty comment
+    this.fileComment,
   ]);
 };
 Entry.prototype.getCompressionMethod = function() {
@@ -15292,7 +15319,7 @@ function dateToDosDateTime(jsDate) {
 }
 
 function writeUInt64LE(buffer, n, offset) {
-  // can't use bitshift here, because JavaScript only allows bitshiting on 32-bit integers.
+  // can't use bitshift here, because JavaScript only allows bitshifting on 32-bit integers.
   var high = Math.floor(n / 0x100000000);
   var low = n % 0x100000000;
   buffer.writeUInt32LE(low, offset);
@@ -15323,6 +15350,87 @@ Crc32Watcher.prototype._transform = function(chunk, encoding, cb) {
   cb(null, chunk);
 };
 
+var cp437 = '\u0000☺☻♥♦♣♠•◘○◙♂♀♪♫☼►◄↕‼¶§▬↨↑↓→←∟↔▲▼ !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~⌂ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜ¢£¥₧ƒáíóúñѪº¿⌐¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ ';
+if (cp437.length !== 256) throw new Error("assertion failure");
+var reverseCp437 = null;
+
+function encodeCp437(string) {
+  if (/^[\x20-\x7e]*$/.test(string)) {
+    // CP437, ASCII, and UTF-8 overlap in this range.
+    return bufferFrom(string, "utf-8");
+  }
+
+  // This is the slow path.
+  if (reverseCp437 == null) {
+    // cache this once
+    reverseCp437 = {};
+    for (var i = 0; i < cp437.length; i++) {
+      reverseCp437[cp437[i]] = i;
+    }
+  }
+
+  var result = bufferAlloc(string.length);
+  for (var i = 0; i < string.length; i++) {
+    var b = reverseCp437[string[i]];
+    if (b == null) throw new Error("character not encodable in CP437: " + JSON.stringify(string[i]));
+    result[i] = b;
+  }
+
+  return result;
+}
+
+function bufferAlloc(size) {
+  bufferAlloc = modern;
+  try {
+    return bufferAlloc(size);
+  } catch (e) {
+    bufferAlloc = legacy;
+    return bufferAlloc(size);
+  }
+  function modern(size) {
+    return Buffer.allocUnsafe(size);
+  }
+  function legacy(size) {
+    return new Buffer(size);
+  }
+}
+function bufferFrom(something, encoding) {
+  bufferFrom = modern;
+  try {
+    return bufferFrom(something, encoding);
+  } catch (e) {
+    bufferFrom = legacy;
+    return bufferFrom(something, encoding);
+  }
+  function modern(something, encoding) {
+    return Buffer.from(something, encoding);
+  }
+  function legacy(something, encoding) {
+    return new Buffer(something, encoding);
+  }
+}
+function bufferIncludes(buffer, content) {
+  bufferIncludes = modern;
+  try {
+    return bufferIncludes(buffer, content);
+  } catch (e) {
+    bufferIncludes = legacy;
+    return bufferIncludes(buffer, content);
+  }
+  function modern(buffer, content) {
+    return buffer.includes(content);
+  }
+  function legacy(buffer, content) {
+    for (var i = 0; i <= buffer.length - content.length; i++) {
+      for (var j = 0;; j++) {
+        if (j === content.length) return true;
+        if (buffer[i + j] !== content[j]) break;
+      }
+    }
+    return false;
+  }
+}
+
 
 /***/ }),
 
@@ -34941,15 +35049,20 @@ async function scanParentDirs(destPath, readPackageJson = false) {
                 fs_extra_1.default.pathExists(path_1.default.join(currentDestPath, 'yarn.lock')),
                 read_config_file_1.readConfigFile(path_1.default.join(currentDestPath, 'pnpm-lock.yaml')),
             ]);
-            if (packageLockJson && !hasYarnLock && !pnpmLockYaml) {
-                cliType = 'npm';
-                lockfileVersion = packageLockJson.lockfileVersion;
+            // Priority order is Yarn > pnpm > npm
+            // - find highest priority lock file and use that
+            if (hasYarnLock) {
+                cliType = 'yarn';
             }
-            if (!packageLockJson && !hasYarnLock && pnpmLockYaml) {
+            else if (pnpmLockYaml) {
                 cliType = 'pnpm';
                 // just ensure that it is read as a number and not a string
                 lockfileVersion = Number(pnpmLockYaml.lockfileVersion);
             }
+            else if (packageLockJson) {
+                cliType = 'npm';
+                lockfileVersion = packageLockJson.lockfileVersion;
+            }
             // Only stop iterating if a lockfile was found, because it's possible
             // that the lockfile is in a higher path than where the `package.json`
             // file was found.
@@ -35136,7 +35249,7 @@ async function runBundleInstall(destPath, args = [], spawnOpts, meta) {
 exports.runBundleInstall = runBundleInstall;
 async function runPipInstall(destPath, args = [], spawnOpts, meta) {
     if (meta && meta.isDev) {
-        debug_1.default('Skipping dependency installation because dev mode is enabled');
+        debug_1.default('Skipping dependency installation because dev mode is enabled');
         return;
     }
     assert_1.default(path_1.default.isAbsolute(destPath));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "2.15.2-canary.5",
+  "version": "2.16.1-canary.0",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -29,8 +29,8 @@
     "@types/multistream": "2.1.1",
     "@types/node-fetch": "^2.1.6",
     "@types/semver": "6.0.0",
-    "@types/yazl": "^2.4.1",
-    "@vercel/frameworks": "0.7.2-canary.1",
+    "@types/yazl": "2.4.2",
+    "@vercel/frameworks": "0.8.0",
     "@vercel/ncc": "0.24.0",
     "aggregate-error": "3.0.1",
     "async-retry": "1.2.3",
@@ -47,7 +47,7 @@
     "node-fetch": "2.6.1",
     "semver": "6.1.1",
     "typescript": "4.3.4",
-    "yazl": "2.4.3"
+    "yazl": "2.5.1"
   },
-  "gitHead": "438576fc7c392e754d1fc85fc1d9f3122e80d015"
+  "gitHead": "8eabbfc6667399fce2a9060fd48a0d7c635a2a62"
 }