Update jest to v26 along with packages related to it

fixtures/attribute-behavior/.env

@@ -0,0 +1 @@
+SKIP_PREFLIGHT_CHECK=true

fixtures/attribute-behavior/package.json

@@ -7,12 +7,12 @@
     "glamor": "^2.20.40",
     "react": "^15.6.1",
     "react-dom": "^15.6.1",
-    "react-scripts": "1.0.11",
+    "react-error-overlay": "^6.0.7",
+    "react-scripts": "3.4.3",
     "react-virtualized": "^9.9.0"
   },
   "scripts": {
-    "prestart":
-      "cp ../../build/node_modules/react/umd/react.development.js public/ && cp ../../build/node_modules/react-dom/umd/react-dom.development.js public/ && cp ../../build/node_modules/react-dom/umd/react-dom-server.browser.development.js public/",
+    "prestart": "cp ../../build/node_modules/react/umd/react.development.js public/ && cp ../../build/node_modules/react-dom/umd/react-dom.development.js public/ && cp ../../build/node_modules/react-dom/umd/react-dom-server.browser.development.js public/",
     "start": "react-scripts start",
     "build": "react-scripts build",
     "test": "react-scripts test --env=jsdom",

fixtures/attribute-behavior/src/App.js

@@ -9,7 +9,7 @@ import FileSaver from 'file-saver';
 import {
   inject as injectErrorOverlay,
   uninject as uninjectErrorOverlay,
-} from 'react-error-overlay/lib/overlay';
+} from 'react-error-overlay/lib';
 
 import attributes from './attributes';
 

fixtures/dom/.env

@@ -0,0 +1 @@
+SKIP_PREFLIGHT_CHECK=true

fixtures/dom/.gitignore

@@ -21,5 +21,4 @@ public/react-dom-test-utils.production.min.js
 
 # misc
 .DS_Store
-.env
 npm-debug.log

fixtures/dom/package.json

@@ -3,15 +3,15 @@
   "version": "0.1.0",
   "private": true,
   "devDependencies": {
-    "react-scripts": "^1.0.11"
+    "react-scripts": "^3.4.3"
   },
   "dependencies": {
     "@babel/standalone": "^7.0.0",
     "art": "^0.10.3",
     "classnames": "^2.2.5",
     "codemirror": "^5.40.0",
     "core-js": "^2.4.1",
-    "jest-diff": "^25.1.0",
+    "jest-diff": "^26.4.2",
     "prop-types": "^15.6.0",
     "query-string": "^4.2.3",
     "react": "^15.4.1",
@@ -25,4 +25,4 @@
     "test": "react-scripts test --env=jsdom",
     "eject": "react-scripts eject"
   }
-}
+}

fixtures/dom/src/__tests__/nested-act-test.js

@@ -57,9 +57,9 @@ describe('unmocked scheduler', () => {
 describe('mocked scheduler', () => {
   beforeEach(() => {
     jest.resetModules();
-    jest.mock('scheduler', () =>
-      require.requireActual('scheduler/unstable_mock')
-    );
+    jest.mock('scheduler', () => {
+      return jest.requireActual('scheduler/unstable_mock');
+    });
     React = require('react');
     DOMAct = require('react-dom/test-utils').act;
     TestRenderer = require('react-test-renderer');

fixtures/flight/package.json

@@ -33,10 +33,10 @@
     "html-webpack-plugin": "4.0.0-beta.5",
     "identity-obj-proxy": "3.0.0",
     "is-wsl": "^1.1.0",
-    "jest": "24.9.0",
-    "jest-environment-jsdom-fourteen": "0.1.0",
-    "jest-resolve": "24.9.0",
-    "jest-watch-typeahead": "0.4.0",
+    "jest": "26.4.2",
+    "jest-environment-jsdom": "^26.3.0",
+    "jest-resolve": "26.4.2",
+    "jest-watch-typeahead": "0.6.0",
     "mini-css-extract-plugin": "0.8.0",
     "optimize-css-assets-webpack-plugin": "5.0.3",
     "pnp-webpack-plugin": "1.5.0",
@@ -101,7 +101,7 @@
       "<rootDir>/src/**/__tests__/**/*.{js,jsx,ts,tsx}",
       "<rootDir>/src/**/*.{spec,test}.{js,jsx,ts,tsx}"
     ],
-    "testEnvironment": "jest-environment-jsdom-fourteen",
+    "testEnvironment": "jest-environment-jsdom",
     "transform": {
       "^.+\\.(js|jsx|ts|tsx)$": "<rootDir>/node_modules/babel-jest",
       "^.+\\.css$": "<rootDir>/config/jest/cssTransform.js",
@@ -138,4 +138,4 @@
       "react-app"
     ]
   }
-}
+}

package.json

@@ -36,7 +36,6 @@
     "@babel/traverse": "^7.11.0",
     "@mattiasbuelens/web-streams-polyfill": "^0.3.2",
     "art": "0.10.1",
-    "babel-eslint": "^10.0.3",
     "babel-plugin-syntax-trailing-function-commas": "^6.5.0",
     "chalk": "^3.0.0",
     "cli-table": "^0.3.1",
@@ -52,7 +51,7 @@
     "eslint-config-prettier": "^6.9.0",
     "eslint-plugin-babel": "^5.3.0",
     "eslint-plugin-flowtype": "^2.25.0",
-    "eslint-plugin-jest": "^22.15.0",
+    "eslint-plugin-jest": "^24.0.2",
     "eslint-plugin-no-for-of-loops": "^1.0.0",
     "eslint-plugin-no-function-declare-after-return": "^1.0.0",
     "eslint-plugin-react": "^6.7.1",
@@ -65,10 +64,10 @@
     "google-closure-compiler": "^20200517.0.0",
     "gzip-size": "^5.1.1",
     "jasmine-check": "^1.0.0-rc.0",
-    "jest": "^25.2.7",
-    "jest-cli": "^25.2.7",
-    "jest-diff": "^25.2.6",
-    "jest-environment-jsdom-sixteen": "^1.0.3",
+    "jest": "^26.4.2",
+    "jest-cli": "^26.4.2",
+    "jest-diff": "^26.4.2",
+    "jest-environment-jsdom": "^26.3.0",
     "jest-snapshot-serializer-raw": "^1.1.0",
     "minimatch": "^3.0.4",
     "minimist": "^1.2.3",
@@ -133,5 +132,8 @@
     "version-check": "node ./scripts/tasks/version-check.js",
     "merge-fork": "node ./scripts/merge-fork/merge-fork.js",
     "replace-fork": "node ./scripts/merge-fork/replace-fork.js"
+  },
+  "dependencies": {
+    "babel-eslint": "^10.1.0"
   }
 }

packages/jest-mock-scheduler/package.json

@@ -5,8 +5,8 @@
   "description": "Jest matchers and utilities for testing the scheduler package.",
   "main": "index.js",
   "repository": {
-    "type" : "git",
-    "url" : "https://github.com/facebook/react.git",
+    "type": "git",
+    "url": "https://github.com/facebook/react.git",
     "directory": "packages/jest-mock-scheduler"
   },
   "keywords": [
@@ -19,7 +19,7 @@
   },
   "homepage": "https://reactjs.org/",
   "peerDependencies": {
-    "jest": "^23.0.1 || ^24.0.0 || ^25.1.0",
+    "jest": "^23.0.1 || ^24.0.0 || ^25.1.0 || ^26.4.2",
     "scheduler": "^0.15.0"
   },
   "files": [
@@ -29,4 +29,4 @@
     "index.js",
     "cjs/"
   ]
-}
+}

packages/jest-react/package.json

@@ -19,7 +19,7 @@
   },
   "homepage": "https://reactjs.org/",
   "peerDependencies": {
-    "jest": "^23.0.1 || ^24.0.0 || ^25.1.0",
+    "jest": "^23.0.1 || ^24.0.0 || ^25.1.0 || ^26.4.2",
     "react": "^17.0.0-alpha",
     "react-test-renderer": "^17.0.0-alpha"
   },
@@ -33,4 +33,4 @@
     "index.js",
     "cjs/"
   ]
-}
+}

packages/react-reconciler/src/__tests__/ReactSchedulerIntegration-test.js

@@ -431,7 +431,7 @@ describe(
       jest.resetModules();
 
       jest.mock('scheduler', () => {
-        const actual = require.requireActual('scheduler/unstable_mock');
+        const actual = jest.requireActual('scheduler/unstable_mock');
         return {
           ...actual,
           unstable_shouldYield() {
@@ -450,7 +450,7 @@ describe(
 
     afterEach(() => {
       jest.mock('scheduler', () =>
-        require.requireActual('scheduler/unstable_mock'),
+        jest.requireActual('scheduler/unstable_mock'),
       );
     });
 

packages/react-test-renderer/src/__tests__/ReactTestRendererAct-test.js

@@ -93,6 +93,7 @@ describe('ReactTestRenderer.act()', () => {
         const [step, proceed] = useReducer(s => (s === 3 ? 3 : s + 1), 1);
         useEffect(() => {
           Scheduler.unstable_yieldValue('Effect');
+          // eslint-disable-next-line jest/valid-expect-in-promise
           alreadyResolvedPromise.then(() => {
             Scheduler.unstable_yieldValue('Microtask');
             proceed();

packages/react/src/__tests__/ReactProfiler-test.internal.js

@@ -268,9 +268,7 @@ describe('Profiler', () => {
         // Mock the Scheduler module so we can track how many times the current
         // time is read
         jest.mock('scheduler', obj => {
-          const ActualScheduler = require.requireActual(
-            'scheduler/unstable_mock',
-          );
+          const ActualScheduler = jest.requireActual('scheduler/unstable_mock');
           return {
             ...ActualScheduler,
             unstable_now: function mockUnstableNow() {
@@ -309,7 +307,7 @@ describe('Profiler', () => {
 
         // Restore original mock
         jest.mock('scheduler', () =>
-          require.requireActual('scheduler/unstable_mock'),
+          jest.requireActual('scheduler/unstable_mock'),
         );
       });
 

packages/scheduler/src/__tests__/SchedulerBrowser-test.js

@@ -34,11 +34,9 @@ describe('SchedulerBrowser', () => {
     jest.resetModules();
 
     // Un-mock scheduler
-    jest.mock('scheduler', () => require.requireActual('scheduler'));
+    jest.mock('scheduler', () => jest.requireActual('scheduler'));
     jest.mock('scheduler/src/SchedulerHostConfig', () =>
-      require.requireActual(
-        'scheduler/src/forks/SchedulerHostConfig.default.js',
-      ),
+      jest.requireActual('scheduler/src/forks/SchedulerHostConfig.default.js'),
     );
 
     runtime = installMockBrowserRuntime();

packages/scheduler/src/__tests__/SchedulerNoDOM-test.js

@@ -24,11 +24,9 @@ describe('SchedulerNoDOM', () => {
     jest.useFakeTimers();
 
     // Un-mock scheduler
-    jest.mock('scheduler', () => require.requireActual('scheduler'));
+    jest.mock('scheduler', () => jest.requireActual('scheduler'));
     jest.mock('scheduler/src/SchedulerHostConfig', () =>
-      require.requireActual(
-        'scheduler/src/forks/SchedulerHostConfig.default.js',
-      ),
+      jest.requireActual('scheduler/src/forks/SchedulerHostConfig.default.js'),
     );
 
     Scheduler = require('scheduler');

packages/scheduler/src/__tests__/SchedulerPostTask-test.js

@@ -33,7 +33,7 @@ describe('SchedulerPostTask', () => {
 
     // Un-mock scheduler
     jest.mock('scheduler', () =>
-      require.requireActual('scheduler/unstable_post_task'),
+      jest.requireActual('scheduler/unstable_post_task'),
     );
 
     runtime = installMockBrowserRuntime();

packages/scheduler/src/__tests__/SchedulerUMDBundle-test.internal.js

@@ -15,11 +15,9 @@ describe('Scheduling UMD bundle', () => {
 
     jest.resetModules();
 
-    jest.mock('scheduler', () => require.requireActual('scheduler'));
+    jest.mock('scheduler', () => jest.requireActual('scheduler'));
     jest.mock('scheduler/src/SchedulerHostConfig', () =>
-      require.requireActual(
-        'scheduler/src/forks/SchedulerHostConfig.default.js',
-      ),
+      jest.requireActual('scheduler/src/forks/SchedulerHostConfig.default.js'),
     );
   });
 

packages/shared/__tests__/ReactDOMFrameScheduling-test.js

@@ -14,11 +14,9 @@ describe('ReactDOMFrameScheduling', () => {
     jest.resetModules();
 
     // Un-mock scheduler
-    jest.mock('scheduler', () => require.requireActual('scheduler'));
+    jest.mock('scheduler', () => jest.requireActual('scheduler'));
     jest.mock('scheduler/src/SchedulerHostConfig', () =>
-      require.requireActual(
-        'scheduler/src/forks/SchedulerHostConfig.default.js',
-      ),
+      jest.requireActual('scheduler/src/forks/SchedulerHostConfig.default.js'),
     );
   });
 

scripts/jest/config.base.js

@@ -24,6 +24,5 @@ module.exports = {
 
   testSequencer: require.resolve('./jestSequencer'),
 
-  // TODO: Upgrade to Jest 26 which uses jsdom 16 by default.
-  testEnvironment: require.resolve('jest-environment-jsdom-sixteen'),
+  testEnvironment: require.resolve('jest-environment-jsdom'),
 };

scripts/jest/setupHostConfigs.js

@@ -3,7 +3,7 @@
 const inlinedHostConfigs = require('../shared/inlinedHostConfigs');
 
 jest.mock('react-reconciler/src/ReactFiberReconciler', () => {
-  return require.requireActual(
+  return jest.requireActual(
     __VARIANT__
       ? 'react-reconciler/src/ReactFiberReconciler.new'
       : 'react-reconciler/src/ReactFiberReconciler.old'
@@ -16,7 +16,7 @@ const shimHostConfigPath = 'react-reconciler/src/ReactFiberHostConfig';
 jest.mock('react-reconciler', () => {
   return config => {
     jest.mock(shimHostConfigPath, () => config);
-    return require.requireActual('react-reconciler');
+    return jest.requireActual('react-reconciler');
   };
 });
 const shimServerStreamConfigPath = 'react-server/src/ReactServerStreamConfig';
@@ -26,7 +26,7 @@ jest.mock('react-server', () => {
   return config => {
     jest.mock(shimServerStreamConfigPath, () => config);
     jest.mock(shimServerFormatConfigPath, () => config);
-    return require.requireActual('react-server');
+    return jest.requireActual('react-server');
   };
 });
 jest.mock('react-server/flight', () => {
@@ -37,19 +37,19 @@ jest.mock('react-server/flight', () => {
       resolveModuleMetaData: config.resolveModuleMetaData,
     }));
     jest.mock(shimFlightServerConfigPath, () =>
-      require.requireActual(
+      jest.requireActual(
         'react-server/src/forks/ReactFlightServerConfig.custom'
       )
     );
-    return require.requireActual('react-server/flight');
+    return jest.requireActual('react-server/flight');
   };
 });
 const shimFlightClientHostConfigPath =
   'react-client/src/ReactFlightClientHostConfig';
 jest.mock('react-client/flight', () => {
   return config => {
     jest.mock(shimFlightClientHostConfigPath, () => config);
-    return require.requireActual('react-client/flight');
+    return jest.requireActual('react-client/flight');
   };
 });
 
@@ -67,7 +67,7 @@ function mockAllConfigs(rendererInfo) {
     jest.mock(path, () => {
       let idx = path.lastIndexOf('/');
       let forkPath = path.substr(0, idx) + '/forks' + path.substr(idx);
-      return require.requireActual(`${forkPath}.${rendererInfo.shortName}.js`);
+      return jest.requireActual(`${forkPath}.${rendererInfo.shortName}.js`);
     });
   });
 }
@@ -83,18 +83,18 @@ inlinedHostConfigs.forEach(rendererInfo => {
   rendererInfo.entryPoints.forEach(entryPoint => {
     jest.mock(entryPoint, () => {
       mockAllConfigs(rendererInfo);
-      return require.requireActual(entryPoint);
+      return jest.requireActual(entryPoint);
     });
   });
 });
 
 // Make it possible to import this module inside
 // the React package itself.
 jest.mock('shared/ReactSharedInternals', () =>
-  require.requireActual('react/src/ReactSharedInternals')
+  jest.requireActual('react/src/ReactSharedInternals')
 );
 
-jest.mock('scheduler', () => require.requireActual('scheduler/unstable_mock'));
+jest.mock('scheduler', () => jest.requireActual('scheduler/unstable_mock'));
 jest.mock('scheduler/src/SchedulerHostConfig', () =>
-  require.requireActual('scheduler/src/forks/SchedulerHostConfig.mock.js')
+  jest.requireActual('scheduler/src/forks/SchedulerHostConfig.mock.js')
 );

scripts/jest/setupTests.build.js

@@ -1,6 +1,6 @@
 'use strict';
 
-jest.mock('scheduler', () => require.requireActual('scheduler/unstable_mock'));
+jest.mock('scheduler', () => jest.requireActual('scheduler/unstable_mock'));
 jest.mock('scheduler/src/SchedulerHostConfig', () =>
-  require.requireActual('scheduler/src/forks/SchedulerHostConfig.mock.js')
+  jest.requireActual('scheduler/src/forks/SchedulerHostConfig.mock.js')
 );