1
0
mirror of https://github.com/Unleash/unleash.git synced 2025-01-25 00:07:47 +01:00

Modified configuration to make it run on heroku.

Please note that scripts and webpack is moved from
devDependences to dependencies. This is due to heroku
running the build process in production mode.
This commit is contained in:
Ivar Østhus 2014-11-06 21:26:55 +01:00
parent 1f8e24166f
commit 43ff5732aa
4 changed files with 22 additions and 14 deletions

View File

@ -24,7 +24,8 @@
"tdd": "mocha --watch test test/*",
"test-bamboo-ci": "mocha test test/*",
"coverage": "istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec",
"coverage-report": "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage"
"coverage-report": "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage",
"postinstall": "npm run build"
},
"dependencies": {
"any-db": "2.1.0",
@ -38,6 +39,12 @@
"ini": "1.3.0",
"log4js": "0.6.21",
"nconf": "0.6.9",
"jsxhint": "0.4.15",
"jsx-loader": "^0.12.0",
"react": "^0.12.0",
"reqwest": "^1.1.4",
"webpack": "^1.4.9",
"webpack-dev-middleware": "^1.0.11",
"pg": "3.6.1"
},
"devDependencies": {
@ -45,18 +52,12 @@
"coveralls": "^2.11.2",
"istanbul": "0.3.2",
"jshint": "2.5.2",
"jsx-loader": "^0.12.0",
"jsxhint": "0.4.15",
"mocha": "1.20.1",
"mocha-lcov-reporter": "0.0.1",
"mockery": "1.4.0",
"pre-commit": "0.0.9",
"react": "^0.12.0",
"reqwest": "^1.1.4",
"supertest": "0.13.0",
"supervisor": "0.6.0",
"webpack": "^1.4.9",
"webpack-dev-middleware": "^1.0.11",
"xmlbuilder": "2.4.4"
}
}

1
public/js/bundle.js.map Normal file

File diff suppressed because one or more lines are too long

View File

@ -32,7 +32,7 @@ app.set('trust proxy');
app.locals.baseUriPath = baseUriPath;
app.use(log4js.connectLogger(logger, {format: ':remote-addr :status :method :url :response-timems'}));
app.set('port', process.env.HTTP_PORT || 4242);
app.set('port', process.env.HTTP_PORT || process.env.PORT || 4242);
app.use(baseUriPath, express.static(__dirname + '/public'));
app.use(bodyParser.json({strict: false}));
@ -56,4 +56,4 @@ process.on('uncaughtException', function(err) {
module.exports = {
app: app,
server: server
};
};

View File

@ -1,18 +1,24 @@
// docs: http://webpack.github.io/docs/configuration.html
var path = require('path');
var root = path.normalize(path.join(__dirname, '.'));
var js_root = path.join(path.join(root, 'public'), 'js');
module.exports = {
context: __dirname + '/public',
entry: './js/app',
context: js_root,
entry: 'app',
output: {
path: __dirname + '/public/js',
path: js_root,
filename: 'bundle.js',
publicPath: '/js/'
},
resolve: {
extensions: ['', '.js', '.jsx']
root: [js_root],
extensions: ['', '.js', '.jsx'],
modulesDirectories: ["web_modules", "node_modules"]
},
module: {
@ -27,4 +33,4 @@ module.exports = {
// stuff not in node_modules can be resolved here.
}
};
};