From 0ac44ac2678198a483a82f697398ecec98e2695f Mon Sep 17 00:00:00 2001
From: willyb321 <wbwilliam7@gmail.com>
Date: Fri, 17 Aug 2018 08:05:04 +1000
Subject: [PATCH] (hopefully) fix bugsnag crashing the build

---
 src/index.ejs          |  7 ++---
 webpack.config.prod.js | 59 +++++++++++++++++++++---------------------
 2 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/src/index.ejs b/src/index.ejs
index c89a866f..32bccb3d 100644
--- a/src/index.ejs
+++ b/src/index.ejs
@@ -26,7 +26,8 @@
     <script>
       window.CORIOLIS_GAPI_KEY = '<%- htmlWebpackPlugin.options.gapiKey %>';
       window.CORIOLIS_VERSION = '<%- htmlWebpackPlugin.options.version %>';
-      window.CORIOLIS_DATE = '<%- new Date().toISOString().slice(0, 10)  %>';
+      window.CORIOLIS_DATE = '<%- htmlWebpackPlugin.options.date.toISOString().slice(0, 10)  %>';
+      window.BUGSNAG_VERSION = '<%- htmlWebpackPlugin.options.version + '-' + htmlWebpackPlugin.options.date.toISOString()  %>';
     </script>
     <% if (htmlWebpackPlugin.options.uaTracking) { %>
     <script>
@@ -36,7 +37,7 @@
     </script>
     <script async src='https://www.google-analytics.com/analytics.js'></script>
     <% } %>
-    
+
     <!-- Piwik -->
    <!-- <script type="text/javascript">
       var _paq = _paq || [];
@@ -58,7 +59,7 @@
     <script src="//d2wy8f7a9ursnm.cloudfront.net/v4/bugsnag.min.js"></script>
     <script src="//d2wy8f7a9ursnm.cloudfront.net/bugsnag-plugins/v1/bugsnag-react.min.js"></script>
     <script>
-      window.bugsnagClient = bugsnag('ba9fae819372850fb660755341fa6ef5', {appVersion: window.CORIOLIS_VERSION || undefined})
+      window.bugsnagClient = bugsnag('ba9fae819372850fb660755341fa6ef5', {appVersion: window.BUGSNAG_VERSION || undefined})
       window.Bugsnag = window.bugsnagClient
     </script>
   </head>
diff --git a/webpack.config.prod.js b/webpack.config.prod.js
index b3f6de99..c0c78bc1 100644
--- a/webpack.config.prod.js
+++ b/webpack.config.prod.js
@@ -1,23 +1,23 @@
-const path = require('path')
-const exec = require('child_process').exec
-const webpack = require('webpack')
-const HtmlWebpackPlugin = require('html-webpack-plugin')
-const ExtractTextPlugin = require('extract-text-webpack-plugin')
-const AppCachePlugin = require('appcache-webpack-plugin')
-const {BugsnagSourceMapUploaderPlugin} = require('webpack-bugsnag-plugins')
-const pkgJson = require('./package')
-
-function CopyDirPlugin (source, destination) {
-  this.source = source
-  this.destination = destination
+const path = require('path');
+const exec = require('child_process').exec;
+const webpack = require('webpack');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const AppCachePlugin = require('appcache-webpack-plugin');
+const { BugsnagSourceMapUploaderPlugin } = require('webpack-bugsnag-plugins');
+const pkgJson = require('./package');
+const buildDate = new Date();
+function CopyDirPlugin(source, destination) {
+  this.source = source;
+  this.destination = destination;
 }
 
-CopyDirPlugin.prototype.apply = function (compiler) {
+CopyDirPlugin.prototype.apply = function(compiler) {
   compiler.plugin('done', () => {
-    console.log(compiler.outputPath, this.destination)
-    exec('cp -r ' + this.source + ' ' + path.join(compiler.outputPath, this.destination))
-  })
-}
+    console.log(compiler.outputPath, this.destination);
+    exec('cp -r ' + this.source + ' ' + path.join(compiler.outputPath, this.destination));
+  });
+};
 
 module.exports = {
   cache: true,
@@ -40,10 +40,10 @@ module.exports = {
       'screw-ie8': true,
       sourceMap: true
     }),
-    //new webpack.optimize.CommonsChunkPlugin({
+    // new webpack.optimize.CommonsChunkPlugin({
     //  name: 'lib',
     //  filename: 'lib.[chunkhash:6].js'
-    //}),
+    // }),
     new HtmlWebpackPlugin({
       inject: false,
       appCache: 'coriolis.appcache',
@@ -60,6 +60,7 @@ module.exports = {
       template: path.join(__dirname, 'src/index.ejs'),
       uaTracking: process.env.CORIOLIS_UA_TRACKING || '',
       gapiKey: process.env.CORIOLIS_GAPI_KEY || '',
+      date: buildDate,
       version: pkgJson.version
     }),
     new ExtractTextPlugin({
@@ -69,7 +70,7 @@ module.exports = {
     }),
     new BugsnagSourceMapUploaderPlugin({
       apiKey: 'ba9fae819372850fb660755341fa6ef5',
-      appVersion: pkgJson.version
+      appVersion: `${pkgJson.version}-${buildDate.toISOString()}`
     }),
     new CopyDirPlugin(path.join(__dirname, 'src/schemas'), 'schemas'),
     new CopyDirPlugin(path.join(__dirname, 'src/images/logo/*'), ''),
@@ -83,14 +84,14 @@ module.exports = {
   ],
   module: {
     rules: [
-      {test: /\.css$/, loader: ExtractTextPlugin.extract({fallback: 'style-loader', use: 'css-loader'})},
-      {test: /\.less$/, loader: ExtractTextPlugin.extract({fallback: 'style-loader', use: 'css-loader!less-loader'})},
-      {test: /\.(js|jsx)$/, loader: 'babel-loader?cacheDirectory=true', include: path.join(__dirname, 'src')},
-      {test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff'},
-      {test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff'},
-      {test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/octet-stream'},
-      {test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file-loader'},
-      {test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=image/svg+xml'}
+      { test: /\.css$/, loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader' }) },
+      { test: /\.less$/, loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader!less-loader' }) },
+      { test: /\.(js|jsx)$/, loader: 'babel-loader?cacheDirectory=true', include: path.join(__dirname, 'src') },
+      { test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff' },
+      { test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff' },
+      { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/octet-stream' },
+      { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file-loader' },
+      { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=image/svg+xml' }
     ]
   }
-}
+};