diff --git a/packages/react-native/src/private/__tests__/MemoryBaseline-itest.js b/packages/react-native/src/private/__tests__/MemoryBaseline-itest.js index dab58d04617ad6..22002f36cb94cc 100644 --- a/packages/react-native/src/private/__tests__/MemoryBaseline-itest.js +++ b/packages/react-native/src/private/__tests__/MemoryBaseline-itest.js @@ -29,12 +29,12 @@ declare var performance: Performance; */ const MEMORY_LIMITS_KB = { environmentSetup: { - dev: 1000, - opt: 500, + dev: 1200, + opt: 600, }, basicSurfaceRender: { - dev: 1200, - opt: 700, + dev: 1700, + opt: 900, }, }; diff --git a/private/react-native-fantom/runner/formatFantomConfig.js b/private/react-native-fantom/runner/formatFantomConfig.js index 68397837ae91c5..e717deac8d0621 100644 --- a/private/react-native-fantom/runner/formatFantomConfig.js +++ b/private/react-native-fantom/runner/formatFantomConfig.js @@ -82,8 +82,6 @@ function formatModesShort(overrides: PartialFantomTestConfig) { function formatFantomHermesVariant(hermesVariant: HermesVariant): string { switch (hermesVariant) { - case FantomTestConfigHermesVariant.Hermes: - return 'hermes'; case FantomTestConfigHermesVariant.StaticHermesStable: return 'shermes 🆕'; case FantomTestConfigHermesVariant.StaticHermesExperimental: diff --git a/private/react-native-fantom/runner/getFantomTestConfigs.js b/private/react-native-fantom/runner/getFantomTestConfigs.js index a8fbaa3a62e296..9edfe412d48c2a 100644 --- a/private/react-native-fantom/runner/getFantomTestConfigs.js +++ b/private/react-native-fantom/runner/getFantomTestConfigs.js @@ -59,7 +59,8 @@ export const FantomTestConfigHermesVariant = HermesVariant; export const DEFAULT_IS_NATIVE_OPTIMIZED: boolean = false; export const DEFAULT_IS_JS_OPTIMIZED: boolean = false; export const DEFAULT_IS_JS_BYTECODE: boolean = false; -export const DEFAULT_HERMES_VARIANT: HermesVariant = HermesVariant.Hermes; +export const DEFAULT_HERMES_VARIANT: HermesVariant = + HermesVariant.StaticHermesStable; export const DEFAULT_FEATURE_FLAGS: FantomTestConfigFeatureFlags = { common: {}, @@ -147,8 +148,7 @@ export function getOverrides( * - `fantom_mode`: specifies the level of optimization to compile the test * with. Valid values are `dev` and `opt`. * - `fantom_hermes_variant`: specifies the Hermes variant to use to run the - * test. Valid values are `hermes`, `static_hermes_stable` and - * `static_hermes_experimental`. + * test. Valid values are `static_hermes_stable` and `static_hermes_experimental`. * - `fantom_flags`: specifies the configuration for common and JS-only feature * flags. They can be specified in the same pragma or in different ones, and * the format is `:`. @@ -294,9 +294,6 @@ export default function getFantomTestConfigs( const hermesVariant = maybeHermesVariant; switch (hermesVariant) { - case 'hermes': - config.hermesVariant = HermesVariant.Hermes; - break; case 'static_hermes_stable': config.hermesVariant = HermesVariant.StaticHermesStable; break; @@ -305,7 +302,6 @@ export default function getFantomTestConfigs( break; case '*': configVariations.push([ - {hermesVariant: HermesVariant.Hermes}, {hermesVariant: HermesVariant.StaticHermesStable}, {hermesVariant: HermesVariant.StaticHermesExperimental}, ]); diff --git a/private/react-native-fantom/runner/runner.js b/private/react-native-fantom/runner/runner.js index 1291f6843317c5..b039b143fb57a8 100644 --- a/private/react-native-fantom/runner/runner.js +++ b/private/react-native-fantom/runner/runner.js @@ -43,7 +43,6 @@ import { updateSnapshotsAndGetJestSnapshotResult, } from './snapshotUtils'; import { - HermesVariant as HermesVariantEnum, getDebugInfoFromCommandResult, printConsoleLog, runCommand, @@ -264,10 +263,7 @@ module.exports = async function runTest( continue; } - if ( - EnvironmentOptions.isOSS && - testConfig.hermesVariant !== HermesVariantEnum.Hermes - ) { + if (EnvironmentOptions.isOSS) { testResultsByConfig.push( skippedTestResults({ ancestorTitles: [ diff --git a/private/react-native-fantom/runner/utils.js b/private/react-native-fantom/runner/utils.js index 8271d77dc4e04e..7b745e27f64870 100644 --- a/private/react-native-fantom/runner/utils.js +++ b/private/react-native-fantom/runner/utils.js @@ -18,7 +18,6 @@ import {SourceMapConsumer} from 'source-map'; const BUCK_ISOLATION_DIR = 'react-native-fantom-buck-out'; export enum HermesVariant { - Hermes, StaticHermesStable, // Static Hermes Stable // This creates too many combinations and it's not worth the cost for now. StaticHermesExperimental, // Static Hermes Trunk @@ -31,8 +30,6 @@ export function getBuckOptionsForHermes( ? ['-c hermes.memory_instrumentation=true'] : []; switch (variant) { - case HermesVariant.Hermes: - return baseOptions; case HermesVariant.StaticHermesStable: return [...baseOptions, '-c hermes.static_hermes=stable']; case HermesVariant.StaticHermesExperimental: @@ -42,8 +39,6 @@ export function getBuckOptionsForHermes( export function getHermesCompilerTarget(variant: HermesVariant): string { switch (variant) { - case HermesVariant.Hermes: - return '//xplat/hermes/tools/hermesc:hermesc'; case HermesVariant.StaticHermesStable: return '//xplat/shermes/stable:hermesc'; case HermesVariant.StaticHermesExperimental: diff --git a/private/react-native-fantom/src/__tests__/__snapshots__/expect-itest.js.snap b/private/react-native-fantom/src/__tests__/__snapshots__/expect-itest.js.snap deleted file mode 100644 index 29c9d4ecee4f5f..00000000000000 --- a/private/react-native-fantom/src/__tests__/__snapshots__/expect-itest.js.snap +++ /dev/null @@ -1,68 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`expect toMatchSnapshot() complex types 1`] = ` -Object { - "foo": "bar", -} -`; - -exports[`expect toMatchSnapshot() complex types 2`] = ` - - hello - -`; - -exports[`expect toMatchSnapshot() complex types 3`] = `[Function foo]`; - -exports[`expect toMatchSnapshot() complex types 4`] = ` -Map { - "foo" => "bar", -} -`; - -exports[`expect toMatchSnapshot() complex types 5`] = ` -Set { - 1, - 2, -} -`; - -exports[`expect toMatchSnapshot() complex types 6`] = `2025-01-02T00:00:00.000Z`; - -exports[`expect toMatchSnapshot() complex types 7`] = `[Error]`; - -exports[`expect toMatchSnapshot() complex types 8`] = `/asd/`; - -exports[`expect toMatchSnapshot() complex types 9`] = ` -Promise { - "_h": 0, - "_i": 0, - "_j": null, - "_k": null, -} -`; - -exports[`expect toMatchSnapshot() named snapshots: named snapshot 1`] = ` -Object { - "a": "b", -} -`; - -exports[`expect toMatchSnapshot() primitive types 1`] = `undefined`; - -exports[`expect toMatchSnapshot() primitive types 2`] = `null`; - -exports[`expect toMatchSnapshot() primitive types 3`] = `true`; - -exports[`expect toMatchSnapshot() primitive types 4`] = `1`; - -exports[`expect toMatchSnapshot() primitive types 5`] = `1n`; - -exports[`expect toMatchSnapshot() primitive types 6`] = `"foo"`; - -exports[`expect toMatchSnapshot() primitive types 8`] = `Symbol(foo)`; - -exports[`expect toMatchSnapshot() primitive types: multiline 7`] = ` -"foo -bar" -`;