From: Mark Otto <markd.otto@gmail.com>
Date: Sun, 26 Oct 2014 02:43:05 +0000 (-0700)
Subject: Merge pull request #13824 from jsdf/node-requirable
X-Git-Tag: v3.3.0~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0521913a99b1e6c4927b0d0f7bae746b14463a77;p=thirdparty%2Fbootstrap.git

Merge pull request #13824 from jsdf/node-requirable

Allow npm package to be resolved via node module resolution
---

0521913a99b1e6c4927b0d0f7bae746b14463a77
diff --cc Gruntfile.js
index 0e5627d9ec,1262a668a2..f1430e0265
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@@ -441,10 -436,9 +442,10 @@@ module.exports = function (grunt) 
      testSubtasks.push('saucelabs-qunit');
    }
    grunt.registerTask('test', testSubtasks);
 +  grunt.registerTask('test-js', ['jshint:core', 'jshint:test', 'jshint:grunt', 'jscs:core', 'jscs:test', 'jscs:grunt', 'qunit']);
  
    // JS distribution task.
-   grunt.registerTask('dist-js', ['concat', 'uglify:core']);
+   grunt.registerTask('dist-js', ['concat', 'uglify:core', 'commonjs']);
  
    // CSS distribution task.
    grunt.registerTask('less-compile', ['less:compileCore', 'less:compileTheme']);