Merge branch 'canary' into update/export-error-page

.github/workflows/build_test_deploy.yml

@@ -28,6 +28,12 @@ jobs:
       docsChange: ${{ steps.docs-change.outputs.DOCS_CHANGE }}
       isRelease: ${{ steps.check-release.outputs.IS_RELEASE }}
     steps:
+      - name: Setup node
+        uses: actions/setup-node@v2
+        if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }}
+        with:
+          node-version: 14
+
       - uses: actions/checkout@v2
         with:
           fetch-depth: 25
@@ -62,6 +68,12 @@ jobs:
     runs-on: ubuntu-latest
     needs: build
     steps:
+      - name: Setup node
+        uses: actions/setup-node@v2
+        if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }}
+        with:
+          node-version: 14
+
       - uses: actions/cache@v2
         id: restore-build
         with:
@@ -77,6 +89,12 @@ jobs:
     env:
       NEXT_TELEMETRY_DISABLED: 1
     steps:
+      - name: Setup node
+        uses: actions/setup-node@v2
+        if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }}
+        with:
+          node-version: 14
+
       # https://github.com/actions/virtual-environments/issues/1187
       - name: tune linux network
         if: ${{needs.build.outputs.docsChange != 'docs only change'}}
@@ -115,6 +133,12 @@ jobs:
       NEXT_TELEMETRY_DISABLED: 1
       NEXT_TEST_JOB: 1
     steps:
+      - name: Setup node
+        uses: actions/setup-node@v2
+        if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }}
+        with:
+          node-version: 14
+
       - uses: actions/cache@v2
         if: ${{needs.build.outputs.docsChange != 'docs only change'}}
         id: restore-build
@@ -139,6 +163,12 @@ jobs:
       NEXT_TELEMETRY_DISABLED: 1
       NEXT_TEST_JOB: 1
     steps:
+      - name: Setup node
+        uses: actions/setup-node@v2
+        if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }}
+        with:
+          node-version: 14
+
       - run: echo ${{needs.build.outputs.docsChange}}
 
       # https://github.com/actions/virtual-environments/issues/1187
@@ -187,6 +217,12 @@ jobs:
       NEXT_TELEMETRY_DISABLED: 1
       NEXT_TEST_JOB: 1
     steps:
+      - name: Setup node
+        uses: actions/setup-node@v2
+        if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }}
+        with:
+          node-version: 14
+
       - run: echo ${{needs.build.outputs.docsChange}}
 
       # https://github.com/actions/virtual-environments/issues/1187
@@ -230,6 +266,12 @@ jobs:
       matrix:
         group: [1, 2, 3, 4, 5, 6]
     steps:
+      - name: Setup node
+        uses: actions/setup-node@v2
+        if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }}
+        with:
+          node-version: 14
+
       - run: echo ${{needs.build.outputs.docsChange}}
 
       # https://github.com/actions/virtual-environments/issues/1187
@@ -274,6 +316,12 @@ jobs:
       NEXT_TEST_JOB: 1
       TEST_ELECTRON: 1
     steps:
+      - name: Setup node
+        uses: actions/setup-node@v2
+        if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }}
+        with:
+          node-version: 14
+
       - uses: actions/cache@v2
         if: ${{needs.build.outputs.docsChange != 'docs only change'}}
         id: restore-build
@@ -300,6 +348,12 @@ jobs:
       NODE_OPTIONS: '--unhandled-rejections=strict'
       YARN_COMPRESSION_LEVEL: '0'
     steps:
+      - name: Setup node
+        uses: actions/setup-node@v2
+        if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }}
+        with:
+          node-version: 14
+
       - uses: actions/cache@v2
         if: ${{needs.build.outputs.docsChange != 'docs only change'}}
         id: restore-build
@@ -342,6 +396,12 @@ jobs:
       BROWSER_NAME: 'firefox'
       NEXT_TELEMETRY_DISABLED: 1
     steps:
+      - name: Setup node
+        uses: actions/setup-node@v2
+        if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }}
+        with:
+          node-version: 14
+
       - uses: actions/cache@v2
         if: ${{needs.build.outputs.docsChange != 'docs only change'}}
         id: restore-build
@@ -370,6 +430,12 @@ jobs:
       BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
       BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
     steps:
+      - name: Setup node
+        uses: actions/setup-node@v2
+        if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }}
+        with:
+          node-version: 14
+
       # https://github.com/actions/virtual-environments/issues/1187
       - name: tune linux network
         run: sudo ethtool -K eth0 tx off rx off
@@ -408,6 +474,12 @@ jobs:
       BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
       BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
     steps:
+      - name: Setup node
+        uses: actions/setup-node@v2
+        if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }}
+        with:
+          node-version: 14
+
       # https://github.com/actions/virtual-environments/issues/1187
       - name: tune linux network
         run: sudo ethtool -K eth0 tx off rx off
@@ -479,6 +551,12 @@ jobs:
     env:
       NPM_TOKEN: ${{ secrets.NPM_TOKEN_ELEVATED }}
     steps:
+      - name: Setup node
+        uses: actions/setup-node@v2
+        if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }}
+        with:
+          node-version: 14
+
       # https://github.com/actions/virtual-environments/issues/1187
       - name: tune linux network
         run: sudo ethtool -K eth0 tx off rx off
@@ -508,6 +586,12 @@ jobs:
     runs-on: ubuntu-latest
     needs: [publishRelease, build-native-dev]
     steps:
+      - name: Setup node
+        uses: actions/setup-node@v2
+        if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }}
+        with:
+          node-version: 14
+
       - uses: actions/cache@v2
         id: restore-build
         with:

packages/next/server/web/spec-extension/response.ts

@@ -1,8 +1,8 @@
 import type { I18NConfig } from '../../config-shared'
-import type { CookieSerializeOptions } from 'next/dist/compiled/cookie'
 import { NextURL } from '../next-url'
 import { toNodeHeaders } from '../utils'
 import cookie from 'next/dist/compiled/cookie'
+import { CookieSerializeOptions } from '../types'
 
 const INTERNALS = Symbol('internal response')
 const REDIRECTS = new Set([301, 302, 303, 307, 308])

packages/next/server/web/types.ts

@@ -7,6 +7,17 @@ export interface NodeHeaders {
   [header: string]: string | string[] | undefined
 }
 
+export interface CookieSerializeOptions {
+  domain?: string
+  encode?(val: string): string
+  expires?: Date
+  httpOnly?: boolean
+  maxAge?: number
+  path?: string
+  sameSite?: boolean | 'lax' | 'strict' | 'none'
+  secure?: boolean
+}
+
 export interface RequestData {
   geo?: {
     city?: string

test/lib/create-next-install.js

@@ -18,15 +18,16 @@ async function createNextInstall(dependencies) {
   )) {
     if (folder.startsWith('swc-')) {
       const swcPkgPath = path.join(origRepoDir, 'node_modules/@next', folder)
-      await fs.copy(
-        swcPkgPath,
-        path.join(origRepoDir, 'packages/next-swc/native'),
-        {
-          filter: (item) =>
+      const outputPath = path.join(origRepoDir, 'packages/next-swc/native')
+      await fs.copy(swcPkgPath, outputPath, {
+        filter: (item) => {
+          return (
             item === swcPkgPath ||
-            (item.endsWith('.node') && !fs.pathExistsSync(item)),
-        }
-      )
+            (item.endsWith('.node') &&
+              !fs.pathExistsSync(path.join(outputPath, path.basename(item))))
+          )
+        },
+      })
     }
   }
 

test/integration/middleware-typescript/pages/interface/_middleware.ts → test/production/middleware-typescript/app/pages/interface/_middleware.ts

@@ -5,7 +5,7 @@ export const middleware: NextMiddleware = function (request) {
   console.log(request.ua?.isBot)
   console.log(request.ua?.ua)
 
-  return new Response(null, {
+  return new Response('hello from middleware', {
     headers: {
       'req-url-basepath': request.nextUrl.basePath,
       'req-url-pathname': request.nextUrl.pathname,

test/integration/middleware-typescript/tsconfig.json → test/production/middleware-typescript/app/tsconfig.json

@@ -6,7 +6,7 @@
     "target": "es5",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
-    "skipLibCheck": true,
+    "skipLibCheck": false,
     "strict": true,
     "forceConsistentCasingInFileNames": true,
     "noEmit": true,

test/production/middleware-typescript/test/index.test.ts

@@ -0,0 +1,33 @@
+/* eslint-env jest */
+
+import { join } from 'path'
+import { createNext, FileRef } from 'e2e-utils'
+import { NextInstance } from 'test/lib/next-modes/base'
+import { renderViaHTTP } from 'next-test-utils'
+
+const appDir = join(__dirname, '../app')
+
+describe('should set-up next', () => {
+  let next: NextInstance
+
+  beforeAll(async () => {
+    next = await createNext({
+      files: {
+        pages: new FileRef(join(appDir, 'pages')),
+        'tsconfig.json': new FileRef(join(appDir, 'tsconfig.json')),
+        'next.config.js': new FileRef(join(appDir, 'next.config.js')),
+      },
+      dependencies: {
+        typescript: 'latest',
+        '@types/react': 'latest',
+        '@types/react-dom': 'latest',
+      },
+    })
+  })
+  afterAll(() => next.destroy())
+
+  it('should have built and started', async () => {
+    const html = await renderViaHTTP(next.url, '/interface/static')
+    expect(html).toContain('hello from middleware')
+  })
+})