Merge pull request #286 from facebook/assetRoots

amasad · amasad · commit 89fc8a4d7f9f · 2015-03-26T17:49:31.000-07:00
[react-packager] Fix assetRoots when starting in node_modules,
diff --git a/packager/packager.js b/packager/packager.js
@@ -69,7 +69,11 @@ if (options.assetRoots) {
     options.assetRoots = options.assetRoots.split(',');
   }
 } else {
-  options.assetRoots = [path.resolve(__dirname, '..')];
+  if (__dirname.match(/node_modules\/react-native\/packager$/)) {
+    options.assetRoots = [path.resolve(__dirname, '../../..')];
+  } else {
+    options.assetRoots = [path.resolve(__dirname, '..')];
+  }
 }
 
 console.log('\n' +

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,11 @@ if (options.assetRoots) {`
`69`	`69`	`options.assetRoots = options.assetRoots.split(',');`
`70`	`70`	`}`
`71`	`71`	`} else {`
`72`		`- options.assetRoots = [path.resolve(__dirname, '..')];`
	`72`	`+ if (__dirname.match(/node_modules\/react-native\/packager$/)) {`
	`73`	`+ options.assetRoots = [path.resolve(__dirname, '../../..')];`
	`74`	`+ } else {`
	`75`	`+ options.assetRoots = [path.resolve(__dirname, '..')];`
	`76`	`+ }`
`73`	`77`	`}`
`74`	`78`
`75`	`79`	`console.log('\n' +`