Merge remote-tracking branch 'upstream/canary' into add/rewrite-proxying

.eslintrc.json

@@ -21,6 +21,7 @@
     }
   },
   "overrides": [
+    { "files": ["**/__tests__/**"], "env": { "jest": true } },
     {
       "files": ["**/*.ts", "**/*.tsx"],
       "parser": "@typescript-eslint/parser",

.github/workflows/build_test_deploy.yml

@@ -0,0 +1,111 @@
+on:
+  push:
+    branches: [canary]
+  pull_request:
+    types: [opened, synchronize]
+
+name: Build, test, and deploy
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    env:
+      NEXT_TELEMETRY_DISABLED: 1
+    steps:
+      - uses: actions/checkout@v2
+      - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
+      - run: yarn install --frozen-lockfile --check-files
+      - uses: actions/cache@v1
+        id: cache-build
+        with:
+          path: '.'
+          key: ${{ github.sha }}
+
+  lint:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - uses: actions/cache@v1
+        id: restore-build
+        with:
+          path: '.'
+          key: ${{ github.sha }}
+      - run: yarn lint
+
+  testAll:
+    name: Test All
+    runs-on: ubuntu-latest
+    needs: build
+    env:
+      NEXT_TELEMETRY_DISABLED: 1
+      HEADLESS: true
+    strategy:
+      fail-fast: false
+      matrix:
+        group: [1, 2, 3, 4, 5, 6]
+    steps:
+      - uses: actions/cache@v1
+        id: restore-build
+        with:
+          path: '.'
+          key: ${{ github.sha }}
+
+      # TODO: remove after we fix watchpack watching too much
+      - run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
+
+      - run: node run-tests.js --timings -g ${{ matrix.group }}/6 -c 3
+
+  testsPass:
+    name: thank you, next
+    runs-on: ubuntu-latest
+    needs: [lint, testAll]
+    steps:
+      - run: exit 0
+
+  testFirefox:
+    name: Test Firefox (production)
+    runs-on: ubuntu-latest
+    needs: build
+    env:
+      NEXT_TELEMETRY_DISABLED: 1
+      HEADLESS: true
+    steps:
+      - uses: actions/cache@v1
+        id: restore-build
+        with:
+          path: '.'
+          key: ${{ github.sha }}
+      - run: yarn testfirefox --forceExit test/integration/production/
+
+  testSafari:
+    name: Test Safari (production)
+    runs-on: ubuntu-latest
+    needs: build
+    env:
+      NEXT_TELEMETRY_DISABLED: 1
+      BROWSERSTACK: true
+      SKIP_LOCAL_SELENIUM_SERVER: true
+      BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
+      BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
+    steps:
+      - uses: actions/cache@v1
+        id: restore-build
+        with:
+          path: '.'
+          key: ${{ github.sha }}
+      - run: '[[ -z "$BROWSERSTACK_ACCESS_KEY" ]] && echo "Skipping for PR" || yarn testsafari --forceExit test/integration/production/'
+
+  publishRelease:
+    name: Potentially publish release
+    runs-on: ubuntu-latest
+    needs: [testsPass]
+    env:
+      NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+    steps:
+      - uses: actions/cache@v1
+        id: restore-build
+        with:
+          path: '.'
+          key: ${{ github.sha }}
+
+      - run: ./publish-release.sh

.github/workflows/pull_request.yml → .github/workflows/pull_request_stats.yml

@@ -1,11 +1,14 @@
-on: pull_request
-name: Generate pull request stats
+on:
+  pull_request:
+    types: [opened, synchronize]
+
+name: Generate Pull Request Stats
+
 jobs:
-  prStats:
+  stats:
     name: PR Stats
     runs-on: ubuntu-latest
     steps:
-      - name: PR Stats
-        uses: zeit/next-stats-action@master
+      - uses: zeit/next-stats-action@master
         env:
           COMMENT_ENDPOINT: https://next-stats.jjsweb.site/api/comment

.github/workflows/release.yml → .github/workflows/release_stats.yml

@@ -1,5 +1,7 @@
 on: release
-name: Generate release stats
+
+name: Generate Release Stats
+
 jobs:
   prStats:
     name: PR Stats