Merge branch 'main' into bulk-codeowners

Author: kodiakhq[bot]

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -12,21 +12,9 @@ body:
     id: description
     attributes:
       label: Summary
-      description: A short description of the problem
+      description: Describe the problem you're seeing.
       placeholder: |
-        Include what you expected to happen, and what actually happened.
-    validations:
-      required: true
-  - type: textarea
-    id: steps-to-reproduce
-    attributes:
-      label: Steps to reproduce
-      description: Steps to reproduce the behavior
-      placeholder: |
-        1. Go to '...'
-        2. Click on '....'
-        3. Scroll down to '....'
-        4. See error
+        Be as precise as you can. Feel free to share screenshots, videos, or data from the devtools of your browser.
     validations:
       required: true
   - type: input
@@ -35,11 +23,36 @@ body:
       label: A link to a reproduction repository
       description: The fastest way to describe your bug is to provide a reproduction repository.
       placeholder: https://github.com/project/link-to-your-reproduction-repo
-
+    validations:
+      required: true
   - type: markdown
     attributes:
       value: |
-        Check out [CONTRIBUTING.md](https://github.com/netlify/next-runtime/blob/main/CONTRIBUTING.md#what-is-a-reproducible-test-case) for advice on producing a reproduction repo.
+        Check out [our contributing guide](https://github.com/netlify/next-runtime/blob/main/CONTRIBUTING.md#how-to-make-a-minimal-reproduction) for advice on producing a reproduction repo.
+  - type: textarea
+    attributes:
+      label: Expected Result
+      description: Describe what you expected to happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Actual Result
+      description: Describe what actually happened.
+    validations:
+      required: true
+  - type: textarea
+    id: steps-to-reproduce
+    attributes:
+      label: Steps to reproduce
+      description: Steps to reproduce the behavior
+      placeholder: |
+        1.
+        2.
+        3.
+        4.
+    validations:
+      required: true
   - type: input
     id: runtime-version
     attributes:
@@ -52,7 +65,7 @@ body:
   - type: checkboxes
     id: more-nextjs-info
     attributes:
-      label: Is your issue related to the `app` directory (beta)?
+      label: Is your issue related to the `app` directory?
       options:
         - label: Yes, I am using the `app` directory
 

.github/pull_request_template.md

@@ -1,22 +1,21 @@
 <!-- Before opening a pull request, ensure you've read our contributing guidelines, https://github.com/netlify/next-runtime/blob/main/CONTRIBUTING.md. -->
 
-### Summary
+## Description
 
 <!-- Provide a brief summary of the change. -->
 
-### Test plan
+### Documentation
 
-1. Visit the Deploy Preview ([insert link to specific page]()) ...
+<!-- Where is this feature or API documented? Did you create an internal and/or external artifact to document this change? -->
 
-### Relevant links (GitHub issues, Notion docs, etc.) or a picture of cute animal
+## Tests
 
-### Standard checks:
+<!-- Did you add tests? How did you test this change? -->
 
-<!-- Please delete any options that reviewers shouldn't check. -->
+You can test this change yourself like so:
 
-- [ ] Check the Deploy Preview's Demo site for your PR's functionality
-- [ ] Add docs when necessary
+1. TODO
 
----
+## Relevant links (GitHub issues, etc.) or a picture of cute animal
 
-🧪 Once merged, make sure to update the version if needed and that it was published correctly.
+<!-- Link to an issue that is fixed by this PR or related to this PR. -->

.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.37.0",
+  "packages/next": "1.4.6"
 }

CONTRIBUTING.md

@@ -45,5 +45,15 @@ Most common commit message prefixes are:
 
 ## Releasing
 
-1. Merge the release PR
-2. Run `npm publish`
+This repository uses [release-please](https://github.com/googleapis/release-please) to automate its releases.
+
+## How to make a minimal reproduction
+
+A reproducible test case is a small Next.js site built to demonstrate a problem - often this problem is caused by a bug in Next.js, next-runtime or user code. Your reproducible test case should contain the bare minimum features needed to clearly demonstrate the bug.
+
+Steps to create a reproducible test case:
+
+- Create a new Next.js site: `npx create-next-app@latest`
+- Add any code or functionality related to the issue. For example, if you have problems with middleware functionality you should add all the necessary code of your middleware.
+- Verify that you're seeing the expected error(s) when running `netlify serve` and on a deployed version on [Netlify](https://www.netlify.com)
+- Publish the code (your GitHub account is a good place to do this) and then link to it when creating an issue. While creating the issue, please give as many details as possible. This could also include screenshots of error messages.

README.md

@@ -174,6 +174,44 @@ If your site uses pnpm to manage dependencies, currently you must
 public-hoist-pattern[]=*
 ```
 
+## Running the tests
+
+To run the tests, ensure that the dependencies are installed as follows:
+
+```shell
+npm install
+```
+
+Then run the tests:
+
+```shell
+npm test
+```
+
+### End-to-end tests
+
+In order to run the end-to-end (E2E) tests, you'll need to be logged in to Netlify. You can do this using the [Netlify CLI](https://github.com/netlify/cli) with the command:
+
+```shell
+netlify login
+```
+
+Alternatively, you can set an environment variable `NETLIFY_AUTH_TOKEN` to a valid Netlify personal access token. This can be obtained from the [Netlify UI](https://docs.netlify.com/cli/get-started/#obtain-a-token-in-the-netlify-ui).
+
+Then run the E2E tests if logged in:
+
+```shell
+npm run test:next
+```
+
+Or if using an access token:
+
+```shell
+NETLIFY_AUTH_TOKEN=your-token-here npm run test:next
+```
+
+_Note: The E2E tests will be deployed to a Netlify owned site. To deploy to your own site then set the environment variable `NETLIFY_SITE_ID` to your site ID._
+
 ## Feedback
 
 If you think you have found a bug in Next.js on Netlify,

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/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