Merge origin/main into master-sync

Author: gauthierpetetin

.depcheckrc.yml

@@ -49,14 +49,11 @@ ignores:
   # storybook
   - '@storybook/cli'
   - '@storybook/core'
-  - '@storybook/addon-designs'
   - '@storybook/addon-essentials'
   - '@storybook/addon-a11y'
-  - '@storybook/addon-mdx-gfm'
   - '@storybook/builder-webpack5'
   - '@storybook/manager-webpack5'
   - '@storybook/react-webpack5'
-  - 'storybook-dark-mode'
   - 'react-syntax-highlighter'
   - 'style-loader'
   - 'css-loader'

.github/CODEOWNERS

@@ -150,3 +150,7 @@ test/e2e/fixture-server.js                @MetaMask/qa
 test/e2e/helpers.js                       @MetaMask/qa
 test/e2e/mock-e2e-allowlist.js            @MetaMask/qa
 test/e2e/mock-e2e.js                      @MetaMask/qa
+
+# Wallet API Platform - Page Load Benchmark
+test/e2e/page-objects/benchmark           @MetaMask/wallet-api-platform-engineers
+test/e2e/playwright/benchmark             @MetaMask/wallet-api-platform-engineers

.github/CONTRIBUTING.md

@@ -19,7 +19,7 @@ When you're done with your project / bugfix / feature and ready to submit a PR,
 - [ ] **Meet the spec**: Make sure the PR adds functionality that matches the issue you're closing. This is especially important for bounties: sometimes design or implementation details are included in the conversation, so read carefully!
 - [ ] **Close the issue**: If this PR closes an open issue, fill out the "Related issues" section with `Fixes: #$ISSUE_NUMBER`. Ex. For closing issue 418, include the line `Fixes: #418`. If it doesn't close the issue but addresses it partially, just include a reference to the issue number, like `#418`.
 - [ ] **Keep it simple**: Try not to include multiple features in a single PR, and don't make extraneous changes outside the scope of your contribution. All those touched files make things harder to review ;)
-- [ ] **PR against `main`**: Submit your PR against the `main` branch. This is where we merge new features so they get some time to receive extra testing before being pushed to `master` for production. If your PR is a hot-fix that needs to be published urgently, you may submit a PR against the `master` branch, but this PR will receive tighter scrutiny before merging.
+- [ ] **PR against `main`**: Submit your PR against the `main` branch. This is where we merge new features so they get some time to receive extra testing before being pushed to `stable` for production. If your PR is a hot-fix that needs to be published urgently, you may submit a PR against the `stable` branch, but this PR will receive tighter scrutiny before merging.
 - [ ] **Get reviewed by MetaMask Internal Developers**: All PRs require 2 approvals from MetaMask Internal Developers before merging.
 - [ ] **Ensure the PR is correctly labeled.**: More detail about PR labels can be found [here](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md).
 - [ ] **PR Titles**: Must adhere to the [Conventional Commits specification](https://www.conventionalcommits.org)

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -67,7 +67,7 @@ body:
     attributes:
       label: Version
       description: What version of MetaMask are you running? You can find the version in "Settings" > "About"
-      placeholder: '7.1.0'
+      placeholder: '13.0.0'
     validations:
       required: true
   - type: dropdown

.github/scripts/benchmark-stats-commit.sh

@@ -0,0 +1,79 @@
+#!/usr/bin/env bash
+
+set -e
+set -u
+set -o pipefail
+
+if [[ -z "${EXTENSION_BENCHMARK_STATS_TOKEN:-}" ]]; then
+    printf '%s\n' 'EXTENSION_BENCHMARK_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_benchmark_stats.git temp
+
+cd temp
+
+git fetch origin main:main
+
+git checkout main
+
+BENCHMARK_FILE="../test-artifacts/benchmarks/benchmark-results.json"
+STATS_FILE="stats/page_load_data.json"
+TEMP_FILE="stats/page_load_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 . "${BENCHMARK_FILE}" > /dev/null || {
+    echo "Error: New benchmark 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 benchmark data correctly using jq
+jq --arg sha "${GITHUB_SHA}" --argjson data "$(cat "${BENCHMARK_FILE}")" \
+    '. + {($sha): $data}' "${STATS_FILE}" > "${TEMP_FILE}"
+
+# Overwrite the original JSON file with the corrected version
+mv "${TEMP_FILE}" "${STATS_FILE}"
+
+# Only add the JSON file
+git add stats/page_load_data.json
+
+git commit --message "Adding page load benchmark data at commit: ${GITHUB_SHA}"
+
+repo_slug="${GITHUB_REPOSITORY_OWNER}/extension_benchmark_stats"
+
+git push "https://metamaskbot:${EXTENSION_BENCHMARK_STATS_TOKEN}@github.com/${repo_slug}" main
+
+cd ..
+
+rm -rf temp

.github/scripts/check-template-and-add-labels.ts

@@ -185,6 +185,22 @@ async function main(): Promise<void> {
         labelable,
         invalidPullRequestTemplateLabel,
       );
+
+      // Skip changelog check if PR has "no-changelog" label
+      const hasNoChangelogLabel = labelable.labels?.some(
+        (label) => label.name === "no-changelog"
+      );
+
+      // Require changelog entry
+      if (hasNoChangelogLabel) {
+        console.log(`PR ${labelable.number} has "no-changelog" label. Skipping changelog entry check.`);
+      } else if (!hasChangelogEntry(labelable.body)) {
+        const errorMessage = `PR is missing a valid "CHANGELOG entry:" line.`;
+        console.log(errorMessage);
+
+        core.setFailed(errorMessage);
+        process.exit(1);
+      }
     } else {
       const errorMessage = `PR body does not match template ('pull-request-template.md').\n\nMake sure PR's body includes all section titles.\n\nSections titles are listed here: https://github.com/MetaMask/metamask-extension/blob/main/.github/scripts/shared/template.ts#L40-L47`;
       console.log(errorMessage);
@@ -274,9 +290,14 @@ function extractReleaseVersionFromBugReportIssueBody(
   const cleanedBody = body.replace(/\r?\n/g, ' ');
 
   // Extract version from the cleaned body
-  const regex = /### Version\s+((.*?)(?=  |$))/;
+  const regex = /### Version\s+(.*?)(?=\s+###|$)/;
   const versionMatch = cleanedBody.match(regex);
-  const version = versionMatch?.[1];
+  const fullVersionString = versionMatch?.[1]?.trim();
+
+  // Extract just the x.x.x part from the full version string
+  const versionRegex = /(\d+\.\d+\.\d+)/;
+  const semanticVersionMatch = fullVersionString?.match(versionRegex);
+  const version = semanticVersionMatch?.[1];
 
   // Check if version is in the format x.y.z
   if (version && !/^(\d+\.)?(\d+\.)?(\*|\d+)$/.test(version)) {
@@ -379,3 +400,37 @@ async function userBelongsToMetaMaskOrg(
 
   return Boolean(userBelongsToMetaMaskOrgResult?.user?.organization?.id);
 }
+
+// This function checks if the PR description has a changelog entry
+function hasChangelogEntry(body: string): boolean {
+  // Remove HTML comments (including multiline)
+  const uncommentedBody = body.replace(/<!--[\s\S]*?-->/g, "");
+
+  // Split body into lines
+  const lines = uncommentedBody.split(/\r?\n/);
+
+  // Find the line starting with "CHANGELOG entry:"
+  const changelogLine = lines.find(line => line.trim().startsWith("CHANGELOG entry:"));
+
+  if (!changelogLine) {
+    console.log("Changelog entry line missing");
+    return false;
+  }
+
+  // Extract everything after the prefix, tolerating extra spaces after the colon
+  const match = changelogLine.match(/^\s*CHANGELOG entry:\s*(.*)$/);
+  const entry = match?.[1]?.trim() ?? "";
+
+  if (entry === "") {
+    console.log("Changelog entry is empty");
+    return false;
+  }
+
+  if (entry.toLowerCase() === "undefined") {
+    console.log("Changelog entry is explicitly undefined");
+    return false;
+  }
+
+  console.log(`Changelog entry found: ${entry}`);
+  return true; // allow any non-empty value, including "null"
+}

.github/scripts/get-next-semver-version.sh

@@ -9,7 +9,16 @@ then
   exit 0
 fi
 
-# Get the version from package.json
-VERSION_PACKAGE=$(node -p "require(process.env.GITHUB_WORKSPACE + '/package.json').version")
+# Pattern for Version-vX.Y.Z branches
+VERSION_BRANCHES_VERSION_V=$(git branch -r | grep -o 'Version-v[0-9]*\.[0-9]*\.[0-9]*' | grep -o '[0-9]*\.[0-9]*\.[0-9]*' | sort --version-sort | tail -n 1)
+# Default pattern for release/x.y.z branches
+VERSION_BRANCHES_RELEASE=$(git branch -r | grep -o 'release/[0-9]*\.[0-9]*\.[0-9]*' | grep -o '[0-9]*\.[0-9]*\.[0-9]*' | sort --version-sort | tail -n 1)
 
-echo "NEXT_SEMVER_VERSION=${VERSION_PACKAGE}" >> "$GITHUB_ENV"
+# Compare versions and keep the highest one
+HIGHEST_VERSION=$(printf "%s\n%s" "$VERSION_BRANCHES_VERSION_V" "$VERSION_BRANCHES_RELEASE" | sort --version-sort | tail -n 1)
+echo "HIGHEST_VERSION=${HIGHEST_VERSION}, VERSION_BRANCHES_VERSION_V=${VERSION_BRANCHES_VERSION_V}, VERSION_BRANCHES_RELEASE=${VERSION_BRANCHES_RELEASE}"
+
+# Increment the minor version of the highest version found and reset the patch version to 0
+NEXT_VERSION=$(echo "$HIGHEST_VERSION" | awk -F. -v OFS=. '{$2++; $3=0; print}')
+
+echo "NEXT_SEMVER_VERSION=${NEXT_VERSION}" >> "$GITHUB_ENV"

.github/workflows/add-release-label.yml

@@ -24,7 +24,8 @@ jobs:
         id: get-next-semver-version
         env:
           FORCE_NEXT_SEMVER_VERSION: ${{ vars.FORCE_NEXT_SEMVER_VERSION }}
-        run: ./development/get-next-semver-version.sh "$FORCE_NEXT_SEMVER_VERSION"
+        run: ./get-next-semver-version.sh "$FORCE_NEXT_SEMVER_VERSION"
+        working-directory: '.github/scripts'
 
       - name: Add release label to PR and linked issues
         id: add-release-label-to-pr-and-linked-issues

.github/workflows/automated-rca.yml

@@ -10,13 +10,9 @@ permissions:
 
 jobs:
   automated-rca:
-    uses: MetaMask/github-tools/.github/workflows/post-gh-rca.yml@727c028d5fdb2b86f6b1cf205b97fa8e79f7de61
+    uses: MetaMask/github-tools/.github/workflows/post-gh-rca.yml@5da154078ddf6c022ed89dc3dbf378594afb8266
     with:
-      google-form-base-url: 'https://docs.google.com/forms/d/e/1FAIpQLSfnfEWH7JCFFtvjCHixgyqJdTU3LW3BmTwdF1dDezTNf7m4ig/viewform'
       repo-owner: ${{ github.repository_owner }}
       repo-name: ${{ github.event.repository.name }}
       issue-number: ${{ github.event.issue.number }}
       issue-labels: '["Sev0-urgent", "Sev1-high"]'
-      entry-issue: 'entry.340898780'
-      entry-team: 'entry.765806202'
-      entry-regression: 'entry.1756851972'

.github/workflows/benchmark-pr.yml

@@ -0,0 +1,67 @@
+name: Benchmark PR Performance
+
+on:
+  workflow_call:
+    inputs:
+      browser-loads:
+        description: 'Number of browser loads to perform'
+        required: false
+        type: string
+        default: '10'
+      page-loads:
+        description: 'Number of page loads per browser'
+        required: false
+        type: string
+        default: '10'
+    secrets:
+      PR_COMMENT_TOKEN:
+        required: true
+      EXTENSION_BENCHMARK_STATS_TOKEN:
+        required: true
+
+jobs:
+  benchmark-pr:
+    name: Run Page Load Benchmarks
+    runs-on: ubuntu-latest
+    env:
+      PR_COMMENT_TOKEN: ${{ secrets.PR_COMMENT_TOKEN }}
+      OWNER: ${{ github.repository_owner }}
+      REPOSITORY: ${{ github.event.repository.name }}
+      PR_NUMBER: ${{ github.event.pull_request.number }}
+      GITHUB_SHA: ${{ github.event.pull_request.head.sha }}
+    steps:
+      - name: Checkout and setup environment
+        uses: MetaMask/action-checkout-and-setup@v1
+        with:
+          is-high-risk-environment: false
+          skip-allow-scripts: true
+          yarn-custom-url: ${{ vars.YARN_URL }}
+
+      - name: Download artifact 'build-dist-browserify'
+        uses: actions/download-artifact@v4
+        with:
+          name: build-dist-browserify
+
+      - name: Install Playwright browsers
+        run: yarn playwright install chromium
+
+      - name: Run page load benchmarks
+        run: yarn test:e2e:benchmark
+
+      - name: Compare and comment
+        if: ${{ github.event_name == 'pull_request' }}
+        run: yarn tsx development/benchmark-pr-comment.ts
+        env:
+          PR_COMMENT_TOKEN: ${{ secrets.PR_COMMENT_TOKEN }}
+          OWNER: ${{ github.repository_owner }}
+          REPOSITORY: ${{ github.event.repository.name }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+          GITHUB_SHA: ${{ github.event.pull_request.head.sha }}
+
+      - name: Upload benchmark results
+        if: github.ref == 'refs/heads/main'
+        run: .github/scripts/benchmark-stats-commit.sh
+        env:
+          EXTENSION_BENCHMARK_STATS_TOKEN: ${{ secrets.EXTENSION_BENCHMARK_STATS_TOKEN }}
+          GITHUB_SHA: ${{ github.sha }}
+          GITHUB_REPOSITORY_OWNER: ${{ github.repository_owner }}