Use ES module exports (#4454)

* Use ESM exports in jest-config * Use ESM exports in eslint-plugin-jest * Use ESM exports in jest-changed-files * Use ESM exports in jest-circus * Use ESM exports in jest-diff * Use ESM exports in jest-editor-support * Use ESM exports in jest-haste-map * Use ESM exports in jest-jasmine2 * Use ESM exports in jest-message-util * Use ESM exports in jest-regex-util * Use ESM exports in jest-repl * Use ESM exports in jest-resolve * Use ESM exports in jest-runner * Use ESM exports in jest-runtime * Use ESM exports in jest-snapshot * Use ESM exports in jest-test-typescript-parser * Use ESM exports in jest-util * Use ESM exports in jest-validate * Fix flow errors * Activate eslint plugin to enforce correct ESM usage * Use ESM exports in jest-cli
jestjs · Sep 11, 2017 · 9c429cd · 9c429cd
1 parent b621cd2
commit 9c429cd
Show file tree

Hide file tree

Showing 213 changed files with 494 additions and 761 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -132,9 +132,6 @@ module.exports = {
     'flowtype/boolean-style': 2,
     'flowtype/no-primitive-constructor-types': 2,
     'flowtype/require-valid-file-annotation': 2,
-    // These has to be disabled until the whole code base is converted to ESM
-    'import/default': 0,
-    'import/named': 0,
     'import/no-duplicates': 2,
     'import/no-extraneous-dependencies': [
       2,
@@ -149,7 +146,6 @@ module.exports = {
         ],
       },
     ],
-    'import/no-unresolved': [2, {ignore: ['^types/']}],
     // This has to be disabled until all type and module imports are combined
     // https://github.com/benmosher/eslint-plugin-import/issues/645
     'import/order': 0,

diff --git a/integration_tests/__tests__/find_related_files.test.js b/integration_tests/__tests__/find_related_files.test.js
@@ -11,10 +11,11 @@
 'use strict';
 
 import runJest from '../runJest';
-import {cleanup, writeFiles} from '../utils';
 import os from 'os';
 import path from 'path';
 
+const {cleanup, writeFiles} = require('../utils');
+
 const skipOnWindows = require('../../scripts/skip_on_windows');
 const DIR = path.resolve(os.tmpdir(), 'find_related_tests_test');
 

diff --git a/integration_tests/__tests__/force_exit.test.js b/integration_tests/__tests__/force_exit.test.js
@@ -11,9 +11,9 @@
 'use strict';
 
 import runJest from '../runJest';
-import {cleanup, writeFiles} from '../utils';
 import os from 'os';
 import path from 'path';
+const {cleanup, writeFiles} = require('../utils');
 
 const skipOnWindows = require('../../scripts/skip_on_windows');
 const DIR = path.resolve(os.tmpdir(), 'force_exit_test');

diff --git a/integration_tests/__tests__/jest_changed_files.test.js b/integration_tests/__tests__/jest_changed_files.test.js
@@ -10,15 +10,15 @@
 
 'use strict';
 
-import {cleanup, run, writeFiles} from '../utils';
 import os from 'os';
 import path from 'path';
 import {
   findRepos,
   getChangedFilesForRoots,
 } from '../../packages/jest-changed-files/src';
-
 const skipOnWindows = require('../../scripts/skip_on_windows');
+const {cleanup, run, writeFiles} = require('../utils');
+
 skipOnWindows.suite();
 
 const DIR = path.resolve(os.tmpdir(), 'jest_changed_files_test_dir');

diff --git a/integration_tests/__tests__/multi_project_runner.test.js b/integration_tests/__tests__/multi_project_runner.test.js
@@ -11,10 +11,10 @@
 'use strict';
 
 import runJest from '../runJest';
-import {cleanup, extractSummary, writeFiles} from '../utils';
 import os from 'os';
 import path from 'path';
 
+const {cleanup, extractSummary, writeFiles} = require('../utils');
 const skipOnWindows = require('../../scripts/skip_on_windows');
 const DIR = path.resolve(os.tmpdir(), 'multi_project_runner_test');
 

diff --git a/integration_tests/__tests__/only_changed.test.js b/integration_tests/__tests__/only_changed.test.js
@@ -11,9 +11,9 @@
 'use strict';
 
 import runJest from '../runJest';
-import {cleanup, run, writeFiles} from '../utils';
 import os from 'os';
 import path from 'path';
+const {cleanup, run, writeFiles} = require('../utils');
 
 const skipOnWindows = require('../../scripts/skip_on_windows');
 const DIR = path.resolve(os.tmpdir(), 'jest_only_changed');

diff --git a/integration_tests/__tests__/run_tests_by_path.test.js b/integration_tests/__tests__/run_tests_by_path.test.js
@@ -11,9 +11,9 @@
 'use strict';
 
 import runJest from '../runJest';
-import {cleanup, writeFiles} from '../utils';
 import os from 'os';
 import path from 'path';
+const {cleanup, writeFiles} = require('../utils');
 
 const skipOnWindows = require('../../scripts/skip_on_windows');
 const DIR = path.resolve(os.tmpdir(), 'run_tests_by_path_test');

diff --git a/integration_tests/__tests__/test_path_pattern_reporter_message.test.js b/integration_tests/__tests__/test_path_pattern_reporter_message.test.js
@@ -10,9 +10,9 @@
 'use strict';
 
 import runJest from '../runJest';
-import {cleanup, writeFiles} from '../utils';
 import os from 'os';
 import path from 'path';
+const {cleanup, writeFiles} = require('../utils');
 
 const skipOnWindows = require('../../scripts/skip_on_windows');
 const DIR = path.resolve(os.tmpdir(), 'jest_path_pattern_reporter_message');

diff --git a/integration_tests/__tests__/use_stderr.test.js b/integration_tests/__tests__/use_stderr.test.js
@@ -11,9 +11,9 @@
 'use strict';
 
 import runJest from '../runJest';
-import {cleanup, writeFiles} from '../utils';
 import os from 'os';
 import path from 'path';
+const {cleanup, writeFiles} = require('../utils');
 
 const skipOnWindows = require('../../scripts/skip_on_windows');
 const DIR = path.resolve(os.tmpdir(), 'use_stderr_test');

diff --git a/packages/eslint-plugin-jest/src/rules/__tests__/no_focused_tests.test.js b/packages/eslint-plugin-jest/src/rules/__tests__/no_focused_tests.test.js
@@ -12,8 +12,8 @@
 
 'use strict';
 
-const RuleTester = require('eslint').RuleTester;
-const rules = require('../../').rules;
+import {RuleTester} from 'eslint';
+const {rules} = require('../../');
 
 const ruleTester = new RuleTester();
 const expectedErrorMessage = 'Unexpected focused test.';

diff --git a/packages/eslint-plugin-jest/src/rules/__tests__/no_identical_title.test.js b/packages/eslint-plugin-jest/src/rules/__tests__/no_identical_title.test.js
@@ -12,8 +12,8 @@
 
 'use strict';
 
-const RuleTester = require('eslint').RuleTester;
-const rules = require('../../').rules;
+import {RuleTester} from 'eslint';
+const {rules} = require('../../');
 
 const ruleTester = new RuleTester();
 

diff --git a/packages/eslint-plugin-jest/src/rules/__tests__/no_skipped_tests.test.js b/packages/eslint-plugin-jest/src/rules/__tests__/no_skipped_tests.test.js
@@ -12,8 +12,8 @@
 
 'use strict';
 
-const RuleTester = require('eslint').RuleTester;
-const rules = require('../../').rules;
+import {RuleTester} from 'eslint';
+const {rules} = require('../../');
 
 const ruleTester = new RuleTester();
 const expectedErrorMessage = 'Unexpected disabled test.';

diff --git a/packages/eslint-plugin-jest/src/rules/__tests__/valid_expect.test.js b/packages/eslint-plugin-jest/src/rules/__tests__/valid_expect.test.js
@@ -12,8 +12,8 @@
 
 'use strict';
 
-const RuleTester = require('eslint').RuleTester;
-const rules = require('../../').rules;
+import {RuleTester} from 'eslint';
+const {rules} = require('../../');
 
 const ruleTester = new RuleTester();
 

diff --git a/packages/eslint-plugin-jest/src/rules/no_disabled_tests.js b/packages/eslint-plugin-jest/src/rules/no_disabled_tests.js
@@ -28,7 +28,7 @@ const isPropertyNamedSkip = property =>
 const isCallToTestSkipFunction = callee =>
   matchesTestFunction(callee.object) && isPropertyNamedSkip(callee.property);
 
-module.exports = (context: EslintContext) => ({
+export default (context: EslintContext) => ({
   CallExpression(node: CallExpression) {
     const callee = node.callee;
     if (!callee) {

diff --git a/packages/eslint-plugin-jest/src/rules/no_focused_tests.js b/packages/eslint-plugin-jest/src/rules/no_focused_tests.js
@@ -28,7 +28,7 @@ const isPropertyNamedOnly = property =>
 const isCallToTestOnlyFunction = callee =>
   matchesTestFunction(callee.object) && isPropertyNamedOnly(callee.property);
 
-module.exports = (context: EslintContext) => ({
+export default (context: EslintContext) => ({
   CallExpression(node: CallExpression) {
     const callee = node.callee;
     if (!callee) {

diff --git a/packages/eslint-plugin-jest/src/rules/no_identical_title.js b/packages/eslint-plugin-jest/src/rules/no_identical_title.js
@@ -82,7 +82,7 @@ const handleTestSuiteTitles = (context, titles, node, title) => {
 const isFirstArgLiteral = node =>
   node.arguments && node.arguments[0] && node.arguments[0].type === 'Literal';
 
-module.exports = (context: EslintContext) => {
+export default (context: EslintContext) => {
   const contexts = [newDescribeContext()];
   return {
     CallExpression(node: CallExpression) {

diff --git a/packages/eslint-plugin-jest/src/rules/valid_expect.js b/packages/eslint-plugin-jest/src/rules/valid_expect.js
@@ -17,7 +17,7 @@ import type {EslintContext, CallExpression} from './types';
 
 const expectProperties = ['not', 'resolves', 'rejects'];
 
-module.exports = (context: EslintContext) => {
+export default (context: EslintContext) => {
   return {
     CallExpression(node: CallExpression) {
       const calleeName = node.callee.name;

diff --git a/packages/jest-changed-files/src/git.js b/packages/jest-changed-files/src/git.js
@@ -70,4 +70,4 @@ const adapter: SCMAdapter = {
   },
 };
 
-module.exports = adapter;
+export default adapter;
diff --git a/packages/jest-changed-files/src/hg.js b/packages/jest-changed-files/src/hg.js
@@ -70,4 +70,4 @@ const adapter: SCMAdapter = {
   },
 };
 
-module.exports = adapter;
+export default adapter;
diff --git a/packages/jest-changed-files/src/index.js b/packages/jest-changed-files/src/index.js
@@ -22,7 +22,7 @@ const mutex = throat(5);
 const findGitRoot = dir => mutex(() => git.getRoot(dir));
 const findHgRoot = dir => mutex(() => hg.getRoot(dir));
 
-const getChangedFilesForRoots = async (
+export const getChangedFilesForRoots = async (
   roots: Array<Path>,
   options: Options,
 ): ChangedFilesPromise => {
@@ -49,7 +49,7 @@ const getChangedFilesForRoots = async (
   return {changedFiles, repos};
 };
 
-const findRepos = async (roots: Array<Path>): Promise<Repos> => {
+export const findRepos = async (roots: Array<Path>): Promise<Repos> => {
   const gitRepos = await Promise.all(
     roots.reduce((promises, root) => promises.concat(findGitRoot(root)), []),
   );
@@ -62,8 +62,3 @@ const findRepos = async (roots: Array<Path>): Promise<Repos> => {
     hg: new Set(hgRepos.filter(Boolean)),
   };
 };
-
-module.exports = {
-  findRepos,
-  getChangedFilesForRoots,
-};
diff --git a/packages/jest-circus/src/event_handler.js b/packages/jest-circus/src/event_handler.js
@@ -81,4 +81,4 @@ const handler: EventHandler = (event, state): void => {
   }
 };
 
-module.exports = handler;
+export default handler;
diff --git a/packages/jest-circus/src/format_node_assert_errors.js b/packages/jest-circus/src/format_node_assert_errors.js
@@ -39,7 +39,7 @@ const humanReadableOperators = {
   notDeepStrictEqual: 'not to deeply and strictly equal',
 };
 
-module.exports = (event: Event, state: State) => {
+export default (event: Event, state: State) => {
   switch (event.name) {
     case 'test_failure':
     case 'test_success': {

diff --git a/packages/jest-circus/src/legacy_code_todo_rewrite/jest_adapter.js b/packages/jest-circus/src/legacy_code_todo_rewrite/jest_adapter.js
@@ -95,4 +95,4 @@ const _addSnapshotData = (results: TestResult, snapshotState) => {
   return results;
 };
 
-module.exports = jestAdapter;
+export default jestAdapter;
diff --git a/packages/jest-circus/src/legacy_code_todo_rewrite/jest_adapter_init.js b/packages/jest-circus/src/legacy_code_todo_rewrite/jest_adapter_init.js
@@ -18,9 +18,10 @@ import {SnapshotState, addSerializer} from 'jest-snapshot';
 import {addEventHandler, ROOT_DESCRIBE_BLOCK_NAME} from '../state';
 import {getTestID} from '../utils';
 import run from '../run';
+// eslint-disable-next-line import/default
 import globals from '../index';
 
-const initialize = ({
+export const initialize = ({
   config,
   globalConfig,
   localRequire,
@@ -58,7 +59,7 @@ const initialize = ({
   return {globals, snapshotState};
 };
 
-const runAndTransformResultsToJestFormat = async ({
+export const runAndTransformResultsToJestFormat = async ({
   config,
   globalConfig,
   testPath,
@@ -184,8 +185,3 @@ const _addSuppressedErrors = (test: TestEntry) => {
     test.errors = test.errors.concat(suppressedErrors);
   }
 };
-
-module.exports = {
-  initialize,
-  runAndTransformResultsToJestFormat,
-};
diff --git a/packages/jest-circus/src/legacy_code_todo_rewrite/jest_expect.js b/packages/jest-circus/src/legacy_code_todo_rewrite/jest_expect.js
@@ -24,7 +24,7 @@ type JasmineMatcher = {
   negativeCompare: () => RawMatcherFn,
 };
 
-module.exports = (config: {expand: boolean}) => {
+export default (config: {expand: boolean}) => {
   global.expect = expect;
   expect.setState({
     expand: config.expand,

diff --git a/packages/jest-circus/src/run.js b/packages/jest-circus/src/run.js
@@ -101,4 +101,4 @@ const _callTest = async (
     .catch(error => dispatch({error, name: 'test_failure', test}));
 };
 
-module.exports = run;
+export default run;
diff --git a/packages/jest-circus/src/state.js b/packages/jest-circus/src/state.js
@@ -19,7 +19,7 @@ const eventHandlers: Array<EventHandler> = [
   formatNodeAssertErrors,
 ];
 
-const ROOT_DESCRIBE_BLOCK_NAME = 'ROOT_DESCRIBE_BLOCK';
+export const ROOT_DESCRIBE_BLOCK_NAME = 'ROOT_DESCRIBE_BLOCK';
 const STATE_SYM = Symbol('JEST_STATE_SYMBOL');
 
 const ROOT_DESCRIBE_BLOCK = makeDescribe(ROOT_DESCRIBE_BLOCK_NAME);
@@ -33,23 +33,15 @@ const INITIAL_STATE: State = {
 
 global[STATE_SYM] = INITIAL_STATE;
 
-const getState = (): State => global[STATE_SYM];
-const setState = (state: State): State => (global[STATE_SYM] = state);
+export const getState = (): State => global[STATE_SYM];
+export const setState = (state: State): State => (global[STATE_SYM] = state);
 
-const dispatch = (event: Event): void => {
+export const dispatch = (event: Event): void => {
   for (const handler of eventHandlers) {
     handler(event, getState());
   }
 };
 
-const addEventHandler = (handler: EventHandler): void => {
+export const addEventHandler = (handler: EventHandler): void => {
   eventHandlers.push(handler);
 };
-
-module.exports = {
-  ROOT_DESCRIBE_BLOCK_NAME,
-  addEventHandler,
-  dispatch,
-  getState,
-  setState,
-};
-Original file line number
+Diff line change
@@ Expand Up / @@ -70,4 +70,4 @@ const adapter: SCMAdapter = { @@
       },
     };
-    module.exports = adapter;
+    export default adapter;