Merge branch 'main' into fix-connections-menu-dqa

Author: darkwing

.circleci/config.yml

@@ -3,13 +3,13 @@ version: 2.1
 executors:
   node-browsers-small:
     docker:
-      - image: cimg/node:22.13-browsers
+      - image: cimg/node:22.14-browsers
     resource_class: small
     environment:
       NODE_OPTIONS: --max_old_space_size=2048
   node-browsers-medium:
     docker:
-      - image: cimg/node:22.13-browsers
+      - image: cimg/node:22.14-browsers
     resource_class: medium
     environment:
       NODE_OPTIONS: --max_old_space_size=3072
@@ -21,7 +21,7 @@ executors:
       NODE_OPTIONS: --max_old_space_size=6144
   node-browsers-medium-plus:
     docker:
-      - image: cimg/node:22.13-browsers
+      - image: cimg/node:22.14-browsers
     resource_class: medium+
     environment:
       NODE_OPTIONS: --max_old_space_size=4096
@@ -95,10 +95,6 @@ workflows:
               pattern: /^rerun-from-failed.*/
               value: << pipeline.schedule.name >>
     jobs:
-      - create_release_pull_request:
-          <<: *rc_branch_only
-          requires:
-            - prep-deps
       - prep-deps
       - get-changed-files-with-git-diff:
           filters:
@@ -277,26 +273,6 @@ workflows:
             - prep-deps
 
 jobs:
-  create_release_pull_request:
-    executor: node-browsers-medium
-    steps:
-      - checkout
-      - run: sudo corepack enable
-      - attach_workspace:
-          at: .
-      - run:
-          name: Bump manifest version
-          command: .circleci/scripts/release-bump-manifest-version.sh
-      - run:
-          name: Update changelog
-          command: yarn update-changelog --rc
-      - run:
-          name: Commit changes
-          command: .circleci/scripts/release-commit-version-bump.sh
-      - run:
-          name: Create GitHub Pull Request for version
-          command: .circleci/scripts/release-create-release-pr.sh
-
   prep-deps:
     executor: node-browsers-medium
     steps:

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

@@ -38,43 +38,38 @@ git config --global user.email "[email protected]"
 
 git config --global user.name "MetaMask Bot"
 
-git clone [email protected]:MetaMask/extension_bundlesize_stats.git temp
-
-{
-    echo " '${CIRCLE_SHA1}': ";
-    cat test-artifacts/chrome/bundle_size_stats.json;
-    echo ", ";
-} >> temp/stats/bundle_size_data.temp.js
-
-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/bundle_size_stats.json;
-    echo "}";
-  } >> bundle_size_stats.temp.json
-else
-  {
-    echo "{";
-    echo "\"$CIRCLE_SHA1\":";
-    cat test-artifacts/chrome/bundle_size_stats.json;
-    echo "}";
-  } > bundle_size_stats.temp.json
+git clone --depth=1 [email protected]: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
 
-jq . bundle_size_stats.temp.json > temp/stats/bundle_size_data.json
-rm bundle_size_stats.temp.json
+# 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(\"$CIRCLE_SHA1\")" "$STATS_FILE" > /dev/null; then
+    echo "SHA $CIRCLE_SHA1 already exists in stats file. No new commit needed."
+    exit 0
+fi
+
+# Append new bundle size data correctly using jq
+jq --arg sha "$CIRCLE_SHA1" --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
 
-git add .
+# Only add the JSON file
+git add stats/bundle_size_data.json
 
 git commit --message "Adding bundle size at commit: ${CIRCLE_SHA1}"
 

.circleci/scripts/release-bump-manifest-version.sh

@@ -137,4 +137,5 @@ ui/components/ui/deprecated-networks                  @MetaMask/metamask-assets
 ui/components/ui/nft-collection-image                 @MetaMask/metamask-assets
 
 # Extension Platform
-yarnrc.yml                                            @MetaMask/extension-platform
+yarnrc.yml                                            @MetaMask/extension-platform
+test/e2e/mock-e2e-allowlist.js                        @MetaMask/extension-platform