@netlify/plugin-nextjs 4.40.0 → 4.40.2

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 [
@@ -210,6 +210,7 @@ const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, constants: {
     const nextConfigFile = await (0, config_1.getRequiredServerFiles)(publish);
     const nextConfig = nextConfigFile.config;
     const usesAppDir = (_a = nextConfig.experimental) === null || _a === void 0 ? void 0 : _a.appDir;
+    await (0, fs_extra_1.copy)(getEdgeTemplatePath('../vendor'), (0, path_1.join)(edgeFunctionRoot, 'vendor'));
     await (0, fs_extra_1.copy)(getEdgeTemplatePath('../edge-shared'), (0, path_1.join)(edgeFunctionRoot, 'edge-shared'));
     await (0, fs_extra_1.writeJSON)((0, path_1.join)(edgeFunctionRoot, 'edge-shared', 'nextConfig.json'), nextConfig);
     await (0, fs_extra_1.copy)((0, path_1.join)(publish, 'prerender-manifest.json'), (0, path_1.join)(edgeFunctionRoot, 'edge-shared', 'prerender-manifest.json'));
@@ -219,6 +220,7 @@ const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, constants: {
         return;
     }
     const rscFunctions = await (0, exports.generateRscDataEdgeManifest)({
+        packagePath: PACKAGE_PATH,
         prerenderManifest: await (0, exports.loadPrerenderManifest)(netlifyConfig),
         appPathRoutesManifest: await (0, exports.loadAppPathRoutesManifest)(netlifyConfig),
     });

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/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/lib/templates/vendor.js

@@ -0,0 +1,20 @@
+"use strict";
+// this file isn't meant to be imported.
+// it's a list of all external modules that we use,
+// and we vendor those into the `vendor/` directory
+// for consumption in other files.
+// Vendoring happens automatically as part of runtime `build` script.
+// You can trigger just vendoring without full package build by running `build:vendor` script.
+Object.defineProperty(exports, "__esModule", { value: true });
+require("https://deno.land/std@0.175.0/encoding/base64.ts");
+require("https://deno.land/std@0.175.0/http/cookie.ts");
+require("https://deno.land/std@0.175.0/node/buffer.ts");
+require("https://deno.land/std@0.175.0/node/events.ts");
+require("https://deno.land/std@0.175.0/node/async_hooks.ts");
+require("https://deno.land/std@0.175.0/node/assert.ts");
+require("https://deno.land/std@0.175.0/node/util.ts");
+require("https://deno.land/std@0.175.0/path/mod.ts");
+require("https://deno.land/x/path_to_regexp@v6.2.1/index.ts");
+require("https://deno.land/x/html_rewriter@v0.1.0-pre.17/index.ts");
+require("https://esm.sh/v91/next@12.2.5/deno/dist/server/web/spec-extension/request.js");
+require("https://esm.sh/v91/next@12.2.5/deno/dist/server/web/spec-extension/response.js");

package/package.json

@@ -1,19 +1,20 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.40.0",
+  "version": "4.40.2",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "index.js",
   "files": [
     "lib/**/*",
     "src/templates/edge/*",
     "src/templates/edge-shared/*",
+    "src/templates/vendor/*",
     "index.js",
     "manifest.yml"
   ],
   "dependencies": {
     "@netlify/esbuild": "0.14.39",
     "@netlify/functions": "^1.6.0",
-    "@netlify/ipx": "^1.4.3",
+    "@netlify/ipx": "^1.4.5",
     "@vercel/node-bridge": "^2.1.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
@@ -37,7 +38,7 @@
   },
   "devDependencies": {
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^29.20.4",
+    "@netlify/build": "^29.21.2",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/merge-stream": "^1.1.2",
@@ -52,7 +53,9 @@
     "publish:install": "npm ci",
     "publish:test": "cd .. && npm ci && npm test",
     "clean": "rimraf lib dist-types",
-    "build": "tsc",
+    "build": "run-s build:*",
+    "build:vendor": "rimraf src/templates/vendor && deno vendor src/templates/vendor.ts --output=src/templates/vendor && patch src/templates/vendor/deno.land/x/html_rewriter@v0.1.0-pre.17/index.ts html_rewriter.patch",
+    "build:tsc": "tsc",
     "watch": "tsc --watch",
     "prepare": "npm run build"
   },

package/src/templates/edge/next-dev.js

@@ -1,6 +1,6 @@
-import { NextRequest } from 'https://esm.sh/v91/next@12.2.5/deno/dist/server/web/spec-extension/request.js'
-import { NextResponse } from 'https://esm.sh/v91/next@12.2.5/deno/dist/server/web/spec-extension/response.js'
-import { fromFileUrl } from 'https://deno.land/std@0.151.0/path/mod.ts'
+import { NextRequest } from '../vendor/esm.sh/v91/next@12.2.5/deno/dist/server/web/spec-extension/request.js'
+import { NextResponse } from '../vendor/esm.sh/v91/next@12.2.5/deno/dist/server/web/spec-extension/response.js'
+import { fromFileUrl } from '../vendor/deno.land/std@0.175.0/path/mod.ts'
 import { buildResponse, isFunction } from '../edge-shared/utils.ts'
 
 globalThis.NFRequestContextMap ||= new Map()

package/src/templates/edge/shims.js

@@ -1,11 +1,11 @@
 // @ts-check
 // deno-lint-ignore-file prefer-const no-unused-vars
-import { decode as _base64Decode } from 'https://deno.land/std@0.175.0/encoding/base64.ts'
-import BufferCompat from 'https://deno.land/std@0.175.0/node/buffer.ts'
-import EventsCompat from 'https://deno.land/std@0.175.0/node/events.ts'
-import AsyncHooksCompat from 'https://deno.land/std@0.175.0/node/async_hooks.ts'
-import AssertCompat from 'https://deno.land/std@0.175.0/node/assert.ts'
-import UtilCompat from 'https://deno.land/std@0.175.0/node/util.ts'
+import { decode as _base64Decode } from '../vendor/deno.land/std@0.175.0/encoding/base64.ts'
+import BufferCompat from '../vendor/deno.land/std@0.175.0/node/buffer.ts'
+import EventsCompat from '../vendor/deno.land/std@0.175.0/node/events.ts'
+import AsyncHooksCompat from '../vendor/deno.land/std@0.175.0/node/async_hooks.ts'
+import AssertCompat from '../vendor/deno.land/std@0.175.0/node/assert.ts'
+import UtilCompat from '../vendor/deno.land/std@0.175.0/node/util.ts'
 
 /**
  * These are the shims, polyfills and other kludges to make Next.js work in standards-compliant runtime.

package/src/templates/edge-shared/next-utils.ts

@@ -7,10 +7,10 @@
  */
 
 // Deno imports
-import type { Key } from 'https://deno.land/x/path_to_regexp@v6.2.1/index.ts'
+import type { Key } from '../vendor/deno.land/x/path_to_regexp@v6.2.1/index.ts'
 
-import { compile, pathToRegexp } from 'https://deno.land/x/path_to_regexp@v6.2.1/index.ts'
-import { getCookies } from 'https://deno.land/std@0.148.0/http/cookie.ts'
+import { compile, pathToRegexp } from '../vendor/deno.land/x/path_to_regexp@v6.2.1/index.ts'
+import { getCookies } from '../vendor/deno.land/std@0.175.0/http/cookie.ts'
 
 // Inlined/re-implemented types
 

package/src/templates/edge-shared/utils.ts

@@ -1,5 +1,5 @@
 import type { Context } from 'https://edge.netlify.com'
-import { ElementHandlers, HTMLRewriter } from 'https://deno.land/x/html_rewriter@v0.1.0-pre.17/index.ts'
+import { ElementHandlers, HTMLRewriter } from '../vendor/deno.land/x/html_rewriter@v0.1.0-pre.17/index.ts'
 
 export interface FetchEventResult {
   response: Response