@vercel/build-utils 4.1.0 → 4.2.0

package/dist/detect-builders.d.ts

@@ -7,7 +7,7 @@ interface ErrorResponse {
     link?: string;
 }
 interface Options {
-    tag?: 'canary' | 'latest' | string;
+    tag?: string;
     functions?: BuilderFunctions;
     ignoreBuildScript?: boolean;
     projectSettings?: ProjectSettings;

package/dist/detect-builders.js

@@ -187,7 +187,7 @@ async function detectBuilders(files, pkg, options = {}) {
             // and package.json can be served as static files
             frontendBuilder = {
                 use: '@vercel/static',
-                src: '!{api/**,package.json}',
+                src: '!{api/**,package.json,middleware.[jt]s}',
                 config: {
                     zeroConfig: true,
                 },
@@ -237,7 +237,13 @@ async function detectBuilders(files, pkg, options = {}) {
 }
 exports.detectBuilders = detectBuilders;
 function maybeGetApiBuilder(fileName, apiMatches, options) {
-    if (!fileName.startsWith('api/')) {
+    const middleware = fileName === 'middleware.js' || fileName === 'middleware.ts';
+    // Root-level Middleware file is handled by `@vercel/next`, so don't
+    // schedule a separate Builder when "nextjs" framework is selected
+    if (middleware && options.projectSettings?.framework === 'nextjs') {
+        return null;
+    }
+    if (!(fileName.startsWith('api/') || middleware)) {
         return null;
     }
     if (fileName.includes('/.')) {
@@ -256,11 +262,14 @@ function maybeGetApiBuilder(fileName, apiMatches, options) {
         return src === fileName || minimatch_1.default(fileName, src);
     });
     const { fnPattern, func } = getFunction(fileName, options);
-    const use = (func && func.runtime) || (match && match.use);
+    const use = func?.runtime || match?.use;
     if (!use) {
         return null;
     }
     const config = { zeroConfig: true };
+    if (middleware) {
+        config.middleware = true;
+    }
     if (fnPattern && func) {
         config.functions = { [fnPattern]: func };
         if (func.includeFiles) {
@@ -290,6 +299,7 @@ function getFunction(fileName, { functions = {} }) {
 function getApiMatches() {
     const config = { zeroConfig: true };
     return [
+        { src: 'middleware.[jt]s', use: `@vercel/node`, config },
         { src: 'api/**/*.js', use: `@vercel/node`, config },
         { src: 'api/**/*.mjs', use: `@vercel/node`, config },
         { src: 'api/**/*.ts', use: `@vercel/node`, config },

package/dist/get-project-paths.d.ts

@@ -0,0 +1,9 @@
+import { DetectorFilesystem } from './detectors/filesystem';
+export interface GetProjectPathsOptions {
+    fs: DetectorFilesystem;
+    path?: string;
+    skipPaths?: string[];
+    depth?: number;
+}
+export declare type ProjectPath = string;
+export declare const getProjectPaths: ({ fs, path, skipPaths, depth, }: GetProjectPathsOptions) => Promise<ProjectPath[]>;

package/dist/get-project-paths.js

@@ -0,0 +1,39 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getProjectPaths = void 0;
+const detect_framework_1 = require("./detect-framework");
+const frameworks_1 = __importDefault(require("@vercel/frameworks"));
+const MAX_DEPTH_TRAVERSE = 3;
+const getProjectPaths = async ({ fs, path, skipPaths, depth = MAX_DEPTH_TRAVERSE, }) => {
+    if (depth === 0)
+        return [];
+    const allPaths = [];
+    const topPath = path ?? './';
+    if (path && skipPaths?.includes(path)) {
+        return allPaths;
+    }
+    const framework = await detect_framework_1.detectFramework({
+        fs: fs.chdir(topPath),
+        frameworkList: frameworks_1.default,
+    });
+    if (framework !== null)
+        allPaths.push(topPath);
+    if (depth > 1) {
+        const directoryContents = await fs.readdir(topPath);
+        const childDirectories = directoryContents.filter(stat => stat.type === 'dir' && !skipPaths?.includes(stat.path));
+        const paths = (await Promise.all(childDirectories.map(({ path }) => {
+            return exports.getProjectPaths({
+                fs,
+                path,
+                depth: depth - 1,
+                skipPaths,
+            });
+        }))).flat();
+        return [...paths, ...allPaths];
+    }
+    return allPaths;
+};
+exports.getProjectPaths = getProjectPaths;

package/dist/index.d.ts

@@ -19,6 +19,7 @@ export { EdgeFunction } from './edge-function';
 export { detectBuilders, detectOutputDirectory, detectApiDirectory, detectApiExtensions, } from './detect-builders';
 export { detectFileSystemAPI } from './detect-file-system-api';
 export { detectFramework } from './detect-framework';
+export { getProjectPaths } from './get-project-paths';
 export { DetectorFilesystem } from './detectors/filesystem';
 export { readConfigFile } from './fs/read-config-file';
 export { normalizePath } from './fs/normalize-path';

package/dist/index.js

@@ -34075,7 +34075,7 @@ async function detectBuilders(files, pkg, options = {}) {
             // and package.json can be served as static files
             frontendBuilder = {
                 use: '@vercel/static',
-                src: '!{api/**,package.json}',
+                src: '!{api/**,package.json,middleware.[jt]s}',
                 config: {
                     zeroConfig: true,
                 },
@@ -34125,7 +34125,13 @@ async function detectBuilders(files, pkg, options = {}) {
 }
 exports.detectBuilders = detectBuilders;
 function maybeGetApiBuilder(fileName, apiMatches, options) {
-    if (!fileName.startsWith('api/')) {
+    const middleware = fileName === 'middleware.js' || fileName === 'middleware.ts';
+    // Root-level Middleware file is handled by `@vercel/next`, so don't
+    // schedule a separate Builder when "nextjs" framework is selected
+    if (middleware && options.projectSettings?.framework === 'nextjs') {
+        return null;
+    }
+    if (!(fileName.startsWith('api/') || middleware)) {
         return null;
     }
     if (fileName.includes('/.')) {
@@ -34144,11 +34150,14 @@ function maybeGetApiBuilder(fileName, apiMatches, options) {
         return src === fileName || minimatch_1.default(fileName, src);
     });
     const { fnPattern, func } = getFunction(fileName, options);
-    const use = (func && func.runtime) || (match && match.use);
+    const use = func?.runtime || match?.use;
     if (!use) {
         return null;
     }
     const config = { zeroConfig: true };
+    if (middleware) {
+        config.middleware = true;
+    }
     if (fnPattern && func) {
         config.functions = { [fnPattern]: func };
         if (func.includeFiles) {
@@ -34178,6 +34187,7 @@ function getFunction(fileName, { functions = {} }) {
 function getApiMatches() {
     const config = { zeroConfig: true };
     return [
+        { src: 'middleware.[jt]s', use: `@vercel/node`, config },
         { src: 'api/**/*.js', use: `@vercel/node`, config },
         { src: 'api/**/*.mjs', use: `@vercel/node`, config },
         { src: 'api/**/*.ts', use: `@vercel/node`, config },
@@ -36382,6 +36392,53 @@ const getPlatformEnv = (name) => {
 exports.getPlatformEnv = getPlatformEnv;
 
 
+/***/ }),
+
+/***/ 1886:
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.getProjectPaths = void 0;
+const detect_framework_1 = __webpack_require__(5224);
+const frameworks_1 = __importDefault(__webpack_require__(8438));
+const MAX_DEPTH_TRAVERSE = 3;
+const getProjectPaths = async ({ fs, path, skipPaths, depth = MAX_DEPTH_TRAVERSE, }) => {
+    if (depth === 0)
+        return [];
+    const allPaths = [];
+    const topPath = path ?? './';
+    if (path && skipPaths?.includes(path)) {
+        return allPaths;
+    }
+    const framework = await detect_framework_1.detectFramework({
+        fs: fs.chdir(topPath),
+        frameworkList: frameworks_1.default,
+    });
+    if (framework !== null)
+        allPaths.push(topPath);
+    if (depth > 1) {
+        const directoryContents = await fs.readdir(topPath);
+        const childDirectories = directoryContents.filter(stat => stat.type === 'dir' && !skipPaths?.includes(stat.path));
+        const paths = (await Promise.all(childDirectories.map(({ path }) => {
+            return exports.getProjectPaths({
+                fs,
+                path,
+                depth: depth - 1,
+                skipPaths,
+            });
+        }))).flat();
+        return [...paths, ...allPaths];
+    }
+    return allPaths;
+};
+exports.getProjectPaths = getProjectPaths;
+
+
 /***/ }),
 
 /***/ 2855:
@@ -36415,8 +36472,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-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;
-exports.monorepoManagers = exports.getWorkspacePackagePaths = exports.getWorkspaces = void 0;
+exports.isStaticRuntime = exports.isOfficialRuntime = exports.normalizePath = exports.readConfigFile = exports.DetectorFilesystem = exports.getProjectPaths = 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;
+exports.monorepoManagers = exports.getWorkspacePackagePaths = exports.getWorkspaces = exports.workspaceManagers = 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));
@@ -36481,6 +36538,8 @@ var detect_file_system_api_1 = __webpack_require__(1182);
 Object.defineProperty(exports, "detectFileSystemAPI", ({ enumerable: true, get: function () { return detect_file_system_api_1.detectFileSystemAPI; } }));
 var detect_framework_1 = __webpack_require__(5224);
 Object.defineProperty(exports, "detectFramework", ({ enumerable: true, get: function () { return detect_framework_1.detectFramework; } }));
+var get_project_paths_1 = __webpack_require__(1886);
+Object.defineProperty(exports, "getProjectPaths", ({ enumerable: true, get: function () { return get_project_paths_1.getProjectPaths; } }));
 var filesystem_1 = __webpack_require__(461);
 Object.defineProperty(exports, "DetectorFilesystem", ({ enumerable: true, get: function () { return filesystem_1.DetectorFilesystem; } }));
 var read_config_file_1 = __webpack_require__(7792);

package/dist/types.d.ts

@@ -377,6 +377,7 @@ export interface BuildResultV2Typical {
 }
 export declare type BuildResultV2 = BuildResultV2Typical | BuildResultBuildOutput;
 export interface BuildResultV3 {
+    routes?: any[];
     output: Lambda | EdgeFunction;
 }
 export declare type BuildV2 = (options: BuildOptions) => Promise<BuildResultV2>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -31,7 +31,7 @@
     "@types/node-fetch": "^2.1.6",
     "@types/semver": "6.0.0",
     "@types/yazl": "2.4.2",
-    "@vercel/frameworks": "1.0.1",
+    "@vercel/frameworks": "1.0.2",
     "@vercel/ncc": "0.24.0",
     "aggregate-error": "3.0.1",
     "async-retry": "1.2.3",
@@ -50,5 +50,5 @@
     "typescript": "4.3.4",
     "yazl": "2.5.1"
   },
-  "gitHead": "0c7b54edad6adf48505abf2cbec01691b85963bb"
+  "gitHead": "eed39913e1394477b224c38efe29429b17eeada6"
 }