fix(5955): ensure getEnvironment() function to return the correct environment values

development/build/index.js

@@ -31,6 +31,7 @@ const createStaticAssetTasks = require('./static');
 const createEtcTasks = require('./etc');
 const {
   getBrowserVersionMap,
+  getBuildTargetFromTask,
   getEnvironment,
   isDevBuild,
   isTestBuild,
@@ -503,10 +504,9 @@ function getIgnoredFiles(target) {
 Please fix builds.yml or specify a compatible set of features.`);
   }
 
-  if (
-    target.includes(BUILD_TARGETS.DEV) ||
-    target.includes(BUILD_TARGETS.TEST)
-  ) {
+  const buildTarget = getBuildTargetFromTask(target);
+
+  if (isDevBuild(buildTarget) || isTestBuild(buildTarget)) {
     return ignoredPaths;
   }
 

development/build/utils.js

@@ -29,6 +29,49 @@ function isTestBuild(buildTarget) {
   );
 }
 
+/**
+ * Task prefix to build target mapping.
+ * Used to extract the build target from task names like 'scripts:core:test:standardEntryPoints'.
+ * Sorted by prefix length (longest first) to ensure 'test-live' matches before 'test'.
+ */
+const TASK_PREFIX_TO_BUILD_TARGET = [
+  ['scripts:core:test-live', BUILD_TARGETS.TEST_DEV],
+  ['scripts:core:dist', BUILD_TARGETS.DIST],
+  ['scripts:core:prod', BUILD_TARGETS.PROD],
+  ['scripts:core:test', BUILD_TARGETS.TEST],
+  ['scripts:core:dev', BUILD_TARGETS.DEV],
+];
+
+/**
+ * Extract the build target from a task name.
+ *
+ * Task names follow patterns like:
+ * - 'dev' -> 'dev' (already a build target)
+ * - 'scripts:core:test:standardEntryPoints' -> 'test'
+ * - 'scripts:core:test-live:sentry' -> 'testDev'
+ *
+ * @param {string} taskName - The task name or build target.
+ * @returns {BUILD_TARGETS} The extracted build target, or the original
+ * taskName if it couldn't be mapped (for backwards compatibility).
+ */
+function getBuildTargetFromTask(taskName) {
+  // If it's already a valid build target, return it
+  const validTargets = Object.values(BUILD_TARGETS);
+  if (validTargets.includes(taskName)) {
+    return taskName;
+  }
+
+  // Check task prefixes to extract the build target
+  for (const [prefix, buildTarget] of TASK_PREFIX_TO_BUILD_TARGET) {
+    if (taskName.startsWith(prefix)) {
+      return buildTarget;
+    }
+  }
+
+  // Return original for backwards compatibility with unknown task names
+  return taskName;
+}
+
 /**
  * Map the current version to a format that is compatible with each browser.
  *
@@ -299,6 +342,7 @@ function makeSelfInjecting(filePath) {
 module.exports = {
   getBrowserVersionMap,
   getBuildName,
+  getBuildTargetFromTask,
   getEnvironment,
   isDevBuild,
   isTestBuild,

development/build/utils.test.ts

@@ -0,0 +1,96 @@
+import { getBuildTargetFromTask, getEnvironment } from './utils';
+
+describe('getBuildTargetFromTask', () => {
+  it('passes through valid build targets unchanged', () => {
+    expect(getBuildTargetFromTask('dev')).toBe('dev');
+    expect(getBuildTargetFromTask('test')).toBe('test');
+    expect(getBuildTargetFromTask('testDev')).toBe('testDev');
+    expect(getBuildTargetFromTask('prod')).toBe('prod');
+    expect(getBuildTargetFromTask('dist')).toBe('dist');
+  });
+
+  it('extracts build target from script task names', () => {
+    expect(getBuildTargetFromTask('scripts:core:dev:standardEntryPoints')).toBe(
+      'dev',
+    );
+    expect(getBuildTargetFromTask('scripts:core:dev:contentscript')).toBe(
+      'dev',
+    );
+    expect(
+      getBuildTargetFromTask('scripts:core:test:standardEntryPoints'),
+    ).toBe('test');
+    expect(getBuildTargetFromTask('scripts:core:test:sentry')).toBe('test');
+    expect(
+      getBuildTargetFromTask('scripts:core:test-live:standardEntryPoints'),
+    ).toBe('testDev');
+    expect(
+      getBuildTargetFromTask('scripts:core:prod:standardEntryPoints'),
+    ).toBe('prod');
+    expect(
+      getBuildTargetFromTask('scripts:core:dist:standardEntryPoints'),
+    ).toBe('dist');
+  });
+
+  it('returns original taskName for unknown patterns (backwards compatibility)', () => {
+    expect(getBuildTargetFromTask('unknown:task')).toBe('unknown:task');
+    expect(getBuildTargetFromTask('manifest:dev')).toBe('manifest:dev');
+  });
+});
+
+describe('getEnvironment', () => {
+  const { env } = process;
+
+  beforeEach(() => {
+    process.env = { ...env };
+    // Clear GitHub env vars that CI sets
+    delete process.env.GITHUB_HEAD_REF;
+    delete process.env.GITHUB_REF_NAME;
+    delete process.env.GITHUB_EVENT_NAME;
+  });
+
+  afterAll(() => {
+    process.env = env;
+  });
+
+  it('returns correct environment for build targets', () => {
+    expect(getEnvironment({ buildTarget: 'prod' as never })).toBe('production');
+    expect(getEnvironment({ buildTarget: 'dev' as never })).toBe('development');
+    expect(getEnvironment({ buildTarget: 'test' as never })).toBe('testing');
+    expect(getEnvironment({ buildTarget: 'testDev' as never })).toBe(
+      'development',
+    );
+    expect(getEnvironment({ buildTarget: 'dist' as never })).toBe('other');
+  });
+
+  it('returns RELEASE_CANDIDATE for dist on release branch', () => {
+    process.env.GITHUB_REF_NAME = 'release/13.12.0';
+    expect(getEnvironment({ buildTarget: 'dist' as never })).toBe(
+      'release-candidate',
+    );
+  });
+
+  it('returns STAGING for dist on main branch', () => {
+    process.env.GITHUB_REF_NAME = 'main';
+    expect(getEnvironment({ buildTarget: 'dist' as never })).toBe('staging');
+  });
+
+  it('returns PULL_REQUEST for dist on pull_request event', () => {
+    process.env.GITHUB_EVENT_NAME = 'pull_request';
+    expect(getEnvironment({ buildTarget: 'dist' as never })).toBe(
+      'pull-request',
+    );
+  });
+
+  it('returns TESTING for test even with pull_request event', () => {
+    process.env.GITHUB_EVENT_NAME = 'pull_request';
+    expect(getEnvironment({ buildTarget: 'test' as never })).toBe('testing');
+  });
+
+  it('prefers GITHUB_HEAD_REF over GITHUB_REF_NAME', () => {
+    process.env.GITHUB_HEAD_REF = 'release/15.0.0';
+    process.env.GITHUB_REF_NAME = 'main';
+    expect(getEnvironment({ buildTarget: 'dist' as never })).toBe(
+      'release-candidate',
+    );
+  });
+});

development/webpack/README.md

@@ -65,6 +65,35 @@ Run `yarn webpack --help` for the list of options.
 
 Note: multiple array options cannot be set this way, due to this bug in yargs: https://github.com/yargs/yargs/issues/821
 
+## CLI Arguments
+
+### `--targetEnvironment`
+
+Explicitly sets the build environment for Sentry reporting and feature flags. If not specified, it is auto-detected from git.
+
+| Value               | When Used                                    |
+| ------------------- | -------------------------------------------- |
+| `production`        | Must be explicitly set (never auto-detected) |
+| `development`       | `--env development`                          |
+| `testing`           | `--test` flag                                |
+| `staging`           | `main` branch on CI                          |
+| `release-candidate` | `release/*` branch on CI                     |
+| `pull-request`      | `pull_request` GitHub event                  |
+| `other`             | Local builds or any other context (default)  |
+
+**Examples:**
+
+```bash
+# Local development (auto-detects as 'other')
+yarn webpack --env production
+
+# Explicit production (for actual releases only)
+yarn webpack --env production --targetEnvironment production
+
+# Check what environment will be used
+yarn webpack --env production --dry-run
+```
+
 You can also combine environment variables with `--config` and CLI options:
 
 ```bash

development/webpack/test/cli.test.ts

@@ -48,7 +48,7 @@ describe('./utils/cli.ts', () => {
 
   it('getDryRunMessage', () => {
     const { args, features } = parseArgv([], loadBuildTypesConfig());
-    const message = getDryRunMessage(args, features);
+    const message = getDryRunMessage(args, features, 'development');
     // testing the exact message could be nice, but verbose and maybe a bit
     // brittle, so we just check that it returns a string
     assert.strictEqual(

development/webpack/utils/cli.ts

@@ -8,6 +8,7 @@ import type { Options as YargsOptions } from 'yargs';
 import yargs from 'yargs/yargs';
 import parser from 'yargs-parser';
 import type { BuildTypesConfig } from '../../lib/build-type';
+import { ENVIRONMENT } from '../../build/constants';
 import {
   Browsers,
   type Manifest,
@@ -16,6 +17,7 @@ import {
   toOrange,
 } from './helpers';
 
+const environmentOptions = Object.values(ENVIRONMENT);
 const ENV_PREFIX = 'BUNDLE';
 const addFeat = 'addFeature' as const;
 const omitFeat = 'omitFeature' as const;
@@ -374,6 +376,19 @@ function getOptions(
       type: 'boolean',
     },
 
+    targetEnvironment: {
+      array: false,
+      choices: environmentOptions,
+      defaultDescription:
+        'Auto-detected from git context (branch name, CI environment)',
+      description:
+        'The build environment (production, staging, release-candidate, pull-request, other). ' +
+        'Controls Sentry project targeting and feature flag detection. ' +
+        'If not specified, auto-detected from git context.',
+      group: toOrange('Build options:'),
+      type: 'string',
+    },
+
     dryRun: {
       array: false,
       default: false,
@@ -394,13 +409,19 @@ function getOptions(
 /**
  * Returns a string representation of the given arguments and features.
  *
- * @param args
- * @param features
+ * @param args - The parsed CLI arguments
+ * @param features - The active and available features
+ * @param resolvedEnvironment - The resolved MetaMask environment
  */
-export function getDryRunMessage(args: Args, features: Features) {
+export function getDryRunMessage(
+  args: Args,
+  features: Features,
+  resolvedEnvironment: string,
+) {
   return `🦊 Build Config 🦊
 
-Environment: ${args.env}
+Environment (--env): ${args.env}
+Target Environment: ${resolvedEnvironment}${resolvedEnvironment === args.targetEnvironment ? '' : ' (auto-detected)'}
 Minify: ${args.minify}
 Watch: ${args.watch}
 Cache: ${args.cache}