Merge branch 'main' into renovate/netlify-ipx-1.x

Author: ascorbic

.github/workflows/cypress-demo-nx.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        containers: [1, 2, 3, 4, 5, 6]
+        containers: [1, 2, 3, 4]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -63,6 +63,8 @@ jobs:
           record: true
           parallel: true
           config-file: cypress/config/nx-demo.json
+          group: 'Next Plugin - Demo NX'
+          spec: cypress/integration/nx/*
         env:
           DEBUG: '@cypress/github-action'
           CYPRESS_baseUrl: ${{ steps.deploy.outputs.origin-url }}

.github/workflows/cypress-demo-static.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        containers: [1, 2, 3, 4, 5, 6]
+        containers: [1, 2, 3, 4]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -63,6 +63,8 @@ jobs:
           record: true
           parallel: true
           config-file: cypress/config/static-root.json
+          group: 'Next Plugin - Demo Static'
+          spec: cypress/integration/static-root/*
         env:
           DEBUG: '@cypress/github-action'
           CYPRESS_baseUrl: ${{ steps.deploy.outputs.origin-url }}

.github/workflows/cypress-demo.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        containers: [1, 2, 3, 4, 5, 6]
+        containers: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -63,6 +63,8 @@ jobs:
           record: true
           parallel: true
           config-file: cypress/config/ci.json
+          group: 'Next Plugin - Demo'
+          spec: cypress/integration/default/*
         env:
           DEBUG: '@cypress/github-action'
           CYPRESS_baseUrl: ${{ steps.deploy.outputs.origin-url }}

.github/workflows/test.yml

@@ -35,6 +35,30 @@ jobs:
         if: "${{ matrix.node-version == '*' }}"
       - name: Run tests against next@latest
         run: npm test
+  canary:
+    name: Unit tests (Canary)
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macOS-latest, windows-latest]
+        node-version: [12, '*']
+        exclude:
+          - os: macOS-latest
+            node-version: 12
+          - os: windows-latest
+            node-version: 12
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node-version }}
+          check-latest: true
+      - name: NPM Install
+        run: npm ci
       - name: Install Next.js Canary
         run: npm install -D next@canary --legacy-peer-deps
       - name: Run tests against next@canary

CHANGELOG.md

@@ -1,5 +1,41 @@
 # Changelog
 
+### [4.3.2](https://github.com/netlify/netlify-plugin-nextjs/compare/v4.3.1...v4.3.2) (2022-04-04)
+
+
+### Bug Fixes
+
+* :bug: include terser bundle into netlify functions ([#1295](https://github.com/netlify/netlify-plugin-nextjs/issues/1295)) ([f29adf3](https://github.com/netlify/netlify-plugin-nextjs/commit/f29adf3ee1d4be8bf40e4695ca4ac1e970c9b1ad))
+
+### [4.3.1](https://github.com/netlify/netlify-plugin-nextjs/compare/v4.3.0...v4.3.1) (2022-03-28)
+
+
+### Bug Fixes
+
+* correctly find site root when using SSR with Nx ([#1281](https://github.com/netlify/netlify-plugin-nextjs/issues/1281)) ([3b26573](https://github.com/netlify/netlify-plugin-nextjs/commit/3b26573407c44a3f6405db776d9d37d993761c1c))
+
+## [4.3.0](https://github.com/netlify/netlify-plugin-nextjs/compare/v4.2.8...v4.3.0) (2022-03-23)
+
+
+### Features
+
+* allow skipping of middleware handling ([#1277](https://github.com/netlify/netlify-plugin-nextjs/issues/1277)) ([63070da](https://github.com/netlify/netlify-plugin-nextjs/commit/63070daaff4082a756af881a382c238c37d07aec))
+
+
+### Bug Fixes
+
+* **deps:** update dependency @vercel/node-bridge to v2.2.0 ([#1246](https://github.com/netlify/netlify-plugin-nextjs/issues/1246)) ([3637fff](https://github.com/netlify/netlify-plugin-nextjs/commit/3637fffce8550b012c8c9f35a0b9f3d1672e90a2))
+
+### [4.2.8](https://github.com/netlify/netlify-plugin-nextjs/compare/v4.2.7...v4.2.8) (2022-03-21)
+
+
+### Bug Fixes
+
+* add new /trace to HIDDEN_PATHS ([#1259](https://github.com/netlify/netlify-plugin-nextjs/issues/1259)) ([84345a8](https://github.com/netlify/netlify-plugin-nextjs/commit/84345a8c27f12bf1a07d1fc83cff9b9a398ee9db))
+* chdir to site root ([#1265](https://github.com/netlify/netlify-plugin-nextjs/issues/1265)) ([8463bbc](https://github.com/netlify/netlify-plugin-nextjs/commit/8463bbcff483ddb6b14e73c6959092e2938cdef1))
+* **deps:** update dependency @netlify/ipx to ^0.0.10 ([#1237](https://github.com/netlify/netlify-plugin-nextjs/issues/1237)) ([16e067d](https://github.com/netlify/netlify-plugin-nextjs/commit/16e067d7ef16da0479d83d09b188838e66946c34))
+* use correct publishDir when building from CLI with cwd option ([#1264](https://github.com/netlify/netlify-plugin-nextjs/issues/1264)) ([e441c97](https://github.com/netlify/netlify-plugin-nextjs/commit/e441c970f3c7ce5c6e74a23cf55efe71d94c9027))
+
 ### [4.2.7](https://github.com/netlify/netlify-plugin-nextjs/compare/v4.2.6...v4.2.7) (2022-02-18)
 
 

cypress/integration/default/preview.spec.ts

@@ -2,7 +2,7 @@ describe('Preview Mode', () => {
   it('enters and exits preview mode', () => {
     // preview mode is off by default
     cy.visit('/previewTest')
-    cy.findByText('Is preview? No')
+    cy.findByText('Is preview? No', {selector: 'h1'})
 
     // enter preview mode
     cy.request('/api/enterPreview').then((response) => {

demos/default/pages/api/hello.js

@@ -1,5 +1,5 @@
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
 
 export default (req, res) => {
-  res.status(200).json({ name: 'John Doe', query: req.query, env: process.env.HELLO_WORLD })
+  res.status(200).json({ name: 'John Doe', query: req.query, env: process.env.HELLO_WORLD, cwd: process.cwd() })
 }

demos/nx-next-monorepo-demo/apps/demo-monorepo/pages/api/index.js

@@ -0,0 +1,7 @@
+// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
+
+export default function handler(req, res) {
+  res.status(200).json({
+    body: 'Hello world',
+  });
+}