Skip to content

Simplify imports in react reconciler #13718

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nhunzaker merged 12 commits into from
Nov 1, 2018
Merged

Simplify imports in react reconciler #13718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0f551c7
Simplify imports in ReactChildFiber
mmarkelov Sep 24, 2018
c5f5103
Import type first in ReactCurrentFiber
mmarkelov Sep 24, 2018
f42e71a
Simplify imports in ReactFiberBeginWork
mmarkelov Sep 24, 2018
95d721d
Simplify imports in ReactFiberScheduler
mmarkelov Sep 24, 2018
9a3b784
Simplify import in ReactFiberTreeReflection
mmarkelov Sep 24, 2018
ac0aa5c
Simplify import in ReactFiberUnwindWork
mmarkelov Sep 24, 2018
23a17e6
Fixes
mmarkelov Sep 25, 2018
cafe1f4
Merge branch 'master' of https://github.com/facebook/react into Simpl…
mmarkelov Sep 25, 2018
b8e6287
Merge master
mmarkelov Oct 29, 2018
e4b39b2
Remove repeated import
mmarkelov Oct 29, 2018
bb45dfd
Fix imports from ReactFiberExpirationTime
mmarkelov Oct 29, 2018
da6419a
Master imports in ReactFiberBeginWork
mmarkelov Oct 29, 2018
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
4 changes: 2 additions & 2 deletions packages/react-reconciler/src/ReactChildFiber.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

import type {ReactElement} from 'shared/ReactElementType';
import type {ReactPortal} from 'shared/ReactTypes';
import type {Fiber} from 'react-reconciler/src/ReactFiber';
import type {ExpirationTime} from 'react-reconciler/src/ReactFiberExpirationTime';
import type {Fiber} from './ReactFiber';
import type {ExpirationTime} from './ReactFiberExpirationTime';
Copy link
Contributor

@nhunzaker nhunzaker Oct 20, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm curious if this was here for a reason. @gaearon do you know of any reason why this can't be relative?

Copy link
Collaborator

@gaearon gaearon Nov 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it was because Flow has issues with symlinks on Windows.

Copy link
Collaborator

@gaearon gaearon Nov 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That said we didn't follow it consistently either.

Copy link
Contributor

@nhunzaker nhunzaker Nov 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay. Reason enough to revert this? There's still the de-duplication stuff in here. We could revise this PR to remove the relative import changes.


import getComponentName from 'shared/getComponentName';
import {Placement, Deletion} from 'shared/ReactSideEffectTags';
Expand Down
4 changes: 2 additions & 2 deletions packages/react-reconciler/src/ReactCurrentFiber.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
* @flow
*/

import type {Fiber} from './ReactFiber';

import ReactSharedInternals from 'shared/ReactSharedInternals';
import {
IndeterminateComponent,
Expand All @@ -21,8 +23,6 @@ import getComponentName from 'shared/getComponentName';

const ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;

import type {Fiber} from './ReactFiber';

type LifeCyclePhase = 'render' | 'getChildContext';

function describeFiber(fiber: Fiber): string {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-reconciler/src/ReactFiberBeginWork.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

import type {ReactProviderType, ReactContext} from 'shared/ReactTypes';
import type {Fiber} from 'react-reconciler/src/ReactFiber';
import type {Fiber} from './ReactFiber';
import type {FiberRoot} from './ReactFiberRoot';
import type {ExpirationTime} from './ReactFiberExpirationTime';
import type {SuspenseState} from './ReactFiberSuspenseComponent';
Expand Down
9 changes: 3 additions & 6 deletions packages/react-reconciler/src/ReactFiberScheduler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,6 @@ import getComponentName from 'shared/getComponentName';
import invariant from 'shared/invariant';
import warningWithoutStack from 'shared/warningWithoutStack';

import {
scheduleTimeout,
cancelTimeout,
noTimeout,
} from './ReactFiberHostConfig';

import ReactFiberInstrumentation from './ReactFiberInstrumentation';
import * as ReactCurrentFiber from './ReactCurrentFiber';
import {
Expand All @@ -67,6 +61,9 @@ import {
cancelDeferredCallback,
prepareForCommit,
resetAfterCommit,
scheduleTimeout,
cancelTimeout,
noTimeout,
} from './ReactFiberHostConfig';
import {
markPendingPriorityLevel,
Expand Down
2 changes: 1 addition & 1 deletion packages/react-reconciler/src/ReactFiberTreeReflection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @flow
*/

import type {Fiber} from 'react-reconciler/src/ReactFiber';
import type {Fiber} from './ReactFiber';

import invariant from 'shared/invariant';
import warningWithoutStack from 'shared/warningWithoutStack';
Expand Down
3 changes: 2 additions & 1 deletion packages/react-reconciler/src/ReactFiberUnwindWork.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,12 @@ import {
isAlreadyFailedLegacyErrorBoundary,
retrySuspendedRoot,
} from './ReactFiberScheduler';
import {NoWork, Sync} from './ReactFiberExpirationTime';

import invariant from 'shared/invariant';
import maxSigned31BitInt from './maxSigned31BitInt';
import {
NoWork,
Sync,
expirationTimeToMs,
LOW_PRIORITY_EXPIRATION,
} from './ReactFiberExpirationTime';
Expand Down