Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies to enable Greenkeeper 🌴 #29

Merged
merged 7 commits into from
Oct 28, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@
"license": "AGPL3.0",
"devDependencies": {
"babel-core": "^6.3.17",
"babel-eslint": "^5.0.0-beta6",
"babel-eslint": "^7.1.0",
"babel-loader": "^6.2.0",
"babel-preset-es2015": "^6.3.13",
"babel-preset-react": "^6.3.13",
"css-loader": "^0.23.0",
"eslint": "^1.10.3",
"css-loader": "^0.25.0",
"eslint": "^3.8.1",
"eslint-loader": "^1.1.1",
"eslint-plugin-react": "^2.5.0",
"extract-text-webpack-plugin": "^0.8.2",
"eslint-plugin-react": "^6.4.1",
"extract-text-webpack-plugin": "^1.0.1",
"favico.js": "^0.3.10",
"file-loader": "^0.8.5",
"file-loader": "^0.9.0",
"json-loader": "^0.5.4",
"less": "^2.5.3",
"less-loader": "^2.2.2",
"node-libs-browser": "^0.5.2",
"node-libs-browser": "^1.0.0",
"react-hot-loader": "^1.3.0",
"url-loader": "^0.5.6",
"webpack": "^1.9.10",
Expand All @@ -36,28 +36,30 @@
"bootstrap": "^3.3.6",
"c3": "^0.4.10",
"classnames": "^2.2.1",
"d3": "^3.5.12",
"d3": "^4.3.0",
"dexie": "^1.3.1",
"etherpad-lite-client": "philschatz/etherpad-lite-client-js#master",
"gfm-linkify": "^0.1.0",
"history": "^3.0.0",
"jsonquery-engine": "^1.0.2",
"level-js": "philschatz/level.js#master",
"level-queryengine": "^3.0.1",
"levelidb": "^0.2.6",
"levelup": "^1.3.1",
"memdown": "^1.1.2",
"mermaid": "^0.5.6",
"moment": "2.10.3",
"octicons": "3.5.0",
"mermaid": "^6.0.0",
"moment": "2.15.2",
"octicons": "^4.4.0",
"octokat": ">=0.5.0-beta.0",
"puzzle-script": "0.0.2",
"react": "^0.14.7",
"react-bootstrap": "^0.28.4",
"qs": "^6.3.0",
"react": "^15.3.2",
"react-bootstrap": "^0.30.5",
"react-dnd": "^2.1.2",
"react-dnd-html5-backend": "^2.1.2",
"react-dom": "^0.14.7",
"react-router": "^1.0.2",
"recordo": "^0.0.3",
"react-dom": "^15.3.2",
"react-router": "^3.0.0",
"recordo": "^0.0.6",
"ultramarked": "^1.7.0",
"underscore": "^1.8.3"
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/app/filter-dropdown.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ const FilterCategory = React.createClass({
let searchInput;
if (!noSearch) {
searchInput = (
<BS.Input type='text' ref='filterInput' placeholder='Filter text' onChange={this.onFilterInputChange}/>
<BS.FormControl type='text' ref='filterInput' placeholder='Filter text' onChange={this.onFilterInputChange}/>
);
}
return (
Expand Down
1 change: 0 additions & 1 deletion src/components/app/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import AppNav from './nav';
import Footer from './footer';

const App = React.createClass({
mixins: [History],
componentDidMount() {
SettingsStore.on('change:tableLayout', this.onChange);
this._historyListener = history.listen(this.storeHistory);
Expand Down
3 changes: 1 addition & 2 deletions src/components/app/saved-filters.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const AddFilterModal = React.createClass({
<BS.Modal.Title><i className='mega-octicon octicon-tag'/> Save Filter</BS.Modal.Title>
</BS.Modal.Header>
<BS.Modal.Body>
<BS.Input type='text' ref='title'/>
<BS.FormControl type='text' ref='title'/>
</BS.Modal.Body>
<BS.Modal.Footer>
<BS.Button bsStyle='primary' onClick={this.onSave}>Save</BS.Button>
Expand All @@ -31,7 +31,6 @@ const AddFilterModal = React.createClass({
});

const SavedFiltersButton = React.createClass({
mixins: [History],
getInitialState() {
return {showModal: false};
},
Expand Down
2 changes: 1 addition & 1 deletion src/components/batch-labels.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ const LabelViewEdit = React.createClass({
const isSaveEnabled = name && name !== label.name;
return (
<tr>
<td><BS.Input ref='labelName' type='text' onChange={this.onChangeName} defaultValue={name || label.name}/></td>
<td><BS.FormControl ref='labelName' type='text' onChange={this.onChangeName} defaultValue={name || label.name}/></td>
<td></td>
<td>
<BS.Button bsStyle='default' onClick={this.onClickCancel}>Cancel</BS.Button>
Expand Down
2 changes: 1 addition & 1 deletion src/components/by-milestone-view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const KanbanColumn = React.createClass({

if (isShowingColumn) {
return (
<BS.Col key={milestone && milestone.title || 'no-milestone'} xl={2} lg={3} md={4} sm={6} xs={12} className='kanban-board-column'>
<BS.Col key={milestone && milestone.title || 'no-milestone'} lg={3} md={4} sm={6} xs={12} className='kanban-board-column'>
<IssueList
title={heading}
milestone={milestone}
Expand Down
3 changes: 2 additions & 1 deletion src/components/by-user-view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const KanbanColumn = React.createClass({
);

return (
<BS.Col key={login} xl={2} lg={3} md={4} sm={6} xs={12} className='kanban-board-column'>
<BS.Col key={login} lg={3} md={4} sm={6} xs={12} className='kanban-board-column'>
<IssueList title={heading}>
{issueComponents}
</IssueList>
Expand Down Expand Up @@ -73,6 +73,7 @@ const MilestonesView = React.createClass({
/*HACK: Column should handle milestones */
return (
<KanbanColumn
key={kanbanColumnCount}
login={login}
cards={columnCards}
primaryRepoName={repoName}
Expand Down
4 changes: 1 addition & 3 deletions src/components/dashboard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ const RepoItem = React.createClass({
});

const RepoGroup = React.createClass({
mixins: [History],
getInitialState() {
return {selectedRepos: {}};
},
Expand Down Expand Up @@ -242,7 +241,6 @@ const Dashboard = React.createClass({
});

const CustomRepoModal = React.createClass({
mixins: [History],
getInitialState() {
return {customRepoName: null};
},
Expand Down Expand Up @@ -270,7 +268,7 @@ const CustomRepoModal = React.createClass({
</BS.Modal.Header>
<BS.Modal.Body className='modal-body'>
<p>Enter the repository owner and name:</p>
<BS.Input
<BS.FormControl
ref='customRepo'
type='text'
placeholder='Example: philschatz/gh-board'
Expand Down
2 changes: 1 addition & 1 deletion src/components/label-badge.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const LabelBadge = React.createClass({
return (
<Link to={getFilters().toggleTagName(label.name).url()}
key={name}
{...this.props}
onClick={onClick}
className={className}
style={{backgroundColor: '#' + label.color}}>
{icon}
Expand Down
2 changes: 1 addition & 1 deletion src/components/login-modal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export default React.createClass({
<BS.Modal.Title>GitHub Credentials</BS.Modal.Title>
</BS.Modal.Header>
<BS.Modal.Body className='modal-body'>
<BS.Input
<BS.FormControl
type='text'
defaultValue={token}
disabled={!!token}
Expand Down
2 changes: 1 addition & 1 deletion src/components/move-modal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ const MoveModal = React.createClass({
);
return (
<li className='related-issue'>
<BS.Input
<BS.FormControl
type='checkbox'
defaultChecked={!unCheckedCards[vertex.key()]}
wrapperClassName='select-related-issue'
Expand Down
2 changes: 1 addition & 1 deletion src/components/repo-kanban.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const KanbanColumn = React.createClass({

if (issueComponents.length || SettingsStore.getShowEmptyColumns()) {
return (
<BS.Col key={label.name} xl={2} lg={3} md={4} sm={6} xs={12} className='kanban-board-column'>
<BS.Col key={label.name} lg={3} md={4} sm={6} xs={12} className='kanban-board-column'>
<IssueList
icon={icon}
title={title}
Expand Down
5 changes: 3 additions & 2 deletions src/history.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import createHashHistory from 'history/lib/createHashHistory';
import {hashHistory} from 'react-router';

// Use hashHistory because there is a <MenuItem> in <App> that explicitly tacks on a "#"
export default createHashHistory({queryKey: false});
// Also, gh-pages does not allow arbitrary URLs
export default hashHistory;
3 changes: 2 additions & 1 deletion src/route-utils.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import _ from 'underscore';
import qs from 'qs';
import {getReposFromStr, convertRepoInfosToStr, KANBAN_LABEL, UNCATEGORIZED_NAME} from './helpers';

const RELEVANT_PATH_SEGMENT = 2;
Expand Down Expand Up @@ -122,7 +123,7 @@ export function parseRoute({params, routes, location}) {
// TODO: remove these fallbacks once URL's are updated.
if (repoStr) { repoInfos = getReposFromStr(repoStr); }

const {query} = location;
const query = qs.parse(location.search.replace(/^\?/, ''));
if (query.m) { milestoneTitles = parseArray(query.m); }
if (query.l) { tagNames = parseArray(query.l); }
if (query.c) { columnLabels = parseArray(query.c); }
Expand Down
8 changes: 6 additions & 2 deletions src/router.js → src/router.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import ReactDOM from 'react-dom';
import Router from 'react-router';
import {Router} from 'react-router';

import history from './history';
import App from './components/app';
Expand Down Expand Up @@ -83,7 +83,11 @@ const routes = [
}
];

const router = React.createElement(Router, {history, routes});
// Use hashHistory because there is a <MenuItem> in <App> that explicitly tacks on a "#"
// Also, gh-pages does not support arbitrary URLs so the repos need to be in the hash
const router = (
<Router history={history} routes={routes} />
);

export default function() {
const div = document.createElement('div');
Expand Down
2 changes: 1 addition & 1 deletion style/app.less
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@ body { background-color: #ddd; }
.modal .anonymous-instructions [disabled] {
opacity: 1;
}
// move the checkbox to cover the list bullet just like a <BS.Input> without a label=""
// move the checkbox to cover the list bullet just like a <BS.FormControl> without a label=""
.modal.move-issue {
.related-issues .related-issue {
list-style: none;
Expand Down
9 changes: 4 additions & 5 deletions style/vendor.less
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import '../node_modules/octicons/octicons/octicons';
@octicons-font-path: '../node_modules/octicons/octicons';
@import (less) '~octicons/build/font/octicons.css';

@bs-path: '../node_modules/bootstrap/less';
@bs-path: '~bootstrap/less';
@import '@{bs-path}/variables';
@import '@{bs-path}/mixins';
@import '@{bs-path}/utilities';
Expand All @@ -28,5 +27,5 @@
@import '@{bs-path}/tooltip';
@import '@{bs-path}/type';

@import (inline) '../node_modules/mermaid/dist/mermaid.css';
@import (inline) '../node_modules/c3/c3.css';
@import (inline) '~mermaid/dist/mermaid.css';
@import (inline) '~c3/c3.css';