Merge branch '3.0'

Author: fgnass

.eslintrc

@@ -0,0 +1,17 @@
+{
+  "extends": [
+    "airbnb/legacy"
+  ],
+  "rules": {
+    "comma-dangle": [2, "never"],
+    "eqeqeq": 0,
+    "func-names": 0,
+    "guard-for-in": 0,
+    "one-var": [2, "never"],
+    "padded-blocks": 0,
+    "vars-on-top": 0,
+    "no-console": 0,
+    "no-param-reassign": 0,
+    "no-use-before-define": 0
+  }
+}

.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
+.vagrant
 node_modules
 npm-debug.log

.jshintrc

@@ -1,3 +1,4 @@
+sudo: false
 language: node_js
 node_js:
-  - 0.10
+  - 4.2

.travis.yml

@@ -1,8 +1,25 @@
 # node-dev
 
+## 3.0.0 / 2016-01-29
+
+- Add `--respawn` to keep watching after a process exits. See #104.
+- Don't terminate the child process if a custom `unchaughtException` handler is registered. See #113.
+- Handle `-r` and `--require` node options correctly. See #111.
+- Add support for passing options to transpilers. See #109.
+- Handle `--no-deps` correctly. See #108.
+- Switch to airbnb code style
+- Use greenkeeper.io to keep dependencies up to date
+
+
+## 2.7.1 / 2015-08-21
+
+- Add `--poll` to fix #87
+- Switch from [`commander`][npm-commander] to [`minimist`][npm-minimist]
+- Fix issues introduced in 2.7.0. See #102 for details.
+
 ## 2.7.0 / 2015-08-17
 
-- [#88]: Support ignoring file paths, e.g. for universal (isomorphic) apps. See
+- Support ignoring file paths, e.g. for universal (isomorphic) apps. See
   [`README`][README-ignore-paths] for more details.
 - Use [`commander`][npm-commander] for CLI argument parsing instead of custom code.
 - Extract [`LICENSE`][LICENSE] file.
@@ -12,9 +29,8 @@
 
 [LICENSE]: LICENSE
 [npm-commander]: https://www.npmjs.com/package/commander
+[npm-minimist]: https://www.npmjs.com/package/minimist
 [npm-tap]: https://www.npmjs.com/package/tap
 [npm-touch]: https://www.npmjs.com/package/touch
 [README]: README.md
 [README-ignore-paths]: README.md#ignore-paths
-
-[#88]: https://github.com/fgnass/node-dev/issues/88

CHANGELOG.md

@@ -116,6 +116,23 @@ This means that if you run `node-dev foo.coffee` node-dev will do a
 __Note:__ If you want to use coffee-script < 1.7 you have to change the
 setting to `{"coffee": "coffee-script"}`.
 
+Options can be passed to a transpiler by providing an object containing
+`name` and `options` attributes:
+
+```json
+    {
+        "js": {
+            "name": "babel/register",
+            "options": {
+                "only": [
+                    "lib/**",
+                    "node_modules/es2015-only-module/**"
+                ]
+            }
+        }
+    }
+```
+
 ### Graceful restarts
 
 Node-dev sends a `SIGTERM` signal to the child-process if a restart is required.

README.md

@@ -0,0 +1,11 @@
+$script = <<SCRIPT
+wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash
+echo "source /home/vagrant/.nvm/nvm.sh" >> /home/vagrant/.profile
+source /home/vagrant/.profile
+nvm install stable
+SCRIPT
+
+Vagrant.configure("2") do |config|
+  config.vm.box = "ubuntu/trusty64"
+  config.vm.provision "shell", privileged: false, inline: $script
+end

Vagrantfile

@@ -1,32 +1,46 @@
 #!/usr/bin/env node
 
-var dev = require('..')
-var minimist = require('minimist')
+var dev = require('..');
+var minimist = require('minimist');
 
 function getFirstNonOptionArgIndex(args) {
-  for (var i=2; i < args.length; i++) {
+  for (var i = 2; i < args.length; i++) {
     if (args[i][0] != '-') return i;
   }
   return args.length;
 }
 
-var scriptIndex = getFirstNonOptionArgIndex(process.argv)
-var script = process.argv[scriptIndex]
-var scriptArgs = process.argv.slice(scriptIndex + 1)
-var devArgs = process.argv.slice(2, scriptIndex)
+function removeValueArgs(args, names) {
+  var i = 0;
+  var removed = [];
+  while (i < args.length) {
+    if (~names.indexOf(args[i])) {
+      removed = removed.concat(args.splice(i, 2));
+    } else {
+      i++;
+    }
+  }
+  return removed;
+}
+
+var nodeArgs = removeValueArgs(process.argv, ['-r', '--require']);
+
+var scriptIndex = getFirstNonOptionArgIndex(process.argv);
+var script = process.argv[scriptIndex];
+var scriptArgs = process.argv.slice(scriptIndex + 1);
+var devArgs = process.argv.slice(2, scriptIndex);
 
-var nodeArgs = []
 var opts = minimist(devArgs, {
-  boolean: ['all-deps', 'deps', 'dedupe', 'poll'],
+  boolean: ['all-deps', 'no-deps', 'dedupe', 'poll', 'respawn'],
   default: { deps: true },
-  unknown: function(arg) {
-    nodeArgs.push(arg)
+  unknown: function (arg) {
+    nodeArgs.push(arg);
   }
-})
+});
 
 if (!script) {
-  console.log('Usage: node-dev [options] script [arguments]\n')
-  process.exit(1)
+  console.log('Usage: node-dev [options] script [arguments]\n');
+  process.exit(1);
 }
 
-dev(script, scriptArgs, nodeArgs, opts)
+dev(script, scriptArgs, nodeArgs, opts);

bin/node-dev

@@ -1,45 +1,49 @@
-var fs = require('fs')
-var path = require('path')
+var fs = require('fs');
+var path = require('path');
 
 function read(dir) {
-  var f = path.resolve(dir, '.node-dev.json')
-  return fs.existsSync(f) ? JSON.parse(fs.readFileSync(f)) : {}
+  var f = path.resolve(dir, '.node-dev.json');
+  return fs.existsSync(f) ? JSON.parse(fs.readFileSync(f)) : {};
 }
 
 function resolvePath(unresolvedPath) {
-  return path.resolve(process.cwd(), unresolvedPath)
+  return path.resolve(process.cwd(), unresolvedPath);
 }
 
-module.exports = function(main, opts) {
-  var dir = main ? path.dirname(main) : '.'
-  var c = read(dir)
+module.exports = function (main, opts) {
 
-  c.__proto__ = read(process.env.HOME || process.env.USERPROFILE)
+  var dir = main ? path.dirname(main) : '.';
+  var c = read(dir);
+
+  /* eslint-disable no-proto */
+  c.__proto__ = read(process.env.HOME || process.env.USERPROFILE);
 
   // Truthy == --all-deps, false: one level of deps
-  if (typeof c.deps != 'number') c.deps = c.deps ? -1 : 1
+  if (typeof c.deps !== 'number') c.deps = c.deps ? -1 : 1;
 
   if (opts) {
     // Overwrite with CLI opts ...
-    if (opts.allDeps) c.deps = -1
-    if (!opts.deps) c.deps = 0
-    if (opts.dedupe) c.dedupe = true
+    if (opts.allDeps) c.deps = -1;
+    if (!opts.deps) c.deps = 0;
+    if (opts.dedupe) c.dedupe = true;
+    if (opts.respawn) c.respawn = true;
   }
 
-  var ignore = (c.ignore || []).map(resolvePath)
+  var ignore = (c.ignore || []).map(resolvePath);
 
   return {
-    vm         : c.vm !== false,
-    fork       : c.fork !== false,
-    notify     : c.notify !== false,
-    deps       : c.deps,
-    timestamp  : c.timestamp || (c.timestamp !== false && 'HH:MM:ss'),
-    clear      : !!c.clear,
-    dedupe     : !!c.dedupe,
-    ignore     : ignore,
-    extensions : c.extensions || {
-      coffee: "coffee-script/register",
-      ls: "LiveScript"
+    vm: c.vm !== false,
+    fork: c.fork !== false,
+    notify: c.notify !== false,
+    deps: c.deps,
+    timestamp: c.timestamp || (c.timestamp !== false && 'HH:MM:ss'),
+    clear: !!c.clear,
+    dedupe: !!c.dedupe,
+    ignore: ignore,
+    respawn: c.respawn || false,
+    extensions: c.extensions || {
+      coffee: 'coffee-script/register',
+      ls: 'LiveScript'
     }
-  }
-}
+  };
+};

lib/cfg.js

@@ -1 +1 @@
-require('dynamic-dedupe').activate()
+require('dynamic-dedupe').activate();