Merge pull request #6 from chipbell4/bugfix/npm-3

Loading grunt tasks manually to work around flattening in npm 3

Author: chipbell4

libs/grunt-loader.js

@@ -0,0 +1,31 @@
+var fs = require('fs');
+var path = require('path');
+
+module.exports = {
+	/**
+	 * Given a folder, attempts to load any grunt modules included in the child directory node_modules. Due to flattening
+	 * in NPM 3+, grunt-springroll's new modules could actually be installed in the game's node_modules folder rather than
+	 * the node_modules folder underneath grunt-springroll. load-grunt-tasks attempts to connect the package.json with the
+	 * sibling folder node_modules, which is why tasks have failed to load NPM 3 and beyond. This however avoids that and
+	 * simply matches filenames based on convention
+	 *
+	 * @param {grunt} grunt The grunt instance with which to load tasks
+	 * @param {string} folder The folder to load tasks from (will look for a node_modules as a child directory)
+	 * @return void
+	 */
+	load: function(grunt, folder) {
+		var lastDirectory = process.cwd();
+
+		process.chdir(folder);
+
+		fs.readdirSync(path.join(folder, 'node_modules'))
+			.filter(function(name) {
+				return name.indexOf('grunt-') === 0 && name !== 'grunt-springroll';
+			})
+			.forEach(function(folder) {
+				grunt.loadNpmTasks(folder);
+			});
+
+		process.chdir(lastDirectory);
+	},
+};

libs/index.js

@@ -4,6 +4,7 @@ module.exports = function(grunt, settings, undefined)
 	var _ = require('lodash'),
 		path = require('path'),
 		loader = require('load-grunt-config'),
+		gruntLoader = require('./grunt-loader'),
 		base = path.dirname(__dirname);
 
 	// Get the settings and options
@@ -26,6 +27,11 @@ module.exports = function(grunt, settings, undefined)
 
 	// We need to load the local grunt plugins
 	var projectDir = process.cwd();
+
+	// load both project and this plugin's grunt modules manually to account for NPM 3+ flattening
+	gruntLoader.load(grunt, projectDir);
+	gruntLoader.load(grunt, pluginFolder);
+
 	process.chdir(pluginFolder);
 
 	// The build file which contains all the list of files to build
@@ -70,16 +76,14 @@ module.exports = function(grunt, settings, undefined)
 
 		// auto grunt.initConfig()
 		init: false,
-
-		// Load the grunt tasks
-		loadGruntTasks : { pattern: [
-			'grunt-*',
-			'!grunt-springroll'
-		]},
+		
+		// don't load grunt tasks, since we'll load them manually (due to NPM 2 vs. NPM 3+ behavioral differences)
+		loadGruntTasks: false,
 
 		// Data based into config
 		data: data
 	});
+
 	process.chdir(projectDir);
 
 	// Project-specific config
@@ -91,11 +95,8 @@ module.exports = function(grunt, settings, undefined)
 		// Get the config, don't run
 		init: false, 
 
-		// We don't want to reload builder
-		loadGruntTasks: { pattern: [
-			'grunt-*',
-			'!grunt-springroll'
-		]}
+		// don't load grunt tasks, since we'll load them manually (due to NPM 2 vs. NPM 3+ behavioral differences)
+		loadGruntTasks: false
 	});
 
 	// Merge the configs
@@ -119,4 +120,4 @@ module.exports = function(grunt, settings, undefined)
 	}
 
 	return config;
-};
+};