Merge pull request #426 from mrfelton/feat/update-tooling

Update tooling

.travis.yml

@@ -31,7 +31,6 @@ addons:
 
 install:
   - yarn
-  - cd app && yarn && cd ..
   - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16"
 
 before_script:

appveyor.yml

@@ -25,7 +25,6 @@ install:
   - ps: Install-Product node $env:nodejs_version
   - set CI=true
   - yarn
-  - cd app && yarn
 
 test_script:
   - node --version

package.json

@@ -137,54 +137,53 @@
     ]
   },
   "devDependencies": {
-    "babel-core": "^6.24.1",
-    "babel-eslint": "^8.2.1",
-    "babel-jest": "^20.0.3",
-    "babel-loader": "^7.1.0",
+    "babel-core": "^6.26.3",
+    "babel-eslint": "^8.2.3",
+    "babel-jest": "^23.0.1",
+    "babel-loader": "^7.1.4",
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-dev-expression": "^0.2.1",
-    "babel-plugin-dynamic-import-webpack": "^1.0.1",
-    "babel-plugin-flow-runtime": "^0.11.1",
+    "babel-plugin-dynamic-import-webpack": "^1.0.2",
+    "babel-plugin-flow-runtime": "^0.17.0",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-es2015-classes": "^6.24.1",
-    "babel-preset-env": "^1.5.1",
+    "babel-preset-env": "^1.7.0",
     "babel-preset-react": "^6.24.1",
     "babel-preset-react-hmre": "^1.1.1",
     "babel-preset-react-optimize": "^1.0.1",
     "babel-preset-stage-0": "^6.24.1",
-    "babel-register": "^6.24.1",
-    "babili-webpack-plugin": "^0.1.2",
+    "babel-register": "^6.26.0",
     "browserslist": "^2.11.0",
-    "chalk": "^2.0.1",
-    "concurrently": "^3.5.0",
-    "cross-env": "^5.0.0",
-    "cross-spawn": "^5.1.0",
-    "css-loader": "^0.28.3",
-    "electron-builder": "^20.15.1",
+    "chalk": "^2.4.1",
+    "concurrently": "^3.5.1",
+    "cross-env": "^5.2.0",
+    "cross-spawn": "^6.0.5",
+    "css-loader": "^0.28.11",
+    "electron-builder": "^20.15.3",
     "electron-devtools-installer": "^2.2.1",
     "enzyme": "^2.9.1",
     "enzyme-to-json": "^1.5.1",
-    "eslint": "^4.16.0",
+    "eslint": "^4.19.1",
     "eslint-config-airbnb": "^16.1.0",
     "eslint-formatter-pretty": "^1.3.0",
-    "eslint-import-resolver-webpack": "^0.8.4",
-    "eslint-plugin-compat": "^2.2.0",
-    "eslint-plugin-flowtype": "^2.42.0",
-    "eslint-plugin-import": "^2.8.0",
-    "eslint-plugin-jest": "^21.7.0",
+    "eslint-import-resolver-webpack": "^0.10.0",
+    "eslint-plugin-compat": "^2.4.0",
+    "eslint-plugin-flowtype": "^2.49.3",
+    "eslint-plugin-import": "^2.12.0",
+    "eslint-plugin-jest": "^21.17.0",
     "eslint-plugin-jsx-a11y": "6.0.3",
-    "eslint-plugin-promise": "^3.6.0",
-    "eslint-plugin-react": "^7.6.1",
+    "eslint-plugin-promise": "^3.8.0",
+    "eslint-plugin-react": "^7.9.1",
     "express": "^4.15.3",
-    "extract-text-webpack-plugin": "^3.0.1",
+    "extract-text-webpack-plugin": "^4.0.0-beta.0",
     "fbjs-scripts": "^0.8.0",
-    "file-loader": "^0.11.1",
-    "flow-bin": "^0.48.0",
-    "flow-runtime": "^0.13.0",
+    "file-loader": "^1.1.11",
+    "flow-bin": "^0.74.0",
+    "flow-runtime": "^0.17.0",
     "flow-typed": "^2.1.2",
-    "html-webpack-plugin": "^2.29.0",
+    "html-webpack-plugin": "^3.2.0",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "^20.0.4",
+    "jest": "^23.1.0",
     "jsdom": "^11.0.0",
     "minimist": "^1.2.0",
     "node-sass": "^4.9.0",
@@ -193,17 +192,18 @@
     "react-test-renderer": "^15.6.1",
     "redux-logger": "^3.0.6",
     "rimraf": "^2.6.1",
-    "sass-loader": "^6.0.6",
+    "sass-loader": "^7.0.3",
     "sinon": "^2.3.5",
     "spectron": "^3.8.0",
-    "style-loader": "^0.18.1",
-    "stylelint": "^9.1.1",
+    "style-loader": "^0.21.0",
+    "stylelint": "9.3.0",
     "stylelint-config-standard": "^18.2.0",
-    "url-loader": "^0.5.8",
-    "webpack": "^3.7.1",
-    "webpack-bundle-analyzer": "^2.8.2",
-    "webpack-dev-server": "^2.5.0",
-    "webpack-merge": "^4.1.0"
+    "url-loader": "^1.0.1",
+    "webpack": "^4.12.0",
+    "webpack-bundle-analyzer": "^2.13.1",
+    "webpack-cli": "^3.0.7",
+    "webpack-dev-server": "^3.1.4",
+    "webpack-merge": "^4.1.3"
   },
   "dependencies": {
     "axios": "^0.16.2",
@@ -219,7 +219,7 @@
     "electron-store": "^1.3.0",
     "font-awesome": "^4.7.0",
     "history": "^4.6.3",
-    "lodash": "^4.17.4",
+    "lodash": "^4.17.10",
     "moment-timezone": "^0.5.13",
     "prop-types": "^15.5.10",
     "qrcode.react": "0.8.0",
@@ -238,7 +238,7 @@
     "redux-thunk": "^2.2.0",
     "reselect": "^3.0.1",
     "satoshi-bitcoin": "^1.0.4",
-    "source-map-support": "^0.4.15",
+    "source-map-support": "^0.5.6",
     "xtend": "^4.0.1"
   },
   "main": "webpack.config.base.js",

webpack.config.base.js

@@ -43,8 +43,10 @@ export default {
   plugins: [
     new webpack.DefinePlugin({
       'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || 'production')
-    }),
+    })
+  ],
 
-    new webpack.NamedModulesPlugin()
-  ]
+  optimization: {
+    namedModules: true
+  }
 }

webpack.config.main.prod.js

@@ -4,7 +4,6 @@
 
 import webpack from 'webpack'
 import merge from 'webpack-merge'
-import BabiliPlugin from 'babili-webpack-plugin'
 import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer'
 import baseConfig from './webpack.config.base'
 import CheckNodeEnv from './internals/scripts/CheckNodeEnv'
@@ -16,6 +15,8 @@ export default merge.smart(baseConfig, {
 
   target: 'electron-main',
 
+  mode: 'production',
+
   entry: './app/main.dev',
 
   // 'main.js' in root
@@ -28,8 +29,6 @@ export default merge.smart(baseConfig, {
     /**
      * Babli is an ES6+ aware minifier based on the Babel toolchain (beta)
      */
-    new BabiliPlugin(),
-
     new BundleAnalyzerPlugin({
       analyzerMode: process.env.OPEN_ANALYZER === 'true' ? 'server' : 'disabled',
       openAnalyzer: process.env.OPEN_ANALYZER === 'true'

webpack.config.renderer.dev.dll.js

@@ -20,6 +20,8 @@ export default merge.smart(baseConfig, {
 
   target: 'electron-renderer',
 
+  mode: 'development',
+
   externals: ['fsevents', 'crypto-browserify'],
 
   /**

webpack.config.renderer.dev.js

@@ -37,6 +37,8 @@ export default merge.smart(baseConfig, {
 
   target: 'electron-renderer',
 
+  mode: 'development',
+
   entry: [
     'react-hot-loader/patch',
     `webpack-dev-server/client?http://localhost:${port}/`,
@@ -210,8 +212,6 @@ export default merge.smart(baseConfig, {
       // multiStep: true
     }),
 
-    new webpack.NoEmitOnErrorsPlugin(),
-
     /**
      * Create global constants which can be configured at compile time.
      *
@@ -262,7 +262,7 @@ export default merge.smart(baseConfig, {
       verbose: true,
       disableDotRule: false
     },
-    setup() {
+    before() {
       if (process.env.START_HOT) {
         console.log('Starting Main Process...')
         spawn(
@@ -274,5 +274,9 @@ export default merge.smart(baseConfig, {
           .on('error', spawnError => console.error(spawnError))
       }
     }
+  },
+
+  optimization: {
+    noEmitOnErrors: true
   }
 })

webpack.config.renderer.prod.js

@@ -7,7 +7,6 @@ import webpack from 'webpack'
 import ExtractTextPlugin from 'extract-text-webpack-plugin'
 import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer'
 import merge from 'webpack-merge'
-import BabiliPlugin from 'babili-webpack-plugin'
 import baseConfig from './webpack.config.base'
 import CheckNodeEnv from './internals/scripts/CheckNodeEnv'
 
@@ -18,6 +17,8 @@ export default merge.smart(baseConfig, {
 
   target: 'electron-renderer',
 
+  mode: 'production',
+
   entry: './app/index',
 
   output: {
@@ -153,11 +154,6 @@ export default merge.smart(baseConfig, {
       'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || 'production')
     }),
 
-    /**
-     * Babli is an ES6+ aware minifier based on the Babel toolchain (beta)
-     */
-    new BabiliPlugin(),
-
     new ExtractTextPlugin('style.css'),
 
     new BundleAnalyzerPlugin({