Refactor SchedulerHostConfigs (#20025)

* Remove SchedulerHostConfigs * Fix builds * Fix forks * Move SchedulerNoDom check to npm/index.js * Fix tests * Add @GATE source * Gate build-only test to build test runs
facebook · Nov 2, 2020 · 454c221 · 454c221
1 parent 56e9fee
commit 454c221
Show file tree

Hide file tree

Showing 28 changed files with 1,365 additions and 548 deletions.
diff --git a/packages/react-dom/src/__tests__/ReactTestUtilsActUnmockedScheduler-test.js b/packages/react-dom/src/__tests__/ReactTestUtilsActUnmockedScheduler-test.js
@@ -33,7 +33,9 @@ function unmount(dom) {
 
 beforeEach(() => {
   jest.resetModules();
-  jest.unmock('scheduler');
+  jest.mock('scheduler', () =>
+    require.requireActual('scheduler/unstable_no_dom'),
+  );
   yields = [];
   React = require('react');
   ReactDOM = require('react-dom');

diff --git a/packages/react-dom/src/__tests__/ReactUnmockedSchedulerWarning-test.internal.js b/packages/react-dom/src/__tests__/ReactUnmockedSchedulerWarning-test.internal.js
@@ -17,7 +17,7 @@ function App() {
 
 beforeEach(() => {
   jest.resetModules();
-  jest.unmock('scheduler');
+  jest.mock('scheduler', () => require('scheduler/unstable_no_dom'));
   React = require('react');
   ReactDOM = require('react-dom');
   ReactFeatureFlags = require('shared/ReactFeatureFlags');

diff --git a/packages/react-dom/src/__tests__/ReactUnmockedSchedulerWarning-test.js b/packages/react-dom/src/__tests__/ReactUnmockedSchedulerWarning-test.js
@@ -16,7 +16,9 @@ function App() {
 
 beforeEach(() => {
   jest.resetModules();
-  jest.unmock('scheduler');
+  jest.mock('scheduler', () =>
+    require.requireActual('scheduler/unstable_no_dom'),
+  );
   React = require('react');
   ReactDOM = require('react-dom');
 });

diff --git a/packages/scheduler/index.js b/packages/scheduler/index.js
@@ -7,4 +7,4 @@
 
 'use strict';
 
-export * from './src/Scheduler';
+export * from './src/forks/SchedulerDOM';
diff --git a/packages/scheduler/npm/index.js b/packages/scheduler/npm/index.js
@@ -1,6 +1,8 @@
 'use strict';
 
-if (process.env.NODE_ENV === 'production') {
+if (typeof window === 'undefined' || typeof MessageChannel !== 'function') {
+  module.exports = require('./unstable_no_dom');
+} else if (process.env.NODE_ENV === 'production') {
   module.exports = require('./cjs/scheduler.production.min.js');
 } else {
   module.exports = require('./cjs/scheduler.development.js');

diff --git a/packages/scheduler/npm/unstable_no_dom.js b/packages/scheduler/npm/unstable_no_dom.js
@@ -0,0 +1,7 @@
+'use strict';
+
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./cjs/scheduler-unstable_no_dom.production.min.js');
+} else {
+  module.exports = require('./cjs/scheduler-unstable_no_dom.development.js');
+}
diff --git a/packages/scheduler/package.json b/packages/scheduler/package.json
@@ -28,6 +28,7 @@
     "tracing.js",
     "tracing-profiling.js",
     "unstable_mock.js",
+    "unstable_no_dom.js",
     "unstable_post_task.js",
     "cjs/",
     "umd/"

diff --git a/...er/src/__tests__/SchedulerBrowser-test.js → ...eduler/src/__tests__/SchedulerDOM-test.js b/...er/src/__tests__/SchedulerBrowser-test.js → ...eduler/src/__tests__/SchedulerDOM-test.js
@@ -35,11 +35,6 @@ describe('SchedulerBrowser', () => {
 
     // Un-mock scheduler
     jest.mock('scheduler', () => require.requireActual('scheduler'));
-    jest.mock('scheduler/src/SchedulerHostConfig', () =>
-      require.requireActual(
-        'scheduler/src/forks/SchedulerHostConfig.default.js',
-      ),
-    );
 
     runtime = installMockBrowserRuntime();
     performance = global.performance;

diff --git a/...scheduler/src/__tests__/Scheduler-test.js → ...duler/src/__tests__/SchedulerMock-test.js b/...scheduler/src/__tests__/Scheduler-test.js → ...duler/src/__tests__/SchedulerMock-test.js
diff --git a/packages/scheduler/src/__tests__/SchedulerNoDOM-test.js b/packages/scheduler/src/__tests__/SchedulerNoDOM-test.js
@@ -24,11 +24,8 @@ describe('SchedulerNoDOM', () => {
     jest.useFakeTimers();
 
     // Un-mock scheduler
-    jest.mock('scheduler', () => require.requireActual('scheduler'));
-    jest.mock('scheduler/src/SchedulerHostConfig', () =>
-      require.requireActual(
-        'scheduler/src/forks/SchedulerHostConfig.default.js',
-      ),
+    jest.mock('scheduler', () =>
+      require.requireActual('scheduler/unstable_no_dom'),
     );
 
     Scheduler = require('scheduler');

diff --git a/packages/scheduler/src/__tests__/SchedulerUMDBundle-test.internal.js b/packages/scheduler/src/__tests__/SchedulerUMDBundle-test.internal.js
@@ -8,6 +8,13 @@
  */
 'use strict';
 
+class MockMessageChannel {
+  constructor() {
+    this.port1 = jest.fn();
+    this.port2 = jest.fn();
+  }
+}
+
 describe('Scheduling UMD bundle', () => {
   beforeEach(() => {
     // Fool SECRET_INTERNALS object into including UMD forwarding methods.
@@ -16,11 +23,18 @@ describe('Scheduling UMD bundle', () => {
     jest.resetModules();
 
     jest.mock('scheduler', () => require.requireActual('scheduler'));
-    jest.mock('scheduler/src/SchedulerHostConfig', () =>
-      require.requireActual(
-        'scheduler/src/forks/SchedulerHostConfig.default.js',
-      ),
-    );
+
+    // Mock a browser environment since we're testing UMD modules.
+    global.window = {
+      requestAnimationFrame: jest.fn(),
+      cancelAnimationFrame: jest.fn(),
+    };
+    global.MessageChannel = MockMessageChannel;
+  });
+
+  afterEach(() => {
+    global.window = undefined;
+    global.MessageChannel = undefined;
   });
 
   function filterPrivateKeys(name) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,4 @@

		'use strict';

		export * from './src/Scheduler';
		export * from './src/forks/SchedulerDOM';