test(wtr): clean up options

Author: wjhsf

packages/@lwc/integration-not-karma/helpers/options.mjs

@@ -41,18 +41,10 @@ export const API_VERSION = process.env.API_VERSION
     : HIGHEST_API_VERSION;
 
 export const NODE_ENV_FOR_TEST = process.env.NODE_ENV_FOR_TEST;
-export const GREP = process.env.GREP;
-
-// --- CI config --- //
 
-export const COVERAGE = Boolean(process.env.COVERAGE);
-export const SAUCE_USERNAME = process.env.SAUCE_USERNAME;
-export const SAUCE_ACCESS_KEY = process.env.SAUCE_ACCESS_KEY || process.env.SAUCE_KEY;
-export const SAUCE_TUNNEL_ID = process.env.SAUCE_TUNNEL_ID;
-export const IS_CI = Boolean(process.env.IS_CI);
-export const GITHUB_RUN_ID = process.env.GITHUB_RUN_ID;
+export const GREP = process.env.GREP;
 
-// --- Derivative values --- //
+export const NATIVE_SHADOW = DISABLE_SYNTHETIC || FORCE_NATIVE_SHADOW_MODE_FOR_TEST;
 
 /** Unique directory name that encodes the flags that the tests were executed with. */
 export const COVERAGE_DIR_FOR_OPTIONS =
@@ -72,3 +64,12 @@ export const COVERAGE_DIR_FOR_OPTIONS =
         .filter(([, val]) => val)
         .map(([key, val]) => `${key}=${val}`)
         .join('/') || 'no-options';
+
+// --- CI config --- //
+
+export const COVERAGE = Boolean(process.env.COVERAGE);
+export const SAUCE_USERNAME = process.env.SAUCE_USERNAME;
+export const SAUCE_ACCESS_KEY = process.env.SAUCE_ACCESS_KEY || process.env.SAUCE_KEY;
+export const SAUCE_TUNNEL_ID = process.env.SAUCE_TUNNEL_ID;
+export const IS_CI = Boolean(process.env.IS_CI);
+export const GITHUB_RUN_ID = process.env.GITHUB_RUN_ID;

packages/@lwc/integration-not-karma/web-test-runner.config.mjs

@@ -1,24 +1,23 @@
-import { HIGHEST_API_VERSION, LWC_VERSION } from '@lwc/shared';
+import { LWC_VERSION } from '@lwc/shared';
 import customRollup from './helpers/lwc.mjs';
+import * as options from './helpers/options.mjs';
 
 const pluck = (obj, keys) => Object.fromEntries(keys.map((k) => [k, Boolean(obj[k])]));
 
 const env = {
-    ...pluck(process.env, [
+    ...pluck(options, [
+        'API_VERSION',
         'DISABLE_NATIVE_CUSTOM_ELEMENT_LIFECYCLE',
         'DISABLE_STATIC_CONTENT_OPTIMIZATION',
         'DISABLE_SYNTHETIC',
         'ENABLE_ARIA_REFLECTION_GLOBAL_POLYFILL',
         'ENABLE_SYNTHETIC_SHADOW_IN_HYDRATION',
         'ENGINE_SERVER',
         'FORCE_NATIVE_SHADOW_MODE_FOR_TEST',
+        'NATIVE_SHADOW',
     ]),
-    API_VERSION: Number(process.env.API_VERSION) || HIGHEST_API_VERSION,
     LWC_VERSION,
-    NATIVE_SHADOW: Boolean(
-        process.env.DISABLE_SYNTHETIC || process.env.FORCE_NATIVE_SHADOW_MODE_FOR_TEST
-    ),
-    NODE_ENV: process.env.NODE_ENV_FOR_TEST || 'development',
+    NODE_ENV: options.NODE_ENV_FOR_TEST || 'development',
 };
 
 /** @type {import("@web/test-runner").TestRunnerConfig} */