fix(snaps): Patch @metamask/snaps-utils

.circleci/config.yml

@@ -444,7 +444,7 @@ jobs:
       - gh/install
       - run:
           name: Install dependencies
-          command: .circleci/scripts/install-dependencies.sh
+          command: yarn --immutable
       - save_cache:
           key: dependency-cache-{{ checksum "/tmp/YARN_VERSION" }}-{{ checksum "yarn.lock" }}
           paths:

.circleci/scripts/git-diff-develop.ts

@@ -20,6 +20,7 @@ type PRInfo = {
     ref: string;
   };
   body: string;
+  labels: { name: string }[];
 };
 
 /**
@@ -123,7 +124,7 @@ async function storeGitDiffOutputAndPrBody() {
     fs.mkdirSync(CHANGED_FILES_DIR, { recursive: true });
 
     console.log(
-      `Determining whether this run is for a PR targeting ${MAIN_BRANCH}`,
+      `Determining whether to run git diff...`,
     );
     if (!PR_NUMBER) {
       console.log('Not a PR, skipping git diff');
@@ -140,6 +141,9 @@ async function storeGitDiffOutputAndPrBody() {
       console.log(`This is for a PR targeting '${baseRef}', skipping git diff`);
       writePrBodyToFile(prInfo.body);
       return;
+    } else if (prInfo.labels.some(label => label.name === 'skip-e2e-quality-gate')) {
+      console.log('PR has the skip-e2e-quality-gate label, skipping git diff');
+      return;
     }
 
     console.log('Attempting to get git diff...');

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

@@ -7,8 +7,6 @@ on:
 
 jobs:
   add-team-label:
-    uses: metamask/github-tools/.github/workflows/add-team-label.yml@058012b49ff2fbd9649c566ba43b29497f93b21d
-    permissions:
-      pull-requests: write
+    uses: metamask/github-tools/.github/workflows/add-team-label.yml@18af6e4b56a18230d1792480e249ebc50b324927
     secrets:
-      PERSONAL_ACCESS_TOKEN: ${{ secrets.RELEASE_LABEL_TOKEN }}
+      TEAM_LABEL_TOKEN: ${{ secrets.TEAM_LABEL_TOKEN }}

.yarn/patches/@metamask-snaps-utils-npm-8.5.1-808feb2a2a.patch

@@ -0,0 +1,26 @@
+diff --git a/dist/json-rpc.cjs b/dist/json-rpc.cjs
+index 6061f7b8b42f0521b0718d616e5a12a1a7520068..11d0233a7bd4b610a99da6a3d105840e88e108e6 100644
+--- a/dist/json-rpc.cjs
++++ b/dist/json-rpc.cjs
+@@ -68,7 +68,7 @@ function createOriginRegExp(matcher) {
+     const escaped = matcher.replace(/[.*+?^${}()|[\]\\]/gu, '\\$&');
+     // Support wildcards
+     const regex = escaped.replace(/\\\*/gu, '.*');
+-    return RegExp(`${regex}$`, 'u');
++    return RegExp(`^${regex}$`, 'u');
+ }
+ /**
+  * Check whether an origin is allowed or not using a matcher string.
+diff --git a/dist/json-rpc.mjs b/dist/json-rpc.mjs
+index bfa1c2dbbed46a2221ef708afdb97b15db84bc1b..81bc2150cf5d6a9bdabe8d43b04352b299bc1c4d 100644
+--- a/dist/json-rpc.mjs
++++ b/dist/json-rpc.mjs
+@@ -63,7 +63,7 @@ function createOriginRegExp(matcher) {
+     const escaped = matcher.replace(/[.*+?^${}()|[\]\\]/gu, '\\$&');
+     // Support wildcards
+     const regex = escaped.replace(/\\\*/gu, '.*');
+-    return RegExp(`${regex}$`, 'u');
++    return RegExp(`^${regex}$`, 'u');
+ }
+ /**
+  * Check whether an origin is allowed or not using a matcher string.

.yarnrc.yml

@@ -119,14 +119,6 @@ npmAuditIgnoreAdvisories:
   - 'react-beautiful-dnd (deprecation)'
   # New package name format for new versions: @ethereumjs/wallet.
   - 'ethereumjs-wallet (deprecation)'
-npmRegistries:
-  'https://npm.pkg.github.com':
-    npmAlwaysAuth: true
-    npmAuthToken: '${GITHUB_PACKAGE_READ_TOKEN-}'
-
-npmScopes:
-  metamask:
-    npmRegistryServer: '${METAMASK_NPM_REGISTRY:-https://registry.yarnpkg.com}'
 
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-allow-scripts.cjs