status-im
/
metro
mirror of https://github.com/status-im/metro.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

metro: Package: fix/simplify replacement behavior for string `browser` field 

Summary:
The spec doesn't say the `browser` field should actually generate a replacement for the main *file*, just that it provides an alternative main: https://github.com/defunctzombie/package-browser-field-spec#alternate-main---basic
We also don't have any test covering this behavior. Any package relying on this behavior should be fixed to have a redirection of the main *file* in addition to their `main` *field*.

This is part of an effort to cleanup the way we do redirections. Eventually this will be part of the resolution module, not `Package.js`.

Reviewed By: davidaurelio

Differential Revision: D6611894

fbshipit-source-id: 0186aa23df2a9183d895ea02b5fd3b2b7339dc76
This commit is contained in:
Jean Lauliac 2017-12-24 08:25:16 -08:00 committed by Facebook Github Bot
parent ec35565c33
commit 3ba92ba160
1 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
packages/metro/src/node-haste/Package.js
View File

@ -43,14 +43,18 @@ class Package {
*/
getMain(): string {
const json = this.read();
var replacements = getReplacements(json);
if (typeof replacements === 'string') {
return path.join(this.root, replacements);
let main;
if (typeof json['react-native'] === 'string') {
main = json['react-native'];
} else if (typeof json.browser === 'string') {
main = json.browser;
} else {
main = json.main || 'index';
}
let main = json.main || 'index';
if (replacements && typeof replacements === 'object') {
const replacements = getReplacements(json);
if (replacements) {
const variants = [main];
if (main.slice(0, 2) === './') {
variants.push(main.slice(2));
@ -92,7 +96,7 @@ class Package {
const json = this.read();
const replacements = getReplacements(json);
if (!replacements || typeof replacements !== 'object') {
if (!replacements) {
return name;
}
@ -144,29 +148,20 @@ class Package {
}
}
function getReplacements(pkg: PackageContent): mixed {
function getReplacements(pkg: PackageContent): ?{[string]: string | boolean} {
let rn = pkg['react-native'];
let browser = pkg.browser;
if (rn == null) {
return browser;
if (rn == null && browser == null) {
return null;
}
if (browser == null) {
return rn;
// If the field is a string, that doesn't mean we want to redirect the `main`
// file itself to anything else. See the spec.
if (rn == null || typeof rn === 'string') {
rn = {};
}
if (typeof rn === 'string') {
/* $FlowFixMe: It is likely unsafe to assume all packages would
* contain a "main" */
rn = {[pkg.main]: rn};
if (browser == null || typeof browser === 'string') {
browser = {};
}
if (typeof browser === 'string') {
/* $FlowFixMe: It is likely unsafe to assume all packages would
* contain a "main" */
browser = {[pkg.main]: browser};
}
// merge with "browser" as default,
// "react-native" as override
return {...browser, ...rn};