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

Update node-haste dependency to 2.12.0 

Summary:
Update to node-haste 2.12.0 to support pass through configuration of supported platforms.
Closes https://github.com/facebook/react-native/pull/7660

Differential Revision: D3335034

Pulled By: mkonicek

fbshipit-source-id: d238b90a90d51654301d61251ceb26d183fef57a
This commit is contained in:
Eric Rozell 2016-05-23 10:27:23 -07:00 committed by Facebook Github Bot 9
parent ca71143ff4
commit 68af89dcbf
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -160,7 +160,7 @@
"mkdirp": "^0.5.1",
"module-deps": "^3.9.1",
"node-fetch": "^1.3.3",
"node-haste": "~2.11.0",
"node-haste": "~2.12.0",
"opn": "^3.0.2",
"optimist": "^0.6.1",
"progress": "^1.1.8",

14
packager/react-packager/src/AssetServer/index.js vendored
View File

@ -51,7 +51,7 @@ class AssetServer {
}
get(assetPath, platform = null) {
const assetData = getAssetDataFromName(assetPath);
const assetData = getAssetDataFromName(assetPath, new Set([platform]));
return this._getAssetRecord(assetPath, platform).then(record => {
for (let i = 0; i < record.scales.length; i++) {
if (record.scales[i] >= assetData.resolution) {
@ -64,7 +64,7 @@ class AssetServer {
}
getAssetData(assetPath, platform = null) {
const nameData = getAssetDataFromName(assetPath);
const nameData = getAssetDataFromName(assetPath, new Set([platform]));
const data = {
name: nameData.name,
type: nameData.type,
@ -115,7 +115,7 @@ class AssetServer {
.then(res => {
const dir = res[0];
const files = res[1];
const assetData = getAssetDataFromName(filename);
const assetData = getAssetDataFromName(filename, new Set([platform]));
const map = this._buildAssetMap(dir, files, platform);
@ -166,8 +166,8 @@ class AssetServer {
});
}
_buildAssetMap(dir, files) {
const assets = files.map(getAssetDataFromName);
_buildAssetMap(dir, files, platform) {
const assets = files.map(this._getAssetDataFromName.bind(this, new Set([platform])));
const map = Object.create(null);
assets.forEach(function(asset, i) {
const file = files[i];
@ -194,6 +194,10 @@ class AssetServer {
return map;
}
_getAssetDataFromName(platform, file) {
return getAssetDataFromName(file, platform);
}
}
function getAssetKey(assetName, platform) {