@vercel/build-utils 2.12.3-canary.21 → 2.12.3-canary.22

package/dist/convert-runtime-to-plugin.d.ts

@@ -11,6 +11,8 @@ export declare function convertRuntimeToPlugin(buildRuntime: (options: BuildOpti
     vercelConfig: {
         functions?: BuilderFunctions;
         regions?: string[];
+        trailingSlash?: boolean;
+        cleanUrls?: boolean;
     };
     workPath: string;
 }) => Promise<void>;
@@ -30,11 +32,30 @@ export declare function updateFunctionsManifest({ vercelConfig, workPath, pages,
     };
 }): Promise<void>;
 /**
- * Will append routes to the `routes-manifest.json` file.
- * If the file does not exist, it'll be created.
+ * Append routes to the `routes-manifest.json` file.
+ * If the file does not exist, it will be created.
  */
-export declare function updateRoutesManifest({ workPath, dynamicRoutes, }: {
+export declare function updateRoutesManifest({ workPath, redirects, rewrites, headers, dynamicRoutes, staticRoutes, }: {
     workPath: string;
+    redirects?: {
+        source: string;
+        destination: string;
+        statusCode: number;
+        regex: string;
+    }[];
+    rewrites?: {
+        source: string;
+        destination: string;
+        regex: string;
+    }[];
+    headers?: {
+        source: string;
+        headers: {
+            key: string;
+            value: string;
+        }[];
+        regex: string;
+    }[];
     dynamicRoutes?: {
         page: string;
         regex: string;
@@ -43,4 +64,12 @@ export declare function updateRoutesManifest({ workPath, dynamicRoutes, }: {
             [named: string]: string;
         };
     }[];
+    staticRoutes?: {
+        page: string;
+        regex: string;
+        namedRegex?: string;
+        routeKeys?: {
+            [named: string]: string;
+        };
+    }[];
 }): Promise<void>;

package/dist/convert-runtime-to-plugin.js

@@ -8,6 +8,7 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = require("path");
 const glob_1 = __importDefault(require("./fs/glob"));
 const normalize_path_1 = require("./fs/normalize-path");
+const detect_builders_1 = require("./detect-builders");
 const lambda_1 = require("./lambda");
 const minimatch_1 = __importDefault(require("minimatch"));
 /**
@@ -18,12 +19,13 @@ const minimatch_1 = __importDefault(require("minimatch"));
 function convertRuntimeToPlugin(buildRuntime, ext) {
     // This `build()` signature should match `plugin.build()` signature in `vercel build`.
     return async function build({ vercelConfig, workPath, }) {
+        var _a;
         const opts = { cwd: workPath };
         const files = await glob_1.default('**', opts);
         delete files['vercel.json']; // Builders/Runtimes didn't have vercel.json
         const entrypoints = await glob_1.default(`api/**/*${ext}`, opts);
         const pages = {};
-        const { functions = {} } = vercelConfig;
+        const { functions = {}, cleanUrls, trailingSlash } = vercelConfig;
         const traceDir = path_1.join(workPath, '.output', 'runtime-traced-files');
         await fs_extra_1.default.ensureDir(traceDir);
         for (const entrypoint of Object.keys(entrypoints)) {
@@ -80,6 +82,53 @@ function convertRuntimeToPlugin(buildRuntime, ext) {
             await fs_extra_1.default.writeFile(nft, json);
         }
         await updateFunctionsManifest({ vercelConfig, workPath, pages });
+        const { warnings, errors, 
+        //defaultRoutes,
+        redirectRoutes, 
+        //rewriteRoutes,
+        dynamicRoutesWithKeys,
+        // errorRoutes, already handled by pages404
+         } = await detect_builders_1.detectBuilders(Object.keys(files), null, {
+            tag: 'latest',
+            functions: functions,
+            projectSettings: undefined,
+            featHandleMiss: true,
+            cleanUrls,
+            trailingSlash,
+        });
+        if (errors) {
+            throw new Error(errors[0].message);
+        }
+        if (warnings) {
+            warnings.forEach(warning => console.warn(warning.message, warning.link));
+        }
+        const redirects = (_a = redirectRoutes === null || redirectRoutes === void 0 ? void 0 : redirectRoutes.filter(r => r.src && 'headers' in r)) === null || _a === void 0 ? void 0 : _a.map(r => {
+            var _a;
+            return ({
+                source: r.src || '',
+                destination: 'headers' in r && ((_a = r.headers) === null || _a === void 0 ? void 0 : _a.Location) ? r.headers.Location : '',
+                statusCode: 'status' in r && r.status ? r.status : 307,
+                regex: r.src || '',
+            });
+        });
+        const dynamicRoutes = dynamicRoutesWithKeys === null || dynamicRoutesWithKeys === void 0 ? void 0 : dynamicRoutesWithKeys.map(r => {
+            const keys = Object.keys(r.routeKeys);
+            return {
+                page: '/' + r.fileName.slice(0, -ext.length),
+                regex: r.regex,
+                routeKeys: r.routeKeys,
+                namedRegex: r.regex
+                    .split('([^/]+)')
+                    .map((str, i) => str + (keys[i] ? `(?<${keys[i]}>[^/]+)` : ''))
+                    .join(''),
+            };
+        });
+        await updateRoutesManifest({
+            workPath,
+            redirects,
+            rewrites: [],
+            dynamicRoutes,
+        });
     };
 }
 exports.convertRuntimeToPlugin = convertRuntimeToPlugin;
@@ -133,21 +182,41 @@ async function updateFunctionsManifest({ vercelConfig, workPath, pages, }) {
 }
 exports.updateFunctionsManifest = updateFunctionsManifest;
 /**
- * Will append routes to the `routes-manifest.json` file.
- * If the file does not exist, it'll be created.
+ * Append routes to the `routes-manifest.json` file.
+ * If the file does not exist, it will be created.
  */
-async function updateRoutesManifest({ workPath, dynamicRoutes, }) {
+async function updateRoutesManifest({ workPath, redirects, rewrites, headers, dynamicRoutes, staticRoutes, }) {
     const routesManifestPath = path_1.join(workPath, '.output', 'routes-manifest.json');
     const routesManifest = await readJson(routesManifestPath);
     if (!routesManifest.version)
-        routesManifest.version = 1;
+        routesManifest.version = 3;
     if (routesManifest.pages404 === undefined)
         routesManifest.pages404 = true;
+    if (redirects) {
+        if (!routesManifest.redirects)
+            routesManifest.redirects = [];
+        routesManifest.redirects.push(...redirects);
+    }
+    if (rewrites) {
+        if (!routesManifest.rewrites)
+            routesManifest.rewrites = [];
+        routesManifest.rewrites.push(...rewrites);
+    }
+    if (headers) {
+        if (!routesManifest.headers)
+            routesManifest.headers = [];
+        routesManifest.headers.push(...headers);
+    }
     if (dynamicRoutes) {
         if (!routesManifest.dynamicRoutes)
             routesManifest.dynamicRoutes = [];
         routesManifest.dynamicRoutes.push(...dynamicRoutes);
     }
+    if (staticRoutes) {
+        if (!routesManifest.staticRoutes)
+            routesManifest.staticRoutes = [];
+        routesManifest.staticRoutes.push(...staticRoutes);
+    }
     await fs_extra_1.default.writeFile(routesManifestPath, JSON.stringify(routesManifest));
 }
 exports.updateRoutesManifest = updateRoutesManifest;

package/dist/detect-builders.d.ts

@@ -6,6 +6,13 @@ interface ErrorResponse {
     action?: string;
     link?: string;
 }
+interface DynamicRoutesWithKeys {
+    fileName: string;
+    regex: string;
+    routeKeys: {
+        [key: string]: string;
+    };
+}
 interface Options {
     tag?: 'canary' | 'latest' | string;
     functions?: BuilderFunctions;
@@ -34,5 +41,6 @@ export declare function detectBuilders(files: string[], pkg?: PackageJson | unde
     redirectRoutes: Route[] | null;
     rewriteRoutes: Route[] | null;
     errorRoutes: Route[] | null;
+    dynamicRoutesWithKeys: DynamicRoutesWithKeys[] | null;
 }>;
 export {};

package/dist/detect-builders.js

@@ -66,6 +66,7 @@ async function detectBuilders(files, pkg, options = {}) {
             redirectRoutes: null,
             rewriteRoutes: null,
             errorRoutes: null,
+            dynamicRoutesWithKeys: null,
         };
     }
     const sortedFiles = files.sort(sortFiles);
@@ -99,11 +100,12 @@ async function detectBuilders(files, pkg, options = {}) {
     let fallbackEntrypoint = null;
     const apiRoutes = [];
     const dynamicRoutes = [];
+    const dynamicRoutesWithKeys = [];
     // API
     for (const fileName of sortedFiles) {
         const apiBuilder = maybeGetApiBuilder(fileName, apiMatches, options);
         if (apiBuilder) {
-            const { routeError, apiRoute, isDynamic } = getApiRoute(fileName, apiSortedFiles, options, absolutePathCache);
+            const { routeError, apiRoute, isDynamic, routeKeys } = getApiRoute(fileName, apiSortedFiles, options, absolutePathCache);
             if (routeError) {
                 return {
                     builders: null,
@@ -113,12 +115,18 @@ async function detectBuilders(files, pkg, options = {}) {
                     redirectRoutes: null,
                     rewriteRoutes: null,
                     errorRoutes: null,
+                    dynamicRoutesWithKeys: null,
                 };
             }
             if (apiRoute) {
                 apiRoutes.push(apiRoute);
                 if (isDynamic) {
                     dynamicRoutes.push(apiRoute);
+                    dynamicRoutesWithKeys.push({
+                        fileName,
+                        regex: apiRoute.src,
+                        routeKeys,
+                    });
                 }
             }
             addToUsedFunctions(apiBuilder);
@@ -167,6 +175,7 @@ async function detectBuilders(files, pkg, options = {}) {
                 defaultRoutes: null,
                 rewriteRoutes: null,
                 errorRoutes: null,
+                dynamicRoutesWithKeys: null,
             };
         }
         // If `outputDirectory` is an empty string,
@@ -203,6 +212,7 @@ async function detectBuilders(files, pkg, options = {}) {
             defaultRoutes: null,
             rewriteRoutes: null,
             errorRoutes: null,
+            dynamicRoutesWithKeys: null,
         };
     }
     const builders = [];
@@ -230,6 +240,7 @@ async function detectBuilders(files, pkg, options = {}) {
         defaultRoutes: routesResult.defaultRoutes,
         rewriteRoutes: routesResult.rewriteRoutes,
         errorRoutes: routesResult.errorRoutes,
+        dynamicRoutesWithKeys,
     };
 }
 exports.detectBuilders = detectBuilders;
@@ -484,6 +495,7 @@ function getApiRoute(fileName, sortedFiles, options, absolutePathCache) {
         return {
             apiRoute: null,
             isDynamic: false,
+            routeKeys: {},
             routeError: {
                 code: 'conflicting_path_segment',
                 message: `The segment "${conflictingSegment}" occurs more than ` +
@@ -498,6 +510,7 @@ function getApiRoute(fileName, sortedFiles, options, absolutePathCache) {
         return {
             apiRoute: null,
             isDynamic: false,
+            routeKeys: {},
             routeError: {
                 code: 'conflicting_file_path',
                 message: `Two or more files have conflicting paths or names. ` +
@@ -510,6 +523,7 @@ function getApiRoute(fileName, sortedFiles, options, absolutePathCache) {
     return {
         apiRoute: out.route,
         isDynamic: out.isDynamic,
+        routeKeys: out.routeKeys,
         routeError: null,
     };
 }
@@ -619,6 +633,7 @@ function createRouteFromPath(filePath, featHandleMiss, cleanUrls) {
     const parts = filePath.split('/');
     let counter = 1;
     const query = [];
+    const routeKeys = {};
     let isDynamic = false;
     const srcParts = parts.map((segment, i) => {
         const name = getSegmentName(segment);
@@ -626,6 +641,7 @@ function createRouteFromPath(filePath, featHandleMiss, cleanUrls) {
         if (name !== null) {
             // We can't use `URLSearchParams` because `$` would get escaped
             query.push(`${name}=$${counter++}`);
+            routeKeys[name] = name;
             isDynamic = true;
             return `([^/]+)`;
         }
@@ -668,7 +684,7 @@ function createRouteFromPath(filePath, featHandleMiss, cleanUrls) {
             dest: `/${filePath}${queryString}`,
         };
     }
-    return { route, isDynamic };
+    return { route, isDynamic, routeKeys };
 }
 function getRouteResult(apiRoutes, dynamicRoutes, outputDirectory, apiBuilders, frontendBuilder, options) {
     var _a, _b;

package/dist/index.js

@@ -32285,6 +32285,7 @@ const fs_extra_1 = __importDefault(__webpack_require__(5392));
 const path_1 = __webpack_require__(5622);
 const glob_1 = __importDefault(__webpack_require__(4240));
 const normalize_path_1 = __webpack_require__(6261);
+const detect_builders_1 = __webpack_require__(4246);
 const lambda_1 = __webpack_require__(6721);
 const minimatch_1 = __importDefault(__webpack_require__(9566));
 /**
@@ -32295,12 +32296,13 @@ const minimatch_1 = __importDefault(__webpack_require__(9566));
 function convertRuntimeToPlugin(buildRuntime, ext) {
     // This `build()` signature should match `plugin.build()` signature in `vercel build`.
     return async function build({ vercelConfig, workPath, }) {
+        var _a;
         const opts = { cwd: workPath };
         const files = await glob_1.default('**', opts);
         delete files['vercel.json']; // Builders/Runtimes didn't have vercel.json
         const entrypoints = await glob_1.default(`api/**/*${ext}`, opts);
         const pages = {};
-        const { functions = {} } = vercelConfig;
+        const { functions = {}, cleanUrls, trailingSlash } = vercelConfig;
         const traceDir = path_1.join(workPath, '.output', 'runtime-traced-files');
         await fs_extra_1.default.ensureDir(traceDir);
         for (const entrypoint of Object.keys(entrypoints)) {
@@ -32357,6 +32359,53 @@ function convertRuntimeToPlugin(buildRuntime, ext) {
             await fs_extra_1.default.writeFile(nft, json);
         }
         await updateFunctionsManifest({ vercelConfig, workPath, pages });
+        const { warnings, errors, 
+        //defaultRoutes,
+        redirectRoutes, 
+        //rewriteRoutes,
+        dynamicRoutesWithKeys,
+        // errorRoutes, already handled by pages404
+         } = await detect_builders_1.detectBuilders(Object.keys(files), null, {
+            tag: 'latest',
+            functions: functions,
+            projectSettings: undefined,
+            featHandleMiss: true,
+            cleanUrls,
+            trailingSlash,
+        });
+        if (errors) {
+            throw new Error(errors[0].message);
+        }
+        if (warnings) {
+            warnings.forEach(warning => console.warn(warning.message, warning.link));
+        }
+        const redirects = (_a = redirectRoutes === null || redirectRoutes === void 0 ? void 0 : redirectRoutes.filter(r => r.src && 'headers' in r)) === null || _a === void 0 ? void 0 : _a.map(r => {
+            var _a;
+            return ({
+                source: r.src || '',
+                destination: 'headers' in r && ((_a = r.headers) === null || _a === void 0 ? void 0 : _a.Location) ? r.headers.Location : '',
+                statusCode: 'status' in r && r.status ? r.status : 307,
+                regex: r.src || '',
+            });
+        });
+        const dynamicRoutes = dynamicRoutesWithKeys === null || dynamicRoutesWithKeys === void 0 ? void 0 : dynamicRoutesWithKeys.map(r => {
+            const keys = Object.keys(r.routeKeys);
+            return {
+                page: '/' + r.fileName.slice(0, -ext.length),
+                regex: r.regex,
+                routeKeys: r.routeKeys,
+                namedRegex: r.regex
+                    .split('([^/]+)')
+                    .map((str, i) => str + (keys[i] ? `(?<${keys[i]}>[^/]+)` : ''))
+                    .join(''),
+            };
+        });
+        await updateRoutesManifest({
+            workPath,
+            redirects,
+            rewrites: [],
+            dynamicRoutes,
+        });
     };
 }
 exports.convertRuntimeToPlugin = convertRuntimeToPlugin;
@@ -32410,21 +32459,41 @@ async function updateFunctionsManifest({ vercelConfig, workPath, pages, }) {
 }
 exports.updateFunctionsManifest = updateFunctionsManifest;
 /**
- * Will append routes to the `routes-manifest.json` file.
- * If the file does not exist, it'll be created.
+ * Append routes to the `routes-manifest.json` file.
+ * If the file does not exist, it will be created.
  */
-async function updateRoutesManifest({ workPath, dynamicRoutes, }) {
+async function updateRoutesManifest({ workPath, redirects, rewrites, headers, dynamicRoutes, staticRoutes, }) {
     const routesManifestPath = path_1.join(workPath, '.output', 'routes-manifest.json');
     const routesManifest = await readJson(routesManifestPath);
     if (!routesManifest.version)
-        routesManifest.version = 1;
+        routesManifest.version = 3;
     if (routesManifest.pages404 === undefined)
         routesManifest.pages404 = true;
+    if (redirects) {
+        if (!routesManifest.redirects)
+            routesManifest.redirects = [];
+        routesManifest.redirects.push(...redirects);
+    }
+    if (rewrites) {
+        if (!routesManifest.rewrites)
+            routesManifest.rewrites = [];
+        routesManifest.rewrites.push(...rewrites);
+    }
+    if (headers) {
+        if (!routesManifest.headers)
+            routesManifest.headers = [];
+        routesManifest.headers.push(...headers);
+    }
     if (dynamicRoutes) {
         if (!routesManifest.dynamicRoutes)
             routesManifest.dynamicRoutes = [];
         routesManifest.dynamicRoutes.push(...dynamicRoutes);
     }
+    if (staticRoutes) {
+        if (!routesManifest.staticRoutes)
+            routesManifest.staticRoutes = [];
+        routesManifest.staticRoutes.push(...staticRoutes);
+    }
     await fs_extra_1.default.writeFile(routesManifestPath, JSON.stringify(routesManifest));
 }
 exports.updateRoutesManifest = updateRoutesManifest;
@@ -32521,6 +32590,7 @@ async function detectBuilders(files, pkg, options = {}) {
             redirectRoutes: null,
             rewriteRoutes: null,
             errorRoutes: null,
+            dynamicRoutesWithKeys: null,
         };
     }
     const sortedFiles = files.sort(sortFiles);
@@ -32554,11 +32624,12 @@ async function detectBuilders(files, pkg, options = {}) {
     let fallbackEntrypoint = null;
     const apiRoutes = [];
     const dynamicRoutes = [];
+    const dynamicRoutesWithKeys = [];
     // API
     for (const fileName of sortedFiles) {
         const apiBuilder = maybeGetApiBuilder(fileName, apiMatches, options);
         if (apiBuilder) {
-            const { routeError, apiRoute, isDynamic } = getApiRoute(fileName, apiSortedFiles, options, absolutePathCache);
+            const { routeError, apiRoute, isDynamic, routeKeys } = getApiRoute(fileName, apiSortedFiles, options, absolutePathCache);
             if (routeError) {
                 return {
                     builders: null,
@@ -32568,12 +32639,18 @@ async function detectBuilders(files, pkg, options = {}) {
                     redirectRoutes: null,
                     rewriteRoutes: null,
                     errorRoutes: null,
+                    dynamicRoutesWithKeys: null,
                 };
             }
             if (apiRoute) {
                 apiRoutes.push(apiRoute);
                 if (isDynamic) {
                     dynamicRoutes.push(apiRoute);
+                    dynamicRoutesWithKeys.push({
+                        fileName,
+                        regex: apiRoute.src,
+                        routeKeys,
+                    });
                 }
             }
             addToUsedFunctions(apiBuilder);
@@ -32622,6 +32699,7 @@ async function detectBuilders(files, pkg, options = {}) {
                 defaultRoutes: null,
                 rewriteRoutes: null,
                 errorRoutes: null,
+                dynamicRoutesWithKeys: null,
             };
         }
         // If `outputDirectory` is an empty string,
@@ -32658,6 +32736,7 @@ async function detectBuilders(files, pkg, options = {}) {
             defaultRoutes: null,
             rewriteRoutes: null,
             errorRoutes: null,
+            dynamicRoutesWithKeys: null,
         };
     }
     const builders = [];
@@ -32685,6 +32764,7 @@ async function detectBuilders(files, pkg, options = {}) {
         defaultRoutes: routesResult.defaultRoutes,
         rewriteRoutes: routesResult.rewriteRoutes,
         errorRoutes: routesResult.errorRoutes,
+        dynamicRoutesWithKeys,
     };
 }
 exports.detectBuilders = detectBuilders;
@@ -32939,6 +33019,7 @@ function getApiRoute(fileName, sortedFiles, options, absolutePathCache) {
         return {
             apiRoute: null,
             isDynamic: false,
+            routeKeys: {},
             routeError: {
                 code: 'conflicting_path_segment',
                 message: `The segment "${conflictingSegment}" occurs more than ` +
@@ -32953,6 +33034,7 @@ function getApiRoute(fileName, sortedFiles, options, absolutePathCache) {
         return {
             apiRoute: null,
             isDynamic: false,
+            routeKeys: {},
             routeError: {
                 code: 'conflicting_file_path',
                 message: `Two or more files have conflicting paths or names. ` +
@@ -32965,6 +33047,7 @@ function getApiRoute(fileName, sortedFiles, options, absolutePathCache) {
     return {
         apiRoute: out.route,
         isDynamic: out.isDynamic,
+        routeKeys: out.routeKeys,
         routeError: null,
     };
 }
@@ -33074,6 +33157,7 @@ function createRouteFromPath(filePath, featHandleMiss, cleanUrls) {
     const parts = filePath.split('/');
     let counter = 1;
     const query = [];
+    const routeKeys = {};
     let isDynamic = false;
     const srcParts = parts.map((segment, i) => {
         const name = getSegmentName(segment);
@@ -33081,6 +33165,7 @@ function createRouteFromPath(filePath, featHandleMiss, cleanUrls) {
         if (name !== null) {
             // We can't use `URLSearchParams` because `$` would get escaped
             query.push(`${name}=$${counter++}`);
+            routeKeys[name] = name;
             isDynamic = true;
             return `([^/]+)`;
         }
@@ -33123,7 +33208,7 @@ function createRouteFromPath(filePath, featHandleMiss, cleanUrls) {
             dest: `/${filePath}${queryString}`,
         };
     }
-    return { route, isDynamic };
+    return { route, isDynamic, routeKeys };
 }
 function getRouteResult(apiRoutes, dynamicRoutes, outputDirectory, apiBuilders, frontendBuilder, options) {
     var _a, _b;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "2.12.3-canary.21",
+  "version": "2.12.3-canary.22",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -49,5 +49,5 @@
     "typescript": "4.3.4",
     "yazl": "2.4.3"
   },
-  "gitHead": "cc7b2691c1d43ecb19f1dd6e88f29137d85da61a"
+  "gitHead": "0cacb1bdace342133fad4bd7a98354e5b2948df0"
 }