From c6f06826674d5e46fe41a11d223000efc1009618 Mon Sep 17 00:00:00 2001
From: Yuya Ochiai <yuya0321@gmail.com>
Date: Sat, 13 Feb 2016 20:12:57 +0900
Subject: [PATCH 1/2] Fix webpack tasks for mattermost.js

Failed to load because common/osVersion.js is missing in dist/ .
Notification is not overrided.
---
 gulpfile.js | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 7cf0908e..ffd8b459 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -50,7 +50,7 @@ gulp.task('build', ['sync-meta', 'webpack', 'copy'], function() {
     .pipe(gulp.dest('dist'));
 });
 
-gulp.task('webpack', ['webpack:main', 'webpack:browser']);
+gulp.task('webpack', ['webpack:main', 'webpack:browser', 'webpack:webview']);
 
 gulp.task('webpack:browser', function() {
   return gulp.src('src/browser/**/*.jsx')
@@ -101,7 +101,19 @@ gulp.task('webpack:main', function() {
     .pipe(gulp.dest('dist/'));
 });
 
-gulp.task('copy', ['copy:resources', 'copy:html/css', 'copy:webview:js', 'copy:modules']);
+gulp.task('webpack:webview', function() {
+  return gulp.src('src/browser/webview/mattermost.js')
+    .pipe(named())
+    .pipe(webpack({
+      output: {
+        filename: '[name].js'
+      },
+      target: 'electron'
+    }))
+    .pipe(gulp.dest('dist/browser/webview'))
+});
+
+gulp.task('copy', ['copy:resources', 'copy:html/css', 'copy:modules']);
 
 gulp.task('copy:resources', function() {
   return gulp.src('src/resources/**')
@@ -113,11 +125,6 @@ gulp.task('copy:html/css', function() {
     .pipe(gulp.dest('dist/browser'));
 });
 
-gulp.task('copy:webview:js', function() {
-  return gulp.src(['src/browser/webview/**/*.js'])
-    .pipe(gulp.dest('dist/browser/webview'))
-});
-
 gulp.task('copy:modules', function() {
   return gulp.src(['src/node_modules/bootstrap/dist/**'])
     .pipe(gulp.dest('dist/browser/modules/bootstrap'))
@@ -128,7 +135,7 @@ gulp.task('watch', ['build'], function() {
   electron.start(options);
 
   gulp.watch(['src/main.js', 'src/main/**/*.js', 'src/common/**/*.js'], ['webpack:main']);
-  gulp.watch(['src/browser/**/*.js', 'src/browser/**/*.jsx'], ['webpack:browser', 'copy:webview:js']);
+  gulp.watch(['src/browser/**/*.js', 'src/browser/**/*.jsx'], ['webpack:browser', 'webpack:webview']);
   gulp.watch(['src/browser/**/*.css', 'src/browser/**/*.html', 'src/resources/**/*.png'], ['copy']);
 
   gulp.watch(['dist/main.js', 'dist/resources/**'], function() {

From 427b6e7ca5f8e8c476aa4e48a05c4f5ccf76da51 Mon Sep 17 00:00:00 2001
From: Yuya Ochiai <yuya0321@gmail.com>
Date: Sat, 13 Feb 2016 20:23:37 +0900
Subject: [PATCH 2/2] Update version to 1.0.5

---
 package.json     | 2 +-
 src/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index a30e3512..c81512be 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron-mattermost",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Electron-based desktop application for Mattermost",
   "main": "main.js",
   "author": "Yuya Ochiai",
diff --git a/src/package.json b/src/package.json
index 6c8a4afc..806c7c98 100644
--- a/src/package.json
+++ b/src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron-mattermost",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Electron-based desktop application for Mattermost",
   "main": "main.js",
   "author": "Yuya Ochiai",