@netlify/plugin-nextjs 4.23.4 → 4.24.0

package/lib/helpers/config.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateCustomHeaders = exports.configureHandlerFunctions = exports.updateRequiredServerFiles = exports.getRequiredServerFiles = exports.getNextConfig = void 0;
+const destr_1 = __importDefault(require("destr"));
 const fs_extra_1 = require("fs-extra");
 const pathe_1 = require("pathe");
 const slash_1 = __importDefault(require("slash"));
@@ -62,8 +63,12 @@ const configureHandlerFunctions = async ({ netlifyConfig, publish, ignore = [] }
     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';
+    if (!(0, destr_1.default)(process.env.DISABLE_IPX)) {
+        (_a = netlifyConfig.functions)._ipx || (_a._ipx = {});
+        netlifyConfig.functions._ipx.node_bundler = 'nft';
+    }
+    /* eslint-enable no-underscore-dangle */
+    ;
     [constants_1.HANDLER_FUNCTION_NAME, constants_1.ODB_FUNCTION_NAME].forEach((functionName) => {
         var _a, _b;
         (_a = netlifyConfig.functions)[functionName] || (_a[functionName] = { included_files: [], external_node_modules: [] });

package/lib/helpers/edge.js

@@ -118,7 +118,9 @@ const writeEdgeFunctions = async (netlifyConfig) => {
     const nextConfig = nextConfigFile.config;
     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);
-    if (!(0, destr_1.default)(process.env.NEXT_DISABLE_EDGE_IMAGES) && !(0, destr_1.default)(process.env.NEXT_DISABLE_NETLIFY_EDGE)) {
+    if (!(0, destr_1.default)(process.env.NEXT_DISABLE_EDGE_IMAGES) &&
+        !(0, destr_1.default)(process.env.NEXT_DISABLE_NETLIFY_EDGE) &&
+        !(0, destr_1.default)(process.env.DISABLE_IPX)) {
         console.log('Using Netlify Edge Functions for image format detection. Set env var "NEXT_DISABLE_EDGE_IMAGES=true" to disable.');
         const edgeFunctionDir = (0, path_1.join)(edgeFunctionRoot, 'ipx');
         await (0, fs_extra_1.ensureDir)(edgeFunctionDir);

package/lib/helpers/functions.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupImageFunction = exports.generatePagesResolver = exports.generateFunctions = void 0;
 const node_bridge_1 = __importDefault(require("@vercel/node-bridge"));
+const destr_1 = __importDefault(require("destr"));
 const fs_extra_1 = require("fs-extra");
 const pathe_1 = require("pathe");
 const constants_1 = require("../constants");
@@ -40,32 +41,47 @@ const generatePagesResolver = async ({ constants: { INTERNAL_FUNCTIONS_SRC, FUNC
 };
 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 }, imageconfig = {}, netlifyConfig, basePath, remotePatterns, responseHeaders, }) => {
-    const functionsPath = INTERNAL_FUNCTIONS_SRC || FUNCTIONS_SRC;
-    const functionName = `${constants_1.IMAGE_FUNCTION_NAME}.js`;
-    const functionDirectory = (0, pathe_1.join)(functionsPath, constants_1.IMAGE_FUNCTION_NAME);
-    await (0, fs_extra_1.ensureDir)(functionDirectory);
-    await (0, fs_extra_1.writeJSON)((0, pathe_1.join)(functionDirectory, 'imageconfig.json'), {
-        ...imageconfig,
-        basePath: [basePath, constants_1.IMAGE_FUNCTION_NAME].join('/'),
-        remotePatterns,
-        responseHeaders,
-    });
-    await (0, fs_extra_1.copyFile)((0, pathe_1.join)(__dirname, '..', '..', 'lib', 'templates', 'ipx.js'), (0, pathe_1.join)(functionDirectory, functionName));
+const setupImageFunction = async ({ constants: { INTERNAL_FUNCTIONS_SRC, FUNCTIONS_SRC = constants_1.DEFAULT_FUNCTIONS_SRC, IS_LOCAL }, imageconfig = {}, netlifyConfig, basePath, remotePatterns, responseHeaders, }) => {
     const imagePath = imageconfig.path || '/_next/image';
-    // If we have edge functions then the request will have already been rewritten
-    // so this won't match. This is matched if edge is disabled or unavailable.
-    netlifyConfig.redirects.push({
-        from: `${imagePath}*`,
-        query: { url: ':url', w: ':width', q: ':quality' },
-        to: `${basePath}/${constants_1.IMAGE_FUNCTION_NAME}/w_:width,q_:quality/:url`,
-        status: 301,
-    });
-    netlifyConfig.redirects.push({
-        from: `${basePath}/${constants_1.IMAGE_FUNCTION_NAME}/*`,
-        to: `/.netlify/builders/${constants_1.IMAGE_FUNCTION_NAME}`,
-        status: 200,
-    });
+    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
+        // backing loader to serve local site images once deployed to Netlify
+        if (!IS_LOCAL && imageconfig.loader === 'default') {
+            netlifyConfig.redirects.push({
+                from: `${imagePath}*`,
+                query: { url: ':url', w: ':width', q: ':quality' },
+                to: '/404.html',
+                status: 404,
+                force: true,
+            });
+        }
+    }
+    else {
+        const functionsPath = INTERNAL_FUNCTIONS_SRC || FUNCTIONS_SRC;
+        const functionName = `${constants_1.IMAGE_FUNCTION_NAME}.js`;
+        const functionDirectory = (0, pathe_1.join)(functionsPath, constants_1.IMAGE_FUNCTION_NAME);
+        await (0, fs_extra_1.ensureDir)(functionDirectory);
+        await (0, fs_extra_1.writeJSON)((0, pathe_1.join)(functionDirectory, 'imageconfig.json'), {
+            ...imageconfig,
+            basePath: [basePath, constants_1.IMAGE_FUNCTION_NAME].join('/'),
+            remotePatterns,
+            responseHeaders,
+        });
+        await (0, fs_extra_1.copyFile)((0, pathe_1.join)(__dirname, '..', '..', 'lib', 'templates', 'ipx.js'), (0, pathe_1.join)(functionDirectory, functionName));
+        // If we have edge functions then the request will have already been rewritten
+        // so this won't match. This is matched if edge is disabled or unavailable.
+        netlifyConfig.redirects.push({
+            from: `${imagePath}*`,
+            query: { url: ':url', w: ':width', q: ':quality' },
+            to: `${basePath}/${constants_1.IMAGE_FUNCTION_NAME}/w_:width,q_:quality/:url`,
+            status: 301,
+        });
+        netlifyConfig.redirects.push({
+            from: `${basePath}/${constants_1.IMAGE_FUNCTION_NAME}/*`,
+            to: `/.netlify/builders/${constants_1.IMAGE_FUNCTION_NAME}`,
+            status: 200,
+        });
+    }
     if (basePath) {
         // next/image generates image static URLs that still point at the site root
         netlifyConfig.redirects.push({

package/package.json

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