@netlify/plugin-nextjs 4.24.3 → 4.26.0

package/index.js

@@ -0,0 +1 @@
+module.exports = require('./lib')

package/lib/helpers/edge.js

@@ -27,26 +27,34 @@ const sanitizeName = (name) => `next_${name.replace(/\W/g, '_')}`;
 /**
  * Initialization added to the top of the edge function bundle
  */
-const bootstrap = /* js */ `
+const preamble = /* js */ `
+
 globalThis.process = { env: {...Deno.env.toObject(), NEXT_RUNTIME: 'edge', 'NEXT_PRIVATE_MINIMAL_MODE': '1' } }
-globalThis._ENTRIES ||= {}
+let _ENTRIES = {}
 // Deno defines "window", but naughty libraries think this means it's a browser
 delete globalThis.window
-
+// Next uses "self" as a function-scoped global-like object
+const self = {}
 `;
+// Slightly different spacing in different versions!
+const IMPORT_UNSUPPORTED = [
+    `Object.defineProperty(globalThis,"__import_unsupported"`,
+    `    Object.defineProperty(globalThis, "__import_unsupported"`,
+];
 /**
  * Concatenates the Next edge function code with the required chunks and adds an export
  */
 const getMiddlewareBundle = async ({ edgeFunctionDefinition, netlifyConfig, }) => {
     const { publish } = netlifyConfig.build;
-    const chunks = [bootstrap];
+    const chunks = [preamble];
     for (const file of edgeFunctionDefinition.files) {
         const filePath = (0, path_1.join)(publish, file);
-        const data = await fs_1.promises.readFile(filePath, 'utf8');
+        let data = await fs_1.promises.readFile(filePath, 'utf8');
+        // Next defines an immutable global variable, which is fine unless you have more than one in the bundle
+        // This adds a check to see if the global is already defined
+        data = IMPORT_UNSUPPORTED.reduce((acc, val) => acc.replace(val, `('__import_unsupported' in globalThis)||${val}`), data);
         chunks.push('{', data, '}');
     }
-    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_${edgeFunctionDefinition.name}"].default;`;
     chunks.push(exports);
     return chunks.join('\n');
@@ -79,7 +87,7 @@ const writeEdgeFunction = async ({ edgeFunctionDefinition, edgeFunctionRoot, net
     // We add a defintion for each matching path
     return matchers.map((matcher) => {
         const pattern = matcher.regexp;
-        return { function: name, pattern };
+        return { function: name, pattern, name: edgeFunctionDefinition.name };
     });
 };
 const cleanupEdgeFunctions = ({ INTERNAL_EDGE_FUNCTIONS_SRC = '.netlify/edge-functions', }) => (0, fs_extra_1.emptyDir)(INTERNAL_EDGE_FUNCTIONS_SRC);
@@ -89,6 +97,7 @@ const writeDevEdgeFunction = async ({ INTERNAL_EDGE_FUNCTIONS_SRC = '.netlify/ed
         functions: [
             {
                 function: 'next-dev',
+                name: 'netlify dev handler',
                 path: '/*',
             },
         ],
@@ -128,6 +137,7 @@ const writeEdgeFunctions = async (netlifyConfig) => {
         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',
+            name: 'next/image handler',
             path: '/_next/image*',
         });
     }

package/lib/templates/getHandler.js

@@ -105,8 +105,9 @@ const makeHandler = (conf, app, pageRoot, staticManifest = [], mode = 'ssr') =>
                     // ODBs currently have a minimum TTL of 60 seconds
                     result.ttl = Math.max(ttl, 60);
                 }
-                // Only cache 404s ephemerally
-                if (ttl === ONE_YEAR_IN_SECONDS && result.statusCode === 404) {
+                const ephemeralCodes = [301, 302, 307, 308, 404];
+                if (ttl === ONE_YEAR_IN_SECONDS && ephemeralCodes.includes(result.statusCode)) {
+                    // Only cache for 60s if default TTL provided
                     result.ttl = 60;
                 }
                 if (result.ttl > 0) {

package/package.json

@@ -1,18 +1,19 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.24.3",
+  "version": "4.26.0",
   "description": "Run Next.js seamlessly on Netlify",
-  "main": "lib/index.js",
+  "main": "index.js",
   "files": [
     "lib/**/*",
     "src/templates/edge/*",
     "src/templates/edge-shared/*",
+    "index.js",
     "manifest.yml"
   ],
   "dependencies": {
     "@netlify/esbuild": "0.14.39",
     "@netlify/functions": "^1.3.0",
-    "@netlify/ipx": "^1.3.0",
+    "@netlify/ipx": "^1.3.1",
     "@vercel/node-bridge": "^2.1.0",
     "chalk": "^4.1.2",
     "destr": "^1.1.1",
@@ -33,7 +34,7 @@
   },
   "devDependencies": {
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^27.20.2",
+    "@netlify/build": "^27.20.6",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/merge-stream": "^1.1.2",