diff options
author | Garren Smith <garren.smith@gmail.com> | 2013-03-16 14:25:49 +0200 |
---|---|---|
committer | Garren Smith <garren.smith@gmail.com> | 2013-03-16 14:25:49 +0200 |
commit | e1a8ab5202e8a4ba31e6a58e33e3ddfb8a8645f1 (patch) | |
tree | 01a5d8dab4c08221b52d5d4f40bf4ec5500b9aa4 | |
parent | d2040ab43aa9a31d3442bce2cdd514003fad7e4a (diff) | |
download | couchdb-e1a8ab5202e8a4ba31e6a58e33e3ddfb8a8645f1.tar.gz |
improve couchserver task to work with new template config
-rw-r--r-- | src/fauxton/grunt.js | 107 | ||||
-rw-r--r-- | src/fauxton/tasks/couchserver.js | 9 |
2 files changed, 3 insertions, 113 deletions
diff --git a/src/fauxton/grunt.js b/src/fauxton/grunt.js index fa612b93a..875316b50 100644 --- a/src/fauxton/grunt.js +++ b/src/fauxton/grunt.js @@ -138,112 +138,7 @@ module.exports = function(grunt) { ] }, - // Create static html files from templates, for managing change of script - // or css name. - template: { - couchdb:{ - src: 'assets/index.underscore', - dest: '../../share/www/fauxton/index.html', - variables: { - assets_root: '/_utils/fauxton/', - requirejs: 'require.min.js', - base: '/_utils/fauxton/' - } - }, - couchdebug:{ - src: 'assets/index.underscore', - dest: '../../share/www/fauxton/index.html', - variables: { - assets_root: '/_utils/fauxton/', - requirejs: 'require.js', - base: '/_utils/fauxton/' - } - }, - release: { - src: 'assets/index.underscore', - dest: 'dist/release/index.html', - variables: { - assets_root: '/', - requirejs: 'require.min.js', - base: '/' - } - }, - debug: { - src: 'assets/index.underscore', - dest: 'dist/debug/index.html', - variables: { - assets_root: '/', - requirejs: 'require.js', - base: '/' - } - }, - couchapp: { - src: 'assets/index.underscore', - dest: 'dist/debug/index.html', - variables: { - assets_root: '/fauxton/_design/fauxton/', - requirejs: 'require.js', - base: '/fauxton/_design/fauxton/index.html' - } - } - }, template: templateSettings, - template: { - couchdb:{ - src: 'assets/index.underscore', - dest: '../../share/www/fauxton/index.html', - variables: { - assets_root: '/_utils/fauxton/', - requirejs: 'require.min.js', - base: '/_utils/fauxton/' - } - }, - couchdebug:{ - src: 'assets/index.underscore', - dest: '../../share/www/fauxton/index.html', - variables: { - assets_root: '/_utils/fauxton/', - requirejs: 'require.js', - base: '/_utils/fauxton/' - } - }, - release: { - src: 'assets/index.underscore', - dest: 'dist/release/index.html', - variables: { - assets_root: '/', - requirejs: 'require.min.js', - base: '/' - } - }, - debug: { - src: 'assets/index.underscore', - dest: 'dist/debug/index.html', - variables: { - assets_root: '/', - requirejs: 'require.js', - base: '/' - } - }, - server: { - src: 'assets/index.underscore', - dest: 'dist/debug/index.html', - variables: { - assets_root: '/assets/', - requirejs: 'require.js', - base: '/' - } - }, - couchapp: { - src: 'assets/index.underscore', - dest: 'dist/debug/index.html', - variables: { - assets_root: '/fauxton/_design/fauxton/', - requirejs: 'require.js', - base: '/fauxton/_design/fauxton/index.html' - } - } - }, // The concatenate task is used here to merge the almond require/define // shim and the templates into the application code. It's named @@ -402,7 +297,7 @@ module.exports = function(grunt) { grunt.registerTask("minify", "min mincss"); // deafult task - push to CouchDB grunt.registerTask("default", "test dependencies build release install"); - grunt.registerTask("dev", "debug template:server couchserver"); + grunt.registerTask("dev", "debug template couchserver"); // make a debug install grunt.registerTask("debug", "test dependencies build template copy:debug concat:debug"); // make an install that is server by mochiweb under _utils diff --git a/src/fauxton/tasks/couchserver.js b/src/fauxton/tasks/couchserver.js index 9680c0006..2d36afa73 100644 --- a/src/fauxton/tasks/couchserver.js +++ b/src/fauxton/tasks/couchserver.js @@ -23,14 +23,9 @@ module.exports = function (grunt) { // inform grunt that this task is async var done = this.async(); - // images don't have the full path, so have to have own route for them - app.get('/img/*', function (req, res) { - res.sendfile(path.join(dist_dir,req.url)); - }); - // serve any javascript or css files from here - app.get('/assets/*', function (req, res) { - res.sendfile(req.url.replace('/assets/',dist_dir)); + app.get(/\.css$|\.js$|img/, function (req, res) { + res.sendfile(path.join(dist_dir,req.url)); }); // serve main index file from here |