Merge branch 'develop' into paring.down

This commit is contained in:
Connor Turland 2016-08-11 15:59:45 -04:00
commit 44bb0020bc
2 changed files with 17 additions and 8 deletions

View file

@ -16,7 +16,7 @@ Metamaps.Views.init = function () {
Metamaps.Views.MapperCard = Backbone.View.extend({ Metamaps.Views.MapperCard = Backbone.View.extend({
template: Hogan.compile($('#mapperCardTemplate').html()), template: Hogan.compile($('#mapperCardTemplate').html()),
tagNamea: 'div', tagName: 'div',
className: 'mapper', className: 'mapper',

View file

@ -1,13 +1,22 @@
const path = 'path' const path = require('path')
const webpack = 'webpack' const webpack = require('webpack')
const NODE_ENV = process.env.NODE_ENV || 'development'
const plugins = [
new webpack.DefinePlugin({
"process.env.NODE_ENV": `"${NODE_ENV}"`
})
]
if (NODE_ENV === 'production') {
plugins.push(new webpack.optimize.UglifyJsPlugin({
compress: { warnings: false }
}))
}
const config = module.exports = { const config = module.exports = {
context: __dirname, context: __dirname,
plugins: [ plugins,
new webpack.DefinePlugin({
"process.env.NODE_ENV": `"${process.env.NODE_ENV || 'development'}"`
})
],
module: { module: {
loaders: [ loaders: [
{ {