diff --git a/.gitignore b/.gitignore index 9832f528..af4067ba 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ Thumbs.db *.log node_modules/ -dist/ +*_bundle.js release/ npm-debug.log* diff --git a/package.json b/package.json index 59b9848b..0c655180 100644 --- a/package.json +++ b/package.json @@ -22,8 +22,7 @@ "build": "npm-run-all build:*", "build:main": "cross-env NODE_ENV=production webpack --bail --config webpack.config.main.js", "build:renderer": "cross-env NODE_ENV=production webpack --bail --config webpack.config.renderer.js", - "build:others": "gulp build", - "start": "electron dist", + "start": "electron src", "watch": "gulp watch", "serve": "gulp watch", "test": "npm-run-all build test:* lint:*", diff --git a/src/browser/components/MattermostView.jsx b/src/browser/components/MattermostView.jsx index 34d5b1cd..2bd91606 100644 --- a/src/browser/components/MattermostView.jsx +++ b/src/browser/components/MattermostView.jsx @@ -1,6 +1,6 @@ const React = require('react'); const {findDOMNode} = require('react-dom'); -const {ipcRenderer, shell} = require('electron'); +const {ipcRenderer, remote, shell} = require('electron'); const fs = require('fs'); const url = require('url'); const osLocale = require('os-locale'); @@ -8,6 +8,8 @@ const electronContextMenu = require('electron-context-menu'); const ErrorView = require('./ErrorView.jsx'); +const preloadJS = `file://${remote.app.getAppPath()}/browser/webview/mattermost_bundle.js`; + const MattermostView = React.createClass({ propTypes: { disablewebsecurity: React.PropTypes.bool, @@ -228,7 +230,7 @@ const MattermostView = React.createClass({ id={this.props.id} className='mattermostView' style={this.props.style} - preload='webview/mattermost.js' + preload={preloadJS} src={this.props.src} ref='webview' nodeintegration='false' diff --git a/src/browser/index.html b/src/browser/index.html index 99cb3b8f..85cdb400 100644 --- a/src/browser/index.html +++ b/src/browser/index.html @@ -3,13 +3,13 @@ - +
- + diff --git a/src/browser/settings.html b/src/browser/settings.html index e8aef706..03be9a29 100644 --- a/src/browser/settings.html +++ b/src/browser/settings.html @@ -4,14 +4,14 @@ Settings - +
- + diff --git a/src/package.json b/src/package.json index 57aea406..5ef9d414 100644 --- a/src/package.json +++ b/src/package.json @@ -4,7 +4,7 @@ "desktopName": "Mattermost.desktop", "version": "3.6.0", "description": "Mattermost", - "main": "main.js", + "main": "main_bundle.js", "author": { "name": "Yuya Ochiai", "email": "yuya0321@gmail.com" diff --git a/webpack.config.main.js b/webpack.config.main.js index 0e7c2b43..8a88b038 100644 --- a/webpack.config.main.js +++ b/webpack.config.main.js @@ -6,7 +6,7 @@ const base = require('./webpack.config.base'); module.exports = merge(base, { entry: './src/main.js', output: { - filename: './dist/main.js' + filename: './src/[name]_bundle.js' }, node: { __filename: false, diff --git a/webpack.config.renderer.js b/webpack.config.renderer.js index 1033d086..99f1e73c 100644 --- a/webpack.config.renderer.js +++ b/webpack.config.renderer.js @@ -10,8 +10,8 @@ module.exports = merge(base, { 'webview/mattermost': './src/browser/webview/mattermost.js' }, output: { - path: './dist/browser', - filename: '[name].js' + path: './src/browser', + filename: '[name]_bundle.js' }, module: { rules: [{