Merge branch 'develop' of https://github.com/Vindeep07/nodemon into V…

…indeep07-develop

* 'develop' of https://github.com/Vindeep07/nodemon:
  Added fix for giving preference to package.main for script

lib/config/load.js

@@ -16,7 +16,9 @@ var existsSync = fs.existsSync || path.existsSync;
 function findAppScript() {
   // nodemon has been run alone, so try to read the package file
   // or try to read the index.js file
-  if (existsSync('./index.js')) {
+
+  var pkg = existsSync(path.join(process.cwd(), 'package.json')) && require(path.join(process.cwd(), 'package.json'));
+  if ((!pkg || pkg.main == undefined) && existsSync('./index.js')) {
     return 'index.js';
   }
 }

test/config/load.test.js

@@ -320,5 +320,17 @@ describe('config load', function () {
     })
   });
 
+  it('should give package.main preference for script over index.js', function (done) {
+    var dir = path.resolve(pwd, 'test/fixtures/packages/main-and-index');
+    process.chdir(dir);
+
+    var config = {},
+      settings = {},
+      options = {};
 
+    load(settings, options, config, function (config) {
+      assert.deepEqual(config.execOptions.script, 'server.js');
+      done();
+    });
+  });
 });

test/fixtures/packages/main-and-index/package.json

@@ -0,0 +1,3 @@
+{
+  "main": "server.js"
+}