Skip to content

Commit

Permalink
Revert "Add a prod and dev webpack configuration, based off NODE_ENV"
Browse files Browse the repository at this point in the history
This reverts commit 9cc2e09.
  • Loading branch information
Risha Mars committed Jun 11, 2018
1 parent 9cc2e09 commit ec015b3
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 100 deletions.
1 change: 0 additions & 1 deletion web/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
"sinon-stub-promise": "^4.0.0",
"webpack": "^3.5.6",
"webpack-dev-server": "^2.7.1",
"webpack-merge": "^4.1.2",
"whatwg-fetch": "^2.0.3"
},
"devDependencies": {
Expand Down
41 changes: 0 additions & 41 deletions web/app/webpack.base.js

This file was deleted.

56 changes: 53 additions & 3 deletions web/app/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,55 @@
/* global require, module, __dirname */

module.exports = process.env.NODE_ENV === 'production'
? require('./webpack.prod.js')
: require('./webpack.dev.js')
const path = require('path');

module.exports = {
entry: './js/index.js',
output: {
path: path.resolve(__dirname, 'dist'),
publicPath: 'dist/',
filename: 'index_bundle.js'
},
devtool: 'cheap-module-source-map',
externals: {
cheerio: 'window',
'react/addons': 'react',
'react/lib/ExecutionEnvironment': 'react',
'react/lib/ReactContext': 'react',
'react-addons-test-utils': 'react-dom',
},
module: {
rules: [
{
test: /\.jsx?$/,
exclude: /node_modules/,
use: [
'babel-loader',
{
loader: 'eslint-loader',
options: {
fix: true,
emitWarning: true
}
}
]
},
{
test: /\.css$/,
use: [
'style-loader',
{ loader: 'css-loader', options: { importLoaders: 1, minimize: true } },
'postcss-loader'
]
},
{
test: /\.(png|jpg|gif|eot|svg|ttf|woff|woff2)$/,
use: [
{
loader: 'file-loader',
options: { publicPath: 'dist/' }
}
]
}
]
}
}
25 changes: 0 additions & 25 deletions web/app/webpack.dev.js

This file was deleted.

24 changes: 0 additions & 24 deletions web/app/webpack.prod.js

This file was deleted.

6 changes: 0 additions & 6 deletions web/app/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7620,12 +7620,6 @@ webpack-dev-server@^2.7.1:
webpack-dev-middleware "^1.11.0"
yargs "^6.6.0"

webpack-merge@^4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.2.tgz#5d372dddd3e1e5f8874f5bf5a8e929db09feb216"
dependencies:
lodash "^4.17.5"

webpack-sources@^1.0.1:
version "1.1.0"
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54"
Expand Down

0 comments on commit ec015b3

Please sign in to comment.