@netlify/plugin-nextjs 4.12.0 → 4.13.0

package/lib/helpers/config.js

@@ -56,8 +56,11 @@ const resolveModuleRoot = (moduleName) => {
     }
 };
 const DEFAULT_EXCLUDED_MODULES = ['sharp', 'electron'];
-const configureHandlerFunctions = ({ netlifyConfig, publish, ignore = [] }) => {
+const configureHandlerFunctions = async ({ netlifyConfig, publish, ignore = [] }) => {
     var _a;
+    const config = await (0, exports.getRequiredServerFiles)(publish);
+    const files = config.files || [];
+    const cssFilesToInclude = files.filter((f) => f.startsWith(`${publish}/static/css/`));
     /* eslint-disable no-underscore-dangle */
     (_a = netlifyConfig.functions)._ipx || (_a._ipx = {});
     netlifyConfig.functions._ipx.node_bundler = 'nft';
@@ -66,7 +69,7 @@ const configureHandlerFunctions = ({ netlifyConfig, publish, ignore = [] }) => {
         (_a = netlifyConfig.functions)[functionName] || (_a[functionName] = { included_files: [], external_node_modules: [] });
         netlifyConfig.functions[functionName].node_bundler = 'nft';
         (_b = netlifyConfig.functions[functionName]).included_files || (_b.included_files = []);
-        netlifyConfig.functions[functionName].included_files.push('.env', '.env.local', '.env.production', '.env.production.local', './public/locales/**', './next-i18next.config.js', `${publish}/server/**`, `${publish}/serverless/**`, `${publish}/*.json`, `${publish}/BUILD_ID`, `${publish}/static/chunks/webpack-middleware*.js`, `!${publish}/server/**/*.js.nft.json`, ...ignore.map((path) => `!${(0, slash_1.default)(path)}`));
+        netlifyConfig.functions[functionName].included_files.push('.env', '.env.local', '.env.production', '.env.production.local', './public/locales/**', './next-i18next.config.js', `${publish}/server/**`, `${publish}/serverless/**`, `${publish}/*.json`, `${publish}/BUILD_ID`, `${publish}/static/chunks/webpack-middleware*.js`, `!${publish}/server/**/*.js.nft.json`, ...cssFilesToInclude, ...ignore.map((path) => `!${(0, slash_1.default)(path)}`));
         const nextRoot = 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`);

package/lib/helpers/edge.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateConfig = exports.writeEdgeFunctions = exports.loadMiddlewareManifest = void 0;
+/* eslint-disable max-lines */
 const fs_1 = require("fs");
 const path_1 = require("path");
 const fs_extra_1 = require("fs-extra");
@@ -80,7 +81,10 @@ const writeEdgeFunctions = async (netlifyConfig) => {
         if (!process.env.NEXT_USE_NETLIFY_EDGE) {
             console.log('Using Netlify Edge Functions for image format detection. Set env var "NEXT_DISABLE_EDGE_IMAGES=true" to disable.');
         }
-        await copyEdgeSourceFile({ edgeFunctionDir: edgeFunctionRoot, file: 'ipx.ts' });
+        const edgeFunctionDir = (0, path_1.join)(edgeFunctionRoot, 'ipx');
+        await (0, fs_extra_1.ensureDir)(edgeFunctionDir);
+        await copyEdgeSourceFile({ edgeFunctionDir, file: 'ipx.ts', target: 'index.ts' });
+        await (0, fs_extra_1.copyFile)((0, path_1.join)('.netlify', 'functions-internal', '_ipx', 'imageconfig.json'), (0, path_1.join)(edgeFunctionDir, 'imageconfig.json'));
         manifest.functions.push({
             function: 'ipx',
             path: '/_next/image*',
@@ -124,3 +128,4 @@ const updateConfig = async (publish) => {
     await (0, fs_extra_1.writeJSON)(configFile, config);
 };
 exports.updateConfig = updateConfig;
+/* eslint-enable max-lines */

package/lib/helpers/verification.js

@@ -66,9 +66,19 @@ const checkForOldFunctions = async ({ functions }) => {
 exports.checkForOldFunctions = checkForOldFunctions;
 const checkNextSiteHasBuilt = ({ publish, failBuild, }) => {
     if (!(0, fs_1.existsSync)(path_1.default.join(publish, 'BUILD_ID'))) {
-        const outWarning = path_1.default.basename(publish) === 'out'
-            ? `Your publish directory is set to "out", but in most cases it should be ".next".`
-            : `In most cases it should be set to ".next", unless you have chosen a custom "distDir" in your Next config.`;
+        let outWarning;
+        if (path_1.default.basename(publish) === 'out') {
+            outWarning = `Your publish directory is set to "out", but in most cases it should be ".next".`;
+        }
+        else if (path_1.default.basename(publish) !== '.next' && (0, fs_1.existsSync)(path_1.default.join('.next', 'BUILD_ID'))) {
+            outWarning = (0, outdent_1.outdent) `
+        However, a '.next' directory was found with a production build.
+        Consider changing your 'publish' directory to '.next'
+      `;
+        }
+        else {
+            outWarning = `In most cases it should be set to ".next", unless you have chosen a custom "distDir" in your Next config.`;
+        }
         return failBuild((0, outdent_1.outdent) `
       The directory "${publish}" does not contain a Next.js production build. Perhaps the build command was not run, or you specified the wrong publish directory.
       ${outWarning}
@@ -76,7 +86,7 @@ const checkNextSiteHasBuilt = ({ publish, failBuild, }) => {
     `);
     }
     if ((0, fs_1.existsSync)(path_1.default.join(publish, 'export-detail.json'))) {
-        failBuild((0, outdent_1.outdent) `
+        return failBuild((0, outdent_1.outdent) `
       Detected that "next export" was run, but site is incorrectly publishing the ".next" directory.
       The publish directory should be set to "out", and you should set the environment variable NETLIFY_NEXT_PLUGIN_SKIP to "true".
     `);

package/lib/index.js

@@ -62,7 +62,7 @@ const plugin = {
             }
         }
         const buildId = (0, fs_extra_1.readFileSync)((0, path_1.join)(publish, 'BUILD_ID'), 'utf8').trim();
-        (0, config_1.configureHandlerFunctions)({ netlifyConfig, ignore, publish: (0, path_1.relative)(process.cwd(), publish) });
+        await (0, config_1.configureHandlerFunctions)({ netlifyConfig, ignore, publish: (0, path_1.relative)(process.cwd(), publish) });
         await (0, functions_1.generateFunctions)(constants, appDir);
         await (0, functions_1.generatePagesResolver)({ target, constants });
         await (0, files_1.movePublicFiles)({ appDir, outdir, publish });

package/lib/templates/getHandler.js

@@ -102,7 +102,7 @@ const makeHandler = (conf, app, pageRoot, staticManifest = [], mode = 'ssr') =>
             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()})`);
+        console.log(`[${event.httpMethod}] ${event.path} (${requestMode === null || requestMode === void 0 ? void 0 : requestMode.toUpperCase()}${result.ttl > 0 ? ` ${result.ttl}s` : ''})`);
         return {
             ...result,
             multiValueHeaders,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.12.0",
+  "version": "4.13.0",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "lib/index.js",
   "files": [
@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^27.3.3",
+    "@netlify/build": "^27.4.2",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/node": "^17.0.25",

package/src/templates/edge/ipx.ts

@@ -1,7 +1,7 @@
 import { Accepts } from "https://deno.land/x/accepts@2.1.1/mod.ts";
 import type { Context } from "netlify:edge";
 // Available at build time
-import imageconfig from "../functions-internal/_ipx/imageconfig.json" assert {
+import imageconfig from "./imageconfig.json" assert {
   type: "json",
 };