e2m
/
dispatch
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Upgrade babel to 6.4.0, fail gulp builds on webpack errors

This commit is contained in:
Ken-Håvard Lieng 2016-01-07 00:28:11 +01:00
parent 47dd4f51cb
commit d7c5d0f9cd
16 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
assets/bindata.go
View File

@ -69,7 +69,7 @@ func bundle_css_gz() (*asset, error) {
return nil, err
}
info := bindata_file_info{name: "bundle.css.gz", size: 1706, mode: os.FileMode(436), modTime: time.Unix(1452019133, 0)}
info := bindata_file_info{name: "bundle.css.gz", size: 1706, mode: os.FileMode(436), modTime: time.Unix(1452122792, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -89,7 +89,7 @@ func bundle_js_gz() (*asset, error) {
return nil, err
}
info := bindata_file_info{name: "bundle.js.gz", size: 114110, mode: os.FileMode(436), modTime: time.Unix(1452019133, 0)}
info := bindata_file_info{name: "bundle.js.gz", size: 114110, mode: os.FileMode(436), modTime: time.Unix(1452122793, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -109,7 +109,7 @@ func config_default_toml() (*asset, error) {
return nil, err
}
info := bindata_file_info{name: "config.default.toml", size: 981, mode: os.FileMode(436), modTime: time.Unix(1452019112, 0)}
info := bindata_file_info{name: "config.default.toml", size: 981, mode: os.FileMode(436), modTime: time.Unix(1452122765, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -129,7 +129,7 @@ func font_fontello_eot_gz() (*asset, error) {
return nil, err
}
info := bindata_file_info{name: "font/fontello.eot.gz", size: 3543, mode: os.FileMode(436), modTime: time.Unix(1452019133, 0)}
info := bindata_file_info{name: "font/fontello.eot.gz", size: 3543, mode: os.FileMode(436), modTime: time.Unix(1452122793, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -149,7 +149,7 @@ func font_fontello_svg_gz() (*asset, error) {
return nil, err
}
info := bindata_file_info{name: "font/fontello.svg.gz", size: 1707, mode: os.FileMode(436), modTime: time.Unix(1452019133, 0)}
info := bindata_file_info{name: "font/fontello.svg.gz", size: 1707, mode: os.FileMode(436), modTime: time.Unix(1452122793, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -169,7 +169,7 @@ func font_fontello_ttf_gz() (*asset, error) {
return nil, err
}
info := bindata_file_info{name: "font/fontello.ttf.gz", size: 3490, mode: os.FileMode(436), modTime: time.Unix(1452019133, 0)}
info := bindata_file_info{name: "font/fontello.ttf.gz", size: 3490, mode: os.FileMode(436), modTime: time.Unix(1452122793, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -189,7 +189,7 @@ func font_fontello_woff_gz() (*asset, error) {
return nil, err
}
info := bindata_file_info{name: "font/fontello.woff.gz", size: 3701, mode: os.FileMode(436), modTime: time.Unix(1452019133, 0)}
info := bindata_file_info{name: "font/fontello.woff.gz", size: 3701, mode: os.FileMode(436), modTime: time.Unix(1452122793, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -209,7 +209,7 @@ func index_html_gz() (*asset, error) {
return nil, err
}
info := bindata_file_info{name: "index.html.gz", size: 252, mode: os.FileMode(436), modTime: time.Unix(1452019133, 0)}
info := bindata_file_info{name: "index.html.gz", size: 252, mode: os.FileMode(436), modTime: time.Unix(1452122793, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}

3
client/gulpfile.js
View File

@ -41,6 +41,9 @@ gulp.task('js', function(cb) {
gutil.log('[webpack]', stats.toString({
colors: true
}));
if (stats.hasErrors()) process.exit(1);
cb();
});
});

6
client/package.json
View File

@ -4,7 +4,7 @@
"description": "",
"main": "index.js",
"devDependencies": {
"babel-core": "^6.3.26",
"babel-core": "^6.4.0",
"babel-eslint": "^5.0.0-beta6",
"babel-loader": "^6.2.1",
"babel-plugin-react-transform": "^2.0.0",
@ -13,7 +13,7 @@
"babel-preset-react": "^6.3.13",
"babel-preset-stage-0": "^6.3.13",
"eslint": "^1.10.3",
"eslint-config-airbnb": "^3.0.0",
"eslint-config-airbnb": "^3.0.1",
"eslint-loader": "^1.2.0",
"eslint-plugin-react": "^3.14.0",
"express": "^4.13.3",
@ -31,7 +31,7 @@
"redux-devtools": "^3.0.1",
"redux-devtools-dock-monitor": "^1.0.1",
"redux-devtools-log-monitor": "^1.0.1",
"webpack": "^1.12.9",
"webpack": "^1.12.10",
"webpack-dev-middleware": "^1.4.0",
"webpack-hot-middleware": "^2.6.0"
},

2
client/src/js/actions/server.js
View File

@ -68,7 +68,7 @@ export function setNick(nick, server) {
socket: {
type: 'nick',
data: {
'new': nick,
new: nick,
server
}
}

2
client/src/js/components/ChatTitle.js
View File

@ -16,7 +16,7 @@ export default class ChatTitle extends Component {
} else {
disconnect(tab.server);
}
}
};
render() {
const { title, tab, channel, toggleSearch } = this.props;

6
client/src/js/components/MessageBox.js
View File

@ -8,7 +8,7 @@ import MessageLine from './MessageLine';
export default class MessageBox extends Component {
state = {
height: window.innerHeight - 100
}
};
componentDidMount() {
this.updateWidth();
@ -43,12 +43,12 @@ export default class MessageBox extends Component {
setWrapWidth(width);
}
}
}
};
handleResize = () => {
this.updateWidth();
this.setState({ height: window.innerHeight - 100 });
}
};
render() {
const { tab, messages, select, openPrivateChat } = this.props;

2
client/src/js/components/MessageHeader.js
View File

@ -12,7 +12,7 @@ export default class MessageHeader extends Component {
openPrivateChat(message.server, message.from);
select(message.server, message.from, true);
}
};
render() {
const { message } = this.props;

6
client/src/js/components/MessageInput.js
View File

@ -5,7 +5,7 @@ import pure from 'pure-render-decorator';
export default class MessageInput extends Component {
state = {
value: ''
}
};
handleKey = e => {
const { tab, runCommand, sendMessage, addInputHistory, incrementInputHistory,
@ -34,11 +34,11 @@ export default class MessageInput extends Component {
this.setState({ value: e.target.value });
resetInputHistory();
}
}
};
handleChange = e => {
this.setState({ value: e.target.value });
}
};
render() {
return (

2
client/src/js/components/Navicon.js
View File

@ -5,7 +5,7 @@ import { toggleMenu } from '../actions/tab';
@pure
class Navicon extends Component {
handleClick = () => this.props.dispatch(toggleMenu())
handleClick = () => this.props.dispatch(toggleMenu());
render() {
return (

2
client/src/js/components/Search.js
View File

@ -10,7 +10,7 @@ export default class Search extends Component {
}
}
handleSearch = e => this.props.onSearch(e.target.value)
handleSearch = e => this.props.onSearch(e.target.value);
render() {
const { search } = this.props;

6
client/src/js/components/TabList.js
View File

@ -7,17 +7,17 @@ export default class TabList extends Component {
handleTabClick = (server, target) => {
this.props.select(server, target, target && target.charAt(0) !== '#');
this.props.hideMenu();
}
};
handleConnectClick = () => {
this.props.pushPath('/connect');
this.props.hideMenu();
}
};
handleSettingsClick = () => {
this.props.pushPath('/settings');
this.props.hideMenu();
}
};
render() {
const { channels, servers, privateChats, showMenu, selected } = this.props;

2
client/src/js/components/TabListItem.js
View File

@ -6,7 +6,7 @@ export default class TabListItem extends Component {
handleClick = () => {
const { server, target, onClick } = this.props;
onClick(server, target);
}
};
render() {
const { target, content, selected } = this.props;

4
client/src/js/components/UserList.js
View File

@ -7,7 +7,7 @@ import UserListItem from './UserListItem';
export default class UserList extends Component {
state = {
height: window.innerHeight - 100
}
};
componentDidMount() {
window.addEventListener('resize', this.handleResize);
@ -19,7 +19,7 @@ export default class UserList extends Component {
handleResize = () => {
this.setState({ height: window.innerHeight - 100 });
}
};
render() {
const { tab, openPrivateChat, select } = this.props;

2
client/src/js/components/UserListItem.js
View File

@ -8,7 +8,7 @@ export default class UserListItem extends Component {
openPrivateChat(tab.server, user.nick);
select(tab.server, user.nick, true);
}
};
render() {
return <p onClick={this.handleClick}>{this.props.user.renderName}</p>;

2
client/src/js/containers/Chat.js
View File

@ -60,7 +60,7 @@ class Chat extends Component {
if (tab.channel) {
dispatch(searchMessages(tab.server, tab.channel, phrase));
}
}
};
render() {
const { tab, channel, search, history, dispatch } = this.props;

6
client/src/js/containers/Connect.js
View File

@ -10,7 +10,7 @@ import { select } from '../actions/tab';
class Connect extends Component {
state = {
showOptionals: false
}
};
handleSubmit = (e) => {
e.preventDefault();
@ -38,11 +38,11 @@ class Connect extends Component {
dispatch(join(channels, address));
}
}
}
};
handleShowClick = () => {
this.setState({ showOptionals: !this.state.showOptionals });
}
};
render() {
let optionals = null;