@netlify/plugin-nextjs 4.40.1 → 4.40.3-rc.0

package/lib/helpers/config.js

@@ -49,9 +49,9 @@ const updateRequiredServerFiles = async (publish, modifiedConfig) => {
     await (0, fs_extra_1.writeJSON)(configFile, modifiedConfig);
 };
 exports.updateRequiredServerFiles = updateRequiredServerFiles;
-const resolveModuleRoot = (moduleName) => {
+const resolveModuleRoot = (moduleName, paths = [process.cwd()]) => {
     try {
-        return (0, pathe_1.dirname)((0, pathe_1.relative)(process.cwd(), require.resolve(`${moduleName}/package.json`, { paths: [process.cwd()] })));
+        return (0, pathe_1.dirname)((0, pathe_1.relative)(process.cwd(), require.resolve(`${moduleName}/package.json`, { paths })));
     }
     catch {
         return null;
@@ -89,6 +89,14 @@ const configureHandlerFunctions = async ({ netlifyConfig, publish, ignore = [],
         const nextRoot = (0, exports.resolveModuleRoot)('next');
         if (nextRoot) {
             netlifyConfig.functions[functionName].included_files.push(`!${nextRoot}/dist/server/lib/squoosh/**/*.wasm`, `!${nextRoot}/dist/next-server/server/lib/squoosh/**/*.wasm`, `!${nextRoot}/dist/compiled/webpack/bundle4.js`, `!${nextRoot}/dist/compiled/webpack/bundle5.js`);
+            // on Next 13.5+ there is no longer statically analyzable import to styled-jsx/style
+            // so lambda fails to bundle it. Next require hooks actually try to resolve it
+            // and fail if it is not bundled, so we forcefully add it to lambda.
+            const styledJsxRoot = (0, exports.resolveModuleRoot)('styled-jsx', [(0, pathe_1.join)(process.cwd(), nextRoot)]);
+            if (styledJsxRoot) {
+                const styledJsxStyleModulePath = (0, pathe_1.join)(styledJsxRoot, 'style.js');
+                netlifyConfig.functions[functionName].included_files.push(styledJsxStyleModulePath);
+            }
         }
         excludedModules.forEach((moduleName) => {
             const moduleRoot = (0, exports.resolveModuleRoot)(moduleName);

package/lib/helpers/edge.js

@@ -197,7 +197,6 @@ exports.getEdgeFunctionPatternForPage = getEdgeFunctionPatternForPage;
  */
 // eslint-disable-next-line max-lines-per-function
 const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, constants: { PACKAGE_PATH = '' }, }) => {
-    var _a;
     const generator = await (0, functionsMetaData_1.getPluginVersion)();
     const manifest = {
         functions: [],
@@ -209,7 +208,7 @@ const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, constants: {
     const { publish } = netlifyConfig.build;
     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'));
@@ -278,8 +277,7 @@ const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, constants: {
                 function: functionName,
                 name: edgeFunctionDefinition.name,
                 pattern,
-                // cache: "manual" is currently experimental, so we restrict it to sites that use experimental appDir
-                cache: usesAppDir ? 'manual' : undefined,
+                cache: 'manual',
                 generator,
             });
             // pages-dir page routes also have a data route. If there's a match, add an entry mapping that to the function too
@@ -289,7 +287,7 @@ const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, constants: {
                     function: functionName,
                     name: edgeFunctionDefinition.name,
                     pattern: dataRoute,
-                    cache: usesAppDir ? 'manual' : undefined,
+                    cache: 'manual',
                     generator,
                 });
             }

package/lib/helpers/functions.js

@@ -66,11 +66,13 @@ const generateFunctions = async ({ INTERNAL_FUNCTIONS_SRC, PUBLISH_DIR, PACKAGE_
         includedFiles.push(...nfInternalFiles);
     }
     const writeHandler = async (functionName, functionTitle, isODB) => {
+        const useHooks = await (0, functionsMetaData_1.useRequireHooks)();
         const handlerSource = (0, getHandler_1.getHandler)({
             isODB,
             publishDir,
             appDir: (0, pathe_1.relative)(functionDir, appDir),
             nextServerModuleRelativeLocation,
+            useHooks,
         });
         await (0, fs_extra_1.ensureDir)((0, pathe_1.join)(functionsDir, functionName));
         // write main handler file (standard or ODB)

package/lib/helpers/functionsMetaData.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeFunctionConfiguration = exports.getPluginVersion = void 0;
+exports.writeFunctionConfiguration = exports.useRequireHooks = exports.getPluginVersion = void 0;
 const fs_extra_1 = require("fs-extra");
 const pathe_1 = require("pathe");
+const semver_1 = require("semver");
 const constants_1 = require("../constants");
 const config_1 = require("./config");
 const getNextRuntimeVersion = async (packageJsonPath, useNodeModulesPath) => {
@@ -13,8 +14,8 @@ const getNextRuntimeVersion = async (packageJsonPath, useNodeModulesPath) => {
     return useNodeModulesPath ? packagePlugin.version : packagePlugin.dependencies[constants_1.NEXT_PLUGIN];
 };
 const PLUGIN_PACKAGE_PATH = '.netlify/plugins/package.json';
-const nextPluginVersion = async () => {
-    const moduleRoot = (0, config_1.resolveModuleRoot)(constants_1.NEXT_PLUGIN);
+const nextPluginVersion = async (module) => {
+    const moduleRoot = (0, config_1.resolveModuleRoot)(module || constants_1.NEXT_PLUGIN);
     const nodeModulesPath = moduleRoot ? (0, pathe_1.join)(moduleRoot, 'package.json') : null;
     return ((await getNextRuntimeVersion(nodeModulesPath, true)) ||
         (await getNextRuntimeVersion(PLUGIN_PACKAGE_PATH, false)) ||
@@ -23,6 +24,8 @@ const nextPluginVersion = async () => {
 };
 const getPluginVersion = async () => `${constants_1.NEXT_PLUGIN_NAME}@${await nextPluginVersion()}`;
 exports.getPluginVersion = getPluginVersion;
+const useRequireHooks = async () => (0, semver_1.satisfies)(await nextPluginVersion('next'), '13.3.3 - 13.4.9');
+exports.useRequireHooks = useRequireHooks;
 /**
  * Creates a function configuration file for the given function.
  *

package/lib/index.js

@@ -144,7 +144,7 @@ const plugin = {
         await (0, verification_1.checkForOldFunctions)({ functions });
         await (0, verification_1.checkZipSize)((0, path_1.join)(FUNCTIONS_DIST, `${constants_1.ODB_FUNCTION_NAME}.zip`));
         const nextConfig = await (0, config_1.getNextConfig)({ publish, failBuild });
-        const { basePath, appDir, experimental } = nextConfig;
+        const { basePath, appDir, experimental, } = nextConfig;
         (0, config_1.generateCustomHeaders)(nextConfig, headers);
         (0, verification_1.warnForProblematicUserRewrites)({ basePath, redirects });
         (0, verification_1.warnForRootRedirects)({ appDir });

package/lib/templates/getHandler.js

@@ -15,7 +15,7 @@ const { overrideRequireHooks, applyRequireHooks } = require('./requireHooks');
 const { getNetlifyNextServer } = require('./server');
 // We return a function and then call `toString()` on it to serialise it as the launcher function
 // eslint-disable-next-line max-lines-per-function
-const makeHandler = ({ conf, app, pageRoot, NextServer, staticManifest = [], mode = 'ssr' }) => {
+const makeHandler = ({ conf, app, pageRoot, NextServer, staticManifest = [], mode = 'ssr', useHooks, }) => {
     var _a;
     // Change working directory into the site root, unless using Nx, which moves the
     // dist directory and handles this itself
@@ -29,10 +29,15 @@ const makeHandler = ({ conf, app, pageRoot, NextServer, staticManifest = [], mod
         require.resolve('./pages.js');
     }
     catch { }
+    const { appDir } = conf.experimental;
     // Next 13.4 conditionally uses different React versions and we need to make sure we use the same one
-    overrideRequireHooks(conf);
+    // With the release of 13.5 experimental.appDir is no longer used.
+    // we will need to check if appDir is set and Next version before running requireHooks
+    if (appDir && useHooks)
+        overrideRequireHooks(conf.experimental);
     const NetlifyNextServer = getNetlifyNextServer(NextServer);
-    applyRequireHooks();
+    if (appDir && useHooks)
+        applyRequireHooks();
     const ONE_YEAR_IN_SECONDS = 31536000;
     (_a = process.env).NODE_ENV || (_a.NODE_ENV = 'production');
     // We don't want to write ISR files to disk in the lambda environment
@@ -144,7 +149,7 @@ const makeHandler = ({ conf, app, pageRoot, NextServer, staticManifest = [], mod
         };
     };
 };
-const getHandler = ({ isODB = false, publishDir = '../../../.next', appDir = '../../..', nextServerModuleRelativeLocation, }) => 
+const getHandler = ({ isODB = false, publishDir = '../../../.next', appDir = '../../..', nextServerModuleRelativeLocation, useHooks, }) => 
 // This is a string, but if you have the right editor plugin it should format as js (e.g. bierner.comment-tagged-templates in VS Code)
 (0, outdent_1.outdent /* javascript */) `
   if (!${JSON.stringify(nextServerModuleRelativeLocation)}) {
@@ -157,7 +162,7 @@ const getHandler = ({ isODB = false, publishDir = '../../../.next', appDir = '..
   const { promises } = require("fs");
   // We copy the file here rather than requiring from the node module
   const { Bridge } = require("./bridge");
-  const { augmentFsModule, getMaxAge, getMultiValueHeaders, getPrefetchResponse, normalizePath } = require('./handlerUtils')
+  const { augmentFsModule, getMaxAge, getMultiValueHeaders, getPrefetchResponse, normalizePath, nextVersionNum } = require('./handlerUtils')
   const { overrideRequireHooks, applyRequireHooks } = require("./requireHooks")
   const { getNetlifyNextServer } = require("./server")
   const NextServer = require(${JSON.stringify(nextServerModuleRelativeLocation)}).default
@@ -170,7 +175,7 @@ const getHandler = ({ isODB = false, publishDir = '../../../.next', appDir = '..
   const path = require("path");
   const pageRoot = path.resolve(path.join(__dirname, "${publishDir}", "server"));
   exports.handler = ${isODB
-    ? `builder((${makeHandler.toString()})({ conf: config, app: "${appDir}", pageRoot, NextServer, staticManifest, mode: 'odb' }));`
-    : `(${makeHandler.toString()})({ conf: config, app: "${appDir}", pageRoot, NextServer, staticManifest, mode: 'ssr' });`}
+    ? `builder((${makeHandler.toString()})({ conf: config, app: "${appDir}", pageRoot, NextServer, staticManifest, mode: 'odb', useHooks: ${useHooks}}));`
+    : `(${makeHandler.toString()})({ conf: config, app: "${appDir}", pageRoot, NextServer, staticManifest, mode: 'ssr', useHooks: ${useHooks}});`}
 `;
 exports.getHandler = getHandler;

package/lib/templates/requireHooks.js

@@ -10,18 +10,18 @@ exports.applyRequireHooks = exports.overrideRequireHooks = void 0;
 const module_1 = __importDefault(require("module"));
 const resolveFilename = module_1.default._resolveFilename;
 const requireHooks = new Map();
-const overrideRequireHooks = (config) => {
-    setRequireHooks(config);
+const overrideRequireHooks = (experimental) => {
+    setRequireHooks(experimental);
     resolveRequireHooks();
 };
 exports.overrideRequireHooks = overrideRequireHooks;
-const setRequireHooks = (config) => {
+const setRequireHooks = (experimental) => {
     requireHooks.set('default', new Map([
         ['react', `react`],
         ['react/jsx-runtime', `react/jsx-runtime`],
     ]));
-    if (config.experimental.appDir) {
-        if (config.experimental.serverActions) {
+    if (experimental.appDir) {
+        if (experimental.serverActions) {
             requireHooks.set('experimental', new Map([
                 ['react', `next/dist/compiled/react-experimental`],
                 ['react/jsx-runtime', `next/dist/compiled/react-experimental/jsx-runtime`],

package/lib/templates/server.js

@@ -32,7 +32,10 @@ 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.nextConfig, parsedUrl);
+                // PrebundledReact should only apply when appDir is set it falls between the specified Next versions
+                const { experimental } = this.nextConfig;
+                if (experimental === null || experimental === void 0 ? void 0 : experimental.appDir)
+                    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

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.1",
+  "version": "4.40.3-rc.0",
   "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.6",
+    "@netlify/build": "^29.22.5",
     "@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