Merge branch 'main' into mk/misc-docs

Author: ascorbic

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [4.2.0](https://www.github.com/netlify/netlify-plugin-nextjs/compare/v4.1.3...v4.2.0) (2022-01-17)
+
+
+### Features
+
+* add request logging ([#1127](https://www.github.com/netlify/netlify-plugin-nextjs/issues/1127)) ([010e86c](https://www.github.com/netlify/netlify-plugin-nextjs/commit/010e86c7c7513df8676dd8b3c747dcfa81fbc09e))
+
 ### [4.1.3](https://www.github.com/netlify/netlify-plugin-nextjs/compare/v4.1.2...v4.1.3) (2022-01-13)
 
 

README.md

@@ -98,6 +98,14 @@ Netlify [asset optimization](https://docs.netlify.com/site-deploys/post-processi
 sites. Assets are already optimized by Next.js at build time, and doing further optimization can break your site. Ensure
 that it is not enabled at **Site settings > Build & deploy > Post processing > Asset optimization**.
 
+## Generated functions
+
+This plugin works by generating three Netlify functions that handle requests that haven't been pre-rendered. These are
+`___netlify-handler` (for SSR and API routes), `___netlify-odb-handler` (for ISR and fallback routes), and `_ipx` (for
+images). You can see the requests for these in [the function logs](https://docs.netlify.com/functions/logs/). For ISR
+and fallback routes you will not see any requests that are served from the edge cache, just actual rendering requests.
+These are all internal functions, so you won't find them in your site's own functions directory.
+
 ## Feedback
 
 If you think you have found a bug in the plugin,

cypress/integration/default/default.spec.ts

@@ -4,7 +4,7 @@ describe('Default site', () => {
   })
 
   it('loads home page', () => {
-    cy.findByText('Next Demo!')
+    cy.findByText('NextJS on Netlify (imported Header component)')
     cy.findByTestId('list-server-side').within(() => {
       cy.findAllByRole('link').should('have.length', 5)
     })

demos/default/components/Header.js

@@ -1,3 +1,3 @@
 export default function Header() {
-  return <h1>Next Demo!</h1>
+  return <h1>NextJS on Netlify (imported Header component)</h1>
 }

demos/default/pages/_app.js

@@ -1,7 +1,11 @@
 import '../styles/globals.css'
 
 function MyApp({ Component, pageProps }) {
-  return <Component {...pageProps} />
+  return (
+    <div className='prose ml-14 mt-10 mb-20'>
+      <Component {...pageProps} />
+    </div>
+  )
 }
 
 export default MyApp