Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .flowconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[ignore]
.*/examples/.*
.*/node_modules/metro-bundler/.*

[options]
module.name_mapper='^pretty-format$' -> '<PROJECT_ROOT>/packages/pretty-format/src/index.js'
Expand All @@ -9,4 +10,4 @@ include_warnings=true
emoji=true

[version]
^0.61.0
^0.64.0
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"eslint-plugin-react": "^7.1.0",
"eslint-plugin-relay": "~0.0.19",
"eslint-plugin-unicorn": "^3.0.0",
"flow-bin": "^0.61.0",
"flow-bin": "^0.64.0",
"glob": "^7.1.1",
"graceful-fs": "^4.1.11",
"immutable": "^4.0.0-rc.7",
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-cli/src/reporters/Status.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export default class Status {
_emitScheduled: boolean;
_estimatedTime: number;
_height: number;
_interval: number;
_interval: IntervalID;
_aggregatedResults: AggregatedResult;
_lastUpdated: number;
_showStatus: boolean;
Expand Down
12 changes: 6 additions & 6 deletions packages/jest-haste-map/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import type {
MockData,
} from 'types/HasteMap';

import typeof {worker} from './worker';
import {worker} from './worker';

// eslint-disable-next-line import/no-duplicates
import typeof HType from './constants';
Expand Down Expand Up @@ -87,7 +87,7 @@ type Watcher = {
close(callback: () => void): void,
};

type WorkerInterface = {worker: worker};
type WorkerInterface = {worker: typeof worker};

export type ModuleMap = HasteModuleMap;
export type FS = HasteFS;
Expand Down Expand Up @@ -199,7 +199,7 @@ const getWhiteList = (list: ?Array<string>): ?RegExp => {
class HasteMap extends EventEmitter {
_buildPromise: ?Promise<HasteMapObject>;
_cachePath: Path;
_changeInterval: number;
_changeInterval: IntervalID;
_console: Console;
_options: InternalOptions;
_watchers: Array<Watcher>;
Expand Down Expand Up @@ -519,14 +519,14 @@ class HasteMap extends EventEmitter {
_getWorker(options: ?{forceInBand: boolean}): WorkerInterface {
if (!this._worker) {
if ((options && options.forceInBand) || this._options.maxWorkers <= 1) {
this._worker = require('./worker');
this._worker = {worker};
} else {
// $FlowFixMe: assignment of a worker with custom properties.
this._worker = new Worker(require.resolve('./worker'), {
this._worker = (new Worker(require.resolve('./worker'), {
exposedMethods: ['worker'],
maxRetries: 3,
numWorkers: this._options.maxWorkers,
});
}): {worker: typeof worker});
}
}

Expand Down
19 changes: 14 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3325,9 +3325,9 @@ flat-cache@^1.2.1:
graceful-fs "^4.1.2"
write "^0.2.1"

flow-bin@^0.61.0:
version "0.61.0"
resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.61.0.tgz#d0473a8c35dbbf4de573823f4932124397d32d35"
flow-bin@^0.64.0:
version "0.64.0"
resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.64.0.tgz#ddd3fb3b183ab1ab35a5d5dec9caf5ebbcded167"

flow-remove-types@^1.1.0:
version "1.2.3"
Expand Down Expand Up @@ -5598,6 +5598,15 @@ node-notifier@^5.1.2:
shellwords "^0.1.0"
which "^1.2.12"

node-notifier@^5.2.1:
version "5.2.1"
resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.2.1.tgz#fa313dd08f5517db0e2502e5758d664ac69f9dea"
dependencies:
growly "^1.3.0"
semver "^5.4.1"
shellwords "^0.1.1"
which "^1.3.0"

node-pre-gyp@^0.6.39:
version "0.6.39"
resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649"
Expand Down Expand Up @@ -7222,7 +7231,7 @@ shelljs@^0.7.8:
interpret "^1.0.0"
rechoir "^0.6.2"

shellwords@^0.1.0:
shellwords@^0.1.0, shellwords@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"

Expand Down Expand Up @@ -8196,7 +8205,7 @@ which-module@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"

which@^1.2.1, which@^1.2.12, which@^1.2.14, which@^1.2.9:
which@^1.2.1, which@^1.2.12, which@^1.2.14, which@^1.2.9, which@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
dependencies:
Expand Down