From 30cca276faebb7d7e35c10366f8ba00ef7aad188 Mon Sep 17 00:00:00 2001 From: Amjad Masad Date: Tue, 22 Sep 2015 15:43:24 -0700 Subject: [PATCH] Return concrete file paths to the client Reviewed By: @martinbigio Differential Revision: D2465182 --- .../src/AssetServer/__tests__/AssetServer-test.js | 12 ++++++++++++ packager/react-packager/src/AssetServer/index.js | 1 + packager/react-packager/src/Bundler/index.js | 1 + 3 files changed, 14 insertions(+) diff --git a/packager/react-packager/src/AssetServer/__tests__/AssetServer-test.js b/packager/react-packager/src/AssetServer/__tests__/AssetServer-test.js index 6c46b3ecf..17c752cff 100644 --- a/packager/react-packager/src/AssetServer/__tests__/AssetServer-test.js +++ b/packager/react-packager/src/AssetServer/__tests__/AssetServer-test.js @@ -217,6 +217,12 @@ describe('AssetServer', () => { type: 'png', name: 'b', scales: [1, 2, 4, 4.5], + files: [ + '/root/imgs/b@1x.png', + '/root/imgs/b@2x.png', + '/root/imgs/b@4x.png', + '/root/imgs/b@4.5x.png', + ], hash: 'wow such hash', }); }); @@ -253,6 +259,12 @@ describe('AssetServer', () => { type: 'jpg', name: 'b', scales: [1, 2, 4, 4.5], + files: [ + '/root/imgs/b@1x.jpg', + '/root/imgs/b@2x.jpg', + '/root/imgs/b@4x.jpg', + '/root/imgs/b@4.5x.jpg', + ], hash: 'wow such hash', }); }); diff --git a/packager/react-packager/src/AssetServer/index.js b/packager/react-packager/src/AssetServer/index.js index 5783e9912..418644868 100644 --- a/packager/react-packager/src/AssetServer/index.js +++ b/packager/react-packager/src/AssetServer/index.js @@ -60,6 +60,7 @@ class AssetServer { return this._getAssetRecord(assetPath, platform).then(record => { data.scales = record.scales; + data.files = record.files; return Promise.all( record.files.map(file => stat(file)) diff --git a/packager/react-packager/src/Bundler/index.js b/packager/react-packager/src/Bundler/index.js index 6927e90e8..d2d8ae7f6 100644 --- a/packager/react-packager/src/Bundler/index.js +++ b/packager/react-packager/src/Bundler/index.js @@ -268,6 +268,7 @@ class Bundler { width: dimensions.width / module.resolution, height: dimensions.height / module.resolution, scales: assetData.scales, + files: assetData.files, hash: assetData.hash, name: assetData.name, type: assetData.type,