sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-05-22 21:57:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4680 from crookedneighbor/config-grunt

Browse source 
Config grunt
This commit is contained in:
Blade Barringer 2015-02-13 10:21:05 -06:00
commit 5d35d7dc86
4 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Gruntfile.js
View file

@ -234,6 +234,11 @@ module.exports = function(grunt) {
grunt.registerTask('run:dev', [ 'build:dev', 'concurrent' ]);
if(process.env.NODE_ENV == 'production')
grunt.registerTask('default', ['build:prod']);
else
grunt.registerTask('default', ['build:dev']);
// Load tasks
grunt.loadNpmTasks('grunt-browserify');
grunt.loadNpmTasks('grunt-contrib-uglify');

0
website/config.json.example → config.json.example
View file

2
package.json
View file

@ -74,7 +74,7 @@
"scripts": {
"test": "./test/run_tests.sh",
"start": "grunt run:dev",
"postinstall": "./node_modules/bower/bin/bower --config.interactive=false install -f; ./node_modules/.bin/grunt build:prod;",
"postinstall": "./node_modules/bower/bin/bower --config.interactive=false install -f; ./node_modules/.bin/grunt;",
"coverage": "COVERAGE=true mocha --require register-handlers.js --reporter html-cov > coverage.html; open coverage.html"
},
"devDependencies": {

4
website/src/utils.js
View file

@ -116,7 +116,7 @@ module.exports.setupConfig = function(){
nconf.argv()
.env()
//.file('defaults', path.join(path.resolve(__dirname, '../config.json.example')))
.file('user', path.join(path.resolve(__dirname, '../config.json')));
.file('user', path.join(path.resolve(__dirname, './../../config.json')));
if (nconf.get('NODE_ENV') === "development")
Error.stackTraceLimit = Infinity;
@ -142,4 +142,4 @@ module.exports.decrypt = function(text){
var dec = decipher.update(text,'hex','utf8')
dec += decipher.final('utf8');
return dec;
}
}