@vercel/build-utils 2.16.0 → 2.16.1-canary.2

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.
@@ -307,6 +312,15 @@ function getEnvForPackageManager({ cliType, lockfileVersion, nodeVersion, env, }
             console.log('Detected `package-lock.json` generated by npm 7...');
         }
     }
+    else if (cliType === 'pnpm') {
+        if (typeof lockfileVersion === 'number' &&
+            lockfileVersion === 5.4 &&
+            ((nodeVersion === null || nodeVersion === void 0 ? void 0 : nodeVersion.major) || 0) > 12) {
+            // Ensure that pnpm 7 is at the beginning of the `$PATH`
+            newEnv.PATH = `/pnpm7/pnpm:${env.PATH}`;
+            console.log('Detected `pnpm-lock.yaml` generated by pnpm 7...');
+        }
+    }
     else {
         // Yarn v2 PnP mode may be activated, so force "node-modules" linker style
         if (!env.YARN_NODE_LINKER) {

package/dist/index.d.ts

@@ -11,11 +11,10 @@ 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 { getLatestNodeVersion, getDiscontinuedNodeVersions } from './fs/node-version';
 import streamToBuffer from './fs/stream-to-buffer';
-import shouldServe from './should-serve';
 import debug from './debug';
 import getIgnoreFilter from './get-ignore-filter';
 import { getPlatformEnv } from './get-platform-env';
-export { FileBlob, FileFsRef, FileRef, Lambda, NodejsLambda, createLambda, Prerender, download, 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, streamToBuffer, shouldServe, debug, isSymbolicLink, getLambdaOptionsFromFunction, scanParentDirs, getIgnoreFilter, };
+export { FileBlob, FileFsRef, FileRef, Lambda, NodejsLambda, createLambda, Prerender, download, 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, streamToBuffer, debug, isSymbolicLink, getLambdaOptionsFromFunction, scanParentDirs, getIgnoreFilter, };
 export { EdgeFunction } from './edge-function';
 export { detectBuilders, detectOutputDirectory, detectApiDirectory, detectApiExtensions, } from './detect-builders';
 export { detectFileSystemAPI } from './detect-file-system-api';
@@ -23,6 +22,7 @@ export { detectFramework } from './detect-framework';
 export { DetectorFilesystem } from './detectors/filesystem';
 export { readConfigFile } from './fs/read-config-file';
 export { normalizePath } from './fs/normalize-path';
+export * from './should-serve';
 export * from './schemas';
 export * from './types';
 export * from './errors';
@@ -31,3 +31,4 @@ export * from './errors';
  */
 export declare const isOfficialRuntime: (desired: string, name?: string | undefined) => boolean;
 export declare const isStaticRuntime: (name?: string | undefined) => boolean;
+export { workspaceManagers } from './workspaces/workspace-managers';

package/dist/index.js

@@ -27001,8 +27001,7 @@ exports.frameworks = [
         detectors: {
             every: [
                 {
-                    path: 'package.json',
-                    matchContent: '"(dev)?(d|D)ependencies":\\s*{[^}]*"remix":\\s*".+?"[^}]*}',
+                    path: 'remix.config.js',
                 },
             ],
         },
@@ -35049,15 +35048,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.
@@ -35170,6 +35174,15 @@ function getEnvForPackageManager({ cliType, lockfileVersion, nodeVersion, env, }
             console.log('Detected `package-lock.json` generated by npm 7...');
         }
     }
+    else if (cliType === 'pnpm') {
+        if (typeof lockfileVersion === 'number' &&
+            lockfileVersion === 5.4 &&
+            ((nodeVersion === null || nodeVersion === void 0 ? void 0 : nodeVersion.major) || 0) > 12) {
+            // Ensure that pnpm 7 is at the beginning of the `$PATH`
+            newEnv.PATH = `/pnpm7/pnpm:${env.PATH}`;
+            console.log('Detected `pnpm-lock.yaml` generated by pnpm 7...');
+        }
+    }
     else {
         // Yarn v2 PnP mode may be activated, so force "node-modules" linker style
         if (!env.YARN_NODE_LINKER) {
@@ -35441,7 +35454,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.isStaticRuntime = exports.isOfficialRuntime = exports.normalizePath = exports.readConfigFile = exports.DetectorFilesystem = exports.detectFramework = exports.detectFileSystemAPI = exports.detectApiExtensions = exports.detectApiDirectory = exports.detectOutputDirectory = exports.detectBuilders = exports.EdgeFunction = exports.getIgnoreFilter = exports.scanParentDirs = exports.getLambdaOptionsFromFunction = exports.isSymbolicLink = exports.debug = exports.shouldServe = exports.streamToBuffer = 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.download = exports.Prerender = exports.createLambda = exports.NodejsLambda = exports.Lambda = exports.FileRef = exports.FileFsRef = exports.FileBlob = void 0;
+exports.workspaceManagers = exports.isStaticRuntime = exports.isOfficialRuntime = exports.normalizePath = exports.readConfigFile = exports.DetectorFilesystem = exports.detectFramework = exports.detectFileSystemAPI = exports.detectApiExtensions = exports.detectApiDirectory = exports.detectOutputDirectory = exports.detectBuilders = exports.EdgeFunction = exports.getIgnoreFilter = exports.scanParentDirs = exports.getLambdaOptionsFromFunction = exports.isSymbolicLink = exports.debug = exports.streamToBuffer = 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.download = exports.Prerender = exports.createLambda = exports.NodejsLambda = exports.Lambda = exports.FileRef = exports.FileFsRef = exports.FileBlob = void 0;
 const file_blob_1 = __importDefault(__webpack_require__(2397));
 exports.FileBlob = file_blob_1.default;
 const file_fs_ref_1 = __importDefault(__webpack_require__(9331));
@@ -35489,8 +35502,6 @@ Object.defineProperty(exports, "getLatestNodeVersion", ({ enumerable: true, get:
 Object.defineProperty(exports, "getDiscontinuedNodeVersions", ({ enumerable: true, get: function () { return node_version_1.getDiscontinuedNodeVersions; } }));
 const stream_to_buffer_1 = __importDefault(__webpack_require__(2560));
 exports.streamToBuffer = stream_to_buffer_1.default;
-const should_serve_1 = __importDefault(__webpack_require__(2564));
-exports.shouldServe = should_serve_1.default;
 const debug_1 = __importDefault(__webpack_require__(1868));
 exports.debug = debug_1.default;
 const get_ignore_filter_1 = __importDefault(__webpack_require__(1148));
@@ -35514,6 +35525,7 @@ var read_config_file_1 = __webpack_require__(7792);
 Object.defineProperty(exports, "readConfigFile", ({ enumerable: true, get: function () { return read_config_file_1.readConfigFile; } }));
 var normalize_path_1 = __webpack_require__(6261);
 Object.defineProperty(exports, "normalizePath", ({ enumerable: true, get: function () { return normalize_path_1.normalizePath; } }));
+__exportStar(__webpack_require__(2564), exports);
 __exportStar(__webpack_require__(2416), exports);
 __exportStar(__webpack_require__(5748), exports);
 __exportStar(__webpack_require__(3983), exports);
@@ -35534,6 +35546,8 @@ const isStaticRuntime = (name) => {
     return exports.isOfficialRuntime('static', name);
 };
 exports.isStaticRuntime = isStaticRuntime;
+var workspace_managers_1 = __webpack_require__(4896);
+Object.defineProperty(exports, "workspaceManagers", ({ enumerable: true, get: function () { return workspace_managers_1.workspaceManagers; } }));
 
 
 /***/ }),
@@ -35824,8 +35838,9 @@ exports.buildsSchema = {
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.shouldServe = void 0;
 const path_1 = __webpack_require__(5622);
-function shouldServe({ entrypoint, files, requestPath, }) {
+const shouldServe = ({ entrypoint, files, requestPath, }) => {
     requestPath = requestPath.replace(/\/$/, ''); // sanitize trailing '/'
     entrypoint = entrypoint.replace(/\\/, '/'); // windows compatibility
     if (entrypoint === requestPath && hasProp(files, entrypoint)) {
@@ -35836,8 +35851,8 @@ function shouldServe({ entrypoint, files, requestPath, }) {
         return true;
     }
     return false;
-}
-exports.default = shouldServe;
+};
+exports.shouldServe = shouldServe;
 function hasProp(obj, key) {
     return Object.hasOwnProperty.call(obj, key);
 }
@@ -35853,6 +35868,141 @@ function hasProp(obj, key) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 
 
+/***/ }),
+
+/***/ 4896:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.workspaceManagers = void 0;
+/**
+ * The supported list of workspace managers.
+ *
+ * This list is designed to work with the @see {@link detectFramework} function.
+ *
+ * @example
+ *   import { workspaceManagers as frameworkList } from '@vercel/build-utils/workspaces'
+ *   import { detectFramework } from '@vercel/build-utils'
+ *
+ *   const fs = new GitDetectorFilesystem(...)
+ *   detectFramwork({ fs, frameworkList }) // returns the 'slug' field if detected, otherwise null
+ *
+ * @todo Will be used by the detect-eligible-projects API endpoint for a given git url.
+ */
+exports.workspaceManagers = [
+    {
+        name: 'Yarn',
+        slug: 'yarn',
+        detectors: {
+            every: [
+                {
+                    path: 'package.json',
+                    matchContent: '"workspaces":\\s*(?:\\[[^\\]]*]|{[^}]*"packages":[^}]*})',
+                },
+                {
+                    path: 'yarn.lock',
+                },
+            ],
+        },
+        // unused props - needed for typescript
+        description: '',
+        logo: '',
+        settings: {
+            buildCommand: {
+                value: '',
+                placeholder: '',
+            },
+            devCommand: {
+                value: '',
+                placeholder: '',
+            },
+            installCommand: {
+                value: '',
+                placeholder: '',
+            },
+            outputDirectory: {
+                value: '',
+                placeholder: '',
+            },
+        },
+        getOutputDirName: () => Promise.resolve(''),
+    },
+    {
+        name: 'pnpm',
+        slug: 'pnpm',
+        detectors: {
+            every: [
+                {
+                    path: 'pnpm-workspace.yaml',
+                },
+            ],
+        },
+        // unused props - needed for typescript
+        description: '',
+        logo: '',
+        settings: {
+            buildCommand: {
+                value: '',
+                placeholder: '',
+            },
+            devCommand: {
+                value: '',
+                placeholder: '',
+            },
+            installCommand: {
+                value: '',
+                placeholder: '',
+            },
+            outputDirectory: {
+                value: '',
+                placeholder: '',
+            },
+        },
+        getOutputDirName: () => Promise.resolve(''),
+    },
+    {
+        name: 'npm',
+        slug: 'npm',
+        detectors: {
+            every: [
+                {
+                    path: 'package.json',
+                    matchContent: '"workspaces":\\s*(?:\\[[^\\]]*]|{[^}]*"packages":[^}]*})',
+                },
+                {
+                    path: 'package-lock.json',
+                },
+            ],
+        },
+        // unused props - needed for typescript
+        description: '',
+        logo: '',
+        settings: {
+            buildCommand: {
+                value: '',
+                placeholder: '',
+            },
+            devCommand: {
+                value: '',
+                placeholder: '',
+            },
+            installCommand: {
+                value: '',
+                placeholder: '',
+            },
+            outputDirectory: {
+                value: '',
+                placeholder: '',
+            },
+        },
+        getOutputDirName: () => Promise.resolve(''),
+    },
+];
+exports.default = exports.workspaceManagers;
+
+
 /***/ }),
 
 /***/ 5685:

package/dist/should-serve.d.ts

@@ -1,2 +1,2 @@
-import { ShouldServeOptions } from './types';
-export default function shouldServe({ entrypoint, files, requestPath, }: ShouldServeOptions): boolean;
+import type { ShouldServe } from './types';
+export declare const shouldServe: ShouldServe;

package/dist/should-serve.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.shouldServe = void 0;
 const path_1 = require("path");
-function shouldServe({ entrypoint, files, requestPath, }) {
+const shouldServe = ({ entrypoint, files, requestPath, }) => {
     requestPath = requestPath.replace(/\/$/, ''); // sanitize trailing '/'
     entrypoint = entrypoint.replace(/\\/, '/'); // windows compatibility
     if (entrypoint === requestPath && hasProp(files, entrypoint)) {
@@ -12,8 +13,8 @@ function shouldServe({ entrypoint, files, requestPath, }) {
         return true;
     }
     return false;
-}
-exports.default = shouldServe;
+};
+exports.shouldServe = shouldServe;
 function hasProp(obj, key) {
     return Object.hasOwnProperty.call(obj, key);
 }

package/dist/types.d.ts

@@ -305,6 +305,7 @@ export interface BuilderV3 {
     version: 3;
     build: BuildV3;
     prepareCache?: PrepareCache;
+    shouldServe?: ShouldServe;
     startDevServer?: StartDevServer;
 }
 declare type ImageFormat = 'image/avif' | 'image/webp';
@@ -353,5 +354,6 @@ export interface BuildResultV3 {
 export declare type BuildV2 = (options: BuildOptions) => Promise<BuildResultV2>;
 export declare type BuildV3 = (options: BuildOptions) => Promise<BuildResultV3>;
 export declare type PrepareCache = (options: PrepareCacheOptions) => Promise<Files>;
+export declare type ShouldServe = (options: ShouldServeOptions) => boolean | Promise<boolean>;
 export declare type StartDevServer = (options: StartDevServerOptions) => Promise<StartDevServerResult>;
 export {};

package/dist/workspaces/workspace-managers.d.ts

@@ -0,0 +1,17 @@
+import type { Framework } from '@vercel/frameworks';
+/**
+ * The supported list of workspace managers.
+ *
+ * This list is designed to work with the @see {@link detectFramework} function.
+ *
+ * @example
+ *   import { workspaceManagers as frameworkList } from '@vercel/build-utils/workspaces'
+ *   import { detectFramework } from '@vercel/build-utils'
+ *
+ *   const fs = new GitDetectorFilesystem(...)
+ *   detectFramwork({ fs, frameworkList }) // returns the 'slug' field if detected, otherwise null
+ *
+ * @todo Will be used by the detect-eligible-projects API endpoint for a given git url.
+ */
+export declare const workspaceManagers: Array<Framework>;
+export default workspaceManagers;

package/dist/workspaces/workspace-managers.js

@@ -0,0 +1,127 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.workspaceManagers = void 0;
+/**
+ * The supported list of workspace managers.
+ *
+ * This list is designed to work with the @see {@link detectFramework} function.
+ *
+ * @example
+ *   import { workspaceManagers as frameworkList } from '@vercel/build-utils/workspaces'
+ *   import { detectFramework } from '@vercel/build-utils'
+ *
+ *   const fs = new GitDetectorFilesystem(...)
+ *   detectFramwork({ fs, frameworkList }) // returns the 'slug' field if detected, otherwise null
+ *
+ * @todo Will be used by the detect-eligible-projects API endpoint for a given git url.
+ */
+exports.workspaceManagers = [
+    {
+        name: 'Yarn',
+        slug: 'yarn',
+        detectors: {
+            every: [
+                {
+                    path: 'package.json',
+                    matchContent: '"workspaces":\\s*(?:\\[[^\\]]*]|{[^}]*"packages":[^}]*})',
+                },
+                {
+                    path: 'yarn.lock',
+                },
+            ],
+        },
+        // unused props - needed for typescript
+        description: '',
+        logo: '',
+        settings: {
+            buildCommand: {
+                value: '',
+                placeholder: '',
+            },
+            devCommand: {
+                value: '',
+                placeholder: '',
+            },
+            installCommand: {
+                value: '',
+                placeholder: '',
+            },
+            outputDirectory: {
+                value: '',
+                placeholder: '',
+            },
+        },
+        getOutputDirName: () => Promise.resolve(''),
+    },
+    {
+        name: 'pnpm',
+        slug: 'pnpm',
+        detectors: {
+            every: [
+                {
+                    path: 'pnpm-workspace.yaml',
+                },
+            ],
+        },
+        // unused props - needed for typescript
+        description: '',
+        logo: '',
+        settings: {
+            buildCommand: {
+                value: '',
+                placeholder: '',
+            },
+            devCommand: {
+                value: '',
+                placeholder: '',
+            },
+            installCommand: {
+                value: '',
+                placeholder: '',
+            },
+            outputDirectory: {
+                value: '',
+                placeholder: '',
+            },
+        },
+        getOutputDirName: () => Promise.resolve(''),
+    },
+    {
+        name: 'npm',
+        slug: 'npm',
+        detectors: {
+            every: [
+                {
+                    path: 'package.json',
+                    matchContent: '"workspaces":\\s*(?:\\[[^\\]]*]|{[^}]*"packages":[^}]*})',
+                },
+                {
+                    path: 'package-lock.json',
+                },
+            ],
+        },
+        // unused props - needed for typescript
+        description: '',
+        logo: '',
+        settings: {
+            buildCommand: {
+                value: '',
+                placeholder: '',
+            },
+            devCommand: {
+                value: '',
+                placeholder: '',
+            },
+            installCommand: {
+                value: '',
+                placeholder: '',
+            },
+            outputDirectory: {
+                value: '',
+                placeholder: '',
+            },
+        },
+        getOutputDirName: () => Promise.resolve(''),
+    },
+];
+exports.default = exports.workspaceManagers;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "2.16.0",
+  "version": "2.16.1-canary.2",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -30,7 +30,7 @@
     "@types/node-fetch": "^2.1.6",
     "@types/semver": "6.0.0",
     "@types/yazl": "2.4.2",
-    "@vercel/frameworks": "0.8.0",
+    "@vercel/frameworks": "0.8.1-canary.0",
     "@vercel/ncc": "0.24.0",
     "aggregate-error": "3.0.1",
     "async-retry": "1.2.3",
@@ -49,5 +49,5 @@
     "typescript": "4.3.4",
     "yazl": "2.5.1"
   },
-  "gitHead": "a400b9b29d171232f4649e67e1fdcf4fb8d6a4c8"
+  "gitHead": "d91bca7d6bc8066690c0db4b11990a354d13ebbd"
 }