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

Jump to bottom

Add fallback shim for AbortController #24285

Merged
merged 9 commits into from Apr 8, 2022
Merged

Add fallback shim for AbortController #24285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6745d48
Add fallback shim for AbortController
rickhanlonii Apr 6, 2022
fc32cff
Replace shim with a minimal stub
rickhanlonii Apr 7, 2022
514ab3e
replace-fork
rickhanlonii Apr 7, 2022
6cb52c8
Better minification
rickhanlonii Apr 7, 2022
8d50df6
Fix flow
rickhanlonii Apr 7, 2022
5b6f406
Even smaller
rickhanlonii Apr 8, 2022
d038e29
replace-fork
rickhanlonii Apr 8, 2022
492474b
Revert back to object constructor
rickhanlonii Apr 8, 2022
afe0c82
replace-fork
rickhanlonii Apr 8, 2022
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
1 change: 0 additions & 1 deletion packages/react-dom/src/__tests__/ReactDOMFizzServerBrowser-test.js
View file
Open in desktop
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
25 changes: 23 additions & 2 deletions packages/react-reconciler/src/ReactFiberCacheComponent.new.js
View file
Open in desktop
Expand Up @@ -15,8 +15,29 @@ 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() {
const listeners = [];
const signal = (this.signal = {
aborted: false,
addEventListener: (type, listener) => {
listeners.push(listener);
},
});

this.abort = () => {
signal.aborted = true;
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 +87,7 @@ export function createCache(): Cache {
return (null: any);
}
const cache: Cache = {
controller: new AbortController(),
controller: new AbortControllerLocal(),
data: new Map(),
refCount: 0,
};
Expand Down
25 changes: 23 additions & 2 deletions packages/react-reconciler/src/ReactFiberCacheComponent.old.js
View file
Open in desktop
Expand Up @@ -15,8 +15,29 @@ import {REACT_CONTEXT_TYPE} from 'shared/ReactSymbols';
import {pushProvider, popProvider} from './ReactFiberNewContext.old';
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() {
const listeners = [];
const signal = (this.signal = {
aborted: false,
addEventListener: (type, listener) => {
listeners.push(listener);
},
});

this.abort = () => {
signal.aborted = true;
listeners.forEach(listener => listener());
};
}: AbortController)
: (null: any);

export type Cache = {|
controller: AbortController,
controller: AbortControllerLocal,
data: Map<() => mixed, mixed>,
refCount: number,
|};
Expand Down Expand Up @@ -66,7 +87,7 @@ export function createCache(): Cache {
return (null: any);
}
const cache: Cache = {
controller: new AbortController(),
controller: new AbortControllerLocal(),
data: new Map(),
refCount: 0,
};
Expand Down
4 changes: 0 additions & 4 deletions scripts/jest/setupEnvironment.js
View file
Open in desktop
@@ -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