From 0f551c7581ed58bae6fc6d19105323bac78151e8 Mon Sep 17 00:00:00 2001 From: mapkeji Date: Mon, 24 Sep 2018 21:19:22 +0300 Subject: [PATCH 01/10] Simplify imports in ReactChildFiber --- packages/react-reconciler/src/ReactChildFiber.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react-reconciler/src/ReactChildFiber.js b/packages/react-reconciler/src/ReactChildFiber.js index ff37b11035f..91d96d064cb 100644 --- a/packages/react-reconciler/src/ReactChildFiber.js +++ b/packages/react-reconciler/src/ReactChildFiber.js @@ -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'; import getComponentName from 'shared/getComponentName'; import {Placement, Deletion} from 'shared/ReactSideEffectTags'; From c5f51032edab7f208cf74a0ce19d6fdcda1bb7c2 Mon Sep 17 00:00:00 2001 From: mapkeji Date: Mon, 24 Sep 2018 21:20:32 +0300 Subject: [PATCH 02/10] Import type first in ReactCurrentFiber --- packages/react-reconciler/src/ReactCurrentFiber.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react-reconciler/src/ReactCurrentFiber.js b/packages/react-reconciler/src/ReactCurrentFiber.js index 42b8e14001e..f1af8023651 100644 --- a/packages/react-reconciler/src/ReactCurrentFiber.js +++ b/packages/react-reconciler/src/ReactCurrentFiber.js @@ -7,6 +7,8 @@ * @flow */ +import type {Fiber} from './ReactFiber'; + import ReactSharedInternals from 'shared/ReactSharedInternals'; import { IndeterminateComponent, @@ -22,8 +24,6 @@ import getComponentName from 'shared/getComponentName'; const ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame; -import type {Fiber} from './ReactFiber'; - type LifeCyclePhase = 'render' | 'getChildContext'; function describeFiber(fiber: Fiber): string { From f42e71a80c212be7c49d0e7199d60724050ce4eb Mon Sep 17 00:00:00 2001 From: mapkeji Date: Mon, 24 Sep 2018 21:23:43 +0300 Subject: [PATCH 03/10] Simplify imports in ReactFiberBeginWork --- packages/react-reconciler/src/ReactFiberBeginWork.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js index 48ab7bb0480..9061b882bc9 100644 --- a/packages/react-reconciler/src/ReactFiberBeginWork.js +++ b/packages/react-reconciler/src/ReactFiberBeginWork.js @@ -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 checkPropTypes from 'prop-types/checkPropTypes'; @@ -57,7 +57,6 @@ import warningWithoutStack from 'shared/warningWithoutStack'; import * as ReactCurrentFiber from './ReactCurrentFiber'; import {cancelWorkTimer} from './ReactDebugFiberPerf'; -import {applyDerivedStateFromProps} from './ReactFiberClassComponent'; import { mountChildFibers, reconcileChildFibers, @@ -94,6 +93,7 @@ import { tryToClaimNextHydratableInstance, } from './ReactFiberHydrationContext'; import { + applyDerivedStateFromProps, adoptClassInstance, constructClassInstance, mountClassInstance, From 95d721d9f355e4b36080fd76f3fc498b0e4a8bd3 Mon Sep 17 00:00:00 2001 From: mapkeji Date: Mon, 24 Sep 2018 21:30:38 +0300 Subject: [PATCH 04/10] Simplify imports in ReactFiberScheduler --- packages/react-reconciler/src/ReactFiberScheduler.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js index d5860628f0d..fdc102b9b50 100644 --- a/packages/react-reconciler/src/ReactFiberScheduler.js +++ b/packages/react-reconciler/src/ReactFiberScheduler.js @@ -57,12 +57,6 @@ import invariant from 'shared/invariant'; import warningWithoutStack from 'shared/warningWithoutStack'; import {getResultFromResolvedThenable} from 'shared/ReactLazyComponent'; -import { - scheduleTimeout, - cancelTimeout, - noTimeout, -} from './ReactFiberHostConfig'; - import ReactFiberInstrumentation from './ReactFiberInstrumentation'; import * as ReactCurrentFiber from './ReactCurrentFiber'; import { @@ -71,6 +65,9 @@ import { cancelDeferredCallback, prepareForCommit, resetAfterCommit, + scheduleTimeout, + cancelTimeout, + noTimeout, } from './ReactFiberHostConfig'; import { markPendingPriorityLevel, From 9a3b784940105e8340caace96c24f3b088509e81 Mon Sep 17 00:00:00 2001 From: mapkeji Date: Mon, 24 Sep 2018 21:31:31 +0300 Subject: [PATCH 05/10] Simplify import in ReactFiberTreeReflection --- packages/react-reconciler/src/ReactFiberTreeReflection.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-reconciler/src/ReactFiberTreeReflection.js b/packages/react-reconciler/src/ReactFiberTreeReflection.js index a2cf418b5ed..452ce2dfeb9 100644 --- a/packages/react-reconciler/src/ReactFiberTreeReflection.js +++ b/packages/react-reconciler/src/ReactFiberTreeReflection.js @@ -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'; From ac0aa5cc5331d919c5b8d3a3bddab629769c8d08 Mon Sep 17 00:00:00 2001 From: mapkeji Date: Mon, 24 Sep 2018 21:33:08 +0300 Subject: [PATCH 06/10] Simplify import in ReactFiberUnwindWork --- packages/react-reconciler/src/ReactFiberUnwindWork.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-reconciler/src/ReactFiberUnwindWork.js b/packages/react-reconciler/src/ReactFiberUnwindWork.js index 35885c8dd06..94d6a3df8cf 100644 --- a/packages/react-reconciler/src/ReactFiberUnwindWork.js +++ b/packages/react-reconciler/src/ReactFiberUnwindWork.js @@ -61,11 +61,11 @@ import { isAlreadyFailedLegacyErrorBoundary, retrySuspendedRoot, } from './ReactFiberScheduler'; -import {Sync} from './ReactFiberExpirationTime'; import invariant from 'shared/invariant'; import maxSigned31BitInt from './maxSigned31BitInt'; import { + Sync, expirationTimeToMs, LOW_PRIORITY_EXPIRATION, } from './ReactFiberExpirationTime'; From 23a17e606449c83139213efa70da630563dce363 Mon Sep 17 00:00:00 2001 From: mapkeji Date: Tue, 25 Sep 2018 07:33:54 +0300 Subject: [PATCH 07/10] Fixes --- packages/react-reconciler/src/ReactChildFiber.js | 4 ++-- packages/react-reconciler/src/ReactFiberBeginWork.js | 2 +- packages/react-reconciler/src/ReactFiberTreeReflection.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/react-reconciler/src/ReactChildFiber.js b/packages/react-reconciler/src/ReactChildFiber.js index 91d96d064cb..2461ef7b2a0 100644 --- a/packages/react-reconciler/src/ReactChildFiber.js +++ b/packages/react-reconciler/src/ReactChildFiber.js @@ -9,8 +9,8 @@ import type {ReactElement} from 'shared/ReactElementType'; import type {ReactPortal} from 'shared/ReactTypes'; -import type {Fiber} from 'ReactFiber'; -import type {ExpirationTime} from 'ReactFiberExpirationTime'; +import type {Fiber} from './ReactFiber'; +import type {ExpirationTime} from './ReactFiberExpirationTime'; import getComponentName from 'shared/getComponentName'; import {Placement, Deletion} from 'shared/ReactSideEffectTags'; diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js index 9061b882bc9..fcd8d480bd0 100644 --- a/packages/react-reconciler/src/ReactFiberBeginWork.js +++ b/packages/react-reconciler/src/ReactFiberBeginWork.js @@ -8,7 +8,7 @@ */ import type {ReactProviderType, ReactContext} from 'shared/ReactTypes'; -import type {Fiber} from 'ReactFiber'; +import type {Fiber} from './ReactFiber'; import type {FiberRoot} from './ReactFiberRoot'; import type {ExpirationTime} from './ReactFiberExpirationTime'; import checkPropTypes from 'prop-types/checkPropTypes'; diff --git a/packages/react-reconciler/src/ReactFiberTreeReflection.js b/packages/react-reconciler/src/ReactFiberTreeReflection.js index 452ce2dfeb9..08c74e5c3f7 100644 --- a/packages/react-reconciler/src/ReactFiberTreeReflection.js +++ b/packages/react-reconciler/src/ReactFiberTreeReflection.js @@ -7,7 +7,7 @@ * @flow */ -import type {Fiber} from 'ReactFiber'; +import type {Fiber} from './ReactFiber'; import invariant from 'shared/invariant'; import warningWithoutStack from 'shared/warningWithoutStack'; From e4b39b276c6127db7504bb2fc62b0f6f84bf98f6 Mon Sep 17 00:00:00 2001 From: mapkeji Date: Mon, 29 Oct 2018 09:33:03 +0300 Subject: [PATCH 08/10] Remove repeated import --- packages/react-reconciler/src/ReactFiberBeginWork.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js index 54c67af9d4a..0abaae5274e 100644 --- a/packages/react-reconciler/src/ReactFiberBeginWork.js +++ b/packages/react-reconciler/src/ReactFiberBeginWork.js @@ -97,7 +97,6 @@ import { import { applyDerivedStateFromProps, adoptClassInstance, - applyDerivedStateFromProps, constructClassInstance, mountClassInstance, resumeMountClassInstance, From bb45dfd3ded94f8d15c7483f5c26413fd13b9801 Mon Sep 17 00:00:00 2001 From: mapkeji Date: Mon, 29 Oct 2018 09:34:23 +0300 Subject: [PATCH 09/10] Fix imports from ReactFiberExpirationTime --- packages/react-reconciler/src/ReactFiberUnwindWork.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-reconciler/src/ReactFiberUnwindWork.js b/packages/react-reconciler/src/ReactFiberUnwindWork.js index 2d5e4ea52d2..2903a81a906 100644 --- a/packages/react-reconciler/src/ReactFiberUnwindWork.js +++ b/packages/react-reconciler/src/ReactFiberUnwindWork.js @@ -61,11 +61,11 @@ 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 da6419a009a20867f6d5a863eb58174903fd8002 Mon Sep 17 00:00:00 2001 From: mapkeji Date: Mon, 29 Oct 2018 09:36:38 +0300 Subject: [PATCH 10/10] Master imports in ReactFiberBeginWork --- packages/react-reconciler/src/ReactFiberBeginWork.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js index 0abaae5274e..f3c0730dc8a 100644 --- a/packages/react-reconciler/src/ReactFiberBeginWork.js +++ b/packages/react-reconciler/src/ReactFiberBeginWork.js @@ -95,8 +95,8 @@ import { tryToClaimNextHydratableInstance, } from './ReactFiberHydrationContext'; import { - applyDerivedStateFromProps, adoptClassInstance, + applyDerivedStateFromProps, constructClassInstance, mountClassInstance, resumeMountClassInstance,