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

Revert packager module randomization

This commit is contained in:
Justin Spahr-Summers 2015-09-25 07:39:06 -07:00 committed by facebook-github-bot-7
parent bf598647d2
commit e2fdd59784
3 changed files with 12 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
packager/react-packager/src/DependencyResolver/DependencyGraph/HasteMap.js vendored
View File

@ -8,9 +8,8 @@
*/
'use strict';
const chalk = require('chalk');
const path = require('path');
const getPlatformExtension = require('../../lib/getPlatformExtension');
const getPontentialPlatformExt = require('../../lib/getPlatformExtension');
class HasteMap {
constructor({ fastfs, moduleCache, helpers }) {
@ -18,7 +17,6 @@ class HasteMap {
this._moduleCache = moduleCache;
this._helpers = helpers;
this._map = Object.create(null);
this._warnedAbout = Object.create(null);
}
build() {
@ -37,9 +35,6 @@ class HasteMap {
processFileChange(type, absPath) {
return Promise.resolve().then(() => {
// Rewarn after file changes.
this._warnedAbout = Object.create(null);
/*eslint no-labels: 0 */
if (type === 'delete' || type === 'change') {
loop: for (let name in this._map) {
@ -69,39 +64,19 @@ class HasteMap {
}
getModule(name, platform = null) {
if (!this._map[name]) {
return null;
}
const modules = this._map[name];
if (platform != null) {
for (let i = 0; i < modules.length; i++) {
if (getPlatformExtension(modules[i].path) === platform) {
return modules[i];
if (this._map[name]) {
const modules = this._map[name];
if (platform != null) {
for (let i = 0; i < modules.length; i++) {
if (getPontentialPlatformExt(modules[i].path) === platform) {
return modules[i];
}
}
}
if (modules.length > 1) {
if (!this._warnedAbout[name]) {
this._warnedAbout[name] = true;
console.warn(
chalk.yellow(
'\nWARNING: Found multiple haste modules or packages ' +
'with the name `%s`. Please fix this by adding it to ' +
'the blacklist or deleting the modules keeping only one.\n' +
'One of the following modules will be selected at random:\n%s\n'
),
name,
modules.map(m => m.path).join('\n'),
);
}
const randomIndex = Math.floor(Math.random() * modules.length);
return modules[randomIndex];
}
return modules[0];
}
return modules[0];
return null;
}
_processHasteModule(file) {

7
packager/react-packager/src/DependencyResolver/DependencyGraph/ResolutionRequest.js vendored
View File

@ -252,11 +252,6 @@ class ResolutionRequest {
_loadAsFile(potentialModulePath) {
return Promise.resolve().then(() => {
if (this._helpers.isAssetFile(potentialModulePath)) {
const dirname = path.dirname(potentialModulePath);
if (!this._fastfs.dirExists(dirname)) {
throw new UnableToResolveError(`Directory ${dirname} doesn't exist`);
}
const {name, type} = getAssetDataFromName(potentialModulePath);
let pattern = '^' + name + '(@[\\d\\.]+x)?';
@ -268,7 +263,7 @@ class ResolutionRequest {
// We arbitrarly grab the first one, because scale selection
// will happen somewhere
const [assetFile] = this._fastfs.matches(
dirname,
path.dirname(potentialModulePath),
new RegExp(pattern)
);

2
packager/react-packager/src/lib/getPlatformExtension.js vendored
View File

@ -10,7 +10,7 @@
const path = require('path');
const SUPPORTED_PLATFORM_EXTS = ['android', 'ios', 'web'];
const SUPPORTED_PLATFORM_EXTS = ['android', 'ios'];
const re = new RegExp(
'[^\\.]+\\.(' + SUPPORTED_PLATFORM_EXTS.join('|') + ')\\.\\w+$'