Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/eslint-plugin-react-native/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ const publicAPIMapping = {
'Libraries/Utilities/BackHandler': 'BackHandler',
'Libraries/Components/Clipboard/Clipboard': 'Clipboard',
'Libraries/Utilities/DeviceInfo': 'DeviceInfo',
'src/private/devmenu/DevMenu': 'DevMenu',
'src/private/devsupport/devmenu/DevMenu': 'DevMenu',
'Libraries/Utilities/DevSettings': 'DevSettings',
'Libraries/Utilities/Dimensions': 'Dimensions',
'Libraries/Animated/Easing': 'Easing',
Expand Down
1 change: 0 additions & 1 deletion packages/react-native/Libraries/.npmignore

This file was deleted.

10 changes: 5 additions & 5 deletions packages/react-native/Libraries/Core/setUpReactDevTools.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

'use strict';

import type {Domain} from '../../src/private/debugging/setUpFuseboxReactDevToolsDispatcher';
import type {Spec as NativeReactDevToolsRuntimeSettingsModuleSpec} from '../../src/private/fusebox/specs/NativeReactDevToolsRuntimeSettingsModule';
import type {Domain} from '../../src/private/devsupport/rndevtools/setUpFuseboxReactDevToolsDispatcher';
import type {Spec as NativeReactDevToolsRuntimeSettingsModuleSpec} from '../../src/private/devsupport/rndevtools/specs/NativeReactDevToolsRuntimeSettingsModule';

if (__DEV__) {
if (typeof global.queueMicrotask !== 'function') {
Expand All @@ -31,18 +31,18 @@ if (__DEV__) {

if (__DEV__) {
// Register dispatcher on global, which can be used later by Chrome DevTools frontend
require('../../src/private/debugging/setUpFuseboxReactDevToolsDispatcher');
require('../../src/private/devsupport/rndevtools/setUpFuseboxReactDevToolsDispatcher');
const {
initialize,
connectToDevTools,
connectWithCustomMessagingProtocol,
} = require('react-devtools-core');

const reactDevToolsSettingsManager = require('../../src/private/debugging/ReactDevToolsSettingsManager');
const reactDevToolsSettingsManager = require('../../src/private/devsupport/rndevtools/ReactDevToolsSettingsManager');
const serializedHookSettings =
reactDevToolsSettingsManager.getGlobalHookSettings();
const maybeReactDevToolsRuntimeSettingsModuleModule =
require('../../src/private/fusebox/specs/NativeReactDevToolsRuntimeSettingsModule').default;
require('../../src/private/devsupport/rndevtools/specs/NativeReactDevToolsRuntimeSettingsModule').default;

let hookSettings = null;
if (serializedHookSettings != null) {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/Libraries/LogBox/Data/LogBoxData.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import type {
Message,
} from './parseLogBoxLog';

import DebuggerSessionObserver from '../../../src/private/debugging/FuseboxSessionObserver';
import DebuggerSessionObserver from '../../../src/private/devsupport/rndevtools/FuseboxSessionObserver';
import parseErrorStack from '../../Core/Devtools/parseErrorStack';
import NativeDevSettings from '../../NativeModules/specs/NativeDevSettings';
import NativeLogBox from '../../NativeModules/specs/NativeLogBox';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
* @format
*/

export * from '../../../src/private/specs_DEPRECATED/modules/NativeDevMenu';
import NativeDevMenu from '../../../src/private/specs_DEPRECATED/modules/NativeDevMenu';
export * from '../../../src/private/devsupport/devmenu/specs/NativeDevMenu';
import NativeDevMenu from '../../../src/private/devsupport/devmenu/specs/NativeDevMenu';
export default NativeDevMenu;
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ const InspectorDeferred = ({
}: InspectorDeferredProps) => {
// D39382967 adds a require cycle: InitializeCore -> AppContainer -> Inspector -> InspectorPanel -> ScrollView -> InitializeCore
// We can't remove it yet, fallback to dynamic require for now. This is the only reason why this logic is in a separate function.
const Inspector = require('../../src/private/inspector/Inspector').default;
const Inspector =
require('../../src/private/devsupport/devmenu/elementinspector/Inspector').default;

return (
<Inspector
Expand All @@ -74,7 +75,7 @@ const ReactDevToolsOverlayDeferred = ({
reactDevToolsAgent,
}: ReactDevToolsOverlayDeferredProps) => {
const ReactDevToolsOverlay =
require('../../src/private/inspector/ReactDevToolsOverlay').default;
require('../../src/private/devsupport/devmenu/elementinspector/ReactDevToolsOverlay').default;

return (
<ReactDevToolsOverlay
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5782,7 +5782,7 @@ declare export function isIgnored(value: mixed): boolean;
`;

exports[`public API should not change unintentionally Libraries/NativeModules/specs/NativeDevMenu.js 1`] = `
"export * from \\"../../../src/private/specs_DEPRECATED/modules/NativeDevMenu\\";
"export * from \\"../../../src/private/devsupport/devmenu/specs/NativeDevMenu\\";
declare export default typeof NativeDevMenu;
"
`;
Expand Down Expand Up @@ -9064,7 +9064,7 @@ export { default as codegenNativeCommands } from \\"./Libraries/Utilities/codege
export { default as DeviceEventEmitter } from \\"./Libraries/EventEmitter/RCTDeviceEventEmitter\\";
export type { DeviceInfoConstants } from \\"./Libraries/Utilities/DeviceInfo\\";
export { default as DeviceInfo } from \\"./Libraries/Utilities/DeviceInfo\\";
export { default as DevMenu } from \\"./src/private/devmenu/DevMenu\\";
export { default as DevMenu } from \\"./src/private/devsupport/devmenu/DevMenu\\";
export { default as DevSettings } from \\"./Libraries/Utilities/DevSettings\\";
export type {
DimensionsPayload,
Expand Down
9 changes: 0 additions & 9 deletions packages/react-native/ReactAndroid/.npmignore

This file was deleted.

This file was deleted.

3 changes: 0 additions & 3 deletions packages/react-native/ReactAndroid/hermes-engine/.npmignore

This file was deleted.

2 changes: 1 addition & 1 deletion packages/react-native/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ module.exports = {
return require('./Libraries/Utilities/DeviceInfo').default;
},
get DevMenu() {
return require('./src/private/devmenu/DevMenu').default;
return require('./src/private/devsupport/devmenu/DevMenu').default;
},
get DevSettings() {
return require('./Libraries/Utilities/DevSettings').default;
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/index.js.flow
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ export {default as DeviceEventEmitter} from './Libraries/EventEmitter/RCTDeviceE
export type {DeviceInfoConstants} from './Libraries/Utilities/DeviceInfo';
export {default as DeviceInfo} from './Libraries/Utilities/DeviceInfo';

export {default as DevMenu} from './src/private/devmenu/DevMenu';
export {default as DevMenu} from './src/private/devsupport/devmenu/DevMenu';
export {default as DevSettings} from './Libraries/Utilities/DevSettings';

export type {
Expand Down
37 changes: 25 additions & 12 deletions packages/react-native/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,48 +49,61 @@
"React",
"!React/Fabric/RCTThirdPartyFabricComponentsProvider.*",
"ReactAndroid",
"!ReactAndroid/.cxx",
"!ReactAndroid/build",
"!ReactAndroid/external-artifacts/artifacts",
"!ReactAndroid/external-artifacts/build",
"!ReactAndroid/hermes-engine/.cxx",
"!ReactAndroid/hermes-engine/build",
"!ReactAndroid/src/main/third-party",
"!ReactAndroid/src/test",
"ReactApple",
"ReactCommon",
"README.md",
"rn-get-polyfills.js",
"scripts/bundle.js",
"scripts/cocoapods",
"scripts/codegen",
"scripts/compose-source-maps.js",
"scripts/find-node-for-xcode.sh",
"scripts/bundle.js",
"scripts/generate-codegen-artifacts.js",
"scripts/generate-provider-cli.js",
"scripts/generate-specs-cli.js",
"scripts/codegen",
"!scripts/codegen/__tests__",
"!scripts/codegen/__test_fixtures__",
"scripts/hermes/hermes-utils.js",
"scripts/hermes/prepare-hermes-for-build.js",
"scripts/ios-configure-glog.sh",
"scripts/xcode/ccache-clang++.sh",
"scripts/xcode/ccache-clang.sh",
"scripts/xcode/ccache.conf",
"scripts/xcode/with-environment.sh",
"scripts/native_modules.rb",
"scripts/node-binary.sh",
"scripts/packager.sh",
"scripts/packager-reporter.js",
"scripts/packager.sh",
"scripts/react_native_pods_utils/script_phases.rb",
"scripts/react_native_pods_utils/script_phases.sh",
"scripts/react_native_pods.rb",
"scripts/cocoapods",
"!scripts/cocoapods/__tests__",
"scripts/react-native-xcode.sh",
"scripts/xcode/ccache-clang.sh",
"scripts/xcode/ccache-clang++.sh",
"scripts/xcode/ccache.conf",
"scripts/xcode/with-environment.sh",
"sdks/.hermesversion",
"sdks/hermes-engine",
"sdks/hermesc",
"settings.gradle.kts",
"src",
"!src/private/testing",
"template.config.js",
"template",
"!template/node_modules",
"!template/package-lock.json",
"!template/yarn.lock",
"third-party-podspecs",
"types"
"types",
"!**/__docs__/**",
"!**/__fixtures__/**",
"!**/__flowtests__/**",
"!**/__mocks__/**",
"!**/__test_fixtures__/**",
"!**/__tests__/**",
"!**/__typetests__/**"
],
"scripts": {
"prepack": "node ./scripts/prepack.js",
Expand Down
2 changes: 0 additions & 2 deletions packages/react-native/scripts/.npmignore

This file was deleted.

2 changes: 0 additions & 2 deletions packages/react-native/src/.npmignore

This file was deleted.

1 change: 0 additions & 1 deletion packages/react-native/src/private/debugging/.npmignore

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* @format
*/

import NativeDevMenu from '../specs_DEPRECATED/modules/NativeDevMenu';
import NativeDevMenu from './specs/NativeDevMenu';

/**
* The DevMenu module exposes methods for interacting with the Dev Menu in development.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@

'use strict';

import type {ViewStyleProp} from '../../../Libraries/StyleSheet/StyleSheet';
import type {ViewStyleProp} from '../../../../../Libraries/StyleSheet/StyleSheet';

import * as React from 'react';

const View = require('../../../Libraries/Components/View/View').default;
const View = require('../../../../../Libraries/Components/View/View').default;

type Props = $ReadOnly<{
children: React.Node,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,15 @@
import type {
TextStyleProp,
ViewStyleProp,
} from '../../../Libraries/StyleSheet/StyleSheet';
} from '../../../../../Libraries/StyleSheet/StyleSheet';
import type {InspectedElementFrame} from './Inspector';

import * as React from 'react';

const View = require('../../../Libraries/Components/View/View').default;
const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet').default;
const Text = require('../../../Libraries/Text/Text').default;
const View = require('../../../../../Libraries/Components/View/View').default;
const StyleSheet =
require('../../../../../Libraries/StyleSheet/StyleSheet').default;
const Text = require('../../../../../Libraries/Text/Text').default;
const resolveBoxStyle = require('./resolveBoxStyle').default;

const blank = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,18 @@

'use strict';

import type {ViewStyleProp} from '../../../Libraries/StyleSheet/StyleSheet';
import type {ViewStyleProp} from '../../../../../Libraries/StyleSheet/StyleSheet';
import type {InspectedElementFrame} from './Inspector';

import * as React from 'react';

const View = require('../../../Libraries/Components/View/View').default;
const View = require('../../../../../Libraries/Components/View/View').default;
const flattenStyle =
require('../../../Libraries/StyleSheet/flattenStyle').default;
const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet').default;
const Dimensions = require('../../../Libraries/Utilities/Dimensions').default;
require('../../../../../Libraries/StyleSheet/flattenStyle').default;
const StyleSheet =
require('../../../../../Libraries/StyleSheet/StyleSheet').default;
const Dimensions =
require('../../../../../Libraries/Utilities/Dimensions').default;
const BorderBox = require('./BorderBox').default;
const resolveBoxStyle = require('./resolveBoxStyle').default;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,23 @@

'use strict';

import type {InspectorData} from '../../../Libraries/Renderer/shims/ReactNativeTypes';
import type {ViewStyleProp} from '../../../Libraries/StyleSheet/StyleSheet';
import type {InspectorData} from '../../../../../Libraries/Renderer/shims/ReactNativeTypes';
import type {ViewStyleProp} from '../../../../../Libraries/StyleSheet/StyleSheet';

import * as React from 'react';

const TouchableHighlight =
require('../../../Libraries/Components/Touchable/TouchableHighlight').default;
require('../../../../../Libraries/Components/Touchable/TouchableHighlight').default;
const TouchableWithoutFeedback =
require('../../../Libraries/Components/Touchable/TouchableWithoutFeedback').default;
const View = require('../../../Libraries/Components/View/View').default;
require('../../../../../Libraries/Components/Touchable/TouchableWithoutFeedback').default;
const View = require('../../../../../Libraries/Components/View/View').default;
const flattenStyle =
require('../../../Libraries/StyleSheet/flattenStyle').default;
const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet').default;
const Text = require('../../../Libraries/Text/Text').default;
require('../../../../../Libraries/StyleSheet/flattenStyle').default;
const StyleSheet =
require('../../../../../Libraries/StyleSheet/StyleSheet').default;
const Text = require('../../../../../Libraries/Text/Text').default;
const mapWithSeparator =
require('../../../Libraries/Utilities/mapWithSeparator').default;
require('../../../../../Libraries/Utilities/mapWithSeparator').default;
const BoxInspector = require('./BoxInspector').default;
const StyleInspector = require('./StyleInspector').default;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,27 @@

'use strict';

import type {InspectedViewRef} from '../../../Libraries/ReactNative/AppContainer-dev';
import type {InspectedViewRef} from '../../../../../Libraries/ReactNative/AppContainer-dev';
import type {
InspectorData,
TouchedViewDataAtPoint,
} from '../../../Libraries/Renderer/shims/ReactNativeTypes';
import type {ViewStyleProp} from '../../../Libraries/StyleSheet/StyleSheet';
import type {ReactDevToolsAgent} from '../../../Libraries/Types/ReactDevToolsTypes';
} from '../../../../../Libraries/Renderer/shims/ReactNativeTypes';
import type {ViewStyleProp} from '../../../../../Libraries/StyleSheet/StyleSheet';
import type {ReactDevToolsAgent} from '../../../../../Libraries/Types/ReactDevToolsTypes';

import SafeAreaView from '../components/safeareaview/SafeAreaView_INTERNAL_DO_NOT_USE';
import SafeAreaView from '../../../components/safeareaview/SafeAreaView_INTERNAL_DO_NOT_USE';
import * as React from 'react';

const View = require('../../../Libraries/Components/View/View').default;
const PressabilityDebug = require('../../../Libraries/Pressability/PressabilityDebug');
const View = require('../../../../../Libraries/Components/View/View').default;
const PressabilityDebug = require('../../../../../Libraries/Pressability/PressabilityDebug');
const {
findNodeHandle,
} = require('../../../Libraries/ReactNative/RendererProxy');
const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet').default;
const Dimensions = require('../../../Libraries/Utilities/Dimensions').default;
const Platform = require('../../../Libraries/Utilities/Platform').default;
} = require('../../../../../Libraries/ReactNative/RendererProxy');
const StyleSheet =
require('../../../../../Libraries/StyleSheet/StyleSheet').default;
const Dimensions =
require('../../../../../Libraries/Utilities/Dimensions').default;
const Platform = require('../../../../../Libraries/Utilities/Platform').default;
const getInspectorDataForViewAtPoint =
require('./getInspectorDataForViewAtPoint').default;
const InspectorOverlay = require('./InspectorOverlay').default;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@

'use strict';

import type {GestureResponderEvent} from '../../../Libraries/Types/CoreEventTypes';
import type {GestureResponderEvent} from '../../../../../Libraries/Types/CoreEventTypes';
import type {InspectedElement} from './Inspector';

import * as React from 'react';

const View = require('../../../Libraries/Components/View/View').default;
const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet').default;
const View = require('../../../../../Libraries/Components/View/View').default;
const StyleSheet =
require('../../../../../Libraries/StyleSheet/StyleSheet').default;
const ElementBox = require('./ElementBox').default;

type Props = $ReadOnly<{
Expand Down
Loading