Improve webpack config

.storybook/webpack.config.js

@@ -23,7 +23,6 @@ module.exports = {
               require.resolve('babel-preset-env')
             ],
             plugins: [
-              require.resolve('babel-plugin-react-require'),
               require.resolve('babel-plugin-transform-class-properties')
             ]
           }

webpack/rules.js

@@ -11,18 +11,16 @@ const include = [
 module.exports = [
   {
     test: /\.(js|jsx)$/,
-    // exclude: /node_modules/,
     include,
     use: {
       loader: 'babel-loader',
       options: {
         presets: [
           require.resolve('babel-preset-stage-2'),
-          // [require.resolve('babel-preset-es2015'), {
-          //   modules: false
-          // }],
           require.resolve('babel-preset-react'),
-          require.resolve('babel-preset-env')
+          [require.resolve('babel-preset-env'), {
+            modules: false
+          }]
         ],
         plugins: [
           'react-hot-loader/babel',

webpack/webpack.dev.config.js

@@ -3,6 +3,7 @@ const webpack = require('webpack')
 const ThemePlugin = require('pubsweet-theme-plugin')
 const config = require('../config/dev')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
+const rules = require('./rules')
 
 module.exports = [
   {
@@ -24,7 +25,7 @@ module.exports = [
     },
     devtool: 'cheap-module-source-map',
     module: {
-      rules: require('./rules')
+      rules
     },
     resolve: {
       symlinks: false,

webpack/webpack.production.config.js

@@ -6,6 +6,7 @@ const ThemePlugin = require('pubsweet-theme-plugin')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
 const CompressionPlugin = require('compression-webpack-plugin')
 const config = require('../config/production')
+const rules = require('./rules')
 
 module.exports = [
   {
@@ -22,7 +23,7 @@ module.exports = [
       publicPath: '/assets/'
     },
     module: {
-      rules: require('./rules')
+      rules
     },
     resolve: {
       symlinks: false,

webpack/webpack.test.config.js

@@ -4,6 +4,7 @@ const ThemePlugin = require('pubsweet-theme-plugin')
 const config = require('../config/test')
 const CompressionPlugin = require('compression-webpack-plugin')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
+const rules = require('./rules')
 
 module.exports = [
   {
@@ -24,7 +25,7 @@ module.exports = [
       publicPath: '/assets/'
     },
     module: {
-      rules: require('./rules')
+      rules
     },
     resolve: {
       symlinks: false,