Merge branch 'main' into update-to-mv3

.eslintignore

@@ -17,3 +17,5 @@ third-party/**
 # ignore d.ts files until we can properly lint them
 **/*.d.ts
 **/*.d.cts
+
+page-functions-test-case*out*.js

.github/workflows/devtools.yml

@@ -176,4 +176,4 @@ jobs:
       uses: actions/upload-artifact@v1
       with:
         name: Smokehouse (devtools smoke)
-        path: ${{ github.workspace }}/lighthouse/.tmp/smokehouse-ci-failures/
+        path: ${{ github.workspace }}/lighthouse/.tmp/smokehouse-failures/

.github/workflows/package-test.yml

@@ -32,27 +32,3 @@ jobs:
 
     # Fail if any changes were written to source files.
     - run: git diff --exit-code
-
-  package-test-legacy:
-    runs-on: ubuntu-latest
-    name: Package Test Legacy Navigation
-    env:
-      FORCE_COLOR: true
-
-    steps:
-    - name: git clone
-      uses: actions/checkout@v2
-
-    - name: Use Node.js 16.x
-      uses: actions/setup-node@v1
-      with:
-        node-version: 16.x
-
-    - run: yarn install --frozen-lockfile --network-timeout 1000000
-    - run: yarn build-report
-    - run: sudo apt-get install xvfb
-
-    - run: xvfb-run --auto-servernum bash $GITHUB_WORKSPACE/core/scripts/release/package-test.sh --legacy-navigation
-
-    # Fail if any changes were written to source files.
-    - run: git diff --exit-code

.github/workflows/smoke.yml

@@ -75,7 +75,7 @@ jobs:
       uses: actions/upload-artifact@v1
       with:
         name: Smokehouse (ubuntu; chrome ${{ matrix.chrome-channel }})
-        path: .tmp/smokehouse-ci-failures/
+        path: .tmp/smokehouse-failures/
 
   smoke-windows:
     strategy:
@@ -118,55 +118,7 @@ jobs:
       uses: actions/upload-artifact@v1
       with:
         name: Smokehouse (windows)
-        path: .tmp/smokehouse-ci-failures/
-
-  smoke-legacy:
-    strategy:
-      matrix:
-        smoke-test-shard: [1, 2, 3]
-      # e.g. if set 1 fails, continue with set 2 anyway
-      fail-fast: false
-    runs-on: ubuntu-latest
-    env:
-      # The total number of shards. Set dynamically when length of *single* matrix variable is
-      # computable. See https://github.community/t/get-length-of-strategy-matrix-or-get-all-matrix-options/18342
-      SHARD_TOTAL: 3
-      FORCE_COLOR: true
-    name: Legacy Navigation ${{ matrix.smoke-test-shard }}/3
-
-    steps:
-    - name: git clone
-      uses: actions/checkout@v2
-
-    - name: Use Node.js 16.x
-      uses: actions/setup-node@v1
-      with:
-        node-version: 16.x
-
-    - run: yarn install --frozen-lockfile --network-timeout 1000000
-    - run: yarn build-report
-    - run: yarn reset-link
-
-    - name: Define ToT chrome path
-      run: echo "CHROME_PATH=/home/runner/chrome-linux-tot/chrome" >> $GITHUB_ENV
-
-    - name: Install Chrome ToT
-      working-directory: /home/runner
-      run: bash $GITHUB_WORKSPACE/core/scripts/download-chrome.sh && mv chrome-linux chrome-linux-tot
-
-    - run: sudo apt-get install xvfb
-    - name: yarn smoke --legacy-navigation
-      run: xvfb-run --auto-servernum yarn smoke --debug --legacy-navigation -j=2 --retries=2 --shard=${{ matrix.smoke-test-shard }}/$SHARD_TOTAL
-
-    # Fail if any changes were written to source files.
-    - run: git diff --exit-code
-
-    - name: Upload failures
-      if: failure()
-      uses: actions/upload-artifact@v1
-      with:
-        name: Smokehouse (legacy)
-        path: .tmp/smokehouse-ci-failures/
+        path: .tmp/smokehouse-failures/
 
   smoke-bundle:
     strategy:
@@ -204,7 +156,7 @@ jobs:
 
     - run: sudo apt-get install xvfb
     - name: yarn test-bundle
-      run: xvfb-run --auto-servernum yarn test-bundle --shard=${{ matrix.smoke-test-shard }}/$SHARD_TOTAL
+      run: xvfb-run --auto-servernum yarn test-bundle --shard=${{ matrix.smoke-test-shard }}/$SHARD_TOTAL --retries=2
 
     # Fail if any changes were written to source files.
     - run: git diff --exit-code
@@ -214,52 +166,4 @@ jobs:
       uses: actions/upload-artifact@v1
       with:
         name: Smokehouse (bundled)
-        path: .tmp/smokehouse-ci-failures/
-
-  smoke-bundle-legacy:
-    strategy:
-      matrix:
-        smoke-test-shard: [1, 2, 3]
-      # e.g. if set 1 fails, continue with set 2 anyway
-      fail-fast: false
-    runs-on: ubuntu-latest
-    env:
-      # The total number of shards. Set dynamically when length of *single* matrix variable is
-      # computable. See https://github.community/t/get-length-of-strategy-matrix-or-get-all-matrix-options/18342
-      SHARD_TOTAL: 3
-      FORCE_COLOR: true
-    name: Bundled Legacy Navigation ${{ matrix.smoke-test-shard }}/3
-
-    steps:
-    - name: git clone
-      uses: actions/checkout@v2
-
-    - name: Use Node.js 16.x
-      uses: actions/setup-node@v1
-      with:
-        node-version: 16.x
-
-    - run: yarn install --frozen-lockfile --network-timeout 1000000
-    - run: yarn build-report
-    - run: yarn build-devtools
-
-    - name: Define ToT chrome path
-      run: echo "CHROME_PATH=/home/runner/chrome-linux-tot/chrome" >> $GITHUB_ENV
-
-    - name: Install Chrome ToT
-      working-directory: /home/runner
-      run: bash $GITHUB_WORKSPACE/core/scripts/download-chrome.sh && mv chrome-linux chrome-linux-tot
-
-    - run: sudo apt-get install xvfb
-    - name: yarn test-bundle
-      run: xvfb-run --auto-servernum yarn test-bundle --legacy-navigation --shard=${{ matrix.smoke-test-shard }}/$SHARD_TOTAL
-
-    # Fail if any changes were written to source files.
-    - run: git diff --exit-code
-
-    - name: Upload dist
-      if: failure()
-      uses: actions/upload-artifact@v1
-      with:
-        name: Smokehouse (bundled)
-        path: .tmp/smokehouse-ci-failures/
+        path: .tmp/smokehouse-failures/

.gitignore

@@ -67,3 +67,4 @@ yarn.lock
 **/*.d.cts
 !**/types/**/*.d.ts
 
+page-functions-test-case*out*.js