Skip to content

Commit

Permalink
fix(jest-haste-map): Fix slowdown on node versions > 10
Browse files Browse the repository at this point in the history
This fixes facebook/metro#429 for example.
  • Loading branch information
vovkasm committed Aug 9, 2019
1 parent 1404933 commit 1d00f13
Showing 1 changed file with 18 additions and 25 deletions.
43 changes: 18 additions & 25 deletions packages/jest-haste-map/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -341,23 +341,18 @@ class HasteMap extends EventEmitter {

build(): Promise<InternalHasteMapObject> {
if (!this._buildPromise) {
this._buildPromise = (async () => {
const data = await this._buildFileMap();

this._buildPromise = this._buildFileMap().then((data) => {
// Persist when we don't know if files changed (changedFiles undefined)
// or when we know a file was changed or deleted.
let hasteMap: InternalHasteMap;
if (
data.changedFiles === undefined ||
data.changedFiles.size > 0 ||
data.removedFiles.size > 0
) {
hasteMap = await this._buildHasteMap(data);
this._persist(hasteMap);
if (data.changedFiles === undefined || data.changedFiles.size > 0 || data.removedFiles.size > 0) {
return this._buildHasteMap(data).then((hasteMap) => {
this._persist(hasteMap);
return hasteMap
});
} else {
hasteMap = data.hasteMap;
return data.hasteMap;
}

}).then((hasteMap) => {
const rootDir = this._options.rootDir;
const hasteFS = new HasteFS({
files: hasteMap.files,
Expand All @@ -369,15 +364,14 @@ class HasteMap extends EventEmitter {
mocks: hasteMap.mocks,
rootDir,
});
const __hasteMapForTest =
(process.env.NODE_ENV === 'test' && hasteMap) || null;
await this._watch(hasteMap);
const __hasteMapForTest = (process.env.NODE_ENV === 'test' && hasteMap) || null;
this._watch(hasteMap);
return {
__hasteMapForTest,
hasteFS,
moduleMap,
};
})();
};
})
}
return this._buildPromise;
}
Expand Down Expand Up @@ -410,15 +404,15 @@ class HasteMap extends EventEmitter {
/**
* 2. crawl the file system.
*/
private async _buildFileMap(): Promise<{
private _buildFileMap(): Promise<{
removedFiles: FileData;
changedFiles?: FileData;
hasteMap: InternalHasteMap;
}> {
let hasteMap: InternalHasteMap;
try {
const read = this._options.resetCache ? this._createEmptyMap : this.read;
hasteMap = await read.call(this);
hasteMap = read.call(this);
} catch {
hasteMap = this._createEmptyMap();
}
Expand Down Expand Up @@ -642,7 +636,7 @@ class HasteMap extends EventEmitter {
.then(workerReply, workerError);
}

private async _buildHasteMap(data: {
private _buildHasteMap(data: {
removedFiles: FileData;
changedFiles?: FileData;
hasteMap: InternalHasteMap;
Expand Down Expand Up @@ -687,16 +681,15 @@ class HasteMap extends EventEmitter {
}
}

try {
await Promise.all(promises);
return Promise.all(promises).then(() => {
this._cleanup();
hasteMap.map = map;
hasteMap.mocks = mocks;
return hasteMap;
} catch (error) {
}).catch((error) => {
this._cleanup();
throw error;
}
})
}

private _cleanup() {
Expand Down

0 comments on commit 1d00f13

Please sign in to comment.