Skip to content

Commit 68af89d

Browse files
rozeleFacebook Github Bot 9
authored andcommitted
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 facebook#7660 Differential Revision: D3335034 Pulled By: mkonicek fbshipit-source-id: d238b90a90d51654301d61251ceb26d183fef57a
1 parent ca71143 commit 68af89d

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
"mkdirp": "^0.5.1",
161161
"module-deps": "^3.9.1",
162162
"node-fetch": "^1.3.3",
163-
"node-haste": "~2.11.0",
163+
"node-haste": "~2.12.0",
164164
"opn": "^3.0.2",
165165
"optimist": "^0.6.1",
166166
"progress": "^1.1.8",

packager/react-packager/src/AssetServer/index.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class AssetServer {
5151
}
5252

5353
get(assetPath, platform = null) {
54-
const assetData = getAssetDataFromName(assetPath);
54+
const assetData = getAssetDataFromName(assetPath, new Set([platform]));
5555
return this._getAssetRecord(assetPath, platform).then(record => {
5656
for (let i = 0; i < record.scales.length; i++) {
5757
if (record.scales[i] >= assetData.resolution) {
@@ -64,7 +64,7 @@ class AssetServer {
6464
}
6565

6666
getAssetData(assetPath, platform = null) {
67-
const nameData = getAssetDataFromName(assetPath);
67+
const nameData = getAssetDataFromName(assetPath, new Set([platform]));
6868
const data = {
6969
name: nameData.name,
7070
type: nameData.type,
@@ -115,7 +115,7 @@ class AssetServer {
115115
.then(res => {
116116
const dir = res[0];
117117
const files = res[1];
118-
const assetData = getAssetDataFromName(filename);
118+
const assetData = getAssetDataFromName(filename, new Set([platform]));
119119

120120
const map = this._buildAssetMap(dir, files, platform);
121121

@@ -166,8 +166,8 @@ class AssetServer {
166166
});
167167
}
168168

169-
_buildAssetMap(dir, files) {
170-
const assets = files.map(getAssetDataFromName);
169+
_buildAssetMap(dir, files, platform) {
170+
const assets = files.map(this._getAssetDataFromName.bind(this, new Set([platform])));
171171
const map = Object.create(null);
172172
assets.forEach(function(asset, i) {
173173
const file = files[i];
@@ -194,6 +194,10 @@ class AssetServer {
194194

195195
return map;
196196
}
197+
198+
_getAssetDataFromName(platform, file) {
199+
return getAssetDataFromName(file, platform);
200+
}
197201
}
198202

199203
function getAssetKey(assetName, platform) {

0 commit comments

Comments
 (0)