@netlify/plugin-nextjs 4.1.3 → 4.2.3

package/lib/templates/getHandler.js

@@ -1,17 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHandler = void 0;
+const outdent_1 = require("outdent");
+/* eslint-disable @typescript-eslint/no-var-requires */
 const { promises } = require('fs');
 const { Server } = require('http');
 const path = require('path');
 // eslint-disable-next-line node/prefer-global/url, node/prefer-global/url-search-params
 const { URLSearchParams, URL } = require('url');
-const { Bridge } = require('@vercel/node/dist/bridge');
+const { Bridge } = require('@vercel/node-bridge/bridge');
 const { augmentFsModule, getMaxAge, getMultiValueHeaders, getNextServer } = require('./handlerUtils');
-const makeHandler = () => 
 // We return a function and then call `toString()` on it to serialise it as the launcher function
 // eslint-disable-next-line max-params
-(conf, app, pageRoot, staticManifest = [], mode = 'ssr') => {
+const makeHandler = (conf, app, pageRoot, staticManifest = [], mode = 'ssr') => {
     var _a;
     // This is just so nft knows about the page entrypoints. It's not actually used
     try {
@@ -23,30 +24,47 @@ const makeHandler = () =>
     (_a = process.env).NODE_ENV || (_a.NODE_ENV = 'production');
     // We don't want to write ISR files to disk in the lambda environment
     conf.experimental.isrFlushToDisk = false;
+    // This is our flag that we use when patching the source
     // eslint-disable-next-line no-underscore-dangle
     process.env._BYPASS_SSG = 'true';
     // Set during the request as it needs the host header. Hoisted so we can define the function once
     let base;
     augmentFsModule({ promises, staticManifest, pageRoot, getBase: () => base });
-    const NextServer = getNextServer();
-    const nextServer = new NextServer({
-        conf,
-        dir: path.resolve(__dirname, app),
-        customServer: false,
-    });
-    const requestHandler = nextServer.getRequestHandler();
-    const server = new Server(async (req, res) => {
-        try {
-            await requestHandler(req, res);
+    // We memoize this because it can be shared between requests, but don't instantiate it until
+    // the first request because we need the host and port.
+    let bridge;
+    const getBridge = (event) => {
+        if (bridge) {
+            return bridge;
         }
-        catch (error) {
-            console.error(error);
-            throw new Error('server function error');
-        }
-    });
-    const bridge = new Bridge(server);
-    bridge.listen();
-    return async (event, context) => {
+        const url = new URL(event.rawUrl);
+        const port = Number.parseInt(url.port) || 80;
+        const { host } = event.headers;
+        const protocol = event.headers['x-forwarded-proto'] || 'http';
+        base = `${protocol}://${host}`;
+        const NextServer = getNextServer();
+        const nextServer = new NextServer({
+            conf,
+            dir: path.resolve(__dirname, app),
+            customServer: false,
+            hostname: url.hostname,
+            port,
+        });
+        const requestHandler = nextServer.getRequestHandler();
+        const server = new Server(async (req, res) => {
+            try {
+                await requestHandler(req, res);
+            }
+            catch (error) {
+                console.error(error);
+                throw new Error('Error handling request. See function logs for details.');
+            }
+        });
+        bridge = new Bridge(server);
+        bridge.listen();
+        return bridge;
+    };
+    return async function handler(event, context) {
         var _a, _b, _c;
         let requestMode = mode;
         // Ensure that paths are encoded - but don't double-encode them
@@ -54,13 +72,7 @@ const makeHandler = () =>
         // Next expects to be able to parse the query from the URL
         const query = new URLSearchParams(event.queryStringParameters).toString();
         event.path = query ? `${event.path}?${query}` : event.path;
-        // Only needed if we're intercepting static files
-        if (staticManifest.length !== 0) {
-            const { host } = event.headers;
-            const protocol = event.headers['x-forwarded-proto'] || 'http';
-            base = `${protocol}://${host}`;
-        }
-        const { headers, ...result } = await bridge.launcher(event, context);
+        const { headers, ...result } = await getBridge(event).launcher(event, context);
         // Convert all headers to multiValueHeaders
         const multiValueHeaders = getMultiValueHeaders(headers);
         if ((_b = (_a = multiValueHeaders['set-cookie']) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.includes('__prerender_bypass')) {
@@ -81,6 +93,7 @@ const makeHandler = () =>
             multiValueHeaders['cache-control'] = ['public, max-age=0, must-revalidate'];
         }
         multiValueHeaders['x-render-mode'] = [requestMode];
+        console.log(`[${event.httpMethod}] ${event.path} (${requestMode === null || requestMode === void 0 ? void 0 : requestMode.toUpperCase()})`);
         return {
             ...result,
             multiValueHeaders,
@@ -88,24 +101,25 @@ const makeHandler = () =>
         };
     };
 };
-const getHandler = ({ isODB = false, publishDir = '../../../.next', appDir = '../../..' }) => `
-const { Server } = require("http");
-const { promises } = require("fs");
-// We copy the file here rather than requiring from the node module
-const { Bridge } = require("./bridge");
-const { augmentFsModule, getMaxAge, getMultiValueHeaders, getNextServer } = require('./handlerUtils')
+const getHandler = ({ isODB = false, publishDir = '../../../.next', appDir = '../../..' }) => 
+// This is a string, but if you have the right editor plugin it should format as js
+(0, outdent_1.outdent) `
+  const { Server } = require("http");
+  const { promises } = require("fs");
+  // We copy the file here rather than requiring from the node module
+  const { Bridge } = require("./bridge");
+  const { augmentFsModule, getMaxAge, getMultiValueHeaders, getNextServer } = require('./handlerUtils')
 
-const { builder } = require("@netlify/functions");
-const { config }  = require("${publishDir}/required-server-files.json")
-let staticManifest 
-try {
-  staticManifest = require("${publishDir}/static-manifest.json")
-} catch {}
-const path = require("path");
-const pageRoot = path.resolve(path.join(__dirname, "${publishDir}", config.target === "server" ? "server" : "serverless", "pages"));
-exports.handler = ${isODB
-    ? `builder((${makeHandler().toString()})(config, "${appDir}", pageRoot, staticManifest, 'odb'));`
-    : `(${makeHandler().toString()})(config, "${appDir}", pageRoot, staticManifest, 'ssr');`}
+  const { builder } = require("@netlify/functions");
+  const { config }  = require("${publishDir}/required-server-files.json")
+  let staticManifest 
+  try {
+    staticManifest = require("${publishDir}/static-manifest.json")
+  } catch {}
+  const path = require("path");
+  const pageRoot = path.resolve(path.join(__dirname, "${publishDir}", config.target === "server" ? "server" : "serverless", "pages"));
+  exports.handler = ${isODB
+    ? `builder((${makeHandler.toString()})(config, "${appDir}", pageRoot, staticManifest, 'odb'));`
+    : `(${makeHandler.toString()})(config, "${appDir}", pageRoot, staticManifest, 'ssr');`}
 `;
 exports.getHandler = getHandler;
-/* eslint-enable @typescript-eslint/no-var-requires */

package/lib/templates/getPageResolver.js

@@ -13,15 +13,15 @@ const constants_1 = require("../constants");
 // build. This is used by the nft bundler to find all the pages.
 const getPageResolver = async ({ publish, target }) => {
     const functionDir = path_1.posix.resolve(path_1.posix.join('.netlify', 'functions', constants_1.HANDLER_FUNCTION_NAME));
-    const root = path_1.posix.resolve(slash_1.default(publish), target === 'server' ? 'server' : 'serverless', 'pages');
-    const pages = await tiny_glob_1.default('**/*.js', {
+    const root = path_1.posix.resolve((0, slash_1.default)(publish), target === 'server' ? 'server' : 'serverless', 'pages');
+    const pages = await (0, tiny_glob_1.default)('**/*.js', {
         cwd: root,
         dot: true,
     });
     const pageFiles = pages
-        .map((page) => `require.resolve('${path_1.posix.relative(functionDir, path_1.posix.join(root, slash_1.default(page)))}')`)
+        .map((page) => `require.resolve('${path_1.posix.relative(functionDir, path_1.posix.join(root, (0, slash_1.default)(page)))}')`)
         .sort();
-    return outdent_1.outdent `
+    return (0, outdent_1.outdent) `
     // This file is purely to allow nft to know about these pages. It should be temporary.
     exports.resolvePages = () => {
         try {

package/lib/templates/handlerUtils.js

@@ -11,7 +11,11 @@ const os_1 = require("os");
 const path_1 = __importDefault(require("path"));
 const stream_1 = require("stream");
 const util_1 = require("util");
-const streamPipeline = util_1.promisify(stream_1.pipeline);
+const streamPipeline = (0, util_1.promisify)(stream_1.pipeline);
+/**
+ * Downloads a file from the CDN to the local aliased filesystem. This is a fallback, because in most cases we'd expect
+ * files required at runtime to not be sent to the CDN.
+ */
 const downloadFile = async (url, destination) => {
     console.log(`Downloading ${url} to ${destination}`);
     const httpx = url.startsWith('https') ? https_1.default : http_1.default;
@@ -21,7 +25,7 @@ const downloadFile = async (url, destination) => {
                 reject(new Error(`Failed to download ${url}: ${response.statusCode} ${response.statusMessage || ''}`));
                 return;
             }
-            const fileStream = fs_1.createWriteStream(destination);
+            const fileStream = (0, fs_1.createWriteStream)(destination);
             streamPipeline(response, fileStream)
                 .then(resolve)
                 .catch((error) => {
@@ -36,6 +40,9 @@ const downloadFile = async (url, destination) => {
     });
 };
 exports.downloadFile = downloadFile;
+/**
+ * Parse maxage from a cache-control header
+ */
 const getMaxAge = (header) => {
     const parts = header.split(',');
     let maxAge;
@@ -66,6 +73,9 @@ const getMultiValueHeaders = (headers) => {
     return multiValueHeaders;
 };
 exports.getMultiValueHeaders = getMultiValueHeaders;
+/**
+ * Monkey-patch the fs module to download missing files from the CDN
+ */
 const augmentFsModule = ({ promises, staticManifest, pageRoot, getBase, }) => {
     // Only do this if we have some static files moved to the CDN
     if (staticManifest.length === 0) {
@@ -78,7 +88,7 @@ const augmentFsModule = ({ promises, staticManifest, pageRoot, getBase, }) => {
     const staticFiles = new Map(staticManifest);
     const downloadPromises = new Map();
     // Yes, you can cache stuff locally in a Lambda
-    const cacheDir = path_1.default.join(os_1.tmpdir(), 'next-static-cache');
+    const cacheDir = path_1.default.join((0, os_1.tmpdir)(), 'next-static-cache');
     // Grab the real fs.promises.readFile...
     const readfileOrig = promises.readFile;
     const statsOrig = promises.stat;
@@ -90,7 +100,7 @@ const augmentFsModule = ({ promises, staticManifest, pageRoot, getBase, }) => {
             // We only want the part after `pages/`
             const filePath = file.slice(pageRoot.length + 1);
             // Is it in the CDN and not local?
-            if (staticFiles.has(filePath) && !fs_1.existsSync(file)) {
+            if (staticFiles.has(filePath) && !(0, fs_1.existsSync)(file)) {
                 // This name is safe to use, because it's one that was already created by Next
                 const cacheFile = path_1.default.join(cacheDir, filePath);
                 const url = `${base}/${staticFiles.get(filePath)}`;
@@ -99,11 +109,11 @@ const augmentFsModule = ({ promises, staticManifest, pageRoot, getBase, }) => {
                     await downloadPromises.get(url);
                 }
                 // Have we already cached it? We download every time if running locally to avoid staleness
-                if ((!fs_1.existsSync(cacheFile) || process.env.NETLIFY_DEV) && base) {
+                if ((!(0, fs_1.existsSync)(cacheFile) || process.env.NETLIFY_DEV) && base) {
                     await promises.mkdir(path_1.default.dirname(cacheFile), { recursive: true });
                     try {
                         // Append the path to our host and we can load it like a regular page
-                        const downloadPromise = exports.downloadFile(url, cacheFile);
+                        const downloadPromise = (0, exports.downloadFile)(url, cacheFile);
                         downloadPromises.set(url, downloadPromise);
                         await downloadPromise;
                     }
@@ -122,7 +132,7 @@ const augmentFsModule = ({ promises, staticManifest, pageRoot, getBase, }) => {
         if (file.startsWith(pageRoot)) {
             // We only want the part after `pages/`
             const cacheFile = path_1.default.join(cacheDir, file.slice(pageRoot.length + 1));
-            if (fs_1.existsSync(cacheFile)) {
+            if ((0, fs_1.existsSync)(cacheFile)) {
                 return statsOrig(cacheFile, options);
             }
         }
@@ -130,6 +140,9 @@ const augmentFsModule = ({ promises, staticManifest, pageRoot, getBase, }) => {
     });
 };
 exports.augmentFsModule = augmentFsModule;
+/**
+ * Next.js has an annoying habit of needing deep imports, but then moving those in patch releases. This is our abstraction.
+ */
 const getNextServer = () => {
     let NextServer;
     try {
@@ -142,7 +155,7 @@ const getNextServer = () => {
             // A different error, so rethrow it
             throw error;
         }
-        // Probably an old version of next
+        // Probably an old version of next, so fall through and find it elsewhere.
     }
     if (!NextServer) {
         try {

package/lib/templates/ipx.js

@@ -5,7 +5,7 @@ exports.handler = void 0;
 const ipx_1 = require("@netlify/ipx");
 // @ts-ignore Injected at build time
 const imageconfig_json_1 = require("./imageconfig.json");
-exports.handler = ipx_1.createIPXHandler({
+exports.handler = (0, ipx_1.createIPXHandler)({
     basePath: imageconfig_json_1.basePath,
     domains: imageconfig_json_1.domains,
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.1.3",
+  "version": "4.2.3",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "lib/index.js",
   "files": [
@@ -27,7 +27,7 @@
     "test:jest": "jest",
     "test:jest:update": "jest --updateSnapshot",
     "test:update": "run-s build build:demo test:jest:update",
-    "prepare": "npm run build",
+    "prepare": "husky install node_modules/@netlify/eslint-config-node/.husky/ && npm run build",
     "clean": "rimraf lib",
     "build": "tsc",
     "watch": "tsc --watch"
@@ -53,9 +53,9 @@
   },
   "homepage": "https://github.com/netlify/netlify-plugin-nextjs#readme",
   "dependencies": {
-    "@netlify/functions": "^0.10.0",
-    "@netlify/ipx": "^0.0.8",
-    "@vercel/node": "^1.11.2-canary.4",
+    "@netlify/functions": "^0.11.0",
+    "@netlify/ipx": "^0.0.9",
+    "@vercel/node-bridge": "^2.1.0",
     "chalk": "^4.1.2",
     "fs-extra": "^10.0.0",
     "globby": "^11.0.4",
@@ -74,20 +74,21 @@
     "@babel/core": "^7.15.8",
     "@babel/preset-env": "^7.15.8",
     "@babel/preset-typescript": "^7.16.0",
-    "@netlify/build": "^26.1.1",
-    "@netlify/eslint-config-node": "^4.1.2",
+    "@netlify/build": "^26.2.2",
+    "@netlify/eslint-config-node": "^4.1.7",
     "@testing-library/cypress": "^8.0.1",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.0.2",
     "@types/mocha": "^9.0.0",
+    "@types/node": "^17.0.10",
     "babel-jest": "^27.2.5",
     "cpy": "^8.1.2",
     "cypress": "^9.0.0",
     "eslint-config-next": "^12.0.0",
-    "husky": "^4.3.0",
+    "husky": "^7.0.4",
     "jest": "^27.0.0",
     "netlify-plugin-cypress": "^2.2.0",
-    "next": "^12.0.2",
+    "next": "^12.0.8",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.1.2",
     "react": "^17.0.1",
@@ -96,12 +97,6 @@
     "tmp-promise": "^3.0.2",
     "typescript": "^4.3.4"
   },
-  "husky": {
-    "hooks": {
-      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
-      "pre-push": "npm run format"
-    }
-  },
   "engines": {
     "node": ">=12.0.0"
   },