From d6f29c8afd14b2cc835649db3c59ed2f0e685331 Mon Sep 17 00:00:00 2001 From: Tim Yung Date: Wed, 11 Jun 2025 23:49:51 -0700 Subject: [PATCH] RN: Move `{packages => private}/react-native-fantom` (#51938) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/51938 Moves `packages/react-native-fantom` to `private/react-native-fantom`. Changelog: [Internal] Reviewed By: huntie Differential Revision: D76368959 fbshipit-source-id: 8d62f792229c10cd108dc849e8629d3174dc72c1 --- .gitignore | 4 ++-- __docs__/README.md | 2 +- package.json | 2 +- .../testing/fantom/specs/__docs__/README.md | 2 +- .../react-native-fantom/__docs__/README.md | 8 +++---- .../__docs__/architecture.excalidraw.svg | 0 .../react-native-fantom/config/hasteImpl.js | 0 .../react-native-fantom/config/jest.config.js | 8 +++---- .../config/metro-babel-transformer.js | 0 .../config/metro.config.js | 0 .../react-native-fantom/download.sh | 0 .../react-native-fantom/package.json | 2 +- .../runner/EnvironmentOptions.js | 0 .../runner/entrypoint-template.js | 0 .../runner/formatFantomConfig.js | 0 .../runner/getFantomTestConfigs.js | 0 .../react-native-fantom/runner/index.js | 0 .../react-native-fantom/runner/runner.js | 2 +- .../runner/snapshotUtils.js | 0 .../react-native-fantom/runner/utils.js | 0 .../runner/warmup/index.js | 0 .../runner/warmup/warmup.js | 0 .../runtime/WarmUpEntryPoint.js | 0 .../react-native-fantom/runtime/expect.js | 0 .../react-native-fantom/runtime/mocks.js | 0 .../mocks/ReactNativeInternalFeatureFlags.js | 0 .../runtime/patchWeakRef.js | 0 .../react-native-fantom/runtime/setup.js | 0 .../runtime/snapshotContext.js | 0 .../react-native-fantom/src/Benchmark.js | 0 .../react-native-fantom/src/Constants.js | 0 .../src/__tests__/Fantom-itest.js | 0 .../src/__tests__/FantomFeatureFlags-itest.js | 0 .../FantomHermesVariantStaticHermes-itest.js | 0 ...esVariantStaticHermesExperimental-itest.js | 0 .../src/__tests__/FantomModeDefault-itest.js | 0 .../src/__tests__/FantomModeDev-itest.js | 0 .../__tests__/FantomModeDevBytecode-itest.js | 0 .../src/__tests__/FantomModeOpt-itest.js | 0 .../src/__tests__/FantomModuleInit-itest.js | 0 .../src/__tests__/FantomWeakRefs-itest.js | 0 .../__snapshots__/expect-itest.js.snap | 0 ...BenchmarkTests-testMode-benchmark-itest.js | 0 .../src/__tests__/expect-itest.js | 0 .../playground/Playground-benchmark-itest.js | 0 .../__tests__/playground/Playground-itest.js | 0 .../__tests__/setup/focused-hooks-itest.js | 0 .../setup/order-of-execution-itest.js | 0 .../setup/order-of-hooks-executions-itest.js | 0 .../src/__tests__/setup/scoping-itest.js | 0 .../src/getFantomRenderedOutput.js | 0 .../react-native-fantom/src/index.js | 23 ++++++++----------- .../src/setUpDefaultReactNativeEnvironment.js | 0 .../react-native-fantom/tester/CMakeLists.txt | 0 .../react-native-fantom/tester/build.sh | 2 +- .../react-native-fantom/tester/src/main.cpp | 0 .../tester/third-party/boost/CmakeLists.txt | 0 57 files changed, 25 insertions(+), 30 deletions(-) rename {packages => private}/react-native-fantom/__docs__/README.md (96%) rename {packages => private}/react-native-fantom/__docs__/architecture.excalidraw.svg (100%) rename {packages => private}/react-native-fantom/config/hasteImpl.js (100%) rename {packages => private}/react-native-fantom/config/jest.config.js (81%) rename {packages => private}/react-native-fantom/config/metro-babel-transformer.js (100%) rename {packages => private}/react-native-fantom/config/metro.config.js (100%) rename {packages => private}/react-native-fantom/download.sh (100%) rename {packages => private}/react-native-fantom/package.json (90%) rename {packages => private}/react-native-fantom/runner/EnvironmentOptions.js (100%) rename {packages => private}/react-native-fantom/runner/entrypoint-template.js (100%) rename {packages => private}/react-native-fantom/runner/formatFantomConfig.js (100%) rename {packages => private}/react-native-fantom/runner/getFantomTestConfigs.js (100%) rename {packages => private}/react-native-fantom/runner/index.js (100%) rename {packages => private}/react-native-fantom/runner/runner.js (99%) rename {packages => private}/react-native-fantom/runner/snapshotUtils.js (100%) rename {packages => private}/react-native-fantom/runner/utils.js (100%) rename {packages => private}/react-native-fantom/runner/warmup/index.js (100%) rename {packages => private}/react-native-fantom/runner/warmup/warmup.js (100%) rename {packages => private}/react-native-fantom/runtime/WarmUpEntryPoint.js (100%) rename {packages => private}/react-native-fantom/runtime/expect.js (100%) rename {packages => private}/react-native-fantom/runtime/mocks.js (100%) rename {packages => private}/react-native-fantom/runtime/mocks/ReactNativeInternalFeatureFlags.js (100%) rename {packages => private}/react-native-fantom/runtime/patchWeakRef.js (100%) rename {packages => private}/react-native-fantom/runtime/setup.js (100%) rename {packages => private}/react-native-fantom/runtime/snapshotContext.js (100%) rename {packages => private}/react-native-fantom/src/Benchmark.js (100%) rename {packages => private}/react-native-fantom/src/Constants.js (100%) rename {packages => private}/react-native-fantom/src/__tests__/Fantom-itest.js (100%) rename {packages => private}/react-native-fantom/src/__tests__/FantomFeatureFlags-itest.js (100%) rename {packages => private}/react-native-fantom/src/__tests__/FantomHermesVariantStaticHermes-itest.js (100%) rename {packages => private}/react-native-fantom/src/__tests__/FantomHermesVariantStaticHermesExperimental-itest.js (100%) rename {packages => private}/react-native-fantom/src/__tests__/FantomModeDefault-itest.js (100%) rename {packages => private}/react-native-fantom/src/__tests__/FantomModeDev-itest.js (100%) rename {packages => private}/react-native-fantom/src/__tests__/FantomModeDevBytecode-itest.js (100%) rename {packages => private}/react-native-fantom/src/__tests__/FantomModeOpt-itest.js (100%) rename {packages => private}/react-native-fantom/src/__tests__/FantomModuleInit-itest.js (100%) rename {packages => private}/react-native-fantom/src/__tests__/FantomWeakRefs-itest.js (100%) rename {packages => private}/react-native-fantom/src/__tests__/__snapshots__/expect-itest.js.snap (100%) rename {packages => private}/react-native-fantom/src/__tests__/benchmarks/BenchmarkTests-testMode-benchmark-itest.js (100%) rename {packages => private}/react-native-fantom/src/__tests__/expect-itest.js (100%) rename {packages => private}/react-native-fantom/src/__tests__/playground/Playground-benchmark-itest.js (100%) rename {packages => private}/react-native-fantom/src/__tests__/playground/Playground-itest.js (100%) rename {packages => private}/react-native-fantom/src/__tests__/setup/focused-hooks-itest.js (100%) rename {packages => private}/react-native-fantom/src/__tests__/setup/order-of-execution-itest.js (100%) rename {packages => private}/react-native-fantom/src/__tests__/setup/order-of-hooks-executions-itest.js (100%) rename {packages => private}/react-native-fantom/src/__tests__/setup/scoping-itest.js (100%) rename {packages => private}/react-native-fantom/src/getFantomRenderedOutput.js (100%) rename {packages => private}/react-native-fantom/src/index.js (97%) rename {packages => private}/react-native-fantom/src/setUpDefaultReactNativeEnvironment.js (100%) rename {packages => private}/react-native-fantom/tester/CMakeLists.txt (100%) rename {packages => private}/react-native-fantom/tester/build.sh (86%) rename {packages => private}/react-native-fantom/tester/src/main.cpp (100%) rename {packages => private}/react-native-fantom/tester/third-party/boost/CmakeLists.txt (100%) diff --git a/.gitignore b/.gitignore index 715ec8ddebf..69956a7dabc 100644 --- a/.gitignore +++ b/.gitignore @@ -171,8 +171,8 @@ fix_*.patch .metro-health-check* # Jest Integration -/packages/react-native-fantom/build/ -/packages/react-native-fantom/tester/build/ +/private/react-native-fantom/build/ +/private/react-native-fantom/tester/build/ # [Experimental] Generated TS type definitions /packages/**/types_generated/ diff --git a/__docs__/README.md b/__docs__/README.md index 6c229fc4afc..9f5195a9f81 100644 --- a/__docs__/README.md +++ b/__docs__/README.md @@ -90,7 +90,7 @@ TODO: Explain the different components of React Native at a high level. - Jest - ESLint - Integration / E2E - - [Fantom](../packages/react-native-fantom/__docs__/README.md) + - [Fantom](../private/react-native-fantom/__docs__/README.md) - Tooling - React Native DevTools diff --git a/package.json b/package.json index aa980399c03..972385e3fff 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "test-typescript": "tsc -p packages/react-native/types/tsconfig.json", "test-generated-typescript": "tsc -p packages/react-native/types_generated/tsconfig.test.json", "test": "jest", - "fantom": "JS_DIR='..' yarn jest --config packages/react-native-fantom/config/jest.config.js", + "fantom": "JS_DIR='..' yarn jest --config private/react-native-fantom/config/jest.config.js", "trigger-react-native-release": "node ./scripts/releases-local/trigger-react-native-release.js", "update-lock": "npx yarn-deduplicate" }, diff --git a/packages/react-native/src/private/testing/fantom/specs/__docs__/README.md b/packages/react-native/src/private/testing/fantom/specs/__docs__/README.md index 5417edef807..a8f04ad939f 100644 --- a/packages/react-native/src/private/testing/fantom/specs/__docs__/README.md +++ b/packages/react-native/src/private/testing/fantom/specs/__docs__/README.md @@ -16,4 +16,4 @@ Fantom. These are not meant to be consumed directly. ### Part of -- [Fantom](../../../../../../../react-native-fantom/__docs__/README.md). +- [Fantom](../../../../../../../../private/react-native-fantom/__docs__/README.md). diff --git a/packages/react-native-fantom/__docs__/README.md b/private/react-native-fantom/__docs__/README.md similarity index 96% rename from packages/react-native-fantom/__docs__/README.md rename to private/react-native-fantom/__docs__/README.md index cdb5ef7b0de..e069208faef 100644 --- a/packages/react-native-fantom/__docs__/README.md +++ b/private/react-native-fantom/__docs__/README.md @@ -92,7 +92,7 @@ For a full API reference, please see the [inline documentation](../src/index.js) defined for the methods in the `@react-native/fantom` [module](../src/index.js). You can check out existing files with the `-itest.js` suffix (e.g.: -[`View-itest`](../../react-native/Libraries/Components/View/__tests__/View-itest.js)) +[`View-itest`](../../../packages/react-native/Libraries/Components/View/__tests__/View-itest.js)) for code examples. Run the test using the following command from the root of the React Native @@ -123,7 +123,7 @@ docblock at the top of the file. E.g.: Available pragmas: - `@fantom_flags`: used to set overrides for - [`ReactNativeFeatureFlags`](../../react-native/src/private/featureflags/__docs__/README.md). + [`ReactNativeFeatureFlags`](../../../packages/react-native/src/private/featureflags/__docs__/README.md). - Example: `@fantom_flags name:value`. - Multiple flags can be defined in different lines or in the same line separated by spaces (e.g.: `@fantom_flags name:value otherName:otherValue`). @@ -195,7 +195,7 @@ The results of Fabric are mounted in a mock UI tree that can be asserted against and individual mounting instructions can be inspected. You can even test your C++ code. For example, we have -[Fantom tests for the new View Culling optimization](../../react-native/Libraries/Components/ScrollView/__tests__/ScrollView-viewCulling-itest.js), +[Fantom tests for the new View Culling optimization](../../../packages/react-native/Libraries/Components/ScrollView/__tests__/ScrollView-viewCulling-itest.js), which is written in C++. #### How can I test logic related to <ScrollView /> scrolling? @@ -343,6 +343,6 @@ The runner then follows these steps: CLI. - Hermes Compiler, to compile the JavaScript test code into Hermes bytecode. - The - [React Native Feature Flags](../../react-native/src/private/featureflags/__docs__/README.md) + [React Native Feature Flags](../../../packages/react-native/src/private/featureflags/__docs__/README.md) system, via the `@fantom_flags` pragmas defined in the docblock for test files. diff --git a/packages/react-native-fantom/__docs__/architecture.excalidraw.svg b/private/react-native-fantom/__docs__/architecture.excalidraw.svg similarity index 100% rename from packages/react-native-fantom/__docs__/architecture.excalidraw.svg rename to private/react-native-fantom/__docs__/architecture.excalidraw.svg diff --git a/packages/react-native-fantom/config/hasteImpl.js b/private/react-native-fantom/config/hasteImpl.js similarity index 100% rename from packages/react-native-fantom/config/hasteImpl.js rename to private/react-native-fantom/config/hasteImpl.js diff --git a/packages/react-native-fantom/config/jest.config.js b/private/react-native-fantom/config/jest.config.js similarity index 81% rename from packages/react-native-fantom/config/jest.config.js rename to private/react-native-fantom/config/jest.config.js index c46a211b959..63c3809c702 100644 --- a/packages/react-native-fantom/config/jest.config.js +++ b/private/react-native-fantom/config/jest.config.js @@ -19,15 +19,15 @@ const isCI = // In CI, we want to prewarm the caches/builds before running the tests so // that time isn't attributed to the first test that runs. const globalSetup /*: ?string */ = isCI - ? '/packages/react-native-fantom/runner/warmup/index.js' + ? '/private/react-native-fantom/runner/warmup/index.js' : null; module.exports = { rootDir: path.resolve(__dirname, '../../..') /*:: as string */, roots: [ '/packages/react-native', - '/packages/react-native-fantom', '/packages/polyfills', + '/private/react-native-fantom', ], moduleFileExtensions: [ ...baseConfig.moduleFileExtensions, @@ -38,7 +38,7 @@ module.exports = { testRegex: '/__tests__/.*-itest(\\.fb)?\\.js$', testPathIgnorePatterns: baseConfig.testPathIgnorePatterns, transformIgnorePatterns: ['.*'], - testRunner: '/packages/react-native-fantom/runner/index.js', - watchPathIgnorePatterns: ['/packages/react-native-fantom/build/'], + testRunner: '/private/react-native-fantom/runner/index.js', + watchPathIgnorePatterns: ['/private/react-native-fantom/build/'], globalSetup, }; diff --git a/packages/react-native-fantom/config/metro-babel-transformer.js b/private/react-native-fantom/config/metro-babel-transformer.js similarity index 100% rename from packages/react-native-fantom/config/metro-babel-transformer.js rename to private/react-native-fantom/config/metro-babel-transformer.js diff --git a/packages/react-native-fantom/config/metro.config.js b/private/react-native-fantom/config/metro.config.js similarity index 100% rename from packages/react-native-fantom/config/metro.config.js rename to private/react-native-fantom/config/metro.config.js diff --git a/packages/react-native-fantom/download.sh b/private/react-native-fantom/download.sh similarity index 100% rename from packages/react-native-fantom/download.sh rename to private/react-native-fantom/download.sh diff --git a/packages/react-native-fantom/package.json b/private/react-native-fantom/package.json similarity index 90% rename from packages/react-native-fantom/package.json rename to private/react-native-fantom/package.json index a85b907ef82..aa1a6f73add 100644 --- a/packages/react-native-fantom/package.json +++ b/private/react-native-fantom/package.json @@ -1,7 +1,7 @@ { "name": "@react-native/fantom", "private": true, - "version": "0.80.0-main", + "version": "0.0.0", "main": "src/index.js", "description": "Internal integration testing and benchmarking tool for React Native", "peerDependencies": { diff --git a/packages/react-native-fantom/runner/EnvironmentOptions.js b/private/react-native-fantom/runner/EnvironmentOptions.js similarity index 100% rename from packages/react-native-fantom/runner/EnvironmentOptions.js rename to private/react-native-fantom/runner/EnvironmentOptions.js diff --git a/packages/react-native-fantom/runner/entrypoint-template.js b/private/react-native-fantom/runner/entrypoint-template.js similarity index 100% rename from packages/react-native-fantom/runner/entrypoint-template.js rename to private/react-native-fantom/runner/entrypoint-template.js diff --git a/packages/react-native-fantom/runner/formatFantomConfig.js b/private/react-native-fantom/runner/formatFantomConfig.js similarity index 100% rename from packages/react-native-fantom/runner/formatFantomConfig.js rename to private/react-native-fantom/runner/formatFantomConfig.js diff --git a/packages/react-native-fantom/runner/getFantomTestConfigs.js b/private/react-native-fantom/runner/getFantomTestConfigs.js similarity index 100% rename from packages/react-native-fantom/runner/getFantomTestConfigs.js rename to private/react-native-fantom/runner/getFantomTestConfigs.js diff --git a/packages/react-native-fantom/runner/index.js b/private/react-native-fantom/runner/index.js similarity index 100% rename from packages/react-native-fantom/runner/index.js rename to private/react-native-fantom/runner/index.js diff --git a/packages/react-native-fantom/runner/runner.js b/private/react-native-fantom/runner/runner.js similarity index 99% rename from packages/react-native-fantom/runner/runner.js rename to private/react-native-fantom/runner/runner.js index 0485f05a94a..3248682854c 100644 --- a/packages/react-native-fantom/runner/runner.js +++ b/private/react-native-fantom/runner/runner.js @@ -209,7 +209,7 @@ module.exports = async function runTest( const setupModulePath = path.resolve(__dirname, '../runtime/setup.js'); const featureFlagsModulePath = path.resolve( __dirname, - '../../react-native/src/private/featureflags/ReactNativeFeatureFlags.js', + '../../../packages/react-native/src/private/featureflags/ReactNativeFeatureFlags.js', ); const testResultsByConfig = []; diff --git a/packages/react-native-fantom/runner/snapshotUtils.js b/private/react-native-fantom/runner/snapshotUtils.js similarity index 100% rename from packages/react-native-fantom/runner/snapshotUtils.js rename to private/react-native-fantom/runner/snapshotUtils.js diff --git a/packages/react-native-fantom/runner/utils.js b/private/react-native-fantom/runner/utils.js similarity index 100% rename from packages/react-native-fantom/runner/utils.js rename to private/react-native-fantom/runner/utils.js diff --git a/packages/react-native-fantom/runner/warmup/index.js b/private/react-native-fantom/runner/warmup/index.js similarity index 100% rename from packages/react-native-fantom/runner/warmup/index.js rename to private/react-native-fantom/runner/warmup/index.js diff --git a/packages/react-native-fantom/runner/warmup/warmup.js b/private/react-native-fantom/runner/warmup/warmup.js similarity index 100% rename from packages/react-native-fantom/runner/warmup/warmup.js rename to private/react-native-fantom/runner/warmup/warmup.js diff --git a/packages/react-native-fantom/runtime/WarmUpEntryPoint.js b/private/react-native-fantom/runtime/WarmUpEntryPoint.js similarity index 100% rename from packages/react-native-fantom/runtime/WarmUpEntryPoint.js rename to private/react-native-fantom/runtime/WarmUpEntryPoint.js diff --git a/packages/react-native-fantom/runtime/expect.js b/private/react-native-fantom/runtime/expect.js similarity index 100% rename from packages/react-native-fantom/runtime/expect.js rename to private/react-native-fantom/runtime/expect.js diff --git a/packages/react-native-fantom/runtime/mocks.js b/private/react-native-fantom/runtime/mocks.js similarity index 100% rename from packages/react-native-fantom/runtime/mocks.js rename to private/react-native-fantom/runtime/mocks.js diff --git a/packages/react-native-fantom/runtime/mocks/ReactNativeInternalFeatureFlags.js b/private/react-native-fantom/runtime/mocks/ReactNativeInternalFeatureFlags.js similarity index 100% rename from packages/react-native-fantom/runtime/mocks/ReactNativeInternalFeatureFlags.js rename to private/react-native-fantom/runtime/mocks/ReactNativeInternalFeatureFlags.js diff --git a/packages/react-native-fantom/runtime/patchWeakRef.js b/private/react-native-fantom/runtime/patchWeakRef.js similarity index 100% rename from packages/react-native-fantom/runtime/patchWeakRef.js rename to private/react-native-fantom/runtime/patchWeakRef.js diff --git a/packages/react-native-fantom/runtime/setup.js b/private/react-native-fantom/runtime/setup.js similarity index 100% rename from packages/react-native-fantom/runtime/setup.js rename to private/react-native-fantom/runtime/setup.js diff --git a/packages/react-native-fantom/runtime/snapshotContext.js b/private/react-native-fantom/runtime/snapshotContext.js similarity index 100% rename from packages/react-native-fantom/runtime/snapshotContext.js rename to private/react-native-fantom/runtime/snapshotContext.js diff --git a/packages/react-native-fantom/src/Benchmark.js b/private/react-native-fantom/src/Benchmark.js similarity index 100% rename from packages/react-native-fantom/src/Benchmark.js rename to private/react-native-fantom/src/Benchmark.js diff --git a/packages/react-native-fantom/src/Constants.js b/private/react-native-fantom/src/Constants.js similarity index 100% rename from packages/react-native-fantom/src/Constants.js rename to private/react-native-fantom/src/Constants.js diff --git a/packages/react-native-fantom/src/__tests__/Fantom-itest.js b/private/react-native-fantom/src/__tests__/Fantom-itest.js similarity index 100% rename from packages/react-native-fantom/src/__tests__/Fantom-itest.js rename to private/react-native-fantom/src/__tests__/Fantom-itest.js diff --git a/packages/react-native-fantom/src/__tests__/FantomFeatureFlags-itest.js b/private/react-native-fantom/src/__tests__/FantomFeatureFlags-itest.js similarity index 100% rename from packages/react-native-fantom/src/__tests__/FantomFeatureFlags-itest.js rename to private/react-native-fantom/src/__tests__/FantomFeatureFlags-itest.js diff --git a/packages/react-native-fantom/src/__tests__/FantomHermesVariantStaticHermes-itest.js b/private/react-native-fantom/src/__tests__/FantomHermesVariantStaticHermes-itest.js similarity index 100% rename from packages/react-native-fantom/src/__tests__/FantomHermesVariantStaticHermes-itest.js rename to private/react-native-fantom/src/__tests__/FantomHermesVariantStaticHermes-itest.js diff --git a/packages/react-native-fantom/src/__tests__/FantomHermesVariantStaticHermesExperimental-itest.js b/private/react-native-fantom/src/__tests__/FantomHermesVariantStaticHermesExperimental-itest.js similarity index 100% rename from packages/react-native-fantom/src/__tests__/FantomHermesVariantStaticHermesExperimental-itest.js rename to private/react-native-fantom/src/__tests__/FantomHermesVariantStaticHermesExperimental-itest.js diff --git a/packages/react-native-fantom/src/__tests__/FantomModeDefault-itest.js b/private/react-native-fantom/src/__tests__/FantomModeDefault-itest.js similarity index 100% rename from packages/react-native-fantom/src/__tests__/FantomModeDefault-itest.js rename to private/react-native-fantom/src/__tests__/FantomModeDefault-itest.js diff --git a/packages/react-native-fantom/src/__tests__/FantomModeDev-itest.js b/private/react-native-fantom/src/__tests__/FantomModeDev-itest.js similarity index 100% rename from packages/react-native-fantom/src/__tests__/FantomModeDev-itest.js rename to private/react-native-fantom/src/__tests__/FantomModeDev-itest.js diff --git a/packages/react-native-fantom/src/__tests__/FantomModeDevBytecode-itest.js b/private/react-native-fantom/src/__tests__/FantomModeDevBytecode-itest.js similarity index 100% rename from packages/react-native-fantom/src/__tests__/FantomModeDevBytecode-itest.js rename to private/react-native-fantom/src/__tests__/FantomModeDevBytecode-itest.js diff --git a/packages/react-native-fantom/src/__tests__/FantomModeOpt-itest.js b/private/react-native-fantom/src/__tests__/FantomModeOpt-itest.js similarity index 100% rename from packages/react-native-fantom/src/__tests__/FantomModeOpt-itest.js rename to private/react-native-fantom/src/__tests__/FantomModeOpt-itest.js diff --git a/packages/react-native-fantom/src/__tests__/FantomModuleInit-itest.js b/private/react-native-fantom/src/__tests__/FantomModuleInit-itest.js similarity index 100% rename from packages/react-native-fantom/src/__tests__/FantomModuleInit-itest.js rename to private/react-native-fantom/src/__tests__/FantomModuleInit-itest.js diff --git a/packages/react-native-fantom/src/__tests__/FantomWeakRefs-itest.js b/private/react-native-fantom/src/__tests__/FantomWeakRefs-itest.js similarity index 100% rename from packages/react-native-fantom/src/__tests__/FantomWeakRefs-itest.js rename to private/react-native-fantom/src/__tests__/FantomWeakRefs-itest.js diff --git a/packages/react-native-fantom/src/__tests__/__snapshots__/expect-itest.js.snap b/private/react-native-fantom/src/__tests__/__snapshots__/expect-itest.js.snap similarity index 100% rename from packages/react-native-fantom/src/__tests__/__snapshots__/expect-itest.js.snap rename to private/react-native-fantom/src/__tests__/__snapshots__/expect-itest.js.snap diff --git a/packages/react-native-fantom/src/__tests__/benchmarks/BenchmarkTests-testMode-benchmark-itest.js b/private/react-native-fantom/src/__tests__/benchmarks/BenchmarkTests-testMode-benchmark-itest.js similarity index 100% rename from packages/react-native-fantom/src/__tests__/benchmarks/BenchmarkTests-testMode-benchmark-itest.js rename to private/react-native-fantom/src/__tests__/benchmarks/BenchmarkTests-testMode-benchmark-itest.js diff --git a/packages/react-native-fantom/src/__tests__/expect-itest.js b/private/react-native-fantom/src/__tests__/expect-itest.js similarity index 100% rename from packages/react-native-fantom/src/__tests__/expect-itest.js rename to private/react-native-fantom/src/__tests__/expect-itest.js diff --git a/packages/react-native-fantom/src/__tests__/playground/Playground-benchmark-itest.js b/private/react-native-fantom/src/__tests__/playground/Playground-benchmark-itest.js similarity index 100% rename from packages/react-native-fantom/src/__tests__/playground/Playground-benchmark-itest.js rename to private/react-native-fantom/src/__tests__/playground/Playground-benchmark-itest.js diff --git a/packages/react-native-fantom/src/__tests__/playground/Playground-itest.js b/private/react-native-fantom/src/__tests__/playground/Playground-itest.js similarity index 100% rename from packages/react-native-fantom/src/__tests__/playground/Playground-itest.js rename to private/react-native-fantom/src/__tests__/playground/Playground-itest.js diff --git a/packages/react-native-fantom/src/__tests__/setup/focused-hooks-itest.js b/private/react-native-fantom/src/__tests__/setup/focused-hooks-itest.js similarity index 100% rename from packages/react-native-fantom/src/__tests__/setup/focused-hooks-itest.js rename to private/react-native-fantom/src/__tests__/setup/focused-hooks-itest.js diff --git a/packages/react-native-fantom/src/__tests__/setup/order-of-execution-itest.js b/private/react-native-fantom/src/__tests__/setup/order-of-execution-itest.js similarity index 100% rename from packages/react-native-fantom/src/__tests__/setup/order-of-execution-itest.js rename to private/react-native-fantom/src/__tests__/setup/order-of-execution-itest.js diff --git a/packages/react-native-fantom/src/__tests__/setup/order-of-hooks-executions-itest.js b/private/react-native-fantom/src/__tests__/setup/order-of-hooks-executions-itest.js similarity index 100% rename from packages/react-native-fantom/src/__tests__/setup/order-of-hooks-executions-itest.js rename to private/react-native-fantom/src/__tests__/setup/order-of-hooks-executions-itest.js diff --git a/packages/react-native-fantom/src/__tests__/setup/scoping-itest.js b/private/react-native-fantom/src/__tests__/setup/scoping-itest.js similarity index 100% rename from packages/react-native-fantom/src/__tests__/setup/scoping-itest.js rename to private/react-native-fantom/src/__tests__/setup/scoping-itest.js diff --git a/packages/react-native-fantom/src/getFantomRenderedOutput.js b/private/react-native-fantom/src/getFantomRenderedOutput.js similarity index 100% rename from packages/react-native-fantom/src/getFantomRenderedOutput.js rename to private/react-native-fantom/src/getFantomRenderedOutput.js diff --git a/packages/react-native-fantom/src/index.js b/private/react-native-fantom/src/index.js similarity index 97% rename from packages/react-native-fantom/src/index.js rename to private/react-native-fantom/src/index.js index fcac0272e6c..0917c0cac1a 100644 --- a/packages/react-native-fantom/src/index.js +++ b/private/react-native-fantom/src/index.js @@ -15,8 +15,8 @@ import type { import type {MixedElement} from 'react'; import type {RootTag} from 'react-native'; import type ReactNativeDocument from 'react-native/src/private/webapis/dom/nodes/ReactNativeDocument'; +import type ReadOnlyNode from 'react-native/src/private/webapis/dom/nodes/ReadOnlyNode'; -import ReactNativeElement from '../../react-native/src/private/webapis/dom/nodes/ReadOnlyNode'; import * as Benchmark from './Benchmark'; import {getConstants} from './Constants'; import getFantomRenderedOutput from './getFantomRenderedOutput'; @@ -226,9 +226,7 @@ export function unstable_produceFramesForDuration(milliseconds: number) { * * Note: This API is marked as unstable and may change in future versions. */ -export function unstable_getDirectManipulationProps( - node: ReactNativeElement, -): mixed { +export function unstable_getDirectManipulationProps(node: ReadOnlyNode): mixed { const shadowNode = getNativeNodeReference(node); return NativeFantom.getDirectManipulationProps(shadowNode); } @@ -394,7 +392,7 @@ export function createRoot(rootConfig?: RootConfig): Root { * ``` */ export function enqueueNativeEvent( - node: ReactNativeElement, + node: ReadOnlyNode, type: string, payload?: $ReadOnly<{[key: string]: mixed}>, options?: $ReadOnly<{category?: NativeEventCategory, isUnique?: boolean}>, @@ -425,7 +423,7 @@ export function enqueueNativeEvent( * ``` */ export function dispatchNativeEvent( - node: ReactNativeElement, + node: ReadOnlyNode, type: string, payload?: $ReadOnly<{[key: string]: mixed}>, options?: $ReadOnly<{category?: NativeEventCategory, isUnique?: boolean}>, @@ -487,7 +485,7 @@ export type ScrollEventOptions = { * ``` */ export function enqueueScrollEvent( - node: ReactNativeElement, + node: ReadOnlyNode, options: ScrollEventOptions, ) { const shadowNode = getNativeNodeReference(node); @@ -525,10 +523,7 @@ export function enqueueScrollEvent( * // Assert that changes from Fantom.scrollTo are in effect. * ``` */ -export function scrollTo( - node: ReactNativeElement, - options: ScrollEventOptions, -) { +export function scrollTo(node: ReadOnlyNode, options: ScrollEventOptions) { runOnUIThread(() => { enqueueScrollEvent(node, options); }); @@ -561,7 +556,7 @@ export function scrollTo( * ``` */ export function enqueueModalSizeUpdate( - node: ReactNativeElement, + node: ReadOnlyNode, size: $ReadOnly<{width: number, height: number}>, ) { const shadowNode = getNativeNodeReference(node); @@ -642,7 +637,7 @@ if (typeof global.EventTarget === 'undefined') { * @param node The node for which to create a reference counting function. */ export function createShadowNodeReferenceCounter( - node: ReactNativeElement, + node: ReadOnlyNode, ): () => number { let shadowNode = getNativeNodeReference(node); return NativeFantom.createShadowNodeReferenceCounter(shadowNode); @@ -655,7 +650,7 @@ export function createShadowNodeReferenceCounter( * @param node The node for which to create a revision getter. */ export function createShadowNodeRevisionGetter( - node: ReactNativeElement, + node: ReadOnlyNode, ): () => ?number { let shadowNode = getNativeNodeReference(node); return NativeFantom.createShadowNodeRevisionGetter(shadowNode); diff --git a/packages/react-native-fantom/src/setUpDefaultReactNativeEnvironment.js b/private/react-native-fantom/src/setUpDefaultReactNativeEnvironment.js similarity index 100% rename from packages/react-native-fantom/src/setUpDefaultReactNativeEnvironment.js rename to private/react-native-fantom/src/setUpDefaultReactNativeEnvironment.js diff --git a/packages/react-native-fantom/tester/CMakeLists.txt b/private/react-native-fantom/tester/CMakeLists.txt similarity index 100% rename from packages/react-native-fantom/tester/CMakeLists.txt rename to private/react-native-fantom/tester/CMakeLists.txt diff --git a/packages/react-native-fantom/tester/build.sh b/private/react-native-fantom/tester/build.sh similarity index 86% rename from packages/react-native-fantom/tester/build.sh rename to private/react-native-fantom/tester/build.sh index ccca2769b7b..4f9e0bc5641 100755 --- a/packages/react-native-fantom/tester/build.sh +++ b/private/react-native-fantom/tester/build.sh @@ -8,7 +8,7 @@ set -e SCRIPT_DIR=$(dirname "$(readlink -f "$0")") BUILD_DIR="$SCRIPT_DIR/build" -REACT_NATIVE_ROOT_DIR=$(readlink -f "$SCRIPT_DIR/../../react-native") +REACT_NATIVE_ROOT_DIR=$(readlink -f "$SCRIPT_DIR/../../../packages/react-native") cmake -S "$SCRIPT_DIR" -B "$BUILD_DIR" \ -DREACT_THIRD_PARTY_NDK_DIR="${REACT_NATIVE_ROOT_DIR}/ReactAndroid/build/third-party-ndk" \ diff --git a/packages/react-native-fantom/tester/src/main.cpp b/private/react-native-fantom/tester/src/main.cpp similarity index 100% rename from packages/react-native-fantom/tester/src/main.cpp rename to private/react-native-fantom/tester/src/main.cpp diff --git a/packages/react-native-fantom/tester/third-party/boost/CmakeLists.txt b/private/react-native-fantom/tester/third-party/boost/CmakeLists.txt similarity index 100% rename from packages/react-native-fantom/tester/third-party/boost/CmakeLists.txt rename to private/react-native-fantom/tester/third-party/boost/CmakeLists.txt