Merge branch 'main' into fix/sig-params-v2

Author: davidmurdoch

app/manifest/v3/_base.json

@@ -84,7 +84,6 @@
     "notifications",
     "scripting",
     "storage",
-    "tabs",
     "unlimitedStorage",
     "webRequest",
     "offscreen",

development/webpack/test/config.test.ts

@@ -1,5 +1,5 @@
 import fs from 'node:fs';
-import { describe, it, after, mock } from 'node:test';
+import { describe, it, afterEach, mock } from 'node:test';
 import assert from 'node:assert';
 import { resolve } from 'node:path';
 import { version } from '../../../package.json';
@@ -13,21 +13,29 @@ describe('./utils/config.ts', () => {
   // behaving
   describe('variables', () => {
     const originalReadFileSync = fs.readFileSync;
-    function mockRc(env: Record<string, string> = {}) {
+    function mockRc(
+      env: Record<string, string> = {},
+      prodEnv: Record<string, string> = {},
+    ) {
       mock.method(fs, 'readFileSync', (path: string, options: object) => {
+        // mock the rc files as users might have customized it which may break our tests
         if (path === resolve(__dirname, '../../../.metamaskrc')) {
-          // mock `.metamaskrc`, as users might have customized it which may
-          // break our tests
           return `
-${Object.entries(env)
-  .map(([key, value]) => `${key}=${value}`)
-  .join('\n')}
-`;
+            ${Object.entries(env)
+              .map(([key, value]) => `${key}=${value}`)
+              .join('\n')}
+            `;
+        } else if (path === resolve(__dirname, '../../../.metamaskprodrc')) {
+          return `
+            ${Object.entries(prodEnv)
+              .map(([key, value]) => `${key}=${value}`)
+              .join('\n')}
+            `;
         }
         return originalReadFileSync(path, options);
       });
     }
-    after(() => mock.restoreAll());
+    afterEach(() => mock.restoreAll());
 
     it('should return valid build variables for the default build', () => {
       const buildTypes = loadBuildTypesConfig();
@@ -49,17 +57,31 @@ ${Object.entries(env)
       );
     });
 
-    it('should prefer .metamaskrc variables over others', () => {
+    it('should prefer .metamaskprodrc over .metamaskrc', () => {
       const buildTypes = loadBuildTypesConfig();
       const { args } = parseArgv([], buildTypes);
       const defaultVars = config.getVariables(args, buildTypes);
 
       // verify the default value of the main build is false
       assert.strictEqual(defaultVars.variables.get('ALLOW_LOCAL_SNAPS'), false);
 
-      mockRc({
-        ALLOW_LOCAL_SNAPS: 'true',
-      });
+      mockRc({ ALLOW_LOCAL_SNAPS: 'false' }, { ALLOW_LOCAL_SNAPS: 'true' });
+
+      const overrides = config.getVariables(args, buildTypes);
+
+      // verify the value of the main build is set to the value in .metamaskprodrc
+      assert.strictEqual(overrides.variables.get('ALLOW_LOCAL_SNAPS'), true);
+    });
+
+    it('should prefer .metamaskrc variables over builds.yml', () => {
+      const buildTypes = loadBuildTypesConfig();
+      const { args } = parseArgv([], buildTypes);
+      const defaultVars = config.getVariables(args, buildTypes);
+
+      // verify the default value of the main build is false
+      assert.strictEqual(defaultVars.variables.get('ALLOW_LOCAL_SNAPS'), false);
+
+      mockRc({ ALLOW_LOCAL_SNAPS: 'true' });
 
       const overrides = config.getVariables(args, buildTypes);
 
@@ -68,10 +90,8 @@ ${Object.entries(env)
     });
 
     it('should return valid build variables for a non-default build', () => {
-      mockRc({
-        // required by the `beta` build type
-        SEGMENT_BETA_WRITE_KEY: '.',
-      });
+      // required by the `beta` build type
+      mockRc({ SEGMENT_BETA_WRITE_KEY: '.' });
       const buildTypes = loadBuildTypesConfig();
       const { args } = parseArgv(
         ['--type', 'beta', '--test', '--env', 'production'],

development/webpack/utils/config.ts

@@ -155,15 +155,16 @@ export function getVariables(
 }
 
 /**
- * Loads configuration variables from process.env, .metamaskrc, and build.yml.
+ * Loads configuration variables from process.env, .metamaskprodrc, .metamaskrc, and build.yml.
  *
  * The order of precedence is:
  * 1. process.env
- * 2. .metamaskrc
- * 3. build.yml
+ * 2. .metamaskprodrc
+ * 3. .metamaskrc
+ * 4. builds.yml
  *
  * i.e., if a variable is defined in `process.env`, it will take precedence over
- * the same variable defined in `.metamaskrc` or `build.yml`.
+ * the same variable defined in `.metamaskprodrc`, `.metamaskrc` or `build.yml`.
  *
  * @param activeBuild
  * @param build
@@ -175,6 +176,7 @@ function loadConfigVars(
   { env }: BuildTypesConfig,
 ) {
   const definitions = loadEnv();
+  addRc(definitions, join(__dirname, '../../../.metamaskprodrc'));
   addRc(definitions, join(__dirname, '../../../.metamaskrc'));
   addVars(activeBuild.env);
   addVars(env);

development/webpack/utils/plugins/ManifestPlugin/helpers.ts

@@ -82,8 +82,8 @@ export function transformManifest(
     }
   }
 
-  if (args.test && args.manifest_version === 2) {
-    // test builds need "tabs" permission for switchToWindowWithTitle in MV2
+  if (args.test) {
+    // test builds need "tabs" permission for switchToWindowWithTitle
     transforms.push(addTabsPermission);
   }
 

development/webpack/webpack.config.ts

@@ -81,6 +81,7 @@ const cache = args.cache
         // `buildDependencies`
         config: [
           __filename,
+          join(context, '../.metamaskprodrc'),
           join(context, '../.metamaskrc'),
           join(context, '../builds.yml'),
           browsersListPath,