Merge branch 'develop' into update-address-component-on-transaction-d…

…ata-screen

.circleci/config.yml

@@ -90,6 +90,9 @@ workflows:
       - test-e2e-firefox-snaps:
           requires:
             - prep-build-test-flask
+      - test-e2e-chrome-mv3:
+          requires:
+            - prep-build-test-mv3
       - test-unit:
           requires:
             - prep-deps
@@ -386,7 +389,7 @@ jobs:
             - builds-test
 
   prep-build-storybook:
-    executor: node-browsers
+    executor: node-browsers-medium-plus
     steps:
       - checkout
       - attach_workspace:
@@ -537,6 +540,33 @@ jobs:
       - store_artifacts:
           path: test-artifacts
           destination: test-artifacts
+
+  test-e2e-chrome-mv3:
+    executor: node-browsers
+    steps:
+      - checkout
+      - run:
+          name: Re-Install Chrome
+          command: ./.circleci/scripts/chrome-install.sh
+      - attach_workspace:
+          at: .
+      - run:
+          name: Move test build to dist
+          command: mv ./dist-test-mv3 ./dist
+      - run:
+          name: Move test zips to builds
+          command: mv ./builds-test-mv3 ./builds
+      - run:
+          name: test:e2e:chrome
+          command: |
+            if .circleci/scripts/test-run-e2e.sh
+            then
+              yarn test:e2e:chrome --retries 2 || echo "Temporarily suppressing MV3 e2e test failures"
+            fi
+          no_output_timeout: 20m
+      - store_artifacts:
+          path: test-artifacts
+          destination: test-artifacts
 
   test-e2e-firefox-snaps:
     executor: node-browsers
@@ -644,7 +674,7 @@ jobs:
           root: .
           paths:
             - test-artifacts
-    
+
   user-actions-benchmark:
     executor: node-browsers-medium-plus
     steps:
@@ -697,6 +727,9 @@ jobs:
       - run:
           name: Run page load benchmark
           command: yarn mv3:stats:chrome --out test-artifacts/chrome/mv3
+      - run:
+          name: Install jq
+          command: sudo apt install jq -y
       - run:
           name: Record bundle size at commit
           command: ./.circleci/scripts/bundle-stats-commit.sh

.circleci/scripts/bundle-stats-commit.sh

@@ -50,6 +50,28 @@ cp temp/stats/bundle_size_data.temp.js temp/stats/bundle_size_data.js
 
 echo " }" >> temp/stats/bundle_size_data.js
 
+if [ -f temp/stats/bundle_size_data.json ]; then
+  # copy bundle_size_data.json in bundle_size_data.temp.json without last 2 lines
+  head -$(($(wc -l < temp/stats/bundle_size_data.json) - 2)) temp/stats/bundle_size_data.json > bundle_size_stats.temp.json
+
+  {
+    echo "},";
+    echo "\"$CIRCLE_SHA1\":";
+    cat test-artifacts/chrome/mv3/bundle_size_stats.json;
+    echo "}";
+  } >> bundle_size_stats.temp.json
+else
+  {
+    echo "{";
+    echo "\"$CIRCLE_SHA1\":";
+    cat test-artifacts/chrome/mv3/bundle_size_stats.json;
+    echo "}";
+  } > bundle_size_stats.temp.json
+fi
+
+jq . bundle_size_stats.temp.json > temp/stats/bundle_size_data.json
+rm bundle_size_stats.temp.json
+
 cd temp
 
 git add .

.circleci/scripts/chrome-install.sh

@@ -5,12 +5,12 @@ set -u
 set -o pipefail
 
 # To get the latest version, see <https://www.ubuntuupdates.org/ppa/google_chrome?dist=stable>
-CHROME_VERSION='105.0.5195.102-1'
+CHROME_VERSION='107.0.5304.87-1'
 CHROME_BINARY="google-chrome-stable_${CHROME_VERSION}_amd64.deb"
 CHROME_BINARY_URL="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/${CHROME_BINARY}"
 
 # To retrieve this checksum, run the `wget` and `shasum` commands below
-CHROME_BINARY_SHA512SUM='3a1f2267ae009424ee8c623c3f78760d969dc1f3acb490e103e667d11e52cf0d955f201aeb3892dd41f33e68625af77ca5a20244b5be718f794eccb07a4c0413'
+CHROME_BINARY_SHA512SUM='07b443bc1382431da84f6812b7e19f1149aa195fb8b3d28834630cc5964fb9d12124abbf4ec1c98d5c0513cdf16c2a3f16a74518c984aaf57ca418b3cd36a4e2'
 
 wget -O "${CHROME_BINARY}" -t 5 "${CHROME_BINARY_URL}"
 

.eslintrc.js

@@ -15,6 +15,7 @@ module.exports = {
     'development/ts-migration-dashboard/build/**',
     'dist/**/*',
     'node_modules/**/*',
+    'jest-coverage/**/*',
   ],
   overrides: [
     /**

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,18 +6,6 @@ Thanks for the pull request. Take a moment to answer these questions so that rev
 * What is the current state of things and why does it need to change?
 * What is the solution your changes offer and how does it work?
 
-Below is a template to give you some ideas. Feel free to use your own words!
-
-Currently, ...
-
-This is a problem because ...
-
-In order to solve this problem, this pull request ...
--->
-
-## More Information
-
-<!--
 Are there any issues, Slack conversations, Zendesk issues, user stories, etc. reviewers should consult to understand this pull request better? For instance:
 
 * Fixes #12345
@@ -46,14 +34,20 @@ How should reviewers and QA manually test your changes? For instance:
 - Then do this
 -->
 
-## Pre-Merge Checklist
+## Pre-merge author checklist
+
+- [ ] I've clearly explained:
+  - [ ] What problem this PR is solving
+  - [ ] How this problem was solved
+  - [ ] How reviewers can test my changes
+- [ ] Sufficient automated test coverage has been added
+
+## Pre-merge reviewer checklist
 
-- [ ] PR template is filled out
-- [ ] **IF** this PR fixes a bug, a test that _would have_ caught the bug has been added
+- [ ] Manual testing (e.g. pull and build branch, run in browser, test code being changed)
 - [ ] PR is linked to the appropriate GitHub issue
-- [ ] PR has been added to the appropriate release Milestone
+- [ ] **IF** this PR fixes a bug in the release milestone, add this PR to the release milestone
 
-### + If there are functional changes:
+If further QA is required (e.g. new feature, complex testing steps, large refactor), add the `Extension QA Board` label.
 
-- [ ] Manual testing complete & passed
-- [ ] "Extension QA Board" label has been applied
+In this case, a QA Engineer approval will be be required.

.gitignore

@@ -53,3 +53,6 @@ notes.txt
 
 # TypeScript
 tsout/
+
+# Test results
+test-results/

.iyarc

@@ -1,5 +1,2 @@
 # improved-yarn-audit advisory exclusions
-GHSA-93q8-gq69-wqmw
 GHSA-257v-vj4p-3w2h
-GHSA-wm7h-9275-46v2
-GHSA-pfrx-2q88-qq97