Merge branch 'master' into dev

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() {

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",

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",