@netlify/plugin-nextjs 4.8.0 → 4.9.2

package/lib/helpers/edge.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateConfig = exports.writeMiddleware = void 0;
+exports.updateConfig = exports.writeEdgeFunctions = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const fs_extra_1 = require("fs-extra");
@@ -14,43 +14,61 @@ const loadMiddlewareManifest = (netlifyConfig) => {
 /**
  * Convert the Next middleware name into a valid Edge Function name
  */
-const sanitizeName = (name) => `next${name === '/' ? '_index' : name.replace(/\W/g, '_')}`;
+const sanitizeName = (name) => `next_${name.replace(/\W/g, '_')}`;
 /**
  * Initialization added to the top of the edge function bundle
  */
 const bootstrap = /* js */ `
+globalThis.process = { env: {...Deno.env.toObject(), NEXT_RUNTIME: 'edge', 'NEXT_PRIVATE_MINIMAL_MODE': '1' } }
 globalThis._ENTRIES ||= {}
+// Deno defines "window", but naughty libraries think this means it's a browser
 delete globalThis.window
 
-`;
-// TODO: set the proper env
-const getEnv = () => /* js */ `
-globalThis.process = { env: {} }
 `;
 /**
  * Concatenates the Next edge function code with the required chunks and adds an export
  */
-const getMiddlewareBundle = async ({ middlewareDefinition, netlifyConfig, }) => {
+const getMiddlewareBundle = async ({ edgeFunctionDefinition, netlifyConfig, }) => {
     const { publish } = netlifyConfig.build;
-    const chunks = [bootstrap, getEnv()];
-    for (const file of middlewareDefinition.files) {
+    const chunks = [bootstrap];
+    for (const file of edgeFunctionDefinition.files) {
         const filePath = (0, path_1.join)(publish, file);
         const data = await fs_1.promises.readFile(filePath, 'utf8');
         chunks.push('{', data, '}');
     }
-    const middleware = await fs_1.promises.readFile((0, path_1.join)(publish, `server`, `${middlewareDefinition.name}.js`), 'utf8');
+    const middleware = await fs_1.promises.readFile((0, path_1.join)(publish, `server`, `${edgeFunctionDefinition.name}.js`), 'utf8');
     chunks.push(middleware);
-    const exports = /* js */ `export default _ENTRIES["middleware_${middlewareDefinition.name}"].default;`;
+    const exports = /* js */ `export default _ENTRIES["middleware_${edgeFunctionDefinition.name}"].default;`;
     chunks.push(exports);
     return chunks.join('\n');
 };
 const copyEdgeSourceFile = ({ file, target, edgeFunctionDir, }) => fs_1.promises.copyFile((0, path_1.join)(__dirname, '..', '..', 'src', 'templates', 'edge', file), (0, path_1.join)(edgeFunctionDir, target !== null && target !== void 0 ? target : file));
 // Edge functions don't support lookahead expressions
 const stripLookahead = (regex) => regex.replace('^/(?!_next)', '^/');
+const writeEdgeFunction = async ({ edgeFunctionDefinition, edgeFunctionRoot, netlifyConfig, }) => {
+    const name = sanitizeName(edgeFunctionDefinition.name);
+    const edgeFunctionDir = (0, path_1.join)(edgeFunctionRoot, name);
+    const bundle = await getMiddlewareBundle({
+        edgeFunctionDefinition,
+        netlifyConfig,
+    });
+    await (0, fs_extra_1.ensureDir)(edgeFunctionDir);
+    await fs_1.promises.writeFile((0, path_1.join)(edgeFunctionDir, 'bundle.js'), bundle);
+    await copyEdgeSourceFile({
+        edgeFunctionDir,
+        file: 'runtime.ts',
+        target: 'index.ts',
+    });
+    await copyEdgeSourceFile({ edgeFunctionDir, file: 'utils.ts' });
+    return {
+        function: name,
+        pattern: stripLookahead(edgeFunctionDefinition.regexp),
+    };
+};
 /**
  * Writes Edge Functions for the Next middleware
  */
-const writeMiddleware = async (netlifyConfig) => {
+const writeEdgeFunctions = async (netlifyConfig) => {
     const middlewareManifest = await loadMiddlewareManifest(netlifyConfig);
     if (!middlewareManifest) {
         console.error("Couldn't find the middleware manifest");
@@ -68,29 +86,25 @@ const writeMiddleware = async (netlifyConfig) => {
         path: '/_next/image*',
     });
     for (const middleware of middlewareManifest.sortedMiddleware) {
-        const name = sanitizeName(middleware);
-        const edgeFunctionDir = (0, path_1.join)(edgeFunctionRoot, name);
-        const middlewareDefinition = middlewareManifest.middleware[middleware];
-        const bundle = await getMiddlewareBundle({
-            middlewareDefinition,
+        const edgeFunctionDefinition = middlewareManifest.middleware[middleware];
+        const functionDefinition = await writeEdgeFunction({
+            edgeFunctionDefinition,
+            edgeFunctionRoot,
             netlifyConfig,
         });
-        await (0, fs_extra_1.ensureDir)(edgeFunctionDir);
-        await fs_1.promises.writeFile((0, path_1.join)(edgeFunctionDir, 'bundle.js'), bundle);
-        await copyEdgeSourceFile({
-            edgeFunctionDir,
-            file: 'runtime.ts',
-            target: 'index.ts',
-        });
-        await copyEdgeSourceFile({ edgeFunctionDir, file: 'utils.ts' });
-        manifest.functions.push({
-            function: name,
-            pattern: stripLookahead(middlewareDefinition.regexp),
+        manifest.functions.push(functionDefinition);
+    }
+    for (const edgeFunctionDefinition of Object.values(middlewareManifest.functions)) {
+        const functionDefinition = await writeEdgeFunction({
+            edgeFunctionDefinition,
+            edgeFunctionRoot,
+            netlifyConfig,
         });
+        manifest.functions.push(functionDefinition);
     }
     await (0, fs_extra_1.writeJson)((0, path_1.join)(edgeFunctionRoot, 'manifest.json'), manifest);
 };
-exports.writeMiddleware = writeMiddleware;
+exports.writeEdgeFunctions = writeEdgeFunctions;
 const updateConfig = async (publish) => {
     const configFile = (0, path_1.join)(publish, 'required-server-files.json');
     const config = await (0, fs_extra_1.readJSON)(configFile);

package/lib/helpers/files.js

@@ -72,7 +72,7 @@ const moveStaticPages = async ({ netlifyConfig, target, i18n, basePath, }) => {
     const root = (0, pathe_1.join)(outputDir, 'pages');
     const buildId = (0, fs_extra_1.readFileSync)((0, pathe_1.join)(netlifyConfig.build.publish, 'BUILD_ID'), 'utf8').trim();
     const dataDir = (0, pathe_1.join)('_next', 'data', buildId);
-    await (0, fs_extra_1.ensureDir)(dataDir);
+    await (0, fs_extra_1.ensureDir)((0, pathe_1.join)(netlifyConfig.build.publish, dataDir));
     // Load the middleware manifest so we can check if a file matches it before moving
     const middlewarePaths = await (0, exports.getMiddleware)(netlifyConfig.build.publish);
     const middleware = middlewarePaths.map((path) => path.slice(1));

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,10 +39,14 @@ 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)({
+        let experimentalRemotePatterns = [];
+        const { appDir, basePath, i18n, images, target, ignore, trailingSlash, outdir, experimental } = await (0, config_1.getNextConfig)({
             publish,
             failBuild,
         });
+        if (experimental.images) {
+            experimentalRemotePatterns = experimental.images.remotePatterns || [];
+        }
         if ((0, utils_1.isNextAuthInstalled)()) {
             const config = await (0, config_1.getRequiredServerFiles)(publish);
             const userDefinedNextAuthUrl = config.config.env.NEXTAUTH_URL;
@@ -68,7 +73,13 @@ 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: experimentalRemotePatterns,
+        });
         await (0, redirects_1.generateRedirects)({
             netlifyConfig,
             nextConfig: { basePath, i18n, trailingSlash, appDir },
@@ -79,7 +90,7 @@ const plugin = {
         ✨ Deploying to ${(0, chalk_1.greenBright) `Netlify Edge Functions`} ✨
         This feature is in beta. Please share your feedback here: https://ntl.fyi/next-netlify-edge
       `);
-            await (0, edge_1.writeMiddleware)(netlifyConfig);
+            await (0, edge_1.writeEdgeFunctions)(netlifyConfig);
             await (0, edge_1.updateConfig)(publish);
         }
     },
@@ -105,3 +116,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.2",
   "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.2",
     "@vercel/node-bridge": "^2.1.0",
     "chalk": "^4.1.2",
     "fs-extra": "^10.0.0",
@@ -28,11 +28,11 @@
   },
   "devDependencies": {
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^27.1.3",
+    "@netlify/build": "^27.2.0",
     "@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
   }