summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Branca <chewbranca@gmail.com>2013-03-19 13:30:39 -0700
committerRussell Branca <chewbranca@gmail.com>2013-03-19 13:30:39 -0700
commite5aeb140f24701c4b8181ea530328a789675f3e6 (patch)
treefabbee2f2477edc34ce039dd69fe09195d1b51b0
parent797d09e61e43d6004afe8ab7f80facc747c33856 (diff)
downloadcouchdb-e5aeb140f24701c4b8181ea530328a789675f3e6.tar.gz
Fix JS minification in COUCHDB-1713
-rw-r--r--src/fauxton/Gruntfile.js12
-rw-r--r--src/fauxton/package.json1
2 files changed, 13 insertions, 0 deletions
diff --git a/src/fauxton/Gruntfile.js b/src/fauxton/Gruntfile.js
index 0f03d08d2..199eb2df6 100644
--- a/src/fauxton/Gruntfile.js
+++ b/src/fauxton/Gruntfile.js
@@ -171,6 +171,16 @@ module.exports = function(grunt) {
]
},
+ uglify: {
+ release: {
+ files: {
+ "dist/release/js/require.min.js": [
+ "dist/debug/js/require.js"
+ ]
+ }
+ }
+ },
+
// Runs a proxy server for easier development, no need to keep deploying to couchdb
couchserver: {
dist: './dist/debug/',
@@ -286,6 +296,8 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-exec');
// Load Require.js task
grunt.loadNpmTasks('grunt-requirejs');
+ // Load UglifyJS task
+ grunt.loadNpmTasks('grunt-contrib-uglify');
// clean out previous build artefacts, lint and unit test
grunt.registerTask('test',['clean','jshint']); //qunit
// Fetch dependencies (from git or local dir), lint them and make load_addons
diff --git a/src/fauxton/package.json b/src/fauxton/package.json
index 475192cce..190ee200c 100644
--- a/src/fauxton/package.json
+++ b/src/fauxton/package.json
@@ -12,6 +12,7 @@
"grunt-cli": "~0.1.6",
"couchapp": "~0.9.1",
"grunt-contrib": "~0.5.0",
+ "grunt-contrib-uglify": "~0.2.0",
"grunt-couchapp": "~0.1.0",
"grunt-exec": "~0.4.0",
"grunt-jasmine-task": "~0.2.3",