@netlify/plugin-nextjs 4.15.0 → 4.16.0

package/lib/helpers/files.js

@@ -229,6 +229,7 @@ const moveStaticPages = async ({ netlifyConfig, target, i18n, basePath, }) => {
     }
 };
 exports.moveStaticPages = moveStaticPages;
+const PATCH_WARNING = `/* File patched by Netlify */`;
 /**
  * Attempt to patch a source file, preserving a backup
  */
@@ -237,7 +238,11 @@ const patchFile = async ({ file, replacements, }) => {
         console.warn('File was not found');
         return false;
     }
-    const content = await (0, fs_extra_1.readFile)(file, 'utf8');
+    let content = await (0, fs_extra_1.readFile)(file, 'utf8');
+    // If the file has already been patched, patch the backed-up original instead
+    if (content.includes(PATCH_WARNING) && (0, fs_extra_1.existsSync)(`${file}.orig`)) {
+        content = await (0, fs_extra_1.readFile)(`${file}.orig`, 'utf8');
+    }
     const newContent = replacements.reduce((acc, [from, to]) => {
         if (acc.includes(to)) {
             console.log('Already patched. Skipping.');
@@ -250,7 +255,7 @@ const patchFile = async ({ file, replacements, }) => {
         return false;
     }
     await (0, fs_extra_1.writeFile)(`${file}.orig`, content);
-    await (0, fs_extra_1.writeFile)(file, newContent);
+    await (0, fs_extra_1.writeFile)(file, `${newContent}\n${PATCH_WARNING}`);
     console.log('Done');
     return true;
 };

package/lib/index.js

@@ -123,7 +123,6 @@ const plugin = {
         (0, config_1.generateCustomHeaders)(nextConfig, headers);
         (0, verification_1.warnForProblematicUserRewrites)({ basePath, redirects });
         (0, verification_1.warnForRootRedirects)({ appDir });
-        await (0, files_1.unpatchNextFiles)(basePath);
     },
 };
 module.exports = plugin;

package/lib/templates/getHandler.js

@@ -81,6 +81,13 @@ const makeHandler = (conf, app, pageRoot, staticManifest = [], mode = 'ssr') =>
         // Next expects to be able to parse the query from the URL
         const query = new URLSearchParams(event.queryStringParameters).toString();
         event.path = query ? `${event.path}?${query}` : event.path;
+        const graphToken = event.netlifyGraphToken;
+        if (graphToken && requestMode !== 'ssr') {
+            // Prefix with underscore to help us determine the origin of the token
+            // allows us to write better error messages
+            // eslint-disable-next-line no-underscore-dangle
+            process.env._NETLIFY_GRAPH_TOKEN = graphToken;
+        }
         const { headers, ...result } = await getBridge(event).launcher(event, context);
         // Convert all headers to multiValueHeaders
         const multiValueHeaders = getMultiValueHeaders(headers);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.15.0",
+  "version": "4.16.0",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "lib/index.js",
   "files": [
@@ -9,8 +9,8 @@
     "manifest.yml"
   ],
   "dependencies": {
-    "@netlify/functions": "^1.0.0",
-    "@netlify/ipx": "^1.2.0",
+    "@netlify/functions": "^1.1.0",
+    "@netlify/ipx": "^1.2.1",
     "@vercel/node-bridge": "^2.1.0",
     "chalk": "^4.1.2",
     "fs-extra": "^10.0.0",
@@ -51,15 +51,14 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/netlify/netlify-plugin-nextjs.git"
+    "url": "git+https://github.com/netlify/next-runtime.git"
   },
-  "author": "",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/netlify/netlify-plugin-nextjs/issues"
+    "url": "https://github.com/netlify/next-runtime/issues"
   },
-  "homepage": "https://github.com/netlify/netlify-plugin-nextjs#readme",
+  "homepage": "https://github.com/netlify/next-runtime#readme",
   "engines": {
     "node": ">=12.0.0"
   }
-}
+}