Merge branch 'master' of github.com:brunch/brunch

brunch · Apr 1, 2013 · f9f6ad4 · f9f6ad4
2 parents f3e3374 + 5785643
commit f9f6ad4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/helpers.coffee b/src/helpers.coffee
@@ -325,7 +325,7 @@ exports.loadConfig = (configPath = 'config', options = {}) ->
     {config} = require fullPath
   catch error
     throw new Error("couldn\'t load config #{configPath}. #{error}")
-  setConfigDefaults config, fullPath
+  setConfigDefaults config, configPath
   deprecations = getConfigDeprecations config
   deprecations.forEach logger.warn if deprecations.length > 0
   recursiveExtend config, options

diff --git a/src/watch.coffee b/src/watch.coffee
@@ -61,6 +61,8 @@ initWatcher = (config, callback) ->
     config.paths.config, config.paths.packageConfig
   ]
 
+  watched.push config.paths.config + ext for ext of require.extensions
+
   async.filter watched, fs_utils.exists, (watchedFiles) ->
     watcher = chokidar.watch watchedFiles,
       ignored: fs_utils.ignored,