8000 Remove Reconciler fork (2/2) (#25775) · facebook/react@f101c2d · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Commit f101c2d

Browse files
kassenskassens
authored
Remove Reconciler fork (2/2) (#25775)
We've heard from multiple contributors that the Reconciler forking mechanism was confusing and/or annoying to deal with. Since it's currently unused and there's no immediate plans to start using it again, this removes the forking. Fully removing the fork is split into 2 steps to preserve file history: **#25774 previous PR that did the bulk of the work:** - remove `enableNewReconciler` feature flag. - remove `unstable_isNewReconciler` export - remove eslint rules for cross fork imports - remove `*.new.js` files and update imports - merge non-suffixed files into `*.old` files where both exist (sometimes types were defined there) **This PR** - rename `*.old` files
1 parent 420f0b7 commit f101c2d
  • ReactFiberHydrationContext.js
  • ReactFiberLane.js
  • ReactFiberLazyComponent.js
  • ReactFiberNewContext.js
  • ReactFiberOffscreenComponent.js
  • ReactFiberReconciler.js
  • ReactFiberRoot.js
  • ReactFiberScope.js
  • ReactFiberShellHydration.js
  • ReactFiberStack.js
  • ReactFiberSuspenseComponent.js
  • ReactFiberSuspenseContext.js
  • ReactFiberSyncTaskQueue.js
  • ReactFiberThenable.js
  • ReactFiberThrow.js
  • ReactFiberTracingMarkerComponent.js
  • ReactFiberTransition.js
  • ReactFiberTreeContext.js
  • ReactFiberTreeReflection.js
  • ReactFiberUnwindWork.js
  • ReactFiberWorkLoop.js
  • ReactInternalTypes.js
  • ReactMutableSource.js
  • ReactProfilerTimer.js
  • ReactReconcilerConstants.js
  • ReactStrictModeWarnings.js
  • __tests__
  • forks
  • react-refresh/src
  • react-test-renderer/src
  • react/src

    • Some content is hidden

    Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

    72 files changed

    +296
    -316
    lines changed

    ‎packages/react-art/src/ReactART.js

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -12,7 +12,7 @@ import {
    1212
    createContainer,
    1313
    updateContainer,
    1414
    injectIntoDevTools,
    15-
    } from 'react-reconciler/src/ReactFiberReconciler.old';
    15+
    } from 'react-reconciler/src/ReactFiberReconciler';
    1616
    import Transform from 'art/core/transform';
    1717
    import Mode from 'art/modes/current';
    1818
    import FastNoSideEffects from 'art/modes/fast-noSideEffects';

    ‎packages/react-art/src/ReactARTHostConfig.js

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -10,7 +10,7 @@ import Mode from 'art/modes/current';
    1010

    1111
    import {TYPES, EVENT_TYPES, childrenAsString} from './ReactARTInternals';
    1212

    13-
    import {DefaultEventPriority} from 'react-reconciler/src/ReactEventPriorities.old';
    13+
    import {DefaultEventPriority} from 'react-reconciler/src/ReactEventPriorities';
    1414

    1515
    const pooledTransform = new Transform();
    1616

    ‎packages/react-dom-bindings/src/client/ReactDOMFloatClient.js

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -29,7 +29,7 @@ import {
    2929
    markNodeAsResource,
    3030
    } from './ReactDOMComponentTree';
    3131
    import {HTML_NAMESPACE, SVG_NAMESPACE} from '../shared/DOMNamespaces';
    32-
    import {getCurrentRootHostContainer} from 'react-reconciler/src/ReactFiberHostContext.old';
    32+
    import {getCurrentRootHostContainer} from 'react-reconciler/src/ReactFiberHostContext';
    3333

    3434
    // The resource types we support. currently they match the form for the as argument.
    3535
    // In the future this may need to change, especially when modules / scripts are supported

    ‎packages/react-dom-bindings/src/client/ReactDOMHostConfig.js

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -7,7 +7,7 @@
    77
    * @flow
    88
    */
    99

    10-
    import type {EventPriority} from 'react-reconciler/src/ReactEventPriorities.old';
    10+
    import type {EventPriority} from 'react-reconciler/src/ReactEventPriorities';
    1111
    import type {DOMEventName} from '../events/DOMEventNames';
    1212
    import type {Fiber, FiberRoot} from 'react-reconciler/src/ReactInternalTypes';
    1313
    import type {
    @@ -81,7 +81,7 @@ import {
    8181
    } from 'react-reconciler/src/ReactWorkTags';
    8282
    import {listenToAllSupportedEvents} from '../events/DOMPluginEventSystem';
    8383

    84-
    import {DefaultEventPriority} from 'react-reconciler/src/ReactEventPriorities.old';
    84+
    import {DefaultEventPriority} from 'react-reconciler/src/ReactEventPriorities';
    8585

    8686
    // TODO: Remove this deep import when we delete the legacy root API
    8787
    import {ConcurrentMode, NoMode} from 'react-reconciler/src/ReactTypeOfMode';

    ‎packages/react-dom-bindings/src/events/ReactDOMEventListener.js

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -7,7 +7,7 @@
    77
    * @flow
    88
    */
    99

    10-
    import type {EventPriority} from 'react-reconciler/src/ReactEventPriorities.old';
    10+
    import type {EventPriority} from 'react-reconciler/src/ReactEventPriorities';
    1111
    import type {AnyNativeEvent} from '../events/PluginModuleType';
    1212
    import type {Fiber, FiberRoot} from 'react-reconciler/src/ReactInternalTypes';
    1313
    import type {Container, SuspenseInstance} from '../client/ReactDOMHostConfig';
    @@ -52,7 +52,7 @@ import {
    5252
    IdleEventPriority,
    5353
    getCurrentUpdatePriority,
    5454
    setCurrentUpdatePriority,
    55-
    } from 'react-reconciler/src/ReactEventPriorities.old';
    55+
    } from 'react-reconciler/src/ReactEventPriorities';
    5656
    import ReactSharedInternals from 'shared/ReactSharedInternals';
    5757
    import {isRootDehydrated} from 'react-reconciler/src/ReactFiberShellHydration';
    5858

    ‎packages/react-dom-bindings/src/events/ReactDOMEventReplaying.js

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -12,7 +12,7 @@ import type {Container, SuspenseInstance} from '../client/ReactDOMHostConfig';
    1212
    import type {DOMEventName} from '../events/DOMEventNames';
    1313
    import type {EventSystemFlags} from './EventSystemFlags';
    1414
    import type {FiberRoot} from 'react-reconciler/src/ReactInternalTypes';
    15-
    import type {EventPriority} < F438 span class="pl-k">from 'react-reconciler/src/ReactEventPriorities.old';
    15+
    import type {EventPriority} from 'react-reconciler/src/ReactEventPriorities';
    1616

    1717
    import {enableCapturePhaseSelectiveHydrationWithoutDiscreteEventReplay} from 'shared/ReactFeatureFlags';
    1818
    import {
    @@ -35,7 +35,7 @@ import {
    3535
    getClosestInstanceFromNode,
    3636
    } from '../client/ReactDOMComponentTree';
    3737
    import {HostRoot, SuspenseComponent} from 'react-reconciler/src/ReactWorkTags';
    38-
    import {isHigherEventPriority} from 'react-reconciler/src/ReactEventPriorities.old';
    38+
    import {isHigherEventPriority} from 'react-reconciler/src/ReactEventPriorities';
    3939
    import {isRootDehydrated} from 'react-reconciler/src/ReactFiberShellHydration';
    4040

    4141
    let _attemptSynchronousHydration: (fiber: Object) => void;

    ‎packages/react-dom/src/client/ReactDOM.js

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -43,11 +43,11 @@ import {
    4343
    attemptDiscreteHydration,
    4444
    attemptContinuousHydration,
    4545
    attemptHydrationAtCurrentPriority,
    46-
    } from 'react-reconciler/src/ReactFiberReconciler.old';
    46+
    } from 'react-reconciler/src/ReactFiberReconciler';
    4747
    import {
    4848
    runWithPriority,
    4949
    getCurrentUpdatePriority,
    50-
    } from 'react-reconciler/src/ReactEventPriorities.old';
    50+
    } from 'react-reconciler/src/ReactEventPriorities';
    5151
    import {createPortal as createPortalImpl} from 'react-reconciler/src/ReactPortal';
    5252
    import {canUseDOM} from 'shared/ExecutionEnvironment';
    5353
    import ReactVersion from 'shared/ReactVersion';

    ‎packages/react-dom/src/client/ReactDOMLegacy.js

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -37,7 +37,7 @@ import {
    3737
    getPublicRootInstance,
    3838
    findHostInstance,
    3939
    findHostInstanceWithWarning,
    40-
    } from 'react-reconciler/src/ReactFiberReconciler.old';
    40+
    } from 'react-reconciler/src/ReactFiberReconciler';
    4141
    import {LegacyRoot} from 'react-reconciler/src/ReactRootTags';
    4242
    import getComponentNameFromType from 'shared/getComponentNameFromType';
    4343
    import ReactSharedInternals from 'shared/ReactSharedInternals';

    ‎packages/react-dom/src/client/ReactDOMRoot.js

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -76,7 +76,7 @@ import {
    7676
    registerMutableSourceForHydration,
    7777
    flushSync,
    7878
    isAlreadyRendering,
    79-
    } from 'react-reconciler/src/ReactFiberReconciler.old';
    79+
    } from 'react-reconciler/src/ReactFiberReconciler';
    8080
    import {ConcurrentRoot} from 'react-reconciler/src/ReactRootTags';
    8181

    8282
    /* global reportError */

    ‎packages/react-dom/unstable_testing.classic.fb.js

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -19,4 +19,4 @@ export {
    1919
    findBoundingRects,
    2020
    focusWithin,
    2121
    observeVisibleRects,
    22-
    } from 'react-reconciler/src/ReactFiberReconciler.old';
    22+
    } from 'react-reconciler/src/ReactFiberReconciler';

    0 commit comments

    Comments
     (0)
    0