From 8887516c442dc90ce2865e00f977ea7ab033351b Mon Sep 17 00:00:00 2001
From: ESadouski <zsadouski@gmail.com>
Date: Fri, 18 Nov 2016 18:27:35 +0300
Subject: [PATCH] fix(electron): fix electron build (fix #407, fix #429)

---
 config/electron/webpack.electron.common.js |  8 +++---
 config/electron/webpack.renderer.common.js | 29 ++++++++++++----------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/config/electron/webpack.electron.common.js b/config/electron/webpack.electron.common.js
index 4569a6b6..de73c4d2 100644
--- a/config/electron/webpack.electron.common.js
+++ b/config/electron/webpack.electron.common.js
@@ -18,14 +18,14 @@ module.exports = {
   },
 
   resolve: {
-    extensions: ['', '.ts', '.js', '.json']
+    extensions: ['.ts', '.js', '.json']
   },
 
   module: {
-    loaders: [
+    rules: [
       {
         test: /\.ts$/,
-        loader: 'awesome-typescript-loader'
+        loaders: 'awesome-typescript-loader'
       }
     ]
   },
@@ -35,4 +35,4 @@ module.exports = {
       from: 'src/package.json'
     }])
   ]
-}
+};
diff --git a/config/electron/webpack.renderer.common.js b/config/electron/webpack.renderer.common.js
index 51c9a2fe..a9532a6e 100644
--- a/config/electron/webpack.renderer.common.js
+++ b/config/electron/webpack.renderer.common.js
@@ -1,9 +1,9 @@
 const helpers = require('./../helpers');
-const webpack = require('webpack');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
 
 const METADATA = {
   baseUrl: './',
-  ENV: 'renderer',
+  ENV: 'renderer'
 };
 
 /*
@@ -14,17 +14,10 @@ const METADATA = {
 module.exports = function (env) {
   METADATA.ENV = env
     ? env
-    : METADATA.ENV
+    : METADATA.ENV;
 
   return {
 
-    /*
-    * Static metadata for index.html
-    *
-    * See: (custom attribute)
-    */
-    metadata: METADATA,
-
     /**
      * The plataform target where the aplication is going to run in.
      * It support target electron-renderer, but is not documented.
@@ -46,7 +39,7 @@ module.exports = function (env) {
        *
        * See: http://webpack.github.io/docs/configuration.html#output-path
        */
-      path: helpers.root('build'),
+      path: helpers.root('build')
     },
 
     /*
@@ -56,12 +49,22 @@ module.exports = function (env) {
     * See: https://webpack.github.io/docs/configuration.html#node
     */
     node: {
-      global: 'window',
+      global: true,
       crypto: 'empty',
       process: true,
       module: false,
       clearImmediate: false,
       setImmediate: false
-    }
+    },
+
+    plugins: [
+      new HtmlWebpackPlugin({
+        template: 'src/index.html',
+        title: METADATA.title,
+        chunksSortMode: 'dependency',
+        metadata: METADATA,
+        inject: 'head'
+      })
+    ]
   };
 };