Merge branch 'main' into ep/add-detection

Author: ericapisani

.release-please-manifest.json

@@ -1,4 +1,4 @@
 {
-  "packages/runtime": "4.15.0",
+  "packages/runtime": "4.16.0",
   "packages/next": "0.0.1"
 }

package-lock.json

@@ -1,5 +1,18 @@
 # Changelog
 
+## [4.16.0](https://github.com/netlify/next-runtime/compare/plugin-nextjs-v4.15.0...plugin-nextjs-v4.16.0) (2022-08-15)
+
+
+### Features
+
+* **graph:** populate graph token for ISR ([#1525](https://github.com/netlify/next-runtime/issues/1525)) ([573b913](https://github.com/netlify/next-runtime/commit/573b9137241882359411f448acd044a32c2c8169))
+
+
+### Bug Fixes
+
+* **deps:** update dependency @netlify/functions to ^1.1.0 ([#1526](https://github.com/netlify/next-runtime/issues/1526)) ([8a98d72](https://github.com/netlify/next-runtime/commit/8a98d7237f9168342e3bfeb9dbcc9240d694dcdd))
+* **deps:** update dependency @netlify/ipx to ^1.2.1 ([#1534](https://github.com/netlify/next-runtime/issues/1534)) ([086a703](https://github.com/netlify/next-runtime/commit/086a703c87fb196d3b84c698dfb1621be6a0713b))
+
 ## [4.15.0](https://github.com/netlify/netlify-plugin-nextjs/compare/plugin-nextjs-v4.14.2...plugin-nextjs-v4.15.0) (2022-08-12)
 
 

packages/runtime/CHANGELOG.md

@@ -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": [
@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@netlify/functions": "^1.1.0",
-    "@netlify/ipx": "^1.2.0",
+    "@netlify/ipx": "^1.2.1",
     "@vercel/node-bridge": "^2.1.0",
     "chalk": "^4.1.2",
     "fs-extra": "^10.0.0",

packages/runtime/package.json

@@ -280,6 +280,8 @@ export const moveStaticPages = async ({
   }
 }
 
+const PATCH_WARNING = `/* File patched by Netlify */`
+
 /**
  * Attempt to patch a source file, preserving a backup
  */
@@ -294,7 +296,13 @@ const patchFile = async ({
     console.warn('File was not found')
     return false
   }
-  const content = await readFile(file, 'utf8')
+  let content = await readFile(file, 'utf8')
+
+  // If the file has already been patched, patch the backed-up original instead
+  if (content.includes(PATCH_WARNING) && existsSync(`${file}.orig`)) {
+    content = await readFile(`${file}.orig`, 'utf8')
+  }
+
   const newContent = replacements.reduce((acc, [from, to]) => {
     if (acc.includes(to)) {
       console.log('Already patched. Skipping.')
@@ -307,7 +315,7 @@ const patchFile = async ({
     return false
   }
   await writeFile(`${file}.orig`, content)
-  await writeFile(file, newContent)
+  await writeFile(file, `${newContent}\n${PATCH_WARNING}`)
   console.log('Done')
   return true
 }

packages/runtime/src/helpers/files.ts

@@ -16,7 +16,7 @@ import {
   generateCustomHeaders,
 } from './helpers/config'
 import { updateConfig, writeEdgeFunctions, loadMiddlewareManifest } from './helpers/edge'
-import { moveStaticPages, movePublicFiles, patchNextFiles, unpatchNextFiles } from './helpers/files'
+import { moveStaticPages, movePublicFiles, patchNextFiles } from './helpers/files'
 import { generateFunctions, setupImageFunction, generatePagesResolver } from './helpers/functions'
 import { generateRedirects, generateStaticRedirects } from './helpers/redirects'
 import { shouldSkip, isNextAuthInstalled, isOldPluginInstalled, getCustomImageResponseHeaders } from './helpers/utils'
@@ -212,7 +212,6 @@ const plugin: NetlifyPlugin = {
 
     warnForProblematicUserRewrites({ basePath, redirects })
     warnForRootRedirects({ appDir })
-    await unpatchNextFiles(basePath)
   },
 }
 module.exports = plugin