Merge branch 'main' into add-discover-network-button

Author: Julink-eth

.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

.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}"
 

.github/CODEOWNERS

@@ -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

.github/scripts/git-diff-default-branch.ts

@@ -1,20 +1,15 @@
-import { exec as execCallback } from 'child_process';
 import fs from 'fs';
 import path from 'path';
-import { promisify } from 'util';
-import { context } from '@actions/github';
+import { context, getOctokit } from '@actions/github';
 import * as core from '@actions/core';
 
-const exec = promisify(execCallback);
-
 // Get PR number from GitHub Actions environment variables
 const PR_NUMBER = context.payload.pull_request?.number;
 
-const GITHUB_DEFAULT_BRANCH = 'main';
-const SOURCE_BRANCH = PR_NUMBER ? `refs/pull/${PR_NUMBER}/head` : '';
-
 const CHANGED_FILES_DIR = 'changed-files';
 
+const octokit = getOctokit(process.env.GITHUB_TOKEN || '');
+
 type PRInfo = {
   base: {
     ref: string;
@@ -35,86 +30,36 @@ async function getPrInfo(): Promise<PRInfo | null> {
 
   const { owner, repo } = context.repo;
 
-  const response = await fetch(
-    `https://api.github.com/repos/${owner}/${repo}/pulls/${PR_NUMBER}`,
-    {
-      headers: {
-        Authorization: `token ${process.env.GITHUB_TOKEN}`,
-        Accept: 'application/vnd.github.v3+json',
-      },
-    },
-  );
-
-  return await response.json();
-}
-
-/**
- * Fetches the git repository with a specified depth.
- *
- * @param depth - The depth to use for the fetch command.
- * @returns True if the fetch is successful, otherwise false.
- */
-async function fetchWithDepth(depth: number): Promise<boolean> {
-  try {
-    await exec(`git fetch --depth ${depth} origin "${GITHUB_DEFAULT_BRANCH}"`);
-    if (SOURCE_BRANCH) {
-      await exec(
-        `git fetch --depth ${depth} origin "${SOURCE_BRANCH}:${SOURCE_BRANCH}"`,
-      );
-    }
-    return true;
-  } catch (error) {
-    core.warning(`Failed to fetch with depth ${depth}:`, error);
-    return false;
-  }
+  return (
+    await octokit.request(`GET /repos/${owner}/${repo}/pulls/${PR_NUMBER}`)
+  ).data;
 }
 
 /**
- * Attempts to fetch the necessary commits until the merge base is found.
- * It tries different fetch depths and performs a full fetch if needed.
+ * Get the list of files changed in the pull request using GraphQL
  *
- * @throws If an unexpected error occurs during the execution of git commands.
+ * @returns List of files changed in the PR
  */
-async function fetchUntilMergeBaseFound() {
-  const depths = [1, 10, 100];
-  for (const depth of depths) {
-    core.info(`Attempting git diff with depth ${depth}...`);
-    await fetchWithDepth(depth);
-
-    try {
-      await exec(`git merge-base origin/${GITHUB_DEFAULT_BRANCH} HEAD`);
-      return;
-    } catch (error: unknown) {
-      if (error instanceof Error && 'code' in error) {
-        core.warning(
-          `Error 'no merge base' encountered with depth ${depth}. Incrementing depth...`,
-        );
-      } else {
-        throw error;
-      }
-    }
-  }
-  await exec(`git fetch --unshallow origin "${GITHUB_DEFAULT_BRANCH}"`);
-}
+async function getPrFilesChanged() {
+  const { owner, repo } = context.repo;
 
-/**
- * Performs a git diff command to get the list of files changed between the current branch and the origin.
- * It first ensures that the necessary commits are fetched until the merge base is found.
- *
- * @returns The output of the git diff command, listing the file paths with status (A, M, D).
- * @throws If unable to get the diff after fetching the merge base or if an unexpected error occurs.
- */
-async function gitDiff(): Promise<string> {
-  await fetchUntilMergeBaseFound();
-  const { stdout: diffResult } = await exec(
-    `git diff --name-status "origin/${GITHUB_DEFAULT_BRANCH}...${
-      SOURCE_BRANCH || 'HEAD'
-    }"`,
-  );
-  if (!diffResult) {
-    throw new Error('Unable to get diff after full checkout.');
-  }
-  return diffResult;
+  const response = await octokit.graphql({
+    query: `
+        {
+          repository(owner: "${owner}", name: "${repo}") {
+            pullRequest(number: ${PR_NUMBER}) {
+              files(first: 100) {
+                nodes {
+                  changeType
+                  path,
+                }
+              }
+            }
+          }
+        }`,
+  });
+
+  return response.repository.pullRequest.files.nodes;
 }
 
 function writePrBodyAndInfoToFile(prInfo: PRInfo) {
@@ -153,12 +98,12 @@ async function storeGitDiffOutputAndPrBody() {
     // We perform git diff even if the PR base is not main or skip-e2e-quality-gate label is applied
     // because we rely on the git diff results for other jobs
     core.info('Attempting to get git diff...');
-    const diffOutput = await gitDiff();
+    const diffOutput = JSON.stringify(await getPrFilesChanged());
     core.info(diffOutput);
 
     // Store the output of git diff
-    const outputPath = path.resolve(CHANGED_FILES_DIR, 'changed-files.txt');
-    fs.writeFileSync(outputPath, diffOutput.trim());
+    const outputPath = path.resolve(CHANGED_FILES_DIR, 'changed-files.json');
+    fs.writeFileSync(outputPath, diffOutput);
     core.info(`Git diff results saved to ${outputPath}`);
 
     writePrBodyAndInfoToFile(prInfo);