@vercel/next 3.7.5 → 3.8.0

package/dist/edge-function-source/get-edge-function-source.js

@@ -12,7 +12,7 @@ const constants_1 = require("./constants");
 const zlib_1 = __importDefault(require("zlib"));
 const util_1 = require("util");
 const utils_1 = require("../utils");
-// @ts-expect-error this is a prebuilt file, based on `../../scripts/build-edge-function-template.js`
+// @ts-ignore this is a prebuilt file, based on `../../scripts/build-edge-function-template.js`
 const ___get_nextjs_edge_function_js_1 = __importDefault(require("../../dist/___get-nextjs-edge-function.js"));
 const gzip = (0, util_1.promisify)(zlib_1.default.gzip);
 /**

package/dist/index.js

@@ -40433,7 +40433,7 @@ function convertTrailingSlash(enable, status = 308) {
 exports.convertTrailingSlash = convertTrailingSlash;
 function sourceToRegex(source) {
     const keys = [];
-    const r = path_to_regexp_1.pathToRegexp(source, keys, {
+    const r = (0, path_to_regexp_1.pathToRegexp)(source, keys, {
         strict: true,
         sensitive: true,
         delimiter: '/',
@@ -40499,7 +40499,7 @@ function replaceSegments(segments, hasItemSegments, destination, isRedirect, int
         indexes[name] = '$' + name;
         escapedDestination = escapeSegment(escapedDestination, name);
     });
-    const parsedDestination = url_1.parse(escapedDestination, true);
+    const parsedDestination = (0, url_1.parse)(escapedDestination, true);
     delete parsedDestination.href;
     delete parsedDestination.path;
     delete parsedDestination.search;
@@ -40514,9 +40514,9 @@ function replaceSegments(segments, hasItemSegments, destination, isRedirect, int
     const hashKeys = [];
     const hostnameKeys = [];
     try {
-        path_to_regexp_1.pathToRegexp(pathname, pathnameKeys);
-        path_to_regexp_1.pathToRegexp(hash || '', hashKeys);
-        path_to_regexp_1.pathToRegexp(hostname || '', hostnameKeys);
+        (0, path_to_regexp_1.pathToRegexp)(pathname, pathnameKeys);
+        (0, path_to_regexp_1.pathToRegexp)(hash || '', hashKeys);
+        (0, path_to_regexp_1.pathToRegexp)(hostname || '', hostnameKeys);
     }
     catch (_) {
         // this is not fatal so don't error when failing to parse the
@@ -40553,7 +40553,7 @@ function replaceSegments(segments, hasItemSegments, destination, isRedirect, int
             }
         }
     }
-    destination = url_1.format({
+    destination = (0, url_1.format)({
         ...rest,
         hostname,
         pathname,
@@ -40572,7 +40572,7 @@ function safelyCompile(value, indexes, attemptDirectCompile) {
             // Attempt compiling normally with path-to-regexp first and fall back
             // to safely compiling to handle edge cases if path-to-regexp compile
             // fails
-            return path_to_regexp_1.compile(value, { validate: false })(indexes);
+            return (0, path_to_regexp_1.compile)(value, { validate: false })(indexes);
         }
         catch (e) {
             // non-fatal, we continue to safely compile
@@ -40595,7 +40595,7 @@ function safelyCompile(value, indexes, attemptDirectCompile) {
         .replace(/--ESCAPED_PARAM_ASTERISK/g, '*');
     // the value needs to start with a forward-slash to be compiled
     // correctly
-    return path_to_regexp_1.compile(`/${value}`, { validate: false })(indexes).slice(1);
+    return (0, path_to_regexp_1.compile)(`/${value}`, { validate: false })(indexes).slice(1);
 }
 function toSegmentDest(index) {
     const i = index + 1; // js is base 0, regex is base 1
@@ -40741,7 +40741,7 @@ const constants_1 = __webpack_require__(2152);
 const zlib_1 = __importDefault(__webpack_require__(8761));
 const util_1 = __webpack_require__(1669);
 const utils_1 = __webpack_require__(6136);
-// @ts-expect-error this is a prebuilt file, based on `../../scripts/build-edge-function-template.js`
+// @ts-ignore this is a prebuilt file, based on `../../scripts/build-edge-function-template.js`
 const ___get_nextjs_edge_function_js_1 = __importDefault(__webpack_require__(6223));
 const gzip = (0, util_1.promisify)(zlib_1.default.gzip);
 /**
@@ -44358,7 +44358,11 @@ exports.stringifySourceMap = stringifySourceMap;
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -45114,27 +45118,33 @@ async function getSourceFilePathFromPage({ workPath, page, pageExtensions, }) {
     // TODO: this should be updated to get the pageExtensions
     // value used during next build
     const extensionsToTry = pageExtensions || ['js', 'jsx', 'ts', 'tsx'];
-    let fsPath = path_1.default.join(workPath, 'pages', page);
-    if (await usesSrcDirectory(workPath)) {
-        fsPath = path_1.default.join(workPath, 'src', 'pages', page);
-    }
-    if (fs_extra_1.default.existsSync(fsPath)) {
-        return path_1.default.relative(workPath, fsPath);
-    }
-    const extensionless = fsPath.slice(0, -3); // remove ".js"
-    for (const ext of extensionsToTry) {
-        fsPath = `${extensionless}.${ext}`;
+    for (const pageType of ['pages', 'app']) {
+        let fsPath = path_1.default.join(workPath, pageType, page);
+        if (await usesSrcDirectory(workPath)) {
+            fsPath = path_1.default.join(workPath, 'src', pageType, page);
+        }
         if (fs_extra_1.default.existsSync(fsPath)) {
             return path_1.default.relative(workPath, fsPath);
         }
-    }
-    if (isDirectory(extensionless)) {
+        const extensionless = fsPath.replace(path_1.default.extname(fsPath), '');
         for (const ext of extensionsToTry) {
-            fsPath = path_1.default.join(extensionless, `index.${ext}`);
+            fsPath = `${extensionless}.${ext}`;
             if (fs_extra_1.default.existsSync(fsPath)) {
                 return path_1.default.relative(workPath, fsPath);
             }
         }
+        if (isDirectory(extensionless)) {
+            for (const ext of extensionsToTry) {
+                fsPath = path_1.default.join(extensionless, `index.${ext}`);
+                if (fs_extra_1.default.existsSync(fsPath)) {
+                    return path_1.default.relative(workPath, fsPath);
+                }
+                fsPath = path_1.default.join(extensionless, `route.${ext}`);
+                if (fs_extra_1.default.existsSync(fsPath)) {
+                    return path_1.default.relative(workPath, fsPath);
+                }
+            }
+        }
     }
     console.log(`WARNING: Unable to find source file for page ${page} with extensions: ${extensionsToTry.join(', ')}, this can cause functions config from \`vercel.json\` to not be applied`);
     return '';
@@ -45842,6 +45852,47 @@ async function getPrivateOutputs(dir, entries) {
     return { files, routes };
 }
 exports.getPrivateOutputs = getPrivateOutputs;
+const vercelFunctionRegionsVar = process.env.VERCEL_FUNCTION_REGIONS;
+let vercelFunctionRegions;
+if (vercelFunctionRegionsVar) {
+    vercelFunctionRegions = vercelFunctionRegionsVar.split(',');
+}
+/**
+ * Normalizes the regions config that comes from the Next.js edge functions manifest.
+ * Ensures that config like `home` and `global` are converted to the corresponding Vercel region config.
+ * In the future we'll want to make `home` and `global` part of the Build Output API.
+ * - `home` refers to the regions set in vercel.json or on the Vercel dashboard project config.
+ * - `global` refers to all regions.
+ */
+function normalizeRegions(regions) {
+    if (typeof regions === 'string') {
+        regions = [regions];
+    }
+    const newRegions = [];
+    for (const region of regions) {
+        // Explicitly mentioned as `home` is one of the explicit values for preferredRegion in Next.js.
+        if (region === 'home') {
+            if (vercelFunctionRegions) {
+                // Includes the regions from the VERCEL_FUNCTION_REGIONS env var.
+                newRegions.push(...vercelFunctionRegions);
+            }
+            continue;
+        }
+        // Explicitly mentioned as `global` is one of the explicit values for preferredRegion in Next.js.
+        if (region === 'global') {
+            // Uses `all` instead as that's how it's implemented on Vercel.
+            newRegions.push('all');
+            continue;
+        }
+        // Explicitly mentioned as `auto` is one of the explicit values for preferredRegion in Next.js.
+        if (region === 'auto') {
+            newRegions.push('auto');
+            continue;
+        }
+        newRegions.push(region);
+    }
+    return [];
+}
 async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest, isCorrectMiddlewareOrder, prerenderBypassToken, nextVersion, appPathRoutesManifest, }) {
     const middlewareManifest = await getMiddlewareManifest(entryPath, outputDirectory);
     const sortedFunctions = [
@@ -45915,7 +45966,9 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
                                 ...wasmFiles,
                                 ...assetFiles,
                             },
-                            regions: edgeFunction.regions,
+                            regions: edgeFunction.regions
+                                ? normalizeRegions(edgeFunction.regions)
+                                : undefined,
                             entrypoint: 'index.js',
                             envVarsInUse: edgeFunction.env,
                             assets: (edgeFunction.assets ?? []).map(({ name }) => {

package/dist/utils.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -757,27 +761,33 @@ async function getSourceFilePathFromPage({ workPath, page, pageExtensions, }) {
     // TODO: this should be updated to get the pageExtensions
     // value used during next build
     const extensionsToTry = pageExtensions || ['js', 'jsx', 'ts', 'tsx'];
-    let fsPath = path_1.default.join(workPath, 'pages', page);
-    if (await usesSrcDirectory(workPath)) {
-        fsPath = path_1.default.join(workPath, 'src', 'pages', page);
-    }
-    if (fs_extra_1.default.existsSync(fsPath)) {
-        return path_1.default.relative(workPath, fsPath);
-    }
-    const extensionless = fsPath.slice(0, -3); // remove ".js"
-    for (const ext of extensionsToTry) {
-        fsPath = `${extensionless}.${ext}`;
+    for (const pageType of ['pages', 'app']) {
+        let fsPath = path_1.default.join(workPath, pageType, page);
+        if (await usesSrcDirectory(workPath)) {
+            fsPath = path_1.default.join(workPath, 'src', pageType, page);
+        }
         if (fs_extra_1.default.existsSync(fsPath)) {
             return path_1.default.relative(workPath, fsPath);
         }
-    }
-    if (isDirectory(extensionless)) {
+        const extensionless = fsPath.replace(path_1.default.extname(fsPath), '');
         for (const ext of extensionsToTry) {
-            fsPath = path_1.default.join(extensionless, `index.${ext}`);
+            fsPath = `${extensionless}.${ext}`;
             if (fs_extra_1.default.existsSync(fsPath)) {
                 return path_1.default.relative(workPath, fsPath);
             }
         }
+        if (isDirectory(extensionless)) {
+            for (const ext of extensionsToTry) {
+                fsPath = path_1.default.join(extensionless, `index.${ext}`);
+                if (fs_extra_1.default.existsSync(fsPath)) {
+                    return path_1.default.relative(workPath, fsPath);
+                }
+                fsPath = path_1.default.join(extensionless, `route.${ext}`);
+                if (fs_extra_1.default.existsSync(fsPath)) {
+                    return path_1.default.relative(workPath, fsPath);
+                }
+            }
+        }
     }
     console.log(`WARNING: Unable to find source file for page ${page} with extensions: ${extensionsToTry.join(', ')}, this can cause functions config from \`vercel.json\` to not be applied`);
     return '';
@@ -1485,6 +1495,47 @@ async function getPrivateOutputs(dir, entries) {
     return { files, routes };
 }
 exports.getPrivateOutputs = getPrivateOutputs;
+const vercelFunctionRegionsVar = process.env.VERCEL_FUNCTION_REGIONS;
+let vercelFunctionRegions;
+if (vercelFunctionRegionsVar) {
+    vercelFunctionRegions = vercelFunctionRegionsVar.split(',');
+}
+/**
+ * Normalizes the regions config that comes from the Next.js edge functions manifest.
+ * Ensures that config like `home` and `global` are converted to the corresponding Vercel region config.
+ * In the future we'll want to make `home` and `global` part of the Build Output API.
+ * - `home` refers to the regions set in vercel.json or on the Vercel dashboard project config.
+ * - `global` refers to all regions.
+ */
+function normalizeRegions(regions) {
+    if (typeof regions === 'string') {
+        regions = [regions];
+    }
+    const newRegions = [];
+    for (const region of regions) {
+        // Explicitly mentioned as `home` is one of the explicit values for preferredRegion in Next.js.
+        if (region === 'home') {
+            if (vercelFunctionRegions) {
+                // Includes the regions from the VERCEL_FUNCTION_REGIONS env var.
+                newRegions.push(...vercelFunctionRegions);
+            }
+            continue;
+        }
+        // Explicitly mentioned as `global` is one of the explicit values for preferredRegion in Next.js.
+        if (region === 'global') {
+            // Uses `all` instead as that's how it's implemented on Vercel.
+            newRegions.push('all');
+            continue;
+        }
+        // Explicitly mentioned as `auto` is one of the explicit values for preferredRegion in Next.js.
+        if (region === 'auto') {
+            newRegions.push('auto');
+            continue;
+        }
+        newRegions.push(region);
+    }
+    return [];
+}
 async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest, isCorrectMiddlewareOrder, prerenderBypassToken, nextVersion, appPathRoutesManifest, }) {
     const middlewareManifest = await getMiddlewareManifest(entryPath, outputDirectory);
     const sortedFunctions = [
@@ -1558,7 +1609,9 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
                                 ...wasmFiles,
                                 ...assetFiles,
                             },
-                            regions: edgeFunction.regions,
+                            regions: edgeFunction.regions
+                                ? normalizeRegions(edgeFunction.regions)
+                                : undefined,
                             entrypoint: 'index.js',
                             envVarsInUse: edgeFunction.env,
                             assets: (edgeFunction.assets ?? []).map(({ name }) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "3.7.5",
+  "version": "3.8.0",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -35,9 +35,9 @@
     "@types/semver": "6.0.0",
     "@types/text-table": "0.2.1",
     "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "6.7.1",
+    "@vercel/build-utils": "6.7.2",
     "@vercel/nft": "0.22.5",
-    "@vercel/routing-utils": "2.2.0",
+    "@vercel/routing-utils": "2.2.1",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",
     "bytes": "3.1.2",
@@ -58,8 +58,7 @@
     "source-map": "0.7.3",
     "test-listen": "1.1.0",
     "text-table": "0.2.0",
-    "typescript": "4.5.2",
     "webpack-sources": "3.2.3"
   },
-  "gitHead": "a63b9d960bec291e152308c30074843aab802c8d"
+  "gitHead": "b5db13c97035d0eae04a5e075ae74e488d1298d6"
 }