Merge branch 'main' into user_ctrl_update

Author: jpuri

.circleci/config.yml

@@ -215,15 +215,6 @@ workflows:
             - test-e2e-firefox-flask
             - test-e2e-chrome-vault-decryption
             - test-e2e-chrome-webpack
-      - benchmark:
-          requires:
-            - prep-build-test
-      - user-actions-benchmark:
-          requires:
-            - prep-build-test
-      - bundle-size:
-          requires:
-            - prep-build-test
       - job-publish-prerelease:
           requires:
             - prep-deps
@@ -236,9 +227,6 @@ workflows:
             - prep-build-test-flask
             - prep-build-test-flask-mv2
             - prep-build-ts-migration-dashboard
-            - benchmark
-            - user-actions-benchmark
-            - bundle-size
             - all-tests-pass
       - job-publish-release:
           filters:
@@ -907,84 +895,6 @@ jobs:
       - store_test_results:
           path: test/test-results/e2e
 
-  benchmark:
-    executor: node-browsers-small
-    steps:
-      - run: *shallow-git-clone-and-enable-vnc
-      - run: sudo corepack enable
-      - attach_workspace:
-          at: .
-      - run:
-          name: Move test build to dist
-          command: mv ./dist-test ./dist
-      - run:
-          name: Move test zips to builds
-          command: mv ./builds-test ./builds
-      - run:
-          name: Run page load benchmark
-          command: yarn benchmark:chrome --out test-artifacts/chrome/benchmark/pageload.json --retries 2
-      - store_artifacts:
-          path: test-artifacts
-          destination: test-artifacts
-      - persist_to_workspace:
-          root: .
-          paths:
-            - test-artifacts
-
-  user-actions-benchmark:
-    executor: node-browsers-small
-    steps:
-      - run: *shallow-git-clone-and-enable-vnc
-      - run: sudo corepack enable
-      - attach_workspace:
-          at: .
-      - run:
-          name: Move test build to dist
-          command: mv ./dist-test ./dist
-      - run:
-          name: Move test zips to builds
-          command: mv ./builds-test ./builds
-      - run:
-          name: Run page load benchmark
-          command: yarn user-actions-benchmark:chrome --out test-artifacts/chrome/benchmark/user_actions.json --retries 2
-      - store_artifacts:
-          path: test-artifacts
-          destination: test-artifacts
-      - persist_to_workspace:
-          root: .
-          paths:
-            - test-artifacts
-
-  bundle-size:
-    executor: node-browsers-small
-    steps:
-      - run: *shallow-git-clone-and-enable-vnc
-      - run: sudo corepack enable
-      - attach_workspace:
-          at: .
-      - run:
-          name: Move test build to dist
-          command: mv ./dist-test ./dist
-      - run:
-          name: Move test zips to builds
-          command: mv ./builds-test ./builds
-      - run:
-          name: Measure bundle size
-          command: yarn bundle-size --out test-artifacts/chrome
-      - run:
-          name: Install jq
-          command: sudo apt install jq -y
-      - run:
-          name: Record bundle size at commit
-          command: ./.circleci/scripts/bundle-stats-commit.sh
-      - store_artifacts:
-          path: test-artifacts
-          destination: test-artifacts
-      - persist_to_workspace:
-          root: .
-          paths:
-            - test-artifacts
-
   job-publish-prerelease:
     executor: node-browsers-medium
     steps:

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

@@ -353,7 +353,6 @@ module.exports = {
         'app/scripts/controllers/alert-controller.test.ts',
         'app/scripts/metamask-controller.actions.test.js',
         'app/scripts/detect-multiple-instances.test.js',
-        'app/scripts/controllers/bridge.test.ts',
         'app/scripts/controllers/swaps/**/*.test.js',
         'app/scripts/controllers/swaps/**/*.test.ts',
         'app/scripts/controllers/metametrics.test.js',

.eslintrc.js

@@ -0,0 +1,75 @@
+#!/usr/bin/env bash
+
+set -e
+set -u
+set -o pipefail
+
+if [[ -z "${EXTENSION_BUNDLESIZE_STATS_TOKEN:-}" ]]; then
+    printf '%s\n' 'EXTENSION_BUNDLESIZE_STATS_TOKEN environment variable must be set'
+    exit 1
+fi
+
+if [[ -z "${GITHUB_SHA:-}" ]]; then
+    printf '%s\n' 'GITHUB_SHA environment variable must be set'
+    exit 1
+fi
+
+if [[ -z "${GITHUB_REPOSITORY_OWNER:-}" ]]; then
+    printf '%s\n' 'GITHUB_REPOSITORY_OWNER environment variable must be set'
+    exit 1
+fi
+
+mkdir temp
+
+git config --global user.email "metamaskbot@users.noreply.github.com"
+
+git config --global user.name "MetaMask Bot"
+
+git clone --depth 1 https://github.com/MetaMask/extension_bundlesize_stats.git temp
+
+BUNDLE_SIZE_FILE="test-artifacts/chrome/bundle_size_stats.json"
+STATS_FILE="temp/stats/bundle_size_data.json"
+TEMP_FILE="temp/stats/bundle_size_data.temp.json"
+
+# Ensure the JSON file exists
+if [[ ! -f "${STATS_FILE}" ]]; then
+    echo "{}" > "${STATS_FILE}"
+fi
+
+# Validate JSON files before modification
+jq . "${STATS_FILE}" > /dev/null || {
+    echo "Error: Existing stats JSON is invalid"
+    exit 1
+}
+jq . "${BUNDLE_SIZE_FILE}" > /dev/null || {
+    echo "Error: New bundle size JSON is invalid"
+    exit 1
+}
+
+# Check if the SHA already exists in the stats file
+if jq -e "has(\"${GITHUB_SHA}\")" "${STATS_FILE}" > /dev/null; then
+    echo "SHA ${GITHUB_SHA} already exists in stats file. No new commit needed."
+    exit 0
+fi
+
+# Append new bundle size data correctly using jq
+jq --arg sha "${GITHUB_SHA}" --argjson data "$(cat "${BUNDLE_SIZE_FILE}")" \
+    '. + {($sha): $data}' "${STATS_FILE}" > "${TEMP_FILE}"
+
+# Overwrite the original JSON file with the corrected version
+mv "${TEMP_FILE}" "${STATS_FILE}"
+
+cd temp
+
+# Only add the JSON file
+git add stats/bundle_size_data.json
+
+git commit --message "Adding bundle size at commit: ${GITHUB_SHA}"
+
+repo_slug="${GITHUB_REPOSITORY_OWNER}/extension_bundlesize_stats"
+
+git push "https://metamaskbot:${EXTENSION_BUNDLESIZE_STATS_TOKEN}@github.com/${repo_slug}" main
+
+cd ..
+
+rm -rf temp