@vercel/next 3.7.6 → 3.8.1

package/dist/index.js

@@ -45118,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 '';
@@ -45846,6 +45852,51 @@ 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);
+    }
+    // Ensure we don't pass an empty array as that is not supported.
+    if (newRegions.length === 0) {
+        return undefined;
+    }
+    return newRegions;
+}
 async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest, isCorrectMiddlewareOrder, prerenderBypassToken, nextVersion, appPathRoutesManifest, }) {
     const middlewareManifest = await getMiddlewareManifest(entryPath, outputDirectory);
     const sortedFunctions = [
@@ -45919,7 +45970,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

@@ -761,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 '';
@@ -1489,6 +1495,51 @@ 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);
+    }
+    // Ensure we don't pass an empty array as that is not supported.
+    if (newRegions.length === 0) {
+        return undefined;
+    }
+    return newRegions;
+}
 async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest, isCorrectMiddlewareOrder, prerenderBypassToken, nextVersion, appPathRoutesManifest, }) {
     const middlewareManifest = await getMiddlewareManifest(entryPath, outputDirectory);
     const sortedFunctions = [
@@ -1562,7 +1613,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.6",
+  "version": "3.8.1",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -60,5 +60,5 @@
     "text-table": "0.2.0",
     "webpack-sources": "3.2.3"
   },
-  "gitHead": "2de365f9cfea3ce283d2bf855507c71209f1e3d8"
+  "gitHead": "85947b658ee1b4b3b7fcb631bdc6e591ee1e338a"
 }