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.

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

Add fallback shim for AbortController #24285

Merged
merged 9 commits into from
Apr 8, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
// Polyfills for test environment
global.ReadableStream = require('web-streams-polyfill/ponyfill/es6').ReadableStream;
global.TextEncoder = require('util').TextEncoder;
global.AbortController = require('abort-controller');

let React;
let ReactDOMFizzServer;
Expand Down
26 changes: 24 additions & 2 deletions packages/react-reconciler/src/ReactFiberCacheComponent.new.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,30 @@ import {REACT_CONTEXT_TYPE} from 'shared/ReactSymbols';
import {pushProvider, popProvider} from './ReactFiberNewContext.new';
import * as Scheduler from 'scheduler';

// In environments without AbortController (e.g. tests)
// replace it with a lightweight shim that only has the features we use.
const AbortControllerLocal = enableCache
? typeof AbortController !== 'undefined'
? AbortController
: (function AbortControllerShim() {
this.listeners = [];
this.signal = {
aborted: false,
};

this.signal.addEventListener = (type, listener) => {
this.listeners.push(listener);
};

this.abort = () => {
this.signal.aborted = true;
this.listeners.forEach(listener => listener());
};
}: AbortController)
rickhanlonii marked this conversation as resolved.
Show resolved Hide resolved
: (null: any);

export type Cache = {|
controller: AbortController,
controller: AbortControllerLocal,
data: Map<() => mixed, mixed>,
refCount: number,
|};
Expand Down Expand Up @@ -66,7 +88,7 @@ export function createCache(): Cache {
return (null: any);
}
const cache: Cache = {
controller: new AbortController(),
controller: new AbortControllerLocal(),
data: new Map(),
refCount: 0,
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import type {ReactContext} from 'shared/ReactTypes';

import {enableCache} from 'shared/ReactFeatureFlags';
import {REACT_CONTEXT_TYPE} from 'shared/ReactSymbols';
import AbortController from './ReactAbortController';

import {pushProvider, popProvider} from './ReactFiberNewContext.old';
import * as Scheduler from 'scheduler';
Expand Down
4 changes: 0 additions & 4 deletions scripts/jest/setupEnvironment.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
/* eslint-disable */

const AbortController = require('abort-controller');

const NODE_ENV = process.env.NODE_ENV;
if (NODE_ENV !== 'development' && NODE_ENV !== 'production') {
throw new Error('NODE_ENV must either be set to development or production.');
Expand All @@ -23,8 +21,6 @@ global.__EXPERIMENTAL__ =

global.__VARIANT__ = !!process.env.VARIANT;

global.AbortController = AbortController;

if (typeof window !== 'undefined') {
global.requestIdleCallback = function(callback) {
return setTimeout(() => {
Expand Down