Merge branch 'main' into template-updates

Author: LekoArts

.github/workflows/e2e-appdir.yml

@@ -6,6 +6,9 @@ on:
   push:
     branches: [main]
 
+env:
+  NEXT_SPLIT_API_ROUTES: true
+
 jobs:
   setup:
     runs-on: ubuntu-latest

.github/workflows/e2e-next.yml

@@ -8,6 +8,9 @@ on:
   schedule:
     - cron: '0 0 * * *'
 
+env:
+  NEXT_SPLIT_API_ROUTES: true
+
 jobs:
   setup:
     runs-on: ubuntu-latest

.github/workflows/test-integration.yml

@@ -9,6 +9,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
+env:
+  NEXT_SPLIT_API_ROUTES: true
+
 jobs:
   build:
     name: Integration tests

.github/workflows/test.yml

@@ -11,6 +11,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
+env:
+  NEXT_SPLIT_API_ROUTES: true
+
 jobs:
   build:
     name: Unit tests

.gitignore

@@ -152,4 +152,6 @@ packages/*/lib
 cypress/screenshots
 
 # Test cases have node module fixtures
-!test/**/node_modules
+!test/**/node_modules
+
+/tmp

.release-please-manifest.json

@@ -1,4 +1,4 @@
 {
-  "packages/runtime": "4.36.0",
-  "packages/next": "1.4.5"
+  "packages/runtime": "4.36.1",
+  "packages/next": "1.4.6"
 }

README.md

@@ -89,6 +89,10 @@ The Next.js Runtime fully supports ISR on Netlify. For more details see
 
 Note that Netlify has a minimum TTL of 60 seconds for revalidation.
 
+## Disable Static 404 on Dynamic Routes with fallback:false
+
+Currently when hitting a non-prerendered path with `fallback=false` it will default to a 404 page. You can now change this default setting by using the environemnt variable `LEGACY_FALLBACK_FALSE=true`. With the environment variable set, those non-prerendered paths will now be routed through using the ISR Handler and will allow you to add redirects for those non-prerendered paths. 
+
 ## Use with `next export`
 
 If you are using `next export` to generate a static site, you do not need most of the functionality of this Next.js

cypress/e2e/default/revalidate.cy.ts

@@ -33,7 +33,7 @@ describe('On-demand revalidation', () => {
     cy.request({ url: '/api/revalidate/?select=5', failOnStatusCode: false }).then((res) => {
       expect(res.status).to.eq(500)
       expect(res.body).to.have.property('message')
-      expect(res.body.message).to.include('Invalid response 404')
+      expect(res.body.message).to.include('could not refresh content for path /getStaticProps/withRevalidate/3/, path is not handled by an odb')
     })
   })
   it('revalidates dynamic non-prerendered ISR route with fallback blocking', () => {

demos/default/netlify.toml

@@ -10,6 +10,7 @@ CYPRESS_CACHE_FOLDER = "../node_modules/.CypressBinary"
 # set TERM variable for terminal output
 TERM = "xterm"
 NODE_VERSION = "16.15.1"
+NEXT_SPLIT_API_ROUTES = "true"
 
 [[headers]]
 for = "/_next/image/*"

demos/default/next.config.js

@@ -67,6 +67,11 @@ module.exports = {
         destination: '/',
         permanent: true,
       },
+      {
+        source: '/getStaticProps/4/',
+        destination: '/',
+        permanent: true,
+      },
     ]
   },
   // https://nextjs.org/docs/basic-features/image-optimization#domains

demos/middleware/netlify.toml

@@ -3,6 +3,9 @@ command = "npm run build"
 publish = ".next"
 ignore = "if [ $CACHED_COMMIT_REF == $COMMIT_REF ]; then (exit 1); else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF ../..; fi;"
 
+[build.environment]
+NEXT_SPLIT_API_ROUTES = "true"
+
 [[plugins]]
 package = "@netlify/plugin-nextjs"
 

demos/nx-next-monorepo-demo/netlify.toml

@@ -3,6 +3,9 @@ command = "npm run build"
 publish = "dist/apps/demo-monorepo/.next"
 ignore = "if [ $CACHED_COMMIT_REF == $COMMIT_REF ]; then (exit 1); else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF ../..; fi;"
 
+[build.environment]
+NEXT_SPLIT_API_ROUTES = "true"
+
 [dev]
 command = "npm run start"
 targetPort = 4200