From 53f688f07cbd161e888aba655ef0ba288b5229ad Mon Sep 17 00:00:00 2001 From: Martin Bigio Date: Fri, 23 Oct 2015 18:47:26 -0700 Subject: [PATCH] Use default asset roots on `default.config.js` Summary: We need to cherry pick this one as well. cc ide Closes https://github.com/facebook/react-native/pull/3640 Reviewed By: svcscm Differential Revision: D2577961 Pulled By: mkonicek fb-gh-sync-id: 3368fc02a931e0f259f3baa6706bd7d8586b0fbf --- local-cli/default.config.js | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/local-cli/default.config.js b/local-cli/default.config.js index 2be890764ed..62f079327c5 100644 --- a/local-cli/default.config.js +++ b/local-cli/default.config.js @@ -12,15 +12,7 @@ var path = require('path'); */ var config = { getProjectRoots() { - if (__dirname.match(/node_modules[\/\\]react-native[\/\\]local-cli$/)) { - // packager is running from node_modules of another project - return [path.resolve(__dirname, '../../..')]; - } else if (__dirname.match(/Pods[\/\\]React[\/\\]packager$/)) { - // packager is running from node_modules of another project - return [path.resolve(__dirname, '../../..')]; - } else { - return [path.resolve(__dirname, '..')]; - } + return getRoots(); }, /** @@ -29,7 +21,7 @@ var config = { * `./` don't require any entry in here. */ getAssetRoots() { - return []; + return getRoots(); }, /** @@ -41,4 +33,16 @@ var config = { } }; +function getRoots() { + if (__dirname.match(/node_modules[\/\\]react-native[\/\\]local-cli$/)) { + // packager is running from node_modules of another project + return [path.resolve(__dirname, '../../..')]; + } else if (__dirname.match(/Pods[\/\\]React[\/\\]packager$/)) { + // packager is running from node_modules of another project + return [path.resolve(__dirname, '../../..')]; + } else { + return [path.resolve(__dirname, '..')]; + } +} + module.exports = config;