[WIP] Update dependencies and support Node 12

client/.babelrc

@@ -1,6 +1,6 @@
 {
   "presets": [
-    "env",
-    "react"
+    "@babel/preset-env",
+    "@babel/preset-react"
   ]
 }

client/cfg/base.js

@@ -2,17 +2,7 @@
 let path = require('path');
 let defaultSettings = require('./defaults');
 
-// Additional npm or bower modules to include in builds
-// Add all foreign plugins you may need into this array
-// @example:
-// let npmBase = path.join(__dirname, '../node_modules');
-// let additionalPaths = [ path.join(npmBase, 'react-bootstrap') ];
-let additionalPaths = [];
-
 module.exports = {
-  additionalPaths: additionalPaths,
-  port: defaultSettings.port,
-  debug: true,
   devtool: 'eval',
   output: {
     path: path.join(__dirname, '/../dist/assets'),
@@ -28,7 +18,6 @@ module.exports = {
     noInfo: false
   },
   resolve: {
-    extensions: ['', '.js', '.jsx'],
     alias: {
       actions: `${defaultSettings.srcPath}/actions/`,
       components: `${defaultSettings.srcPath}/components/`,
@@ -39,11 +28,4 @@ module.exports = {
     }
   },
   module: {},
-  postcss: function () {
-    return [
-      require('autoprefixer')({
-        browsers: ['last 5 versions', 'ie >= 8', 'last 5 iOS versions']
-      })
-    ];
-  }
 };

client/cfg/defaults.js

@@ -4,12 +4,13 @@ const srcPath = path.join(__dirname, '/../src');
 const dfltPort = 8000;
 function getDefaultModules() {
   return {
-    preLoaders: [{
+    rules: [
+      {
         test: /\.(js|jsx)$/,
         include: srcPath,
-        loader: 'eslint-loader'
-      }],
-    loaders: [
+        loader: 'eslint-loader',
+        enforce: 'pre'
+      },
       {
         test: /\.(html)$/,
         loader: 'html-loader',
@@ -70,13 +71,5 @@ module.exports = {
   srcPath: srcPath,
   publicPath: '/assets/',
   port: dfltPort,
-  getDefaultModules: getDefaultModules,
-  postcss: function () {
-    return [
-      // require('autoprefixer')({
-      //   browsers: ['last 5 versions', 'ie >= 8', 'last 5 iOS versions']
-      // })
-    ];
-
-  }
+  getDefaultModules: getDefaultModules
 };

client/cfg/dev.js

@@ -4,9 +4,7 @@ let path = require('path');
 let webpack = require('webpack');
 let baseConfig = require('./base');
 let defaultSettings = require('./defaults');
-
-// Add needed plugins here
-let BowerWebpackPlugin = require('bower-webpack-plugin');
+let autoprefixer = require('autoprefixer');
 
 let config = Object.assign({}, baseConfig, {
   entry: [
@@ -15,25 +13,42 @@ let config = Object.assign({}, baseConfig, {
     './src/index'
   ],
   cache: true,
+  devServer: {
+    contentBase: './src/',
+    historyApiFallback: true,
+    hot: false,
+    port: defaultSettings.port,
+    publicPath: defaultSettings.publicPath,
+    noInfo: false
+  },
   devtool: 'eval-source-map',
   plugins: [
     new webpack.HotModuleReplacementPlugin(),
-    new webpack.NoErrorsPlugin(),
-    new BowerWebpackPlugin({
-      searchResolveModulesDirectories: false
-    })
+    new webpack.NoEmitOnErrorsPlugin(),
+		new webpack.LoaderOptionsPlugin({
+			options: {
+				context: __dirname,
+				postcss: [
+					autoprefixer
+				]
+			}
+		})
   ],
   module: defaultSettings.getDefaultModules()
 });
 
 // Add needed loaders to the defaults here
-config.module.loaders.push({
+config.module.rules.push({
   test: /\.(js|jsx)$/,
   loader: require.resolve('babel-loader'),
-  include: [].concat(
-    config.additionalPaths,
-    [ path.join(__dirname, '/../src') ]
-  ),
+  exclude: [
+    /node_modules[\\\/]react-waypoint/,
+    /node_modules[\\\/]consolidated-events/
+  ],
+  //include: [].concat(
+  //  config.additionalPaths,
+  //  [ path.join(__dirname, '/../src') ]
+  //),
   options: {
 		cacheDirectory: true,
 		plugins: ['react-hot-loader/babel'],

client/cfg/dist.js

@@ -6,9 +6,6 @@ let webpack = require('webpack');
 let baseConfig = require('./base');
 let defaultSettings = require('./defaults');
 
-// Add needed plugins here
-let BowerWebpackPlugin = require('bower-webpack-plugin');
-
 let config = Object.assign({}, baseConfig, {
   entry: ['babel-polyfill', path.join(__dirname, '../src/index')],
   cache: false,
@@ -18,13 +15,10 @@ let config = Object.assign({}, baseConfig, {
     new webpack.DefinePlugin({
       'process.env.NODE_ENV': '"production"'
     }),
-    new BowerWebpackPlugin({
-      searchResolveModulesDirectories: false
-    }),
     new webpack.optimize.UglifyJsPlugin(),
     new webpack.optimize.OccurenceOrderPlugin(),
     new webpack.optimize.AggressiveMergingPlugin(),
-    new webpack.NoErrorsPlugin()
+    new webpack.NoEmitOnErrorsPlugin()
   ],
   module: defaultSettings.getDefaultModules(),
   postcss: function () {

client/cfg/test.js

@@ -5,22 +5,18 @@ let srcPath = path.join(__dirname, '/../src/');
 
 let baseConfig = require('./base');
 
-// Add needed plugins here
-let BowerWebpackPlugin = require('bower-webpack-plugin');
-
 module.exports = {
   devtool: 'eval',
   module: {
-    preLoaders: [
+    loaders: [
       {
         test: /\.(js|jsx)$/,
-        loader: 'isparta-instrumenter-loader',
+        loader: 'isparta-loader',
         include: [
           path.join(__dirname, '/../src')
-        ]
-      }
-    ],
-    loaders: [
+        ],
+        enforce: 'pre'
+      },
       {
         test: /\.(png|svg|jpg|gif|woff|woff2|css|sass|scss|less|styl)$/,
         loader: 'null-loader'
@@ -39,7 +35,6 @@ module.exports = {
     ]
   },
   resolve: {
-    extensions: [ '', '.js', '.jsx' ],
     alias: {
       actions: srcPath + 'actions/',
       helpers: path.join(__dirname, '/../test/helpers'),
@@ -49,10 +44,5 @@ module.exports = {
       styles: srcPath + 'styles/',
       config: srcPath + 'config/' + process.env.REACT_WEBPACK_ENV
     }
-  },
-  plugins: [
-    new BowerWebpackPlugin({
-      searchResolveModulesDirectories: false
-    })
-  ]
+  }
 };