From eecdd8ff3c03596b9d51cbc2862e8813ef3ba147 Mon Sep 17 00:00:00 2001 From: Koen Vendrik Date: Wed, 24 Jul 2019 18:20:51 -0400 Subject: [PATCH 01/10] adds state and run exports to index --- packages/jest-circus/src/index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/jest-circus/src/index.ts b/packages/jest-circus/src/index.ts index f7dc64781f81..69dd7c36a084 100644 --- a/packages/jest-circus/src/index.ts +++ b/packages/jest-circus/src/index.ts @@ -213,3 +213,5 @@ export default { it, test, }; +export * from './state'; +export {default as run} from './run'; From 16d2c66a987f647eb65f39d570c85c63f5f412c5 Mon Sep 17 00:00:00 2001 From: Koen Vendrik Date: Wed, 24 Jul 2019 18:20:51 -0400 Subject: [PATCH 02/10] adds state and run exports to index --- packages/jest-circus/src/index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/jest-circus/src/index.ts b/packages/jest-circus/src/index.ts index f7dc64781f81..69dd7c36a084 100644 --- a/packages/jest-circus/src/index.ts +++ b/packages/jest-circus/src/index.ts @@ -213,3 +213,5 @@ export default { it, test, }; +export * from './state'; +export {default as run} from './run'; From d6fa868bb98a0036fdc23aa4479c94a5ca535b15 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Thu, 22 Aug 2019 11:36:34 +0200 Subject: [PATCH 03/10] chnagelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a69936a8fb79..ae06d2224686 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ### Features +- `[jest-circus]` [**BREAKING**] Export `state` and `run` ([#8748](https://github.com/facebook/jest/pull/8748)) - `[jest-config]` [**BREAKING**] Set default display name color based on runner ([#8689](https://github.com/facebook/jest/pull/8689)) ### Fixes From 32ae00ce48d378d8b088f364b37f105106c00463 Mon Sep 17 00:00:00 2001 From: Koen Vendrik Date: Wed, 4 Sep 2019 19:41:18 -0400 Subject: [PATCH 04/10] fixes exports --- packages/jest-circus/runner.js | 11 ----------- packages/jest-circus/src/index.ts | 2 -- packages/jest-circus/src/runner.ts | 3 +++ 3 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 packages/jest-circus/runner.js create mode 100644 packages/jest-circus/src/runner.ts diff --git a/packages/jest-circus/runner.js b/packages/jest-circus/runner.js deleted file mode 100644 index 9dd2221862f9..000000000000 --- a/packages/jest-circus/runner.js +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. - * - * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. - */ - -// Allow people to use `jest-circus/runner` as a runner. -const runner = require('./build/legacy-code-todo-rewrite/jestAdapter'); -module.exports = runner; diff --git a/packages/jest-circus/src/index.ts b/packages/jest-circus/src/index.ts index 69dd7c36a084..f7dc64781f81 100644 --- a/packages/jest-circus/src/index.ts +++ b/packages/jest-circus/src/index.ts @@ -213,5 +213,3 @@ export default { it, test, }; -export * from './state'; -export {default as run} from './run'; diff --git a/packages/jest-circus/src/runner.ts b/packages/jest-circus/src/runner.ts new file mode 100644 index 000000000000..323cea394410 --- /dev/null +++ b/packages/jest-circus/src/runner.ts @@ -0,0 +1,3 @@ +export {default} from './legacy-code-todo-rewrite/jestAdapter'; +export * from './state'; +export {default as run} from './run'; From 8de07e7ee174f1aa26f84c824c986281a7de83b5 Mon Sep 17 00:00:00 2001 From: Koen Vendrik Date: Wed, 4 Sep 2019 19:42:55 -0400 Subject: [PATCH 05/10] rm exports from index --- packages/jest-circus/src/index.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/jest-circus/src/index.ts b/packages/jest-circus/src/index.ts index 69dd7c36a084..f7dc64781f81 100644 --- a/packages/jest-circus/src/index.ts +++ b/packages/jest-circus/src/index.ts @@ -213,5 +213,3 @@ export default { it, test, }; -export * from './state'; -export {default as run} from './run'; From 9cb91e159f88ea13a042d9bba1029fea635ea997 Mon Sep 17 00:00:00 2001 From: Koen Vendrik Date: Wed, 4 Sep 2019 20:00:13 -0400 Subject: [PATCH 06/10] fixes runner location --- packages/jest-circus/package.json | 3 +++ packages/jest-circus/runner.js | 41 ++++++++++++++++++++++++++++++ packages/jest-circus/src/runner.ts | 14 +++++++++- packages/jest-circus/tsconfig.json | 3 ++- 4 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 packages/jest-circus/runner.js diff --git a/packages/jest-circus/package.json b/packages/jest-circus/package.json index d8484864aff8..5afaca19ed58 100644 --- a/packages/jest-circus/package.json +++ b/packages/jest-circus/package.json @@ -9,6 +9,9 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", + "scripts": { + "build": "tsc && mv ./build/runner.js ./runner.js", + }, "dependencies": { "@babel/traverse": "^7.1.0", "@jest/environment": "^24.9.0", diff --git a/packages/jest-circus/runner.js b/packages/jest-circus/runner.js new file mode 100644 index 000000000000..65c32ebe11ad --- /dev/null +++ b/packages/jest-circus/runner.js @@ -0,0 +1,41 @@ +'use strict'; + +Object.defineProperty(exports, '__esModule', { + value: true +}); +var _exportNames = { + run: true +}; +Object.defineProperty(exports, 'run', { + enumerable: true, + get: function() { + return _run.default; + } +}); +exports.default = void 0; + +var _jestAdapter = _interopRequireDefault( + require('./legacy-code-todo-rewrite/jestAdapter') +); + +var _state = require('./state'); + +Object.keys(_state).forEach(function(key) { + if (key === 'default' || key === '__esModule') return; + if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return; + Object.defineProperty(exports, key, { + enumerable: true, + get: function() { + return _state[key]; + } + }); +}); + +var _run = _interopRequireDefault(require('./run')); + +function _interopRequireDefault(obj) { + return obj && obj.__esModule ? obj : {default: obj}; +} + +var _default = _jestAdapter.default; +exports.default = _default; diff --git a/packages/jest-circus/src/runner.ts b/packages/jest-circus/src/runner.ts index 323cea394410..ebd7e1b4b7a2 100644 --- a/packages/jest-circus/src/runner.ts +++ b/packages/jest-circus/src/runner.ts @@ -1,3 +1,15 @@ -export {default} from './legacy-code-todo-rewrite/jestAdapter'; +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +// Gets moved to jest-circus/runner during build (yarn build) +// to allow people to import using `jest-circus/runner`. + +import runner from './legacy-code-todo-rewrite/jestAdapter'; + +export default runner; export * from './state'; export {default as run} from './run'; diff --git a/packages/jest-circus/tsconfig.json b/packages/jest-circus/tsconfig.json index 10a995ffa2ba..adbbabc870ea 100644 --- a/packages/jest-circus/tsconfig.json +++ b/packages/jest-circus/tsconfig.json @@ -2,7 +2,8 @@ "extends": "../../tsconfig", "compilerOptions": { "outDir": "build", - "rootDir": "src" + "rootDir": "src", + "esModuleInterop": true }, "references": [ {"path": "../jest-each"}, From df641542681090ec71dfd6d955a0d116238bab28 Mon Sep 17 00:00:00 2001 From: Koen Vendrik Date: Wed, 4 Sep 2019 20:02:44 -0400 Subject: [PATCH 07/10] rm runner.js build --- packages/jest-circus/.gitignore | 1 + packages/jest-circus/runner.js | 41 --------------------------------- 2 files changed, 1 insertion(+), 41 deletions(-) create mode 100644 packages/jest-circus/.gitignore delete mode 100644 packages/jest-circus/runner.js diff --git a/packages/jest-circus/.gitignore b/packages/jest-circus/.gitignore new file mode 100644 index 000000000000..1a6d8fe33819 --- /dev/null +++ b/packages/jest-circus/.gitignore @@ -0,0 +1 @@ +runner.js diff --git a/packages/jest-circus/runner.js b/packages/jest-circus/runner.js deleted file mode 100644 index 65c32ebe11ad..000000000000 --- a/packages/jest-circus/runner.js +++ /dev/null @@ -1,41 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { - value: true -}); -var _exportNames = { - run: true -}; -Object.defineProperty(exports, 'run', { - enumerable: true, - get: function() { - return _run.default; - } -}); -exports.default = void 0; - -var _jestAdapter = _interopRequireDefault( - require('./legacy-code-todo-rewrite/jestAdapter') -); - -var _state = require('./state'); - -Object.keys(_state).forEach(function(key) { - if (key === 'default' || key === '__esModule') return; - if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return; - Object.defineProperty(exports, key, { - enumerable: true, - get: function() { - return _state[key]; - } - }); -}); - -var _run = _interopRequireDefault(require('./run')); - -function _interopRequireDefault(obj) { - return obj && obj.__esModule ? obj : {default: obj}; -} - -var _default = _jestAdapter.default; -exports.default = _default; From 9a2e7fe33bc28c03a93539f99a0a40905a478989 Mon Sep 17 00:00:00 2001 From: Koen Vendrik Date: Wed, 4 Sep 2019 20:05:38 -0400 Subject: [PATCH 08/10] fixes package error --- packages/jest-circus/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/jest-circus/package.json b/packages/jest-circus/package.json index 5afaca19ed58..be67180adf31 100644 --- a/packages/jest-circus/package.json +++ b/packages/jest-circus/package.json @@ -10,7 +10,7 @@ "main": "build/index.js", "types": "build/index.d.ts", "scripts": { - "build": "tsc && mv ./build/runner.js ./runner.js", + "build": "tsc && mv ./build/runner.js ./runner.js" }, "dependencies": { "@babel/traverse": "^7.1.0", From 3301bdffe3c3002a99c979b840c340782a875835 Mon Sep 17 00:00:00 2001 From: Koen Vendrik Date: Wed, 4 Sep 2019 20:26:48 -0400 Subject: [PATCH 09/10] reverts to simpler approach --- packages/jest-circus/.gitignore | 1 - packages/jest-circus/package.json | 3 --- packages/jest-circus/runner.d.ts | 3 +++ packages/jest-circus/runner.js | 15 +++++++++++++++ packages/jest-circus/src/runner.ts | 15 --------------- packages/jest-circus/tsconfig.json | 3 +-- 6 files changed, 19 insertions(+), 21 deletions(-) delete mode 100644 packages/jest-circus/.gitignore create mode 100644 packages/jest-circus/runner.d.ts create mode 100644 packages/jest-circus/runner.js delete mode 100644 packages/jest-circus/src/runner.ts diff --git a/packages/jest-circus/.gitignore b/packages/jest-circus/.gitignore deleted file mode 100644 index 1a6d8fe33819..000000000000 --- a/packages/jest-circus/.gitignore +++ /dev/null @@ -1 +0,0 @@ -runner.js diff --git a/packages/jest-circus/package.json b/packages/jest-circus/package.json index be67180adf31..d8484864aff8 100644 --- a/packages/jest-circus/package.json +++ b/packages/jest-circus/package.json @@ -9,9 +9,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "scripts": { - "build": "tsc && mv ./build/runner.js ./runner.js" - }, "dependencies": { "@babel/traverse": "^7.1.0", "@jest/environment": "^24.9.0", diff --git a/packages/jest-circus/runner.d.ts b/packages/jest-circus/runner.d.ts new file mode 100644 index 000000000000..d767a1e6132b --- /dev/null +++ b/packages/jest-circus/runner.d.ts @@ -0,0 +1,3 @@ +export {default} from './build/legacy-code-todo-rewrite/jestAdapter'; +export * from './build/state'; +export {default as run} from './build/run'; diff --git a/packages/jest-circus/runner.js b/packages/jest-circus/runner.js new file mode 100644 index 000000000000..5834059ccea4 --- /dev/null +++ b/packages/jest-circus/runner.js @@ -0,0 +1,15 @@ +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +// Allow people to use `jest-circus/runner` as a runner. +const runner = require('./build/legacy-code-todo-rewrite/jestAdapter'); +module.exports = runner; + +exports = require('./build/state'); + +const run = require('./build/run'); +exports.run = run; diff --git a/packages/jest-circus/src/runner.ts b/packages/jest-circus/src/runner.ts deleted file mode 100644 index ebd7e1b4b7a2..000000000000 --- a/packages/jest-circus/src/runner.ts +++ /dev/null @@ -1,15 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -// Gets moved to jest-circus/runner during build (yarn build) -// to allow people to import using `jest-circus/runner`. - -import runner from './legacy-code-todo-rewrite/jestAdapter'; - -export default runner; -export * from './state'; -export {default as run} from './run'; diff --git a/packages/jest-circus/tsconfig.json b/packages/jest-circus/tsconfig.json index adbbabc870ea..10a995ffa2ba 100644 --- a/packages/jest-circus/tsconfig.json +++ b/packages/jest-circus/tsconfig.json @@ -2,8 +2,7 @@ "extends": "../../tsconfig", "compilerOptions": { "outDir": "build", - "rootDir": "src", - "esModuleInterop": true + "rootDir": "src" }, "references": [ {"path": "../jest-each"}, From 771f67dd039792a47268acdb0e9a3c0eecb3e8c3 Mon Sep 17 00:00:00 2001 From: Koen Vendrik Date: Mon, 9 Sep 2019 10:48:54 -0400 Subject: [PATCH 10/10] updates type definition and logic --- packages/jest-circus/runner.d.ts | 13 ++++++++++--- packages/jest-circus/runner.js | 10 +++------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/packages/jest-circus/runner.d.ts b/packages/jest-circus/runner.d.ts index d767a1e6132b..164bc8878c95 100644 --- a/packages/jest-circus/runner.d.ts +++ b/packages/jest-circus/runner.d.ts @@ -1,3 +1,10 @@ -export {default} from './build/legacy-code-todo-rewrite/jestAdapter'; -export * from './build/state'; -export {default as run} from './build/run'; +import adapter = require('./build/legacy-code-todo-rewrite/jestAdapter'); +import * as circusState from './build/state'; +import circusRun from './build/run'; + +declare namespace jestCircusRunner { + export const state = circusState; + export const run = circusRun; +} + +export = jestCircusRunner; diff --git a/packages/jest-circus/runner.js b/packages/jest-circus/runner.js index 5834059ccea4..849209acc713 100644 --- a/packages/jest-circus/runner.js +++ b/packages/jest-circus/runner.js @@ -6,10 +6,6 @@ */ // Allow people to use `jest-circus/runner` as a runner. -const runner = require('./build/legacy-code-todo-rewrite/jestAdapter'); -module.exports = runner; - -exports = require('./build/state'); - -const run = require('./build/run'); -exports.run = run; +module.exports = require('./build/legacy-code-todo-rewrite/jestAdapter'); +module.exports.state = require('./build/state'); +module.exports.run = require('./build/run');