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

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

@@ -30,11 +30,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 +62,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

@@ -46,7 +46,7 @@ function convertRuntimeToPlugin(buildRuntime, ext) {
                 maxDuration: output.maxDuration,
                 environment: output.environment,
                 allowQuery: output.allowQuery,
-                regions: output.regions,
+                //regions: output.regions,
             };
             // @ts-ignore This symbol is a private API
             const lambdaFiles = output[lambda_1.FILES_SYMBOL];
@@ -133,21 +133,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

@@ -34,5 +34,11 @@ export declare function detectBuilders(files: string[], pkg?: PackageJson | unde
     redirectRoutes: Route[] | null;
     rewriteRoutes: Route[] | null;
     errorRoutes: Route[] | null;
+    limitedRoutes: LimitedRoutes | null;
 }>;
+interface LimitedRoutes {
+    defaultRoutes: Route[];
+    redirectRoutes: Route[];
+    rewriteRoutes: Route[];
+}
 export {};

package/dist/detect-builders.js

@@ -66,6 +66,7 @@ async function detectBuilders(files, pkg, options = {}) {
             redirectRoutes: null,
             rewriteRoutes: null,
             errorRoutes: null,
+            limitedRoutes: null,
         };
     }
     const sortedFiles = files.sort(sortFiles);
@@ -113,6 +114,7 @@ async function detectBuilders(files, pkg, options = {}) {
                     redirectRoutes: null,
                     rewriteRoutes: null,
                     errorRoutes: null,
+                    limitedRoutes: null,
                 };
             }
             if (apiRoute) {
@@ -167,6 +169,7 @@ async function detectBuilders(files, pkg, options = {}) {
                 defaultRoutes: null,
                 rewriteRoutes: null,
                 errorRoutes: null,
+                limitedRoutes: null,
             };
         }
         // If `outputDirectory` is an empty string,
@@ -203,6 +206,7 @@ async function detectBuilders(files, pkg, options = {}) {
             defaultRoutes: null,
             rewriteRoutes: null,
             errorRoutes: null,
+            limitedRoutes: null,
         };
     }
     const builders = [];
@@ -221,7 +225,7 @@ async function detectBuilders(files, pkg, options = {}) {
             });
         }
     }
-    const routesResult = getRouteResult(apiRoutes, dynamicRoutes, usedOutputDirectory, apiBuilders, frontendBuilder, options);
+    const routesResult = getRouteResult(pkg, apiRoutes, dynamicRoutes, usedOutputDirectory, apiBuilders, frontendBuilder, options);
     return {
         warnings,
         builders: builders.length ? builders : null,
@@ -230,6 +234,7 @@ async function detectBuilders(files, pkg, options = {}) {
         defaultRoutes: routesResult.defaultRoutes,
         rewriteRoutes: routesResult.rewriteRoutes,
         errorRoutes: routesResult.errorRoutes,
+        limitedRoutes: routesResult.limitedRoutes,
     };
 }
 exports.detectBuilders = detectBuilders;
@@ -670,23 +675,51 @@ function createRouteFromPath(filePath, featHandleMiss, cleanUrls) {
     }
     return { route, isDynamic };
 }
-function getRouteResult(apiRoutes, dynamicRoutes, outputDirectory, apiBuilders, frontendBuilder, options) {
+function getRouteResult(pkg, apiRoutes, dynamicRoutes, outputDirectory, apiBuilders, frontendBuilder, options) {
     var _a, _b;
+    const deps = Object.assign({}, pkg === null || pkg === void 0 ? void 0 : pkg.dependencies, pkg === null || pkg === void 0 ? void 0 : pkg.devDependencies);
     const defaultRoutes = [];
     const redirectRoutes = [];
     const rewriteRoutes = [];
     const errorRoutes = [];
+    const limitedRoutes = {
+        defaultRoutes: [],
+        redirectRoutes: [],
+        rewriteRoutes: [],
+    };
     const framework = ((_a = frontendBuilder === null || frontendBuilder === void 0 ? void 0 : frontendBuilder.config) === null || _a === void 0 ? void 0 : _a.framework) || '';
     const isNextjs = framework === 'nextjs' || _1.isOfficialRuntime('next', frontendBuilder === null || frontendBuilder === void 0 ? void 0 : frontendBuilder.use);
     const ignoreRuntimes = (_b = slugToFramework.get(framework)) === null || _b === void 0 ? void 0 : _b.ignoreRuntimes;
     if (apiRoutes && apiRoutes.length > 0) {
         if (options.featHandleMiss) {
+            // Exclude extension names if the corresponding plugin is not found in package.json
+            // detectBuilders({ignoreRoutesForBuilders: ['@vercel/python']})
+            // return a copy of routes.
+            // We should exclud errorRoutes and
             const extSet = detectApiExtensions(apiBuilders);
+            const withTag = options.tag ? `@${options.tag}` : '';
+            const extSetLimited = detectApiExtensions(apiBuilders.filter(b => {
+                if (b.use === `@vercel/python${withTag}` &&
+                    !('vercel-plugin-python' in deps)) {
+                    return false;
+                }
+                if (b.use === `@vercel/go${withTag}` &&
+                    !('vercel-plugin-go' in deps)) {
+                    return false;
+                }
+                if (b.use === `@vercel/ruby${withTag}` &&
+                    !('vercel-plugin-ruby' in deps)) {
+                    return false;
+                }
+                return true;
+            }));
             if (extSet.size > 0) {
-                const exts = Array.from(extSet)
+                const extGroup = `(?:\\.(?:${Array.from(extSet)
                     .map(ext => ext.slice(1))
-                    .join('|');
-                const extGroup = `(?:\\.(?:${exts}))`;
+                    .join('|')}))`;
+                const extGroupLimited = `(?:\\.(?:${Array.from(extSetLimited)
+                    .map(ext => ext.slice(1))
+                    .join('|')}))`;
                 if (options.cleanUrls) {
                     redirectRoutes.push({
                         src: `^/(api(?:.+)?)/index${extGroup}?/?$`,
@@ -700,6 +733,18 @@ function getRouteResult(apiRoutes, dynamicRoutes, outputDirectory, apiBuilders,
                         },
                         status: 308,
                     });
+                    limitedRoutes.redirectRoutes.push({
+                        src: `^/(api(?:.+)?)/index${extGroupLimited}?/?$`,
+                        headers: { Location: options.trailingSlash ? '/$1/' : '/$1' },
+                        status: 308,
+                    });
+                    limitedRoutes.redirectRoutes.push({
+                        src: `^/api/(.+)${extGroupLimited}/?$`,
+                        headers: {
+                            Location: options.trailingSlash ? '/api/$1/' : '/api/$1',
+                        },
+                        status: 308,
+                    });
                 }
                 else {
                     defaultRoutes.push({ handle: 'miss' });
@@ -708,9 +753,16 @@ function getRouteResult(apiRoutes, dynamicRoutes, outputDirectory, apiBuilders,
                         dest: '/api/$1',
                         check: true,
                     });
+                    limitedRoutes.defaultRoutes.push({ handle: 'miss' });
+                    limitedRoutes.defaultRoutes.push({
+                        src: `^/api/(.+)${extGroupLimited}$`,
+                        dest: '/api/$1',
+                        check: true,
+                    });
                 }
             }
             rewriteRoutes.push(...dynamicRoutes);
+            limitedRoutes.rewriteRoutes.push(...dynamicRoutes);
             if (typeof ignoreRuntimes === 'undefined') {
                 // This route is only necessary to hide the directory listing
                 // to avoid enumerating serverless function names.
@@ -755,6 +807,7 @@ function getRouteResult(apiRoutes, dynamicRoutes, outputDirectory, apiBuilders,
         redirectRoutes,
         rewriteRoutes,
         errorRoutes,
+        limitedRoutes,
     };
 }
 function sortFilesBySegmentCount(fileA, fileB) {

package/dist/index.js

@@ -26274,7 +26274,7 @@ exports.frameworks = [
         name: 'Remix',
         slug: 'remix',
         demo: 'https://remix.examples.vercel.com',
-        logo: 'https://raw.githubusercontent.com/vercel/vercel/main/packages/frameworks/logos/remix.svg',
+        logo: 'https://raw.githubusercontent.com/vercel/vercel/main/packages/frameworks/logos/remix-no-shadow.svg',
         tagline: 'Build Better Websites',
         description: 'A new Remix app — the result of running `npx create-remix`.',
         website: 'https://remix.run',
@@ -26329,8 +26329,8 @@ exports.frameworks = [
         ],
         defaultHeaders: [
             {
-                source: '^/build/(.*)$',
-                regex: '^/build/(.*)$',
+                source: '/build/(.*)',
+                regex: '/build/(.*)',
                 headers: [
                     { key: 'cache-control', value: 'public, max-age=31536000, immutable' },
                 ],
@@ -32323,7 +32323,7 @@ function convertRuntimeToPlugin(buildRuntime, ext) {
                 maxDuration: output.maxDuration,
                 environment: output.environment,
                 allowQuery: output.allowQuery,
-                regions: output.regions,
+                //regions: output.regions,
             };
             // @ts-ignore This symbol is a private API
             const lambdaFiles = output[lambda_1.FILES_SYMBOL];
@@ -32410,21 +32410,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 +32541,7 @@ async function detectBuilders(files, pkg, options = {}) {
             redirectRoutes: null,
             rewriteRoutes: null,
             errorRoutes: null,
+            limitedRoutes: null,
         };
     }
     const sortedFiles = files.sort(sortFiles);
@@ -32568,6 +32589,7 @@ async function detectBuilders(files, pkg, options = {}) {
                     redirectRoutes: null,
                     rewriteRoutes: null,
                     errorRoutes: null,
+                    limitedRoutes: null,
                 };
             }
             if (apiRoute) {
@@ -32622,6 +32644,7 @@ async function detectBuilders(files, pkg, options = {}) {
                 defaultRoutes: null,
                 rewriteRoutes: null,
                 errorRoutes: null,
+                limitedRoutes: null,
             };
         }
         // If `outputDirectory` is an empty string,
@@ -32658,6 +32681,7 @@ async function detectBuilders(files, pkg, options = {}) {
             defaultRoutes: null,
             rewriteRoutes: null,
             errorRoutes: null,
+            limitedRoutes: null,
         };
     }
     const builders = [];
@@ -32676,7 +32700,7 @@ async function detectBuilders(files, pkg, options = {}) {
             });
         }
     }
-    const routesResult = getRouteResult(apiRoutes, dynamicRoutes, usedOutputDirectory, apiBuilders, frontendBuilder, options);
+    const routesResult = getRouteResult(pkg, apiRoutes, dynamicRoutes, usedOutputDirectory, apiBuilders, frontendBuilder, options);
     return {
         warnings,
         builders: builders.length ? builders : null,
@@ -32685,6 +32709,7 @@ async function detectBuilders(files, pkg, options = {}) {
         defaultRoutes: routesResult.defaultRoutes,
         rewriteRoutes: routesResult.rewriteRoutes,
         errorRoutes: routesResult.errorRoutes,
+        limitedRoutes: routesResult.limitedRoutes,
     };
 }
 exports.detectBuilders = detectBuilders;
@@ -33125,23 +33150,51 @@ function createRouteFromPath(filePath, featHandleMiss, cleanUrls) {
     }
     return { route, isDynamic };
 }
-function getRouteResult(apiRoutes, dynamicRoutes, outputDirectory, apiBuilders, frontendBuilder, options) {
+function getRouteResult(pkg, apiRoutes, dynamicRoutes, outputDirectory, apiBuilders, frontendBuilder, options) {
     var _a, _b;
+    const deps = Object.assign({}, pkg === null || pkg === void 0 ? void 0 : pkg.dependencies, pkg === null || pkg === void 0 ? void 0 : pkg.devDependencies);
     const defaultRoutes = [];
     const redirectRoutes = [];
     const rewriteRoutes = [];
     const errorRoutes = [];
+    const limitedRoutes = {
+        defaultRoutes: [],
+        redirectRoutes: [],
+        rewriteRoutes: [],
+    };
     const framework = ((_a = frontendBuilder === null || frontendBuilder === void 0 ? void 0 : frontendBuilder.config) === null || _a === void 0 ? void 0 : _a.framework) || '';
     const isNextjs = framework === 'nextjs' || _1.isOfficialRuntime('next', frontendBuilder === null || frontendBuilder === void 0 ? void 0 : frontendBuilder.use);
     const ignoreRuntimes = (_b = slugToFramework.get(framework)) === null || _b === void 0 ? void 0 : _b.ignoreRuntimes;
     if (apiRoutes && apiRoutes.length > 0) {
         if (options.featHandleMiss) {
+            // Exclude extension names if the corresponding plugin is not found in package.json
+            // detectBuilders({ignoreRoutesForBuilders: ['@vercel/python']})
+            // return a copy of routes.
+            // We should exclud errorRoutes and
             const extSet = detectApiExtensions(apiBuilders);
+            const withTag = options.tag ? `@${options.tag}` : '';
+            const extSetLimited = detectApiExtensions(apiBuilders.filter(b => {
+                if (b.use === `@vercel/python${withTag}` &&
+                    !('vercel-plugin-python' in deps)) {
+                    return false;
+                }
+                if (b.use === `@vercel/go${withTag}` &&
+                    !('vercel-plugin-go' in deps)) {
+                    return false;
+                }
+                if (b.use === `@vercel/ruby${withTag}` &&
+                    !('vercel-plugin-ruby' in deps)) {
+                    return false;
+                }
+                return true;
+            }));
             if (extSet.size > 0) {
-                const exts = Array.from(extSet)
+                const extGroup = `(?:\\.(?:${Array.from(extSet)
                     .map(ext => ext.slice(1))
-                    .join('|');
-                const extGroup = `(?:\\.(?:${exts}))`;
+                    .join('|')}))`;
+                const extGroupLimited = `(?:\\.(?:${Array.from(extSetLimited)
+                    .map(ext => ext.slice(1))
+                    .join('|')}))`;
                 if (options.cleanUrls) {
                     redirectRoutes.push({
                         src: `^/(api(?:.+)?)/index${extGroup}?/?$`,
@@ -33155,6 +33208,18 @@ function getRouteResult(apiRoutes, dynamicRoutes, outputDirectory, apiBuilders,
                         },
                         status: 308,
                     });
+                    limitedRoutes.redirectRoutes.push({
+                        src: `^/(api(?:.+)?)/index${extGroupLimited}?/?$`,
+                        headers: { Location: options.trailingSlash ? '/$1/' : '/$1' },
+                        status: 308,
+                    });
+                    limitedRoutes.redirectRoutes.push({
+                        src: `^/api/(.+)${extGroupLimited}/?$`,
+                        headers: {
+                            Location: options.trailingSlash ? '/api/$1/' : '/api/$1',
+                        },
+                        status: 308,
+                    });
                 }
                 else {
                     defaultRoutes.push({ handle: 'miss' });
@@ -33163,9 +33228,16 @@ function getRouteResult(apiRoutes, dynamicRoutes, outputDirectory, apiBuilders,
                         dest: '/api/$1',
                         check: true,
                     });
+                    limitedRoutes.defaultRoutes.push({ handle: 'miss' });
+                    limitedRoutes.defaultRoutes.push({
+                        src: `^/api/(.+)${extGroupLimited}$`,
+                        dest: '/api/$1',
+                        check: true,
+                    });
                 }
             }
             rewriteRoutes.push(...dynamicRoutes);
+            limitedRoutes.rewriteRoutes.push(...dynamicRoutes);
             if (typeof ignoreRuntimes === 'undefined') {
                 // This route is only necessary to hide the directory listing
                 // to avoid enumerating serverless function names.
@@ -33210,6 +33282,7 @@ function getRouteResult(apiRoutes, dynamicRoutes, outputDirectory, apiBuilders,
         redirectRoutes,
         rewriteRoutes,
         errorRoutes,
+        limitedRoutes,
     };
 }
 function sortFilesBySegmentCount(fileA, fileB) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "2.12.3-canary.21",
+  "version": "2.12.3-canary.25",
   "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.1",
-    "@vercel/frameworks": "0.5.1-canary.13",
+    "@vercel/frameworks": "0.5.1-canary.15",
     "@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.4.3"
   },
-  "gitHead": "cc7b2691c1d43ecb19f1dd6e88f29137d85da61a"
+  "gitHead": "6b865ff753ad0e51b284dac173e7e32953de3298"
 }