diff --git a/web/app/package.json b/web/app/package.json index e52ba18f7ee86..c100a13b81144 100644 --- a/web/app/package.json +++ b/web/app/package.json @@ -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": { diff --git a/web/app/webpack.base.js b/web/app/webpack.base.js deleted file mode 100644 index 6870d5695a04b..0000000000000 --- a/web/app/webpack.base.js +++ /dev/null @@ -1,41 +0,0 @@ -/* global require, module, __dirname */ - -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: /\.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/' } - } - ] - } - ] - } -} diff --git a/web/app/webpack.config.js b/web/app/webpack.config.js index 241c90221f049..8b250ae40d1fa 100644 --- a/web/app/webpack.config.js +++ b/web/app/webpack.config.js @@ -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/' } + } + ] + } + ] + } +} diff --git a/web/app/webpack.dev.js b/web/app/webpack.dev.js deleted file mode 100644 index ac6ed220dbda2..0000000000000 --- a/web/app/webpack.dev.js +++ /dev/null @@ -1,25 +0,0 @@ -/* global require, module, __dirname */ - -const merge = require('webpack-merge'); -const baseWebpackConfig = require('./webpack.base'); - -module.exports = merge(baseWebpackConfig, { - module: { - rules: [ - { - test: /\.jsx?$/, - exclude: /node_modules/, - use: [ - 'babel-loader', - { - loader: 'eslint-loader', - options: { - fix: true, - emitWarning: true - } - } - ] - } - ] - } -}); diff --git a/web/app/webpack.prod.js b/web/app/webpack.prod.js deleted file mode 100644 index 605ebe78a650f..0000000000000 --- a/web/app/webpack.prod.js +++ /dev/null @@ -1,24 +0,0 @@ -/* global require, module, __dirname */ - -const merge = require('webpack-merge'); -const baseWebpackConfig = require('./webpack.base'); - -module.exports = merge(baseWebpackConfig, { - module: { - rules: [ - { - test: /\.jsx?$/, - exclude: /node_modules/, - use: [ - 'babel-loader', - { - loader: 'eslint-loader', - options: { - fix: true - } - } - ] - } - ] - } -}); diff --git a/web/app/yarn.lock b/web/app/yarn.lock index b344d0d00ee7e..12a956e2c98e7 100644 --- a/web/app/yarn.lock +++ b/web/app/yarn.lock @@ -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"