Skip to content
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

Fix crash during server render in react 16.4.1. #13088

Merged
merged 5 commits into from
Jun 22, 2018
Merged

Fix crash during server render in react 16.4.1. #13088

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a2cd55a
Fix crash during server render.
Jun 21, 2018
d29667a
Fix flow errors and log warning if setTimeout / clearTimeout are
Jun 21, 2018
98afa72
Use invariant to assert setTimeout / clearTimeout are functions
Jun 21, 2018
ffd89fd
Remove use of invariant
Jun 22, 2018
96881ff
Explain
gaearon Jun 22, 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
17 changes: 15 additions & 2 deletions packages/react-scheduler/src/ReactScheduler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ export type CallbackIdType = CallbackConfigType;

import {canUseDOM} from 'shared/ExecutionEnvironment';
import warning from 'shared/warning';
import invariant from 'shared/invariant';

if (__DEV__) {
if (canUseDOM && typeof requestAnimationFrame !== 'function') {
Expand All @@ -60,8 +61,10 @@ if (__DEV__) {
// this module is initially evaluated.
// We want to be using a consistent implementation.
const localDate = Date;
const localSetTimeout = setTimeout;
const localClearTimeout = clearTimeout;
const localSetTimeout =
typeof setTimeout === 'function' ? setTimeout : undefined;
const localClearTimeout =
typeof clearTimeout === 'function' ? clearTimeout : undefined;

const hasNativePerformanceNow =
typeof performance === 'object' && typeof performance.now === 'function';
Expand Down Expand Up @@ -91,6 +94,11 @@ if (!canUseDOM) {
callback: FrameCallbackType,
options?: {timeout: number},
): CallbackIdType {
invariant(
typeof localSetTimeout === 'function',
'localSetTimeout is not a function. Please load a polyfill that defines this function.',
Copy link
Collaborator

Choose a reason for hiding this comment

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

localSetTimeout is a variable name so it doesn't mean anything to somebody reading this. That said, I don't think we want an invariant at all.

);

// keeping return type consistent
const callbackConfig = {
scheduledCallback: callback,
Expand All @@ -110,6 +118,11 @@ if (!canUseDOM) {
return callbackConfig;
};
cancelScheduledWork = function(callbackId: CallbackIdType) {
invariant(
typeof localClearTimeout === 'function',
'localClearTimeout is not a function. Please load a polyfill that defines this function.',
);

const callback = callbackId.scheduledCallback;
const timeoutId = timeoutIds.get(callback);
timeoutIds.delete(callbackId);
Expand Down