Merge branch 'main' into mk/wasm-support

Author: ascorbic

.release-please-manifest.json

@@ -1,4 +1,4 @@
 {
-  "packages/runtime": "4.27.1",
+  "packages/runtime": "4.27.3",
   "packages/next": "1.3.1"
 }

cypress/integration/middleware/enhanced.spec.ts

@@ -18,7 +18,7 @@ describe('Enhanced middleware', () => {
   })
 
   it('modifies the page props', () => {
-    cy.request('/_next/data/build-id/static.json').then((response) => {
+    cy.request('/_next/data/build-id/en/static.json').then((response) => {
       expect(response.body).to.have.nested.property('pageProps.showAd', true)
       expect(response.body)
         .to.have.nested.property('pageProps.message')

cypress/integration/middleware/standard.spec.ts

@@ -37,11 +37,22 @@ describe('Middleware matchers', () => {
   })
 
   it('matches when headers are sent', () => {
-    cy.request('/_next/data/build-id/static.json').then((response) => {
+    cy.request('/_next/data/build-id/en/static.json').then((response) => {
       expect(response.headers).to.have.property('x-is-deno', 'true')
       expect(response.headers).to.have.property('x-modified-edge', 'true')
     })
   })
+
+  it('correctly handles negative lookaheads', () => {
+    cy.request('/shows/11').then((response) => {
+      expect(response.headers).to.have.property('x-is-deno', 'true')
+      expect(response.headers).to.have.property('x-modified-edge', 'true')
+    })
+    cy.request('/shows/99').then((response) => {
+      expect(response.headers).not.to.have.property('x-is-deno', 'true')
+      expect(response.headers).not.to.have.property('x-modified-edge', 'true')
+    })
+  })
 })
 
 describe('Middleware with edge API', () => {

cypress/integration/nx/general.spec.ts

@@ -16,4 +16,11 @@ describe('Default site', () => {
       expect(res.headers['content-type']).to.match(/javascript/)
     })
   })
+
+  it('serves API routes', () => {
+    cy.request('/api/hello').then((res) => {
+      expect(res.status).to.eq(200)
+      expect(res.body).to.deep.eq({ body: 'Hello world' })
+    })
+  })
 })

demos/middleware/middleware.ts

@@ -94,7 +94,7 @@ export const config = {
     '/api/:all*',
     '/headers',
     { source: '/static' },
-    { source: '/shows/:all*' },
+    { source: '/shows/((?!99|88).*)' },
     {
       source: '/conditional',
       has: [

demos/middleware/next.config.js

@@ -7,6 +7,10 @@ const nextConfig = {
     ignoreDuringBuilds: true,
   },
   generateBuildId: () => 'build-id',
+  i18n: {
+    defaultLocale: 'en',
+    locales: ['en'],
+  },
 }
 
 module.exports = nextConfig

demos/turborepo-next-monorepo-demo/apps/web/pages/api/index.js renamed to demos/nx-next-monorepo-demo/apps/demo-monorepo/pages/api/hello.js

@@ -7,12 +7,12 @@ ignore = "if [ $CACHED_COMMIT_REF == $COMMIT_REF ]; then (exit 1); else git diff
 command = "npm run start"
 targetPort = 4200
 
+[[plugins]]
+package = "../plugin-wrapper"
+
 [[plugins]]
 package = "@netlify/plugin-nextjs"
 
 # This is a fake plugin, that makes it run npm install
 [[plugins]]
 package = "@netlify/plugin-local-install-core"
-
-[[plugins]]
-package = "../plugin-wrapper"

demos/nx-next-monorepo-demo/libs/.gitkeep

@@ -9,6 +9,7 @@
   },
   "private": true,
   "dependencies": {
+    "@netlify/plugin-nextjs": "file:plugin-wrapper",
     "@nrwl/next": "14.7.11",
     "core-js": "^3.6.5",
     "next": "12.3.1",

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

@@ -0,0 +1,5 @@
+# plugin-wrapper
+
+This empty plugin exists to ensure the demo sites can use `"@netlify/plugin-local-install-core"` to run `npm install`,
+which in turn builds the runtime package. This is needed because `npm install` isn't run in the site if the dependencies
+are unchanged.

demos/nx-next-monorepo-demo/package-lock.json

@@ -0,0 +1 @@
+module.exports = require("../../../packages/runtime")

demos/nx-next-monorepo-demo/package.json

@@ -0,0 +1 @@
+name: '@netlify/plugin-nextjs'

demos/nx-next-monorepo-demo/plugin-wrapper/README.md

@@ -0,0 +1,9 @@
+{
+  "name": "local-plugin",
+  "version": "1.0.0-alpha-local-wrapper",
+  "main": "index.js",
+  "license": "MIT",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  }
+}