Merge branch 'master' into we-dont-need-to-ship-a-yaml-parser

app/src/lib/git/diff.ts

@@ -84,6 +84,7 @@ const imageFileExtensions = new Set([
   '.gif',
   '.ico',
   '.webp',
+  '.bmp',
 ])
 
 /**
@@ -307,6 +308,9 @@ function getMediaType(extension: string) {
   if (extension === '.webp') {
     return 'image/webp'
   }
+  if (extension === '.bmp') {
+    return 'image/bmp'
+  }
 
   // fallback value as per the spec
   return 'text/plain'

app/webpack.production.js

@@ -7,6 +7,8 @@ const merge = require('webpack-merge')
 const ExtractTextPlugin = require('extract-text-webpack-plugin')
 const BabelPlugin = require('babel-webpack-plugin')
 
+const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer')
+
 const config = {
   devtool: 'source-map',
   plugins: [
@@ -52,6 +54,16 @@ const rendererConfig = merge({}, common.renderer, config, {
   plugins: [
     // Necessary to be able to use ExtractTextPlugin as a loader.
     new ExtractTextPlugin('ui.css'),
+    new BundleAnalyzerPlugin({
+      // this generates the static HTML file to view afterwards, rather
+      // than disrupting the user
+      analyzerMode: 'static',
+      openAnalyzer: false,
+      // we can't emit this directly to the dist directory because the
+      // build script immediately blows away dist after webpack is done
+      // compiling the source into bundles
+      reportFilename: 'renderer.report.html',
+    }),
   ],
 })
 

package.json

@@ -101,6 +101,7 @@
     "typescript": "^2.8.1",
     "typescript-eslint-parser": "^14.0.0",
     "webpack": "^3.10.0",
+    "webpack-bundle-analyzer": "^2.11.1",
     "webpack-dev-middleware": "^2.0.3",
     "webpack-hot-middleware": "^2.21.0",
     "webpack-merge": "^4.1.0",

script/build.ts

@@ -63,6 +63,8 @@ copyStaticResources()
 console.log('Parsing license metadata…')
 generateLicenseMetadata(outRoot)
 
+moveAnalysisFiles()
+
 const isFork = process.env.CIRCLE_PR_USERNAME
 if (process.platform === 'darwin' && process.env.CIRCLECI && !isFork) {
   console.log('Setting up keychain…')
@@ -204,6 +206,22 @@ function copyStaticResources() {
   fs.copySync(common, destination, { clobber: false })
 }
 
+function moveAnalysisFiles() {
+  const rendererReport = 'renderer.report.html'
+  const analysisSource = path.join(outRoot, rendererReport)
+  if (fs.existsSync(analysisSource)) {
+    const distRoot = getDistRoot()
+    const destination = path.join(distRoot, rendererReport)
+    fs.mkdirpSync(distRoot)
+    // there's no moveSync API here, so let's do it the old fashioned way
+    //
+    // unlinkSync below ensures that the analysis file isn't bundled into
+    // the app by accident
+    fs.copySync(analysisSource, destination, { clobber: true })
+    fs.unlinkSync(analysisSource)
+  }
+}
+
 function copyDependencies() {
   // eslint-disable-next-line import/no-dynamic-require
   const originalPackage: Package = require(path.join(