couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gar...@apache.org
Subject fauxton commit: updated refs/heads/master to 0f301b5
Date Tue, 12 Apr 2016 12:29:27 GMT
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 6dbf2bafe -> 0f301b5d0


fixes fauxton to work as an npm release again


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/0f301b5d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/0f301b5d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/0f301b5d

Branch: refs/heads/master
Commit: 0f301b5d05271e776d9a8bdd89627356e260ac3b
Parents: 6dbf2ba
Author: Garren Smith <garren.smith@gmail.com>
Authored: Tue Apr 12 11:10:23 2016 +0200
Committer: Garren Smith <garren.smith@gmail.com>
Committed: Tue Apr 12 11:10:23 2016 +0200

----------------------------------------------------------------------
 .travis.yml  | 2 +-
 index.js     | 2 +-
 package.json | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0f301b5d/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index db8d848..7beac34 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,7 @@ before_install:
 before_script:
   - npm test
   - grunt debugDev
-  - ./bin/fauxton &
+  - DIST=./dist/debug ./bin/fauxton &
   - sleep 30
 script:
   - ./node_modules/grunt-cli/bin/grunt nightwatch

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0f301b5d/index.js
----------------------------------------------------------------------
diff --git a/index.js b/index.js
index 958a97e..82b2645 100644
--- a/index.js
+++ b/index.js
@@ -4,7 +4,7 @@ var httpProxy = require('http-proxy');
 var send = require('send');
 var urlLib = require('url');
 var _ = require('lodash');
-var dist_dir = process.env.DIST || __dirname + '/dist/debug/';
+var dist_dir = process.env.DIST || __dirname + '/dist/release/';
 
 module.exports = function (options) {
   // Options

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0f301b5d/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 7f933ec..3ed74aa 100644
--- a/package.json
+++ b/package.json
@@ -17,15 +17,12 @@
   },
   "devDependencies": {
     "es5-shim": "4.5.4",
-    "file-loader": "^0.8.5",
-    "imports-loader": "^0.6.5",
     "mocha": "^2.4.5",
     "mocha-phantomjs": "~4.0.2",
     "nightwatch": "~0.8.18",
     "phantomjs": "^2.0.1",
     "react-addons-test-utils": "^0.14.7",
-    "sinon": "git+https://github.com/sinonjs/sinon.git",
-    "url-loader": "^0.5.7"
+    "sinon": "git+https://github.com/sinonjs/sinon.git"
   },
   "dependencies": {
     "async": "~0.2.6",
@@ -49,6 +46,7 @@
     "exports-loader": "^0.6.2",
     "expose-loader": "^0.7.1",
     "express": "^4.13.4",
+    "file-loader": "^0.8.5",
     "flux": "^2.1.1",
     "grunt": "~0.4.1",
     "grunt-chmod": "^1.0.3",
@@ -63,6 +61,7 @@
     "grunt-md5": "^0.1.11",
     "grunt-shell": "^1.1.1",
     "http-proxy": "^1.13.2",
+    "imports-loader": "^0.6.5",
     "jquery": "^2.2.0",
     "less": "^2.3.1",
     "less-loader": "^2.2.3",
@@ -83,6 +82,7 @@
     "style-loader": "^0.13.1",
     "underscore": "~1.4.2",
     "url": "~0.7.9",
+    "url-loader": "^0.5.7",
     "urls": "~0.0.3",
     "velocity-animate": "^1.2.3",
     "webpack": "^1.12.12",


Mime
View raw message