Merge branch 'main' into rs/isr-i18n-homepage

Author: orinokai

.github/workflows/e2e-next.yml

@@ -0,0 +1,24 @@
+name: Next.js e2e test suite
+
+on:
+  pull_request:
+  push:
+    branches: [main]
+
+jobs:
+  test:
+    name: E2E tests
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Installing with LTS Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: 'lts/*'
+      - name: NPM Install
+        run: npm install
+      - name: Run Next.js e2e test suite
+        run: npm run test:next
+        env:
+          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_BOT_AUTH_TOKEN }}
+          NETLIFY_SITE_ID: 1d5a5c76-d445-4ae5-b694-b0d3f2e2c395

.release-please-manifest.json

@@ -1,4 +1,4 @@
 {
-  "packages/runtime": "4.28.6",
+  "packages/runtime": "4.29.1",
   "packages/next": "1.4.0"
 }

README.md

@@ -138,6 +138,14 @@ If you currently use redirects or rewrites on your site, see
 information on changes to how they are handled in this version. In particular, note that `_redirects` and `_headers`
 files must be placed in `public`, not in the root of the site.
 
+## Using with pnpm
+If your site uses pnpm to manage dependencies, currently you must [enable public hoisting](https://pnpm.io/npmrc#public-hoist-pattern). 
+The simplest way to do this is to create a `.npmrc` file in the root of your project with the content:
+
+```ini
+public-hoist-pattern[]=*
+```
+
 ## Feedback
 
 If you think you have found a bug in Next.js on Netlify,

cypress/integration/middleware/enhanced.spec.ts

@@ -25,4 +25,15 @@ describe('Enhanced middleware', () => {
         .that.includes('This was static but has been transformed in')
     })
   })
+
+  it('adds geo data', () => {
+    cy.request('/api/geo').then((response) => {
+      expect(response.body).to.have.nested.property('headers.x-geo-country')
+      expect(response.body).to.have.nested.property('headers.x-geo-region')
+      expect(response.body).to.have.nested.property('headers.x-geo-city')
+      expect(response.body).to.have.nested.property('headers.x-geo-longitude')
+      expect(response.body).to.have.nested.property('headers.x-geo-latitude')
+      expect(response.body).to.have.nested.property('headers.x-geo-timezone')
+    })
+  })
 })

demos/base-path/package.json

@@ -13,7 +13,7 @@
     "typescript": "^4.6.3"
   },
   "dependencies": {
-    "next": "^13.0.0"
+    "next": "^13.0.3"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

demos/canary/package-lock.json

@@ -10,8 +10,8 @@
   },
   "dependencies": {
     "next": "^12.3.1",
-    "react": "18.1.0",
-    "react-dom": "18.1.0"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   },
   "devDependencies": {
     "@netlify/plugin-nextjs": "*",

demos/canary/package.json

@@ -14,7 +14,7 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "next": "^13.0.0"
+    "next": "^13.0.3"
   },
   "scripts": {
     "build": "next build",

demos/custom-routes/package.json

@@ -0,0 +1 @@
+world

demos/default/hello.txt

@@ -18,12 +18,13 @@
   },
   "homepage": "https://github.com/netlify/next-runtime#readme",
   "dependencies": {
+    "@netlify/next": "*",
     "@reach/dialog": "^0.16.2",
     "@reach/visually-hidden": "^0.16.0",
-    "@vercel/og": "^0.0.15",
-    "next": "^13.0.0",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0"
+    "@vercel/og": "^0.0.20",
+    "next": "^13.0.3",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   },
   "devDependencies": {
     "@netlify/plugin-nextjs": "*",