-
-
Notifications
You must be signed in to change notification settings - Fork 6.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: custom haste #11107
Merged
Merged
feat: custom haste #11107
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
b30f4db
Custom haste map module config
DiZy ca656d2
Fix tests
DiZy c0ce5fd
Address comments
DiZy d169986
Fix bug in refactor
DiZy 6755553
Lints
DiZy 4555c9f
Fix import
DiZy c7a7fd8
Fix copyright header
DiZy 41287a3
Address comments
DiZy e62ffbd
Changelog
DiZy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
/** | ||
* 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. | ||
*/ | ||
|
||
import * as path from 'path'; | ||
import runJest from '../runJest'; | ||
|
||
describe('Custom Haste Integration', () => { | ||
test('valid test with fake module resolutions', () => { | ||
const config = { | ||
haste: { | ||
hasteMapModulePath: path.resolve( | ||
__dirname, | ||
'..', | ||
'custom-haste-map/hasteMap.js', | ||
), | ||
}, | ||
}; | ||
|
||
const {exitCode} = runJest('custom-haste-map', [ | ||
'--config', | ||
JSON.stringify(config), | ||
'hasteExample.test.js', | ||
]); | ||
expect(exitCode).toBe(0); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
/** | ||
* 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. | ||
* | ||
*/ | ||
|
||
'use strict'; | ||
|
||
const add = require('fakeModuleName'); | ||
|
||
describe('Custom Haste', () => { | ||
test('adds ok', () => { | ||
expect(true).toBe(true); | ||
expect(add(1, 2)).toBe(3); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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. | ||
* | ||
*/ | ||
|
||
'use strict'; | ||
|
||
function add(a, b) { | ||
return a + b; | ||
} | ||
|
||
module.exports = add; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,139 @@ | ||
/** | ||
* 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. | ||
*/ | ||
|
||
'use strict'; | ||
|
||
const path = require('path'); | ||
const fakeFile = { | ||
file: path.resolve(__dirname, '__tests__/hasteExampleHelper.js'), | ||
moduleName: 'fakeModuleName', | ||
sha1: 'fakeSha1', | ||
}; | ||
|
||
const fakeJSON = 'fakeJSON'; | ||
|
||
const testPath = path.resolve(__dirname, '__tests__/hasteExample.test.js'); | ||
|
||
const allFiles = [fakeFile.file, testPath]; | ||
|
||
class HasteFS { | ||
getModuleName(file) { | ||
if (file === fakeFile.file) { | ||
return fakeFile.moduleName; | ||
} | ||
return null; | ||
} | ||
|
||
getSize(file) { | ||
return null; | ||
} | ||
|
||
getDependencies(file) { | ||
if (file === testPath) { | ||
return fakeFile.file; | ||
} | ||
return []; | ||
} | ||
|
||
getSha1(file) { | ||
if (file === fakeFile.file) { | ||
return fakeFile.sha1; | ||
} | ||
return null; | ||
} | ||
|
||
exists(file) { | ||
return allFiles.includes(file); | ||
} | ||
|
||
getAllFiles() { | ||
return allFiles; | ||
} | ||
|
||
getFileIterator() { | ||
return allFiles; | ||
} | ||
|
||
getAbsoluteFileIterator() { | ||
return allFiles; | ||
} | ||
|
||
matchFiles(pattern) { | ||
if (!(pattern instanceof RegExp)) { | ||
pattern = new RegExp(pattern); | ||
} | ||
const files = []; | ||
for (const file of this.getAbsoluteFileIterator()) { | ||
if (pattern.test(file)) { | ||
files.push(file); | ||
} | ||
} | ||
return files; | ||
} | ||
|
||
matchFilesWithGlob(globs, root) { | ||
return []; | ||
} | ||
} | ||
|
||
class ModuleMap { | ||
getModule(name, platform, supportsNativePlatform, type) { | ||
if (name === fakeFile.moduleName) { | ||
return fakeFile.file; | ||
} | ||
return null; | ||
} | ||
|
||
getPackage() { | ||
return null; | ||
} | ||
|
||
getMockModule() { | ||
return undefined; | ||
} | ||
|
||
getRawModuleMap() { | ||
return {}; | ||
} | ||
|
||
toJSON() { | ||
return fakeJSON; | ||
} | ||
} | ||
|
||
class HasteMap { | ||
constructor(options) { | ||
this._cachePath = HasteMap.getCacheFilePath( | ||
options.cacheDirectory, | ||
options.name, | ||
); | ||
} | ||
|
||
async build() { | ||
return { | ||
hasteFS: new HasteFS(), | ||
moduleMap: new ModuleMap(), | ||
}; | ||
} | ||
|
||
static getCacheFilePath(tmpdir, name) { | ||
return path.join(tmpdir, name); | ||
} | ||
|
||
getCacheFilePath() { | ||
return this._cachePath; | ||
} | ||
|
||
static getModuleMapFromJSON(json) { | ||
if (json === fakeJSON) { | ||
return new ModuleMap(); | ||
} | ||
throw new Error('Failed to parse serialized module map'); | ||
} | ||
} | ||
|
||
module.exports = HasteMap; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
{ | ||
"jest": { | ||
"haste": { | ||
"hasteMapModulePath": "<rootDir>/hasteMap.js" | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can we make this
async
so we can useimport(config.haste.hasteMapModulePath)
in the future? same forcreate
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changing to async complicates some call sites such as the setup function in testWorker.ts
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
right, but it needs to be async in order to use ESM. so we either need to make it so now, or make it async whenever somebody wants to write these modules using ESM (such as a WASM implementation)