@netlify/plugin-nextjs 4.30.1 → 4.30.3-als.0

package/lib/helpers/config.js

@@ -9,6 +9,7 @@ const fs_extra_1 = require("fs-extra");
 const pathe_1 = require("pathe");
 const slash_1 = __importDefault(require("slash"));
 const constants_1 = require("../constants");
+const utils_1 = require("./utils");
 const ROUTES_MANIFEST_FILE = 'routes-manifest.json';
 const defaultFailBuild = (message, { error }) => {
     throw new Error(`${message}\n${error && error.stack}`);
@@ -133,7 +134,8 @@ const generateCustomHeaders = (nextConfig, netlifyHeaders = []) => {
         const useLocale = ((_a = i18n === null || i18n === void 0 ? void 0 : i18n.locales) === null || _a === void 0 ? void 0 : _a.length) > 0 && localeEnabled !== false;
         if (useLocale) {
             const { locales } = i18n;
-            const joinedLocales = locales.join('|');
+            // escape the locale strings to match the way Next writes the routes-manifest.json file
+            const joinedLocales = locales.map((locale) => (0, utils_1.escapeStringRegexp)(locale)).join('|');
             /**
              *  converts e.g.
              *  /:nextInternalLocale(en|fr)/some-path

package/lib/helpers/edge.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeEdgeFunctions = exports.writeRscDataEdgeFunction = exports.writeDevEdgeFunction = exports.cleanupEdgeFunctions = exports.loadPrerenderManifest = exports.loadAppPathRoutesManifest = exports.loadMiddlewareManifest = exports.isAppDirRoute = void 0;
+exports.writeEdgeFunctions = exports.getEdgeFunctionPatternForPage = exports.writeRscDataEdgeFunction = exports.writeDevEdgeFunction = exports.cleanupEdgeFunctions = exports.loadPrerenderManifest = exports.loadAppPathRoutesManifest = exports.loadMiddlewareManifest = exports.isAppDirRoute = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const chalk_1 = require("chalk");
@@ -36,12 +36,18 @@ const preamble = /* js */ `
 import {
   decode as _base64Decode,
 } from "https://deno.land/std@0.159.0/encoding/base64.ts";
+
+import { AsyncLocalStorage } from "https://raw.githubusercontent.com/crowlKats/deno_std/asynclocalstorage/node/async_hooks.ts";
+
 // Deno defines "window", but naughty libraries think this means it's a browser
 delete globalThis.window
 globalThis.process = { env: {...Deno.env.toObject(), NEXT_RUNTIME: 'edge', 'NEXT_PRIVATE_MINIMAL_MODE': '1' } }
 globalThis.EdgeRuntime = "netlify-edge"
 let _ENTRIES = {}
 
+// Next.js expects this as a global
+globalThis.AsyncLocalStorage = AsyncLocalStorage
+
 // Next.js uses this extension to the Headers API implemented by Cloudflare workerd
 if(!('getAll' in Headers.prototype)) {
   Headers.prototype.getAll = function getAll(name) {
@@ -87,6 +93,7 @@ const IMPORT_UNSUPPORTED = [
 const getMiddlewareBundle = async ({ edgeFunctionDefinition, netlifyConfig, }) => {
     const { publish } = netlifyConfig.build;
     const chunks = [preamble];
+    chunks.push(`export const _DEFINITION = ${JSON.stringify(edgeFunctionDefinition)}`);
     if ('wasm' in edgeFunctionDefinition) {
         for (const { name, filePath } of edgeFunctionDefinition.wasm) {
             const wasm = await fs_1.promises.readFile((0, path_1.join)(publish, filePath));
@@ -212,12 +219,19 @@ const writeRscDataEdgeFunction = async ({ prerenderManifest, appPathRoutesManife
 exports.writeRscDataEdgeFunction = writeRscDataEdgeFunction;
 const getEdgeFunctionPatternForPage = ({ edgeFunctionDefinition, pageRegexMap, appPathRoutesManifest, }) => {
     // We don't just use the matcher from the edge function definition, because it doesn't handle trailing slashes
-    var _a;
+    var _a, _b;
     // appDir functions have a name that _isn't_ the route name, but rather the route with `/page` appended
     const regexp = pageRegexMap.get((_a = appPathRoutesManifest === null || appPathRoutesManifest === void 0 ? void 0 : appPathRoutesManifest[edgeFunctionDefinition.page]) !== null && _a !== void 0 ? _a : edgeFunctionDefinition.page);
+    if (regexp) {
+        return regexp;
+    }
+    if ('regexp' in edgeFunctionDefinition) {
+        return edgeFunctionDefinition.regexp.replace(/([^/])\$$/, '$1/?$');
+    }
     // If we need to fall back to the matcher, we need to add an optional trailing slash
-    return regexp !== null && regexp !== void 0 ? regexp : edgeFunctionDefinition.matchers[0].regexp.replace(/([^/])\$$/, '$1/?$');
+    return (_b = edgeFunctionDefinition.matchers) === null || _b === void 0 ? void 0 : _b[0].regexp.replace(/([^/])\$$/, '$1/?$');
 };
+exports.getEdgeFunctionPatternForPage = getEdgeFunctionPatternForPage;
 /**
  * Writes Edge Functions for the Next middleware
  */
@@ -282,13 +296,17 @@ const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, }) => {
             });
             manifest.functions.push(...matchers.map((matcher) => middlewareMatcherToEdgeFunctionDefinition(matcher, functionName)));
         }
+        // Functions (i.e. not middleware, but edge SSR and API routes)
         if (typeof middlewareManifest.functions === 'object') {
             // When using the app dir, we also need to check if the EF matches a page
             const appPathRoutesManifest = await (0, exports.loadAppPathRoutesManifest)(netlifyConfig);
+            // A map of all route pages to their page regex. This is used for pages dir and appDir.
             const pageRegexMap = new Map([...(routesManifest.dynamicRoutes || []), ...(routesManifest.staticRoutes || [])].map((route) => [
                 route.page,
                 route.regex,
             ]));
+            // Create a map of pages-dir routes to their data route regex (appDir uses the same route as the HTML)
+            const dataRoutesMap = new Map([...(routesManifest.dataRoutes || [])].map((route) => [route.page, route.dataRouteRegex]));
             for (const edgeFunctionDefinition of Object.values(middlewareManifest.functions)) {
                 usesEdge = true;
                 const functionName = sanitizeName(edgeFunctionDefinition.name);
@@ -298,7 +316,7 @@ const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, }) => {
                     netlifyConfig,
                     functionName,
                 });
-                const pattern = getEdgeFunctionPatternForPage({
+                const pattern = (0, exports.getEdgeFunctionPatternForPage)({
                     edgeFunctionDefinition,
                     pageRegexMap,
                     appPathRoutesManifest,
@@ -310,6 +328,16 @@ const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, }) => {
                     // cache: "manual" is currently experimental, so we restrict it to sites that use experimental appDir
                     cache: usesAppDir ? 'manual' : undefined,
                 });
+                // pages-dir page routes also have a data route. If there's a match, add an entry mapping that to the function too
+                const dataRoute = dataRoutesMap.get(edgeFunctionDefinition.page);
+                if (dataRoute) {
+                    manifest.functions.push({
+                        function: functionName,
+                        name: edgeFunctionDefinition.name,
+                        pattern: dataRoute,
+                        cache: usesAppDir ? 'manual' : undefined,
+                    });
+                }
             }
         }
         if (usesEdge) {

package/lib/helpers/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRemotePatterns = exports.isBundleSizeCheckDisabled = exports.getCustomImageResponseHeaders = exports.isNextAuthInstalled = exports.findModuleFromBase = exports.shouldSkip = exports.getPreviewRewrites = exports.getApiRewrites = exports.redirectsForNextRouteWithData = exports.redirectsForNext404Route = exports.redirectsForNextRoute = exports.is404Route = exports.isApiRoute = exports.localizeRoute = exports.routeToDataRoute = exports.generateNetlifyRoutes = exports.toNetlifyRoute = exports.getFunctionNameForPage = void 0;
+exports.escapeStringRegexp = exports.getRemotePatterns = exports.isBundleSizeCheckDisabled = exports.getCustomImageResponseHeaders = exports.isNextAuthInstalled = exports.findModuleFromBase = exports.shouldSkip = exports.getPreviewRewrites = exports.getApiRewrites = exports.redirectsForNextRouteWithData = exports.redirectsForNext404Route = exports.redirectsForNextRoute = exports.is404Route = exports.isApiRoute = exports.localizeRoute = exports.routeToDataRoute = exports.generateNetlifyRoutes = exports.toNetlifyRoute = exports.getFunctionNameForPage = void 0;
 const globby_1 = __importDefault(require("globby"));
 const pathe_1 = require("pathe");
 const constants_1 = require("../constants");
@@ -207,3 +207,8 @@ const getRemotePatterns = (experimental, images) => {
     return [];
 };
 exports.getRemotePatterns = getRemotePatterns;
+// Taken from next/src/shared/lib/escape-regexp.ts
+const reHasRegExp = /[|\\{}()[\]^$+*?.-]/;
+const reReplaceRegExp = /[|\\{}()[\]^$+*?.-]/g;
+const escapeStringRegexp = (str) => (reHasRegExp.test(str) ? str.replace(reReplaceRegExp, '\\$&') : str);
+exports.escapeStringRegexp = escapeStringRegexp;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.30.1",
+  "version": "4.30.3-als.0",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "index.js",
   "files": [
@@ -36,12 +36,12 @@
   },
   "devDependencies": {
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^29.5.1",
+    "@netlify/build": "^29.5.2",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/merge-stream": "^1.1.2",
     "@types/node": "^17.0.25",
-    "next": "^13.0.7",
+    "next": "^13.1.5",
     "npm-run-all": "^4.1.5",
     "typescript": "^4.6.3"
   },

package/src/templates/edge/bundle.js

@@ -1,7 +1,8 @@
 /**
  * This placeholder is replaced with the compiled Next.js bundle at build time
  * @param {Object} props
- * @param {import("./runtime.ts").RequestData} props.request
+ * @param {import("./function-runtime.ts").RequestData} props.request
  * @returns {Promise<import("../edge-shared/utils.ts").FetchEventResult>}
  */
 export default async ({ request }) => {}
+export const _DEFINITION = { env: [], files: [], page: 'placeholder', name: 'pages_placeholder', matchers: [] }

package/src/templates/edge/function-runtime.ts

@@ -1,6 +1,6 @@
 import type { Context } from 'https://edge.netlify.com'
 // Available at build time
-import edgeFunction from './bundle.js'
+import { _DEFINITION as edgeFunctionDefinition, default as edgeFunction } from './bundle.js'
 import { buildNextRequest, buildResponse, redirectTrailingSlash } from '../edge-shared/utils.ts'
 import nextConfig from '../edge-shared/nextConfig.json' assert { type: 'json' }
 
@@ -11,6 +11,7 @@ const handler = async (req: Request, context: Context) => {
     return redirect
   }
   const request = buildNextRequest(req, context, nextConfig)
+  request.headers['x-matched-path'] ||= edgeFunctionDefinition.page
   try {
     const result = await edgeFunction({ request })
     return buildResponse({ result, request: req, context })