@netlify/plugin-nextjs 4.39.4 → 4.40.1

package/lib/helpers/edge.js

@@ -138,7 +138,7 @@ exports.writeDevEdgeFunction = writeDevEdgeFunction;
 /**
  * Writes an edge function that routes RSC data requests to the `.rsc` route
  */
-const generateRscDataEdgeManifest = async ({ prerenderManifest, appPathRoutesManifest, }) => {
+const generateRscDataEdgeManifest = async ({ prerenderManifest, appPathRoutesManifest, packagePath = '', }) => {
     const generator = await (0, functionsMetaData_1.getPluginVersion)();
     if (!prerenderManifest || !appPathRoutesManifest) {
         return [];
@@ -158,7 +158,7 @@ const generateRscDataEdgeManifest = async ({ prerenderManifest, appPathRoutesMan
     if (staticAppdirRoutes.length === 0 && dynamicAppDirRoutes.length === 0) {
         return [];
     }
-    const edgeFunctionDir = (0, path_1.resolve)('.netlify', 'edge-functions', 'rsc-data');
+    const edgeFunctionDir = (0, path_1.resolve)(packagePath, '.netlify', 'edge-functions', 'rsc-data');
     await (0, fs_extra_1.ensureDir)(edgeFunctionDir);
     await copyEdgeSourceFile({ edgeFunctionDir, file: 'rsc-data.ts' });
     return [
@@ -196,7 +196,7 @@ exports.getEdgeFunctionPatternForPage = getEdgeFunctionPatternForPage;
  * Writes Edge Functions for the Next middleware
  */
 // eslint-disable-next-line max-lines-per-function
-const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, }) => {
+const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, constants: { PACKAGE_PATH = '' }, }) => {
     var _a;
     const generator = await (0, functionsMetaData_1.getPluginVersion)();
     const manifest = {
@@ -204,7 +204,7 @@ const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, }) => {
         layers: [],
         version: 1,
     };
-    const edgeFunctionRoot = (0, path_1.resolve)('.netlify', 'edge-functions');
+    const edgeFunctionRoot = (0, path_1.resolve)(PACKAGE_PATH, '.netlify', 'edge-functions');
     await (0, fs_extra_1.emptyDir)(edgeFunctionRoot);
     const { publish } = netlifyConfig.build;
     const nextConfigFile = await (0, config_1.getRequiredServerFiles)(publish);
@@ -219,6 +219,7 @@ const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, }) => {
         return;
     }
     const rscFunctions = await (0, exports.generateRscDataEdgeManifest)({
+        packagePath: PACKAGE_PATH,
         prerenderManifest: await (0, exports.loadPrerenderManifest)(netlifyConfig),
         appPathRoutesManifest: await (0, exports.loadAppPathRoutesManifest)(netlifyConfig),
     });

package/lib/helpers/functions.js

@@ -21,7 +21,7 @@ const files_1 = require("./files");
 const functionsMetaData_1 = require("./functionsMetaData");
 const pack_1 = require("./pack");
 const utils_1 = require("./utils");
-const generateFunctions = async ({ FUNCTIONS_SRC = constants_1.DEFAULT_FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC, PUBLISH_DIR }, appDir, apiLambdas, ssrLambdas) => {
+const generateFunctions = async ({ INTERNAL_FUNCTIONS_SRC, PUBLISH_DIR, PACKAGE_PATH = '', FUNCTIONS_SRC = (0, pathe_1.join)(PACKAGE_PATH, constants_1.DEFAULT_FUNCTIONS_SRC), }, appDir, apiLambdas, ssrLambdas) => {
     const publish = (0, pathe_1.resolve)(PUBLISH_DIR);
     const functionsDir = (0, pathe_1.resolve)(INTERNAL_FUNCTIONS_SRC || FUNCTIONS_SRC);
     const functionDir = (0, pathe_1.join)(functionsDir, constants_1.HANDLER_FUNCTION_NAME);
@@ -95,15 +95,15 @@ exports.generateFunctions = generateFunctions;
  * Writes a file in each function directory that contains references to every page entrypoint.
  * This is just so that the nft bundler knows about them. We'll eventually do this better.
  */
-const generatePagesResolver = async ({ INTERNAL_FUNCTIONS_SRC, FUNCTIONS_SRC = constants_1.DEFAULT_FUNCTIONS_SRC, PUBLISH_DIR, }) => {
+const generatePagesResolver = async ({ INTERNAL_FUNCTIONS_SRC, PUBLISH_DIR, PACKAGE_PATH = '', FUNCTIONS_SRC = (0, pathe_1.join)(PACKAGE_PATH, constants_1.DEFAULT_FUNCTIONS_SRC), }) => {
     const functionsPath = INTERNAL_FUNCTIONS_SRC || FUNCTIONS_SRC;
-    const jsSource = await (0, getPageResolver_1.getResolverForPages)(PUBLISH_DIR);
+    const jsSource = await (0, getPageResolver_1.getResolverForPages)(PUBLISH_DIR, PACKAGE_PATH);
     await (0, fs_extra_1.writeFile)((0, pathe_1.join)(functionsPath, constants_1.ODB_FUNCTION_NAME, 'pages.js'), jsSource);
     await (0, fs_extra_1.writeFile)((0, pathe_1.join)(functionsPath, constants_1.HANDLER_FUNCTION_NAME, 'pages.js'), jsSource);
 };
 exports.generatePagesResolver = generatePagesResolver;
 // Move our next/image function into the correct functions directory
-const setupImageFunction = async ({ constants: { INTERNAL_FUNCTIONS_SRC, FUNCTIONS_SRC = constants_1.DEFAULT_FUNCTIONS_SRC, IS_LOCAL }, imageconfig = {}, netlifyConfig, basePath, remotePatterns, responseHeaders, }) => {
+const setupImageFunction = async ({ constants: { IS_LOCAL, INTERNAL_FUNCTIONS_SRC, PACKAGE_PATH = '', FUNCTIONS_SRC = (0, pathe_1.join)(PACKAGE_PATH, constants_1.DEFAULT_FUNCTIONS_SRC), }, imageconfig = {}, netlifyConfig, basePath, remotePatterns, responseHeaders, }) => {
     const imagePath = imageconfig.path || '/_next/image';
     if ((0, destr_1.default)(process.env.DISABLE_IPX)) {
         // If no image loader is specified, need to redirect to a 404 page since there's no

package/lib/index.js

@@ -128,7 +128,7 @@ const plugin = {
             buildId,
             apiLambdas,
         });
-        await (0, edge_1.writeEdgeFunctions)({ netlifyConfig, routesManifest });
+        await (0, edge_1.writeEdgeFunctions)({ constants, netlifyConfig, routesManifest });
     },
     async onPostBuild({ netlifyConfig: { build: { publish }, redirects, headers, }, utils: { status, cache, functions, build: { failBuild }, }, constants: { FUNCTIONS_DIST }, }) {
         await (0, cache_1.saveCache)({ cache, publish });

package/lib/templates/getHandler.js

@@ -68,8 +68,7 @@ const makeHandler = ({ conf, app, pageRoot, NextServer, staticManifest = [], mod
             try {
                 await requestHandler(req, res);
             }
-            catch (error) {
-                console.error(error);
+            catch {
                 throw new Error('Error handling request. See function logs for details.');
             }
         });

package/lib/templates/getPageResolver.js

@@ -39,8 +39,8 @@ const getResolverForDependencies = ({ dependencies, functionDir, }) => {
   `;
 };
 exports.getResolverForDependencies = getResolverForDependencies;
-const getResolverForPages = async (publish) => {
-    const functionDir = (0, pathe_1.resolve)('.netlify', 'functions', constants_1.HANDLER_FUNCTION_NAME);
+const getResolverForPages = async (publish, packagePath) => {
+    const functionDir = (0, pathe_1.resolve)(packagePath, '.netlify', 'functions', constants_1.HANDLER_FUNCTION_NAME);
     const dependencies = await (0, exports.getAllPageDependencies)(publish);
     return (0, exports.getResolverForDependencies)({ dependencies, functionDir });
 };

package/lib/templates/handlerUtils.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.localizeDataRoute = exports.localizeRoute = exports.unlocalizeRoute = exports.joinPaths = exports.normalizeRoute = exports.netlifyApiFetch = exports.normalizePath = exports.getPrefetchResponse = exports.augmentFsModule = exports.getMultiValueHeaders = exports.getMaxAge = exports.downloadFile = void 0;
+exports.getMatchedRoute = exports.localizeDataRoute = exports.localizeRoute = exports.unlocalizeRoute = exports.joinPaths = exports.normalizeRoute = exports.netlifyApiFetch = exports.normalizePath = exports.getPrefetchResponse = exports.augmentFsModule = exports.getMultiValueHeaders = exports.getMaxAge = exports.downloadFile = void 0;
 const fs_1 = require("fs");
 const os_1 = require("os");
 const path_1 = __importDefault(require("path"));
@@ -230,3 +230,16 @@ const localizeDataRoute = (dataRoute, localizedRoute) => {
         .replace(/\/index\.json$/, '.json');
 };
 exports.localizeDataRoute = localizeDataRoute;
+const getMatchedRoute = (paths, routesManifest, parsedUrl, basePath, trailingSlash) => routesManifest === null || routesManifest === void 0 ? void 0 : routesManifest.find((route) => {
+    // Some internationalized routes are automatically removing the locale prefix making the path not match the route
+    // we can use the parsedURL, which has the locale included and will match
+    const base = '/';
+    return new RegExp(route.regex).test(new URL(
+    // If using basepath config, we have to use the original path to match the route
+    // This seems to only be an issue on the index page when using group routes
+    parsedUrl ||
+        (basePath && paths === (trailingSlash && !(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith('/')) ? `${basePath}/` : basePath)
+            ? base
+            : paths), 'http://n').pathname);
+});
+exports.getMatchedRoute = getMatchedRoute;

package/lib/templates/server.js

@@ -7,6 +7,10 @@ const handlerUtils_1 = require("./handlerUtils");
 // eslint-disable-next-line max-lines-per-function
 const getNetlifyNextServer = (NextServer) => {
     class NetlifyNextServer extends NextServer {
+        getAppRouterReactVersion() {
+            var _a;
+            return ((_a = this.nextConfig.experimental) === null || _a === void 0 ? void 0 : _a.serverActions) ? 'experimental' : 'next';
+        }
         constructor(options, netlifyConfig) {
             super(options);
             this.netlifyConfig = netlifyConfig;
@@ -28,7 +32,7 @@ const getNetlifyNextServer = (NextServer) => {
                 // preserve the URL before Next.js mutates it for i18n
                 const { url, headers } = req;
                 // conditionally use the prebundled React module
-                this.netlifyPrebundleReact(url);
+                this.netlifyPrebundleReact(url, this.nextConfig, parsedUrl);
                 // intercept on-demand revalidation requests and handle with the Netlify API
                 if (headers['x-prerender-revalidate'] && this.netlifyConfig.revalidateToken) {
                     // handle on-demand revalidation by purging the ODB cache
@@ -52,22 +56,19 @@ const getNetlifyNextServer = (NextServer) => {
             };
         }
         // doing what they do in https://github.com/vercel/vercel/blob/1663db7ca34d3dd99b57994f801fb30b72fbd2f3/packages/next/src/server-build.ts#L576-L580
-        netlifyPrebundleReact(path) {
-            var _a, _b, _c;
+        async netlifyPrebundleReact(path, { basePath, trailingSlash }, parsedUrl) {
+            var _a, _b;
             const routesManifest = (_a = this.getRoutesManifest) === null || _a === void 0 ? void 0 : _a.call(this);
             const appPathsRoutes = (_b = this.getAppPathRoutes) === null || _b === void 0 ? void 0 : _b.call(this);
             const routes = routesManifest && [...routesManifest.staticRoutes, ...routesManifest.dynamicRoutes];
-            const matchedRoute = routes === null || routes === void 0 ? void 0 : routes.find((route) => new RegExp(route.regex).test(new URL(path, 'http://n').pathname));
+            const matchedRoute = await (0, handlerUtils_1.getMatchedRoute)(path, routes, parsedUrl, basePath, trailingSlash);
             const isAppRoute = appPathsRoutes && matchedRoute ? appPathsRoutes[matchedRoute.page] : false;
             if (isAppRoute) {
                 // app routes should use prebundled React
                 // eslint-disable-next-line no-underscore-dangle
-                process.env.__NEXT_PRIVATE_PREBUNDLED_REACT = ((_c = this.nextConfig.experimental) === null || _c === void 0 ? void 0 : _c.serverActions)
-                    ? 'experimental'
-                    : 'next';
+                process.env.__NEXT_PRIVATE_PREBUNDLED_REACT = this.getAppRouterReactVersion();
                 return;
             }
-            // pages routes should use use node_modules React
             // eslint-disable-next-line no-underscore-dangle
             process.env.__NEXT_PRIVATE_PREBUNDLED_REACT = '';
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.39.4",
+  "version": "4.40.1",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "index.js",
   "files": [
@@ -37,7 +37,7 @@
   },
   "devDependencies": {
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^29.20.1",
+    "@netlify/build": "^29.20.6",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/merge-stream": "^1.1.2",