]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge pull request #13824 from jsdf/node-requirable
authorMark Otto <markd.otto@gmail.com>
Sun, 26 Oct 2014 02:43:05 +0000 (19:43 -0700)
committerMark Otto <markd.otto@gmail.com>
Sun, 26 Oct 2014 02:43:05 +0000 (19:43 -0700)
Allow npm package to be resolved via node module resolution

1  2 
Gruntfile.js
package.json

diff --cc Gruntfile.js
index 0e5627d9ec63815ba392680b3d56aad42e78e3b7,1262a668a2bb0dface3178a03cc5b8ec9a980777..f1430e0265316a512b6c9f48080b3f608b30ea99
@@@ -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']);
diff --cc package.json
Simple merge