Merge pull request #36 from AndrewGable/andrew-fix

Fix dev/prod issues by splitting up webpack configs

.gitignore

@@ -34,6 +34,7 @@ local.properties
 node_modules/
 npm-debug.log
 yarn-error.log
+dist/
 
 # BUCK
 buck-out/

package.json

@@ -6,8 +6,8 @@
     "android": "react-native run-android",
     "ios": "react-native run-ios",
     "start": "react-native start",
-    "web": "webpack-dev-server --open --config webpack.config.js",
-    "build": "webpack --config webpack.config.js",
+    "web": "webpack-dev-server --open --config webpack.dev.js",
+    "build": "webpack --config webpack.prod.js",
     "test": "jest",
     "lint": "eslint ."
   },
@@ -54,7 +54,8 @@
     "react-test-renderer": "16.13.1",
     "webpack": "^4.44.1",
     "webpack-cli": "^3.3.12",
-    "webpack-dev-server": "^3.11.0"
+    "webpack-dev-server": "^3.11.0",
+    "webpack-merge": "^5.1.1"
   },
   "jest": {
     "preset": "react-native"

src/lib/Network.js

@@ -30,6 +30,7 @@ function request(command, data, type = 'post') {
             if (responseData.jsonCode === 200) {
                 return responseData;
             }
+            // eslint-disable-next-line no-console
             console.info('[API] Error', responseData);
         })
         // eslint-disable-next-line no-unused-vars

src/lib/Pusher/pusher.js

@@ -209,6 +209,7 @@ function unsubscribe(channelName, eventName = '') {
         channel.unbind(eventName);
     } else {
         if (!channel.subscribed) {
+            // eslint-disable-next-line no-console
             console.warn('[Pusher] Attempted to unsubscribe from channel, but we are not subscribed to begin with', 0, {channelName});
             return;
         }

src/store/actions/PersonalDetailsActions.js

@@ -71,6 +71,7 @@ function fetch() {
         })
         .catch((error) => {
             if (error.message === 'No login') {
+                // eslint-disable-next-line no-console
                 console.info('No email in store, not fetching personal details.');
                 return;
             }

src/store/actions/ReportActions.js

@@ -131,6 +131,7 @@ function fetchAll() {
                 return data;
             })
             .then(data => Store.set(STOREKEYS.REPORTS, _.values(data.reports)))
+            // eslint-disable-next-line no-console
             .catch((error) => { console.log('Error fetching report actions', error); });
     }
 
@@ -146,6 +147,7 @@ function fetchAll() {
             return data;
         })
         .then(data => Store.set(STOREKEYS.REPORTS, _.values(data.reportListBeta)))
+        // eslint-disable-next-line no-console
         .catch((error) => { console.log('Error fetching report actions', error); });
 }
 

webpack.config.js → webpack.common.js

@@ -3,19 +3,13 @@ const {CleanWebpackPlugin} = require('clean-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 
 module.exports = {
-    mode: 'development',
     entry: {
         app: './web/index.js',
     },
     output: {
         filename: '[name]-[hash].bundle.js',
         path: path.resolve(__dirname, 'dist'),
     },
-    devtool: 'inline-source-map',
-    devServer: {
-        contentBase: path.join(__dirname, 'dist'),
-        hot: true,
-    },
     plugins: [
         new CleanWebpackPlugin(),
         new HtmlWebpackPlugin({

webpack.dev.js

@@ -0,0 +1,12 @@
+const path = require('path');
+const {merge} = require('webpack-merge');
+const common = require('./webpack.common.js');
+
+module.exports = merge(common, {
+    mode: 'development',
+    devtool: 'inline-source-map',
+    devServer: {
+        contentBase: path.join(__dirname, 'dist'),
+        hot: true,
+    },
+});

webpack.prod.js

@@ -0,0 +1,7 @@
+const {merge} = require('webpack-merge');
+const common = require('./webpack.common.js');
+
+module.exports = merge(common, {
+    mode: 'production',
+    devtool: 'source-map',
+});