@vercel/build-utils 2.14.1-canary.2 → 2.14.1-canary.3

package/.turbo/turbo-build.log

@@ -30,4 +30,4 @@ ncc: Using typescript@4.3.4 (local user-provided)
    4kB  dist/main/fs/run-user-scripts.d.ts
   10kB  dist/main/types.d.ts
 1232kB  dist/main/index.js
-1261kB  [7389ms] - ncc 0.24.0
+1261kB  [9158ms] - ncc 0.24.0

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

@@ -1,10 +1,10 @@
 /// <reference types="node" />
 import { SpawnOptions } from 'child_process';
 import { Meta, PackageJson, NodeVersion, Config } from '../types';
-export declare type CliType = 'yarn' | 'npm';
+export declare type CliType = 'yarn' | 'npm' | 'pnpm';
 export interface ScanParentDirsResult {
     /**
-     * "yarn" or "npm", depending on the presence of lockfiles.
+     * "yarn", "npm", or "pnpm" depending on the presence of lockfiles.
      */
     cliType: CliType;
     /**

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

@@ -12,6 +12,7 @@ const cross_spawn_1 = __importDefault(require("cross-spawn"));
 const util_1 = require("util");
 const errors_1 = require("../errors");
 const node_version_1 = require("./node-version");
+const read_config_file_1 = require("./read-config-file");
 function spawnAsync(command, args, opts = {}) {
     return new Promise((resolve, reject) => {
         const stderrLogs = [];
@@ -164,7 +165,7 @@ async function scanParentDirs(destPath, readPackageJson = false) {
                 packageJson = JSON.parse(await fs_extra_1.default.readFile(packageJsonPath, 'utf8'));
             }
             // eslint-disable-next-line no-await-in-loop
-            const [packageLockJson, hasYarnLock] = await Promise.all([
+            const [packageLockJson, hasYarnLock, pnpmLockYaml] = await Promise.all([
                 fs_extra_1.default
                     .readJson(path_1.default.join(currentDestPath, 'package-lock.json'))
                     .catch(error => {
@@ -175,15 +176,21 @@ async function scanParentDirs(destPath, readPackageJson = false) {
                     throw error;
                 }),
                 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) {
+            if (packageLockJson && !hasYarnLock && !pnpmLockYaml) {
                 cliType = 'npm';
                 lockfileVersion = packageLockJson.lockfileVersion;
             }
+            if (!packageLockJson && !hasYarnLock && pnpmLockYaml) {
+                cliType = 'pnpm';
+                // just ensure that it is read as a number and not a string
+                lockfileVersion = Number(pnpmLockYaml.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.
-            if (packageLockJson || hasYarnLock) {
+            if (packageLockJson || hasYarnLock || pnpmLockYaml) {
                 break;
             }
         }
@@ -234,6 +241,14 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
             .filter(a => a !== '--prefer-offline')
             .concat(['install', '--no-audit', '--unsafe-perm']);
     }
+    else if (cliType === 'pnpm') {
+        // PNPM's install command is similar to NPM's but without the audit nonsense
+        // @see options https://pnpm.io/cli/install
+        opts.prettyCommand = 'pnpm install';
+        commandArgs = args
+            .filter(a => a !== '--prefer-offline')
+            .concat(['install', '--unsafe-perm']);
+    }
     else {
         opts.prettyCommand = 'yarn install';
         commandArgs = ['install', ...args];

package/dist/index.js

@@ -34583,6 +34583,7 @@ const cross_spawn_1 = __importDefault(__webpack_require__(7618));
 const util_1 = __webpack_require__(1669);
 const errors_1 = __webpack_require__(3983);
 const node_version_1 = __webpack_require__(7903);
+const read_config_file_1 = __webpack_require__(7792);
 function spawnAsync(command, args, opts = {}) {
     return new Promise((resolve, reject) => {
         const stderrLogs = [];
@@ -34735,7 +34736,7 @@ async function scanParentDirs(destPath, readPackageJson = false) {
                 packageJson = JSON.parse(await fs_extra_1.default.readFile(packageJsonPath, 'utf8'));
             }
             // eslint-disable-next-line no-await-in-loop
-            const [packageLockJson, hasYarnLock] = await Promise.all([
+            const [packageLockJson, hasYarnLock, pnpmLockYaml] = await Promise.all([
                 fs_extra_1.default
                     .readJson(path_1.default.join(currentDestPath, 'package-lock.json'))
                     .catch(error => {
@@ -34746,15 +34747,21 @@ async function scanParentDirs(destPath, readPackageJson = false) {
                     throw error;
                 }),
                 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) {
+            if (packageLockJson && !hasYarnLock && !pnpmLockYaml) {
                 cliType = 'npm';
                 lockfileVersion = packageLockJson.lockfileVersion;
             }
+            if (!packageLockJson && !hasYarnLock && pnpmLockYaml) {
+                cliType = 'pnpm';
+                // just ensure that it is read as a number and not a string
+                lockfileVersion = Number(pnpmLockYaml.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.
-            if (packageLockJson || hasYarnLock) {
+            if (packageLockJson || hasYarnLock || pnpmLockYaml) {
                 break;
             }
         }
@@ -34805,6 +34812,14 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
             .filter(a => a !== '--prefer-offline')
             .concat(['install', '--no-audit', '--unsafe-perm']);
     }
+    else if (cliType === 'pnpm') {
+        // PNPM's install command is similar to NPM's but without the audit nonsense
+        // @see options https://pnpm.io/cli/install
+        opts.prettyCommand = 'pnpm install';
+        commandArgs = args
+            .filter(a => a !== '--prefer-offline')
+            .concat(['install', '--unsafe-perm']);
+    }
     else {
         opts.prettyCommand = 'yarn install';
         commandArgs = ['install', ...args];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "2.14.1-canary.2",
+  "version": "2.14.1-canary.3",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -49,5 +49,5 @@
     "typescript": "4.3.4",
     "yazl": "2.4.3"
   },
-  "gitHead": "82ba9324471e7bf3f4426793c86694fdeb4530a4"
+  "gitHead": "a17f3a96ec12483a28667894dcdc3bb57675ead3"
 }