Minor bug fixes

config/environment/.env

@@ -0,0 +1 @@
+BASE_URL=http://localhost.base.com

config/environment/.env.development

@@ -0,0 +1,2 @@
+BASE_URL=http://localhost.dev.com
+BASE_URL_EXPAND=$BASE_URL/expanded

config/environment/.env.production

@@ -0,0 +1,2 @@
+BASE_URL=http://localhost.prod.com
+BASE_URL_EXPAND=$BASE_URL/expanded

config/webpack/paths.js

@@ -6,6 +6,7 @@ module.exports = {
     bundleReportPath: resolve(__dirname, '../', '../', 'dist', 'report.html'),
     entryPath: resolve(__dirname, '../', '../', 'src/index.js'),
     templatePath: resolve(__dirname, '../', '../', 'src/index.html'),
-    envDevPath: resolve(__dirname, '../', '../', '.env.development'),
-    envPath: resolve(__dirname, '../', '../', '.env')
+    envDevPath: resolve(__dirname, '../', 'environment', '.env.development'),
+    envProdPath: resolve(__dirname, '../', 'environment' , '.env.production'),
+    envPath: resolve(__dirname, '../', 'environment' , '.env'),
 };

config/webpack/rules.js

@@ -9,9 +9,7 @@ module.exports = [
         loader: 'url-loader',
         options: {
             limit: fontInlineSizeLimit,
-            name: '[name].[ext]',
-            publicPath: '../fonts/',
-            outputPath: 'fonts/'
+            name: 'fonts/[name].[ext]',
         }
     },
     {
@@ -22,7 +20,8 @@ module.exports = [
                 options: {
                     hmr: process.env.NODE_ENV === 'development',
                     // if hmr does not work, this is a forceful method.
-                    reloadAll: process.env.NODE_ENV === 'development'
+                    reloadAll: process.env.NODE_ENV === 'development',
+                    publicPath: '../'
                 }
             },
             {
@@ -55,9 +54,7 @@ module.exports = [
             loader: 'url-loader',
             options: {
                 limit: imageInlineSizeLimit,
-                name: '[name].[hash:8].[ext]',
-                publicPath: '../images/',
-                outputPath: 'images/'
+                name: 'images/[name].[hash:8].[ext]',
             }
         }
     },
@@ -72,10 +69,8 @@ module.exports = [
         test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
         loader: 'url-loader',
         options: {
-            limit: 1000,
-            name: '[name].[hash:8].[ext]',
-            publicPath: '../images/',
-            outputPath: 'images/'
+            limit: imageInlineSizeLimit,
+            name: 'images/[name].[hash:8].[ext]',
         }
     }
 ];

config/webpack/webpack.development.js

@@ -28,8 +28,8 @@ module.exports = {
             exclude: /node_modules/,
             loader: 'eslint-loader',
             options: {
-                cache: true,
-                configFile: '.eslintrc.js',
+                cache: false,
+                configFile: './.eslintrc.js',
                 emitWarning: true,
                 // Fail only on errors
                 failOnWarning: false,
@@ -47,7 +47,12 @@ module.exports = {
     },
     plugins: [
         new Dotenv({
-            path: paths.envDevPath // Path to .env file (this is the default)
+            path: paths.envDevPath, // Path to .env.development file
+            expand: true 
+        }),
+        new Dotenv({
+            path: paths.envPath, // Path to .env file 
+            expand: true
         }),
         new MiniCssExtractPlugin({
             filename: 'css/[name].css',

config/webpack/webpack.production.js

@@ -18,7 +18,12 @@ module.exports = {
         new webpack.HashedModuleIdsPlugin(), // so that file hashes don't change unexpectedly
         new CleanWebpackPlugin(),
         new Dotenv({
-            path: paths.envPath // Path to .env file (this is the default)
+            path: paths.envProdPath, // Path to .env.production file 
+            expand: true
+        }),
+        new Dotenv({
+            path: paths.envPath, // Path to .env file 
+            expand: true
         }),
         new MiniCssExtractPlugin({
             filename: 'css/[name]-[contenthash:8].css',

src/index.js

@@ -15,6 +15,7 @@ if (process.env.NODE_ENV !== 'production') {
     console.log('Looks like we are in development mode!');
 }
 
+console.log('Env var test ===>', process.env.BASE_URL, process.env.BASE_URL_EXPAND);
 // Wire up mithril app to DOM
 const $root = document.body.querySelector('#root');
 m.route($root, DefaultRoute, Routes);