Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8576B10C62 for ; Mon, 8 Jul 2013 16:00:01 +0000 (UTC) Received: (qmail 22027 invoked by uid 500); 8 Jul 2013 15:59:56 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 21858 invoked by uid 500); 8 Jul 2013 15:59:56 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 21433 invoked by uid 99); 8 Jul 2013 15:59:55 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Jul 2013 15:59:55 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 06954885978; Mon, 8 Jul 2013 15:59:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: garren@apache.org To: commits@couchdb.apache.org Date: Mon, 08 Jul 2013 16:00:04 -0000 Message-Id: <7f61b4cd3e434ae284f0865526f8613f@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [11/21] working with less and css http://git-wip-us.apache.org/repos/asf/couchdb/blob/4d06c100/src/fauxton/assets/js/plugins/require-less/package.json ---------------------------------------------------------------------- diff --git a/src/fauxton/assets/js/plugins/require-less/package.json b/src/fauxton/assets/js/plugins/require-less/package.json new file mode 100644 index 0000000..aeed5c6 --- /dev/null +++ b/src/fauxton/assets/js/plugins/require-less/package.json @@ -0,0 +1,18 @@ +{ + "volo": { + "type": "directory", + "dependencies": { + "require-css": "guybedford/require-css/0.0.6" + } + }, + "jspm": { + "dependencies": { + "css": "0.0.6" + } + }, + "jam": { + "dependencies": { + "require-css": "0.1.x" + } + } +} http://git-wip-us.apache.org/repos/asf/couchdb/blob/4d06c100/src/fauxton/package.json ---------------------------------------------------------------------- diff --git a/src/fauxton/package.json b/src/fauxton/package.json index 88f33bc..fe34a79 100644 --- a/src/fauxton/package.json +++ b/src/fauxton/package.json @@ -11,13 +11,18 @@ "grunt": "~0.4.1", "grunt-cli": "~0.1.6", "couchapp": "~0.9.1", - "grunt-contrib": "~0.5.0", "grunt-contrib-cssmin": "~0.5.0", + "grunt-contrib-clean": "~0.4.1", + "grunt-contrib-jshint": "~0.6.0", + "grunt-contrib-concat": "~0.3.0", + "grunt-contrib-less": "~0.5.0", + "grunt-contrib-jst": "~0.5.0", + "grunt-contrib-watch": "~0.4.4", "grunt-contrib-uglify": "~0.2.0", + "grunt-contrib-copy": "~0.4.1", "grunt-couchapp": "~0.1.0", "grunt-exec": "~0.4.0", "grunt-init": "~0.2.0", - "grunt-jasmine-task": "~0.2.3", "grunt-requirejs": "~0.3.3", "underscore": "~1.4.2", "url": "~0.7.9", http://git-wip-us.apache.org/repos/asf/couchdb/blob/4d06c100/src/fauxton/tasks/couchserver.js ---------------------------------------------------------------------- diff --git a/src/fauxton/tasks/couchserver.js b/src/fauxton/tasks/couchserver.js index 165fa44..1ed5c16 100644 --- a/src/fauxton/tasks/couchserver.js +++ b/src/fauxton/tasks/couchserver.js @@ -52,10 +52,11 @@ module.exports = function (grunt) { } else if (!!url.match(/\.css$|\/js\/|img/)) { // serve any javascript or css files from dist debug dir filePath = path.join(dist_dir,req.url); + console.log('css', url, filePath); } else if (!!url.match(/\.js$|\.html$/)) { // server js from app directory - console.log('js', req.url); filePath = path.join(app_dir,req.url.replace('/_utils/fauxton/app','')); + console.log('less', url, filePath); } else if (url === '/' && accept[0] !== 'application/json') { // serve main index file from here filePath = path.join(dist_dir, 'index.html'); @@ -73,7 +74,7 @@ module.exports = function (grunt) { return false; } - var watch = grunt.util.spawn({cmd: 'bbb', grunt: true, args: ['watch']}, function (error, result, code) {/* log.writeln(String(result));*/ }); + var watch = grunt.util.spawn({cmd: 'grunt', grunt: true, args: ['watch']}, function (error, result, code) {/* log.writeln(String(result));*/ }); watch.stdout.pipe(process.stdout); watch.stderr.pipe(process.stderr);