@netlify/plugin-nextjs 4.8.0 → 4.9.0

package/lib/helpers/functions.js

@@ -40,7 +40,7 @@ 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, }) => {
+const setupImageFunction = async ({ constants: { INTERNAL_FUNCTIONS_SRC, FUNCTIONS_SRC = constants_1.DEFAULT_FUNCTIONS_SRC }, imageconfig = {}, netlifyConfig, basePath, remotePatterns, }) => {
     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);
@@ -48,6 +48,7 @@ const setupImageFunction = async ({ constants: { INTERNAL_FUNCTIONS_SRC, FUNCTIO
     await (0, fs_extra_1.writeJSON)((0, pathe_1.join)(functionDirectory, 'imageconfig.json'), {
         ...imageconfig,
         basePath: [basePath, constants_1.IMAGE_FUNCTION_NAME].join('/'),
+        remotePatterns,
     });
     await (0, fs_extra_1.copyFile)((0, pathe_1.join)(__dirname, '..', '..', 'lib', 'templates', 'ipx.js'), (0, pathe_1.join)(functionDirectory, functionName));
     const imagePath = imageconfig.path || '/_next/image';

package/lib/index.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable max-lines */
 const path_1 = require("path");
 const chalk_1 = require("chalk");
 const fs_extra_1 = require("fs-extra");
@@ -38,7 +39,7 @@ const plugin = {
         }
         const { publish } = netlifyConfig.build;
         (0, verification_1.checkNextSiteHasBuilt)({ publish, failBuild });
-        const { appDir, basePath, i18n, images, target, ignore, trailingSlash, outdir } = await (0, config_1.getNextConfig)({
+        const { appDir, basePath, i18n, images, target, ignore, trailingSlash, outdir, experimental: { images: { remotePatterns }, }, } = await (0, config_1.getNextConfig)({
             publish,
             failBuild,
         });
@@ -68,7 +69,7 @@ const plugin = {
             netlifyConfig,
             nextConfig: { basePath, i18n },
         });
-        await (0, functions_1.setupImageFunction)({ constants, imageconfig: images, netlifyConfig, basePath });
+        await (0, functions_1.setupImageFunction)({ constants, imageconfig: images, netlifyConfig, basePath, remotePatterns });
         await (0, redirects_1.generateRedirects)({
             netlifyConfig,
             nextConfig: { basePath, i18n, trailingSlash, appDir },
@@ -105,3 +106,4 @@ const plugin = {
     },
 };
 module.exports = plugin;
+/* eslint-enable max-lines */

package/lib/templates/ipx.js

@@ -7,5 +7,6 @@ const imageconfig_json_1 = require("./imageconfig.json");
 exports.handler = (0, ipx_1.createIPXHandler)({
     basePath: imageconfig_json_1.basePath,
     domains: imageconfig_json_1.domains,
+    remotePatterns: imageconfig_json_1.remotePatterns,
 });
 /* eslint-enable node/no-missing-import, import/no-unresolved, @typescript-eslint/ban-ts-comment  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.8.0",
+  "version": "4.9.0",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "lib/index.js",
   "files": [
@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@netlify/functions": "^1.0.0",
-    "@netlify/ipx": "^1.0.1",
+    "@netlify/ipx": "^1.1.0",
     "@vercel/node-bridge": "^2.1.0",
     "chalk": "^4.1.2",
     "fs-extra": "^10.0.0",
@@ -32,7 +32,7 @@
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/node": "^17.0.25",
-    "next": "^12.1.6",
+    "next": "^12.1.7-canary.33",
     "npm-run-all": "^4.1.5",
     "typescript": "^4.6.3"
   },

package/src/templates/edge/runtime.ts

@@ -34,7 +34,7 @@ export interface RequestData {
 
 const handler = async (req: Request, context: Context) => {
   const url = new URL(req.url)
-  if (url.pathname.startsWith('/_next/')) {
+  if (url.pathname.startsWith('/_next/static/')) {
     return
   }