Consolidated webpack configs

ApacheEx · Aug 23, 2016 · a52af30 · a52af30
1 parent 58fcf25
commit a52af30
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 56 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,5 +1,5 @@
 {
-  "presets": ["es2015-webpack", "react", "stage-2"],
+  "presets": ["es2015", "react", "stage-2"],
   "env": {
     "development": {
       "plugins": ["lodash", "transform-es2015-modules-commonjs"]

diff --git a/package.json b/package.json
@@ -12,8 +12,8 @@
     "build": "npm run build:lib && npm run build:es && npm run build:umd && npm run build:umd:min",
     "build:lib": "babel src --out-dir lib",
     "build:es": "cross-env BABEL_ENV=es babel src --out-dir es",
-    "build:umd": "webpack src/index.js dist/redux-form.js --config webpack.config.development.js",
-    "build:umd:min": "webpack src/index.js dist/redux-form.min.js --config webpack.config.production.js",
+    "build:umd": "cross-env NODE_ENV=development webpack src/index.js dist/redux-form.js",
+    "build:umd:min": "cross-env NODE_ENV=production webpack src/index.js dist/redux-form.min.js",
     "clean": "rimraf dist lib",
     "lint": "eslint src",
     "example:simple": "node examples/simple/server.js",
@@ -59,9 +59,7 @@
     "babel-plugin-syntax-async-functions": "^6.5.0",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.8.0",
     "babel-plugin-transform-regenerator": "^6.6.5",
-    "babel-polyfill": "^6.7.4",
-    "babel-preset-es2015": "6.9.0",
-    "babel-preset-es2015-webpack": "^6.4.1",
+    "babel-preset-es2015": "^6.13.2",
     "babel-preset-react": "^6.1.18",
     "babel-preset-stage-2": "^6.1.18",
     "babel-register": "^6.3.13",
@@ -75,18 +73,18 @@
     "expect-predicate": "^1.0.0",
     "flux-standard-action": "^0.6.1",
     "jsdom": "^9.1.0",
-    "lodash-webpack-plugin": "^0.9.0",
+    "lodash-webpack-plugin": "^0.10.0",
     "mocha": "^3.0.2",
     "nyc": "^8.1.0",
-    "react": "^15.2.0",
-    "react-addons-test-utils": "^15.2.0",
-    "react-dom": "^15.2.0",
+    "react": "^15.3.1",
+    "react-addons-test-utils": "^15.3.1",
+    "react-dom": "^15.3.1",
     "react-redux": "^4.4.1",
     "redux": "^3.3.1",
     "redux-immutablejs": "0.0.8",
     "rifraf": "^2.0.2",
     "rimraf": "^2.5.1",
-    "webpack": "^1.12.13"
+    "webpack": "^1.13.2"
   },
   "peerDependencies": {
     "react": "^15.0.0",

diff --git a/src/__tests__/setup.js b/src/__tests__/setup.js
@@ -1,4 +1,3 @@
-require('babel-polyfill')
 import { jsdom } from 'jsdom'
 
 global.document = jsdom('<!doctype html><html><body></body></html>')

diff --git a/webpack.config.development.js b/webpack.config.development.js
diff --git a/webpack.config.base.js → webpack.config.js b/webpack.config.base.js → webpack.config.js
@@ -1,5 +1,8 @@
 'use strict'
 var webpack = require('webpack')
+var LodashModuleReplacementPlugin = require('lodash-webpack-plugin')
+
+var env = process.env.NODE_ENV
 
 var reactExternal = {
   root: 'React',
@@ -22,7 +25,7 @@ var reactReduxExternal = {
   amd: 'react-redux'
 }
 
-module.exports = {
+var config = {
   externals: {
     'react': reactExternal,
     'redux': reduxExternal,
@@ -37,7 +40,27 @@ module.exports = {
     library: 'ReduxForm',
     libraryTarget: 'umd'
   },
-  resolve: {
-    extensions: ['', '.js']
-  }
+  plugins: [
+    new LodashModuleReplacementPlugin,
+    new webpack.optimize.OccurenceOrderPlugin(),
+    new webpack.DefinePlugin({
+      'process.env.NODE_ENV': JSON.stringify(env)
+    })
+  ]
+}
+
+if (env === 'production') {
+  config.plugins.push(
+    new webpack.optimize.UglifyJsPlugin({
+      compressor: {
+        pure_getters: true,
+        unsafe: true,
+        unsafe_comps: true,
+        warnings: false
+      }
+    })
+  )
+  config.plugins.push(new webpack.optimize.DedupePlugin())
 }
+
+module.exports = config
diff --git a/webpack.config.production.js b/webpack.config.production.js